diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 620e8c05ce..905922d636 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,15 +2,10 @@
 # Order is important; the last matching pattern takes the most precedence.
 
 * @Unity-Technologies/multiplayer-sdk
-Profiling/ @Unity-Technologies/multiplayer-tools
-Metrics/ @Unity-Technologies/multiplayer-tools
-/com.unity.netcode.gameobjects/Runtime/Transports/ @Unity-Technologies/multiplayer-workflows
-/com.unity.netcode.gameobjects/Tests/Editor/Transports/ @Unity-Technologies/multiplayer-workflows
-/com.unity.netcode.gameobjects/Tests/Runtime/Transports/ @Unity-Technologies/multiplayer-workflows
-*.asmdef @chrispope @miniwolf @NoelStephensUnity @fluong6
-package.json @chrispope @miniwolf @NoelStephensUnity @fluong6
-AssemblyInfo.cs @chrispope @miniwolf @NoelStephensUnity @fluong6
-.editorconfig @chrispope @miniwolf @NoelStephensUnity @fluong6
-.gitignore @chrispope @miniwolf @NoelStephensUnity @fluong6
-.github/ @chrispope @miniwolf @NoelStephensUnity @fluong6
-.yamato/ @chrispope @miniwolf @NoelStephensUnity @fluong6
+*.asmdef @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
+package.json @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
+AssemblyInfo.cs @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
+.editorconfig @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
+.gitignore @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
+.github/ @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
+.yamato/ @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
diff --git a/.github/ISSUE_TEMPLATE/support.md b/.github/ISSUE_TEMPLATE/support.md
index 0033a651de..2383875723 100644
--- a/.github/ISSUE_TEMPLATE/support.md
+++ b/.github/ISSUE_TEMPLATE/support.md
@@ -7,6 +7,7 @@ assignees: ''
 
 ---
 
-Post your questions or problems here.
+For support related questions we HIGHLY recommend to post a message either on the [Unity Discussions](https://discussions.unity.com/tag/netcode-for-gameobjects) or on our [Discord Community](https://discord.gg/TqNeJTtC) where you can get help from the community and the developers.
+Those forums will get you the fastest response and are the best place to ask for help.
 
-For general questions, networking advice or discussions about the Netcode for GameObjects, you can also reach us on our [Discord Community](https://discord.gg/FM8SE9E) or create a post in the [Unity Multiplayer Forum](https://forum.unity.com/forums/multiplayer.26/).
+If you still feel like you want to open a support issue as an GitHub Issue, please make sure to include as much information as possible (also including any relevant code/project) to help us understand your problem.
\ No newline at end of file
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index efe4270525..bdf3f3801f 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -2,8 +2,6 @@
 
 <!-- Add short version of the JIRA ticket to the PR title (e.g. "feat: new shiny feature [MTT-123]") -->
 
-<!-- Add RFC link here if applicable. -->
-
 ## Changelog
 
 - Added: The package whose Changelog should be added to should be in the header. Delete the changelog section entirely if it's not needed.
@@ -26,3 +24,13 @@
 - [ ] Deprecation of the API is explained in the CHANGELOG.
 - [ ] The users can understand why this API was removed and what they should use instead.
 -->
+
+## Backport
+
+<!-- If this is a backport:
+ - Add the following to the PR title: "\[Backport\] ..." .
+ - Link to the original PR.
+If this needs a backport - state this here
+If a backport is not needed please provide the reason why.
+If the "Backports" section is not present it will lead to a CI test failure. 
+-->
\ No newline at end of file
diff --git a/.github/renovate.json5 b/.github/renovate.json5
new file mode 100644
index 0000000000..1b96abd02f
--- /dev/null
+++ b/.github/renovate.json5
@@ -0,0 +1,37 @@
+{
+  "baseBranches": ["develop", "develop-2.0.0"],
+  "dependencyDashboard": true,
+
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "local>Unity-Technologies/unity-renovate-config"
+  ],
+  "prConcurrentLimit": 100,
+  // Ignore commits produced by GitHub actions workflows
+  "gitIgnoredAuthors": ["githubaction@githubaction.com"],
+  "ignorePaths": [
+    "**/node_modules/**",
+    // Don't renovate files in special folders using ~ as suffix
+    "**/*~/**",
+    "com.unity.netcode.gameobjects/**/*",
+    "Examples/**/*",
+    "testproject/**/*",
+    "minimalproject/**/*",
+    "testproject-tools-integration/**/*"
+  ],
+  "packageRules": [
+    // Run unity-upm-project and unity-upm-package only on weekends to reduce PR noise
+    // Also ensure dependencies won't be downgraded when they don't exist in the public repositories
+    {
+      "matchManagers": [
+        "unity-upm-project",
+        "unity-upm-package"
+      ],
+      "enabled": "true",
+      "schedule": [
+        "every weekend"
+      ],
+      "rollbackPrs": false,
+    }
+  ],
+}
diff --git a/.github/workflows/assignee-management.yaml b/.github/workflows/assignee-management.yaml
new file mode 100644
index 0000000000..b330a01191
--- /dev/null
+++ b/.github/workflows/assignee-management.yaml
@@ -0,0 +1,70 @@
+# This workflow manages issue assignments and related label changes:
+# 1. When someone is assigned to an issue:
+#    - Removes "stat:awaiting-triage" label
+#    - Adds "stat:Investigating" label
+# 2. When all assignees are removed from an issue:
+#    - Adds "stat:awaiting-triage" label
+#    - Removes "stat:Investigating" label
+# 3. When "stat:Investigating" label is added:
+#    - Automatically assigns the issue to the person who added the label
+
+name: Handle Issue Assignment and Labels
+
+on:
+  issues:
+    types: [assigned, unassigned, labeled]
+
+env:
+  AWAITING-TRIAGE_LABEL: stat:awaiting-triage
+  INVESTIGATING_LABEL: stat:Investigating
+
+jobs:
+  handle_assignment:
+    name: Handle Issue Assignment Changes
+    if: ${{ !github.event.issue.pull_request && github.event.issue.state == 'open' }}
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+
+    steps:
+      - name: Handle Assignment Changes
+        run: |
+          if [[ "${{ github.event.action }}" == "assigned" ]]; then
+            # Someone was assigned - remove awaiting-triage, add investigating
+            echo "ADD=${{ env.INVESTIGATING_LABEL }}" >> $GITHUB_ENV
+            echo "REMOVE=${{ env.AWAITING-TRIAGE_LABEL }}" >> $GITHUB_ENV
+          elif [[ "${{ github.event.action }}" == "unassigned" ]]; then
+            # Check if there are any remaining assignees
+            ASSIGNEES=$(echo '${{ toJson(github.event.issue.assignees) }}' | jq length)
+            if [[ "$ASSIGNEES" == "0" ]]; then
+              # No assignees left - add awaiting-triage, remove investigating
+              echo "ADD=${{ env.AWAITING-TRIAGE_LABEL }}" >> $GITHUB_ENV
+              echo "REMOVE=${{ env.INVESTIGATING_LABEL }}" >> $GITHUB_ENV
+            fi
+          fi
+
+      - name: Update Labels
+        if: env.ADD != '' || env.REMOVE != ''
+        run: gh issue edit "$NUMBER" --add-label "$ADD" --remove-label "$REMOVE"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          NUMBER: ${{ github.event.issue.number }}
+
+  handle_investigating_label:
+    name: Handle Investigating Label Addition
+    if: ${{ github.event.action == 'labeled' && github.event.label.name == 'stat:Investigating' && !github.event.issue.pull_request && github.event.issue.state == 'open' }}
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+
+    steps:
+      - name: Assign Issue to person that added Investigating Label
+        run: |
+          # Assign the issue to the person who added the label
+          gh issue edit "$NUMBER" --add-assignee "$ACTOR"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          NUMBER: ${{ github.event.issue.number }}
+          ACTOR: ${{ github.actor }}
diff --git a/.github/workflows/backport-verification.yml b/.github/workflows/backport-verification.yml
new file mode 100644
index 0000000000..4e82b13af6
--- /dev/null
+++ b/.github/workflows/backport-verification.yml
@@ -0,0 +1,32 @@
+# This workflow is designed to verify that the pull request description contains a "## Backport" section, which is important as a reminder to account for backports for anyone that works with NGO repository.
+# We have 2 development branches (develop and develop-2.0.0) and we need to ensure that relevant changes are landing in only one or both of them
+# If the "##Backport" section is missing, the workflow will fail and block the PR from merging, prompting the developer to add this section.
+
+# The workflow is configured to run when PR is created as well as when it is edited which also counts simple description edits.
+
+name: "NGO - Backport Verification"
+
+on:
+  pull_request:
+    types: [opened, edited, synchronize, reopened]
+    branches:
+      - develop
+      - develop-2.0.0
+
+jobs:
+  backport-verification:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Check PR description
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const pr = context.payload.pull_request;
+            const body = pr.body || '';
+
+            if (!body.includes('## Backport')) {
+              core.setFailed('PR description must include a "## Backport" section. Please add this section and provide information about this PR backport to develop or develop-2.0.0 branch respectively or explain why backport is not needed.');
+            }
\ No newline at end of file
diff --git a/.github/workflows/conventional-pr.yml b/.github/workflows/conventional-pr.yml
index ec3a6512e3..8e783eec55 100644
--- a/.github/workflows/conventional-pr.yml
+++ b/.github/workflows/conventional-pr.yml
@@ -1,6 +1,6 @@
 name: Conventional PR
 
-# Controls when the action will run. 
+# Controls when the action will run.
 on:
   pull_request:
     branches:
@@ -17,7 +17,7 @@ jobs:
     steps:
       - name: semantic-pull-request
         # Internal Unity mirror available at jesseo/action-semantic-pull-request, but actions from private repos aren't supported, so continue to use the public one below
-        uses: amannn/action-semantic-pull-request@b7a9a97cb10fa6e1ae02647e718798175f6b1f1d
+        uses: amannn/action-semantic-pull-request@v5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -34,4 +34,4 @@ jobs:
           # For work-in-progress PRs you can typically use draft pull requests from Github. However, private repositories on the free plan don't have this option and therefore this action allows you to opt-in to using the special '[WIP]' prefix to indicate this state. This will avoid the validation of the PR title and the pull request checks remain pending. Note that a second check will be reported if this is enabled.
           #wip: # optional
           # When using "Squash and merge" on a PR with only one commit, GitHub will suggest using that commit message instead of the PR title for the merge commit, and it's easy to commit this by mistake. Enable this option to also validate the commit message for one commit PRs.
-          validateSingleCommit: true # optional
+          # validateSingleCommit: true # optional
diff --git a/.github/workflows/conversation-labels.yaml b/.github/workflows/conversation-labels.yaml
new file mode 100644
index 0000000000..0297464bc5
--- /dev/null
+++ b/.github/workflows/conversation-labels.yaml
@@ -0,0 +1,51 @@
+# This workflow will update issues with proper "conversation related" labels. This mean that stat:awaiting-repsonse label will be present after Unity account made comments and stat:reply-needed will be present when user made latest comment
+
+name: Update conversation labels of the issue
+
+# Trigger for the workflow
+# This trigger will populate the github.event object
+# Details on properties are here: https://docs.github.com/en/webhooks/webhook-events-and-payloads?actionType=created#issue_comment
+on:
+  issue_comment:
+    types: [created]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.issue.number }}
+  cancel-in-progress: true
+
+# Define labels here
+env:
+  AWAITING_RESPONSE: stat:awaiting-response
+  REPLY_NEEDED: stat:reply-needed
+
+jobs:
+  conversation_labels:
+    name: Calculate and update conversation labels of the issue
+    if: ${{ !github.event.issue.pull_request && github.event.issue.state == 'open' }}
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+
+    steps:
+      - name: Calculate labels
+        run: |
+
+          if [[ "${{ github.event.comment.author_association }}" == "MEMBER" ]]; then
+            # Unity member commented - add awaiting-response, remove reply-needed
+            echo "ADD=${{ env.AWAITING_RESPONSE }}" >> $GITHUB_ENV
+            echo "REMOVE=${{ env.REPLY_NEEDED }}" >> $GITHUB_ENV
+          else
+            # Non-Unity member commented - add reply-needed, remove awaiting-response
+            echo "ADD=${{ env.REPLY_NEEDED }}" >> $GITHUB_ENV
+            echo "REMOVE=${{ env.AWAITING_RESPONSE }}" >> $GITHUB_ENV
+          fi
+
+      - name: Update labels
+        # This runs a command using the github cli: https://cli.github.com/manual/gh_issue_edit
+        # If $ADD is set, it will add the label, otherwise it will remove the label
+        # There is no need to check if $ADD or $REMOVE is set, as the command will ignore it if it is empty
+        run: gh issue edit "$NUMBER" --add-label "$ADD" --remove-label "$REMOVE"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          NUMBER: ${{ github.event.issue.number }}
diff --git a/.github/workflows/mark-stale-issue.yaml b/.github/workflows/mark-stale-issue.yaml
new file mode 100644
index 0000000000..2e77192183
--- /dev/null
+++ b/.github/workflows/mark-stale-issue.yaml
@@ -0,0 +1,39 @@
+# This workflow utilises an existing implementation (https://github.com/actions/stale) that performs the following actions:
+#   1) Adds "stale" label to issues that have "stat:awaiting-response" for more than 30 days meaning that since we don't have enough information we may potentially close such issue
+#   2) Closes issues that have been marked as "stale" for more than 30 days
+
+# This affects only Issues but at some point we may also consider rules for PRs
+
+name: Mark or Close Stale Issues
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * *'  # Runs daily at midnight
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    
+    steps:
+      - uses: actions/stale@v9
+        with:
+          # Only mark issues (not PRs) as stale
+          any-of-labels: 'stat:awaiting-response'
+          days-before-stale: 30
+          days-before-close: 30
+          stale-issue-label: 'Stale'
+          exempt-issue-labels: 'stat:import,stat:imported'
+          stale-issue-message: >
+            This issue has been automatically marked as stale because it has been awaiting 
+            response for over 30 days without any activity.
+
+            Please update the issue with any new information or it may be closed in 30 days.
+          close-issue-message: >
+            This issue has been automatically closed because it has been stale for 30 days 
+            without any activity. Feel free to reopen if you have new information to add.
+          # Prevent the action from marking/closing PRs
+          days-before-pr-stale: -1
+          days-before-pr-close: -1
diff --git a/.github/workflows/remove-labels-on-issue-close.yaml b/.github/workflows/remove-labels-on-issue-close.yaml
new file mode 100644
index 0000000000..2ac5145e16
--- /dev/null
+++ b/.github/workflows/remove-labels-on-issue-close.yaml
@@ -0,0 +1,40 @@
+# This workflow will remove almost all labels from closed issues beside ones that could be relevant for future tracking like: "port:", "type:", "priority:", "regression" and "stat:imported"
+
+name: Remove labels when issue is closed
+
+on:
+  issues:
+    types: [closed] # We want it to run on closed issues
+
+jobs:
+  remove_labels:
+    name: Calculate and remove issue labels
+    if: ${{ !github.event.issue.pull_request  }} # This is needed to distinguish from PRs (which we don't want to affect)
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+
+    steps:
+      - name: Find labels to remove
+        id: data
+        run: |
+          # Convert labels to array and filter out type: labels
+          LABELS_TO_REMOVE=($(echo "$EXISTING_LABELS" | jq -r '.[] | select(startswith("type:") or startswith("port:") or startswith("priority:") or . == "regression" or . == "stat:imported" | not)'))
+          
+          # Only proceed if we have labels to remove
+          if [ ${#LABELS_TO_REMOVE[@]} -gt 0 ]; then
+            echo "REMOVE_LABELS=$(IFS=,; echo "${LABELS_TO_REMOVE[*]}")" >> $GITHUB_ENV
+            echo "HAS_LABELS=true" >> $GITHUB_ENV
+          else
+            echo "HAS_LABELS=false" >> $GITHUB_ENV
+          fi
+        env:
+          EXISTING_LABELS: ${{ toJson(github.event.issue.labels.*.name) }}
+
+      - name: Remove labels
+        if: ${{ env.REMOVE_LABELS != '' }}
+        run: gh issue edit "$NUMBER" --remove-label "$REMOVE_LABELS"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          NUMBER: ${{ github.event.issue.number }}
diff --git a/.gitignore b/.gitignore
index 4b4867581e..1d3ee28bec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,6 @@ upm-ci~
 utr
 utr.bat
 .download
+Tools/CI/bin
+Tools/CI/obj
 
diff --git a/.yamato/README.md b/.yamato/README.md
new file mode 100644
index 0000000000..2e0a761714
--- /dev/null
+++ b/.yamato/README.md
@@ -0,0 +1,80 @@
+# Netcode for GameObjects CI Documentation
+
+## Overview
+This document provides an overview of the Continuous Integration (CI) implementation for Netcode for GameObjects. 
+Specifics of each test are described within related files (for example .yamato/package-tests.yml) and this file present high level overview related to overall implementation.
+
+## Test Configurations
+CI related files are present inside .yamato/ folder and we can distinguish specific tests
+
+### Helper jobs
+- `.yamato/package-pack.yml` responsible for generating package artifacts (.tgz) required for testing and publishing.
+- `.yamato/project-pack.yml` responsible for generating package artifacts (.tgz) required for testing and publishing. This packs all packages of a given project.
+- `.yamato/_run-all.yml` responsible for grouping tests into groups for easier management (for example "all console tests").
+- `.yamato/_triggers.yml` responsible for defining triggers (PR, nightly, weekly etc.) and defining which tests to run.
+- `disable-burst-if-requested.py` responsible for helping to disable burst if needed.
+- `.yamato/project.metafile` being the central configuration file defining test environments, platforms, projects, editors and other parameters used.
+
+### In-Editor Tests
+- `.yamato/package-tests.yml` responsible for running package tests.
+- `.yamato/project-tests.yml` responsible for running project tests.
+- `.yamato/project-updated-dependencies-test.yml` responsible for running tests after updating dependencies to latest ones.
+- `.yamato/project-standards.yml` responsible for running standards check on a package.
+- `.yamato/code-coverage.yml` responsible for running code coverage analysis.
+- `.yamato/performance-tests.yml` responsible for running performance tests.
+- `.yamato/webgl-build.yml` responsible for making a build for webgl platform.
+
+### Standalone Tests
+- `.yamato/desktop-standalone-tests.yml` responsible for running tests on standalone desktops.
+- `.yamato/console-standalone-test.yml` responsible for running tests on standalone consoles.
+- `.yamato/mobile-standalone-test.yml` responsible for running tests on standalone mobiles.
+
+### Wrench jobs
+This file is auto generated by wrench and used for automating release process.
+Those tests can also be used by our CI as dependencies.
+- `.yamato/wrench/api-validation-jobs.yml` responsible for validating api for a given package version (for example if there are no breaking changes when updating patch version)
+- `.yamato/wrench/package-pack-jobs.yml` responsible for generating package artifacts (.tgz) required for testing and publishing.
+- `.yamato/wrench/preview-a-p-v.yml` responsible for validating PVP (Package Verification Profiles) standards for the package.
+- `.yamato/wrench/promotion-jobs.yml` responsible for publishing.
+- `.yamato/wrench/publish-trigger.yml` responsible for defining jobs that need to pass in order to publish.
+- `.yamato/wrench/recipe-regeneration.yml` responsible for verifying regeneration of wrench recipes (no manual changes).
+- `.yamato/wrench/validation-jobs.yml` responsible for running package tests.
+- `.yamato/wrench/wrench_config.json` this is the configuration file for wrench.
+- `.yamato/generated-scripts/` is a collection of infrastructure instability detection tools.
+
+## Jobs Configuration Structure
+This section explains some configuration details that may be confusing while looking at .yml files.
+
+### Job Generation
+Our configuration uses a dynamic job generation approach based on the `.yamato/project.metafile` configuration. While it may appear that only one job is defined per file, the system (Yamato) actually generates multiple jobs through nested loops.
+Usually only 1 job is defined and then generated with multiple configurations/parameters but in case of standalone tests 2 jobs are defined which are responsible for building and then testing.
+
+### Job Naming Convention
+Because the jobs are being generated their names will be filled by given parameters from project.metfaile. For example jobs from .yamato/console-standalone-test may have names like:
+- Display Name (in Yamato): `Build testproject - [win, 6000.0, il2cpp]`
+- Internal Job Name (used when adding dependency for example): `console_standalone_build_testproject_win_6000.0`
+
+## Platform Support
+Currently, the CI implementation supports the following platforms:
+1. Console Platforms:
+   - Switch
+   - PS4
+   - PS5
+   - Xbox360
+   - XboxOne
+2. Mobile Platforms:
+   - Android
+   - iOS
+3. Desktop Platforms:
+   - Windows
+   - Ubuntu
+   - macOS
+4. Unity Editor Versions
+    - Supports NGOv2.X (6000.0+ editors)
+5. Architectures
+   - x64
+   - ARM64 (This is present for consoles/mobiles but will be extended. More information is present in specific standalone test files)
+
+## Design Considerations
+In theory, we could manually write jobs for every configuration. However, this approach would be more error-prone, especially when modifications or fixes are needed, as it would require keeping track of all configurations.
+The downside of our current approach is that it can sometimes impact readability due to the use of nested if and for statements.
\ No newline at end of file
diff --git a/.yamato/_run-all.yml b/.yamato/_run-all.yml
index 8bf0c61968..ec26e6eb90 100644
--- a/.yamato/_run-all.yml
+++ b/.yamato/_run-all.yml
@@ -1,161 +1,186 @@
-{% metadata_file .yamato/project.metafile %}
+{% metadata_file .yamato/project.metafile %} # All configuration that is used to create different configurations (used in for loops) is taken from this file.
 ---
-run_all_tests:
-  name: Run All Package and Project Tests
+
+# DESCRIPTION--------------------------------------------------------------------------
+  # Those jobs group together related test as dependencies to allow to easily manage running a given set of tests.
+  # This enables efficient test execution for different validation scenarios
+
+# QUALITY CONSIDERATIONS---------------------------------------------------------------
+  # It's important to ensure that all dependencies exist (this can be verified in Yamato) since a modification in parameters may result in a given job not being generated, and thus we will not be able to run such erroneous job.
+
+#-----------------------------------------------------------------------------------
+
+# Runs all package tests
+run_all_package_tests:
+  name: Run All Package Tests
   dependencies:
-    # Pull in package and validate jobs through the badges job
-    - .yamato/_triggers.yml#badges_test_trigger
-    - .yamato/mobile-build-and-test.yml#run_{{ projects.first.name }}_tests_{{ mobile_validation_editor }}_iOS
-    - .yamato/mobile-build-and-test.yml#run_{{ projects.first.name }}_tests_{{ mobile_validation_editor }}_android
-    # - .yamato/_run-all.yml#all_project_tests_standalone
-{% for project in projects -%}
-{% if project.name == "testproject" -%}
-{% for editor in project.test_editors -%}
-    - .yamato/webgl-build.yml#build_{{ project.name }}_tests_{{ editor }}_webgl
+{% for platform in test_platforms.desktop -%}
+{% for editor in validation_editors.all -%}
+    - .yamato/package-tests.yml#package_test_-_ngo_{{ editor }}_{{ platform.name }}
 {% endfor -%}
-{% endif -%}
 {% endfor -%}
 
-{% for platform in test_platforms -%}
-{% for project in projects -%}
-{% for editor in project.test_editors -%}
-{% if editor != "trunk" -%}
-{% for package in project.packages -%}
-    - .yamato/package-tests.yml#test_{{ project.name}}_{{ package.name }}_{{ editor }}_{{ platform.name }}
+
+# Runs all package tests on trunk editor
+run_all_package_tests_trunk:
+  name: Run All Package Tests [Trunk only]
+  dependencies:
+{% for platform in test_platforms.desktop -%}
+{% for editor in validation_editors.default -%}
+    - .yamato/package-tests.yml#package_test_-_ngo_{{ editor }}_{{ platform.name }}
 {% endfor -%}
-    - .yamato/project-tests.yml#test_{{ project.name }}_{{ editor }}_{{ platform.name }}
-{% endif -%}
 {% endfor -%}
 
-## Test minimal project with different versions of dependencies
-{% if project.name == "minimalproject" -%}
-{% for dependency in dependencies -%}
-{% for depeditor in dependency.test_editors -%}
-{% if depeditor != "trunk" -%}
-    - .yamato/package-tests.yml#test_compatibility_{{ project.name }}_{{ project.packages.first.name }}_with_{{ dependency.name }}@{{ dependency.version }}_{{ depeditor }}_{{ platform.name }}
-{% endif -%}
+
+# Runs all projects tests
+run_all_project_tests:
+  name: Run All Project Tests
+  dependencies:
+{% for project in projects.all -%}
+{% if project.has_tests == "true" -%}
+{% for platform in test_platforms.desktop -%}
+{% for editor in validation_editors.all -%}
+    - .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_{{ editor }}
 {% endfor -%}
 {% endfor -%}
 {% endif -%}
 {% endfor -%}
-{% endfor -%}
 
-run_all_tests_trunk:
-  name: Run All Package and Project Tests [Trunk]
+
+# Runs all projects tests on trunk editor
+run_all_project_tests_trunk:
+  name: Run All Project Tests [Trunk only]
   dependencies:
-{% for platform in test_platforms -%}
-{% for project in projects -%}
-{% for editor in project.test_editors -%}
-{% if editor == "trunk" -%}
-{% for package in project.packages -%}
-    - .yamato/package-tests.yml#test_{{ project.name}}_{{ package.name }}_{{ editor }}_{{ platform.name }}
-{% endfor -%}
-    - .yamato/project-tests.yml#test_{{ project.name }}_{{ editor }}_{{ platform.name }}
+{% for project in projects.all -%}
+{% if project.has_tests == "true" -%}
+{% for platform in test_platforms.desktop -%}
+{% for editor in validation_editors.default -%}
+    - .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_{{ editor }}
+{% endfor -%}
+{% endfor -%}
 {% endif -%}
 {% endfor -%}
 
-## Test minimal project with different versions of dependencies on trunk
-{% if project.name == "minimalproject" -%}
-{% for dependency in dependencies -%}
-{% for depeditor in dependency.test_editors -%}
-{% if depeditor == "trunk" -%}
-    - .yamato/package-tests.yml#test_compatibility_{{ project.name }}_{{ project.packages.first.name }}_with_{{ dependency.name }}@{{ dependency.version }}_{{ depeditor }}_{{ platform.name }}
-{% endif -%}
+
+# Runs all project standards check
+run_all_projects_standards:
+  name: Run All Projects Standards
+  dependencies:
+{% for platform in test_platforms.default -%}
+{% for project in projects.all -%}
+{% for editor in validation_editors.default -%}
+    - .yamato/project-standards.yml#standards_{{ platform.name }}_{{ project.name }}_{{ editor }}
+{% endfor -%}
 {% endfor -%}
 {% endfor -%}
+
+
+# Runs all WebGL builds
+run_all_webgl_builds:
+  name: Run All WebGl Build
+  dependencies:
+{% for project in projects.default -%}
+{% for platform in test_platforms.desktop -%}
+{% if platform.name != "mac" -%} # There is an error about "Light baking could not be started because no valid OpenCL device could be found". Tracked in MTT-11726
+{% for editor in validation_editors.all -%}
+    - .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}
+{% endfor -%}
 {% endif -%}
 {% endfor -%}
 {% endfor -%}
 
-all_project_tests:
-  name: Run All Project Tests
+
+# Runs all WebGL builds on trunk editor
+run_all_webgl_builds_trunk:
+  name: Run All WebGl Build [Trunk only]
   dependencies:
-    - .yamato/_triggers.yml#badges_test_trigger
-{% for platform in test_platforms -%}
-{% for project in projects -%}
-{% for editor in project.test_editors -%}
-    - .yamato/project-tests.yml#test_{{ projects.first.name }}_{{ editor }}_{{ platform.name }}
+{% for project in projects.default -%}
+{% for platform in test_platforms.desktop -%}
+{% if platform.name != "mac" -%} # There is an error about "Light baking could not be started because no valid OpenCL device could be found". Tracked in MTT-11726
+{% for editor in validation_editors.default -%}
+    - .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}
 {% endfor -%}
+{% endif -%}
 {% endfor -%}
 {% endfor -%}
 
-all_package_tests:
-  name: Run All Package Tests
+
+# Runs all Desktop tests
+run_all_project_tests_desktop_standalone:
+  name: Run All Standalone Tests - Desktop
   dependencies:
-    - .yamato/_triggers.yml#badges_test_trigger
-{% for platform in test_platforms -%}
-{% for project in projects -%}
-{% for editor in project.test_editors -%}
-{% for package in project.packages -%}
-    - .yamato/package-tests.yml#test_{{ project.name}}_{{ package.name }}_{{ editor }}_{{ platform.name }}
+{% for project in projects.default -%}
+{% for platform in test_platforms.desktop -%}
+{% for editor in validation_editors.all -%}
+{% for backend in scripting_backends -%}
+    - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }}
 {% endfor -%}
 {% endfor -%}
 {% endfor -%}
 {% endfor -%}
 
-# Test minimal project with different versions of dependencies
-all_compatibility_tests:
-  name: Run All Compatibility Tests
+
+# Runs all Desktop tests on trunk editor
+run_all_project_tests_desktop_standalone_trunk:
+  name: Run All Standalone Tests - Desktop [Trunk only]
   dependencies:
-{% for platform in test_platforms -%}
-{% for project in projects -%}
-{% if project.name == "minimalproject" -%}
-{% for dependency in dependencies -%}
-{% for editor in dependency.test_editors -%}
-    - .yamato/package-tests.yml#test_compatibility_{{ project.name }}_{{ project.packages.first.name }}_with_{{ dependency.name }}@{{ dependency.version }}_{{ editor }}_{{ platform.name }}
+{% for project in projects.default -%}
+{% for platform in test_platforms.desktop -%}
+{% for editor in validation_editors.default -%}
+{% for backend in scripting_backends -%}
+    - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }}
 {% endfor -%}
 {% endfor -%}
-{% endif -%}
 {% endfor -%}
 {% endfor -%}
 
-all_singlenode_multiprocess_tests:
-  name: Run All Multiprocess Tests - Single Node
+# Runs all Mobile tests
+run_all_project_tests_mobile_standalone:
+  name: Run All Standalone Tests - Mobile
   dependencies:
-{% for platform in test_platforms -%}
-{% for project in projects -%}
-{% for editor in project.test_editors -%}
-{% if editor != "trunk" %}
-    - .yamato/multiprocess-project-tests.yml#singlenode_multiprocess_test_testproject_{{ editor }}_{{ platform.name }}
-{% endif %}
+{% for project in projects.default -%}
+{% for platform in test_platforms.mobile_test -%}
+{% for editor in validation_editors.all -%}
+    - .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}
 {% endfor -%}
 {% endfor -%}
 {% endfor -%}
 
-all_project_tests_standalone:
-  name: Run All Project Tests - Standalone
+
+# Runs all Mobile tests on trunk editor
+run_all_project_tests_mobile_standalone_trunk:
+  name: Run All Standalone Tests - Mobile [Trunk only]
   dependencies:
-{% for platform in test_platforms -%}
-{% for project in projects -%}
-{% if project.has_tests == "true" -%}
-{% for editor in project.test_editors -%}
-{% for backend in scripting_backends -%}
-    - .yamato/standalone-project-tests.yml#standalone_tests_{{ project.name }}_{{ backend }}_{{ editor }}_{{ platform.name }}
+{% for project in projects.default -%}
+{% for platform in test_platforms.mobile_test -%}
+{% for editor in validation_editors.default -%}
+    - .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}
 {% endfor -%}
 {% endfor -%}
-{% endif -%}
-{% endfor -%}
 {% endfor -%}
 
-all_project_tests_mobile:
-  name: Run All Project Tests - Mobile
+
+# Runs all Console tests
+run_all_project_tests_console_standalone:
+  name: Run All Standalone Tests - Console
   dependencies:
-{% for project in projects -%}
-{% if project.name == "testproject" -%}
-{% for editor in project.test_editors -%}
-    - .yamato/mobile-build-and-test.yml#run_{{ project.name }}_tests_{{ editor }}_android
-    - .yamato/mobile-build-and-test.yml#run_{{ project.name }}_tests_{{ editor }}_iOS
+{% for project in projects.default -%}
+{% for platform in test_platforms.console_test -%}
+{% for editor in validation_editors.all -%}
+    - .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}
+{% endfor -%}
 {% endfor -%}
-{% endif -%}
 {% endfor -%}
 
-all_project_tests_webgl:
-  name: Build All Project Tests - WebGL
+
+# Runs all Console tests on trunk editor
+run_all_project_tests_console_standalone_trunk:
+  name: Run All Standalone Tests - Console [Trunk only]
   dependencies:
-{% for project in projects -%}
-{% if project.name == "testproject" -%}
-{% for editor in project.test_editors -%}
-    - .yamato/webgl-build.yml#build_{{ project.name }}_tests_{{ editor }}_webgl
+{% for project in projects.default -%}
+{% for platform in test_platforms.console_test -%}
+{% for editor in validation_editors.default -%}
+    - .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}
+{% endfor -%}
 {% endfor -%}
-{% endif -%}
 {% endfor -%}
diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml
index 6bafa5ff1b..352f1f6c08 100644
--- a/.yamato/_triggers.yml
+++ b/.yamato/_triggers.yml
@@ -1,100 +1,123 @@
-{% metadata_file .yamato/project.metafile %}
+{% metadata_file .yamato/project.metafile %} # All configuration that is used to create different configurations (used in for loops) is taken from this file.
 ---
-develop_nightly:
-  name: "\U0001F319 [Nightly] Run All Tests"
-  triggers:
-    recurring:
-    - branch: develop
-      frequency: daily
-      rerun: always
-  dependencies:
-    - .yamato/_run-all.yml#run_all_tests
-{% for project in projects -%}
-{% if project.has_tests == "true" -%}
-    - .yamato/code-coverage.yml#code_coverage_win_{{ project.name }}_{{ validation_editor }}
-{% endif -%}
-{% endfor -%}
 
-develop_weekly_trunk:
-  name: "\U0001F319 [Weekly] Run All Tests [Trunk]"
-  triggers:
-    recurring:
-    - branch: develop
-      frequency: weekly
-      rerun: always
-  dependencies:
-    - .yamato/_run-all.yml#run_all_tests_trunk
+# DESCRIPTION--------------------------------------------------------------------------
+  # This configuration defines three main CI trigger patterns:
+    # 1. Pull Request Validation: Validation performed on PR basis
+    # 2. Nightly Development: Test set run nightly (validates most important test cases)
+    # 3. Weekly Full Validation: Test set run weekly (validates all test cases to prevent any suprises)
+  # Each pattern represents different balance between validation depth, execution time and CI resource usage
 
-multiprocess_nightly:
-  name: "\U0001F319 [Nightly] Run Multiprocess Tests"
-  triggers:
-    recurring:
-    - branch: develop
-      frequency: daily
-      rerun: always
-  dependencies:
-    - .yamato/_run-all.yml#all_singlenode_multiprocess_tests
+# TRIGGER PATTERNS-------------------------------------------------------------------
+  # Pull Request:
+    # This test validaes Standards, Package tests, Project tests and Desktop standalone tests to ensure that main platforms are covered
+    # Triggers on PRs to develop, develop-2.0.0, and release branches
+    # Focuses on critical validation paths that we should validate before merging PRs
+    # Cancels previous runs on new commits
+    # Excludes draft PRs
+
+  # Nightly:
+    # This test validaes same subset as pull_request_trigger with addition of mobile/console tests and webgl builds
+    # Runs daily on develop-2.0.0 (local configuration)
+    # Includes all test types but only on trunk. TODO: Add validation for minimum supported editor in nightly
+    # Adds platform-specific and APV validation
+
+  # Weekly:
+  # This test validaes same subset as develop_nightly but runs per all supported editors as well as executes code coverage test and runs project standards per project
+    # Runs across all supported editor versions
+    # Includes code coverage analysis
+    # Validates all projects and standards
+
+# CONFIGURATION STRUCTURE--------------------------------------------------------------
+  # Jobs configurations are generated by ensuring that all dependencies are successful.
+  # The dependencies are taken from _run-all.yml file where we can gather multiple tests into proper sets
 
-# Run all relevant tasks when a pull request targeting the develop
-# branch is created or updated. Currently only netcode package tests are
-# enabled, since the others are missing test coverage and will fail CI.
+# QUALITY CONSIDERATIONS---------------------------------------------------------------
+# It's important to ensure that all dependencies exist (this can be verified in Yamato) since a modification in parameters may result in a given job not being generated, and thus we will not be able to run such erroneous job.
+
+
+
+#-----------------------------------------------------------------------------------
+
+# Run all relevant tasks when a pull request targeting the develop or release branch is created or updated.
 pull_request_trigger:
-  name: Pull Request Trigger (master, develop, & release branches)
+  name: Pull Request Trigger (develop, develop-2.0.0, & release branches)
   dependencies:
-    - .yamato/project-standards.yml#standards_{{ projects.first.name }}
-{% for project in projects -%}
-{% for package in project.packages -%}
-{% if project.validate == "true" -%}
-    - .yamato/project-publish.yml#validate_{{ package.name }}_{{ test_platforms.first.name }}_{{ validation_editor }}
-{% endif -%}
-{% endfor -%}
-{% for platform in test_platforms -%}
-{% for package in project.packages -%}
-    - .yamato/package-tests.yml#test_{{ project.name }}_{{ package.name }}_{{ project.test_editors.first }}_{{ platform.name }}
-{% endfor -%}
-    - .yamato/project-tests.yml#test_{{ project.name }}_{{ project.test_editors.first }}_{{ platform.name }}
-{% endfor -%}
-{% endfor -%}
+    # Run project standards to verify package/default project
+    - .yamato/project-standards.yml#standards_ubuntu_testproject_trunk
+    # Run package EditMode and Playmode tests on desktop platforms on trunk
+    - .yamato/_run-all.yml#run_all_package_tests_trunk
+    # Run project EditMode and PLaymode tests on desktop platforms on trunk 
+    - .yamato/_run-all.yml#run_all_project_tests_trunk
+    # Run one standalone test to make sure there are no obvious issues with most common platform (for example --fail-on-assert option is not present with package/project tests)
+    - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_win_il2cpp_trunk
   triggers:
     cancel_old_ci: true
     pull_requests:
-    - targets:
-        only:
-          - "master"
-          - "develop"
-          - "develop-2.0.0"
-          - "/release\/.*/"
-          
-# Currently, we need to have a trigger to updated badges
-# Only package badges currently exist
-badges_test_trigger:
-  name: ⚡ Badges Tests Trigger
-  agent:
-    type: Unity::VM
-    image: package-ci/ubuntu-22.04:v4
-    flavor: b1.small
-  commands:
-    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
-    - upm-ci package izon -t
-  artifacts:
-    logs:
-      paths:
-        - "upm-ci~/test-results/**/*"
-    packages:
-      paths:
-        - "upm-ci~/packages/**/*"
+      - targets:
+          only:
+            - "develop"
+            - "develop-2.0.0"
+            - "/release\/.*/"
+      - drafts: false
+            
+
+# Run all tests on trunk on nightly basis.
+# Same subset as pull_request_trigger with addition of mobile/desktop/console tests and webgl builds
+# Those tests are all running on trunk editor (since it's daily and running all of them would add a lot of overhead)
+develop_nightly:
+  name: "\U0001F319 [Nightly] Run All Tests [Trunk]"
+  triggers:
+    recurring:
+      - branch: develop-2.0.0
+        frequency: daily
+        rerun: always
+  dependencies:
+    # Run project standards to verify package/default project
+    - .yamato/project-standards.yml#standards_ubuntu_testproject_trunk
+    # Run APV jobs to make sure the change won't break any dependants
+    - .yamato/wrench/preview-a-p-v.yml#all_preview_apv_jobs
+    # Run package EditMode and Playmode tests on desktop platforms on trunk
+    - .yamato/_run-all.yml#run_all_package_tests_trunk
+    # Run project EditMode and PLaymode tests on desktop platforms on trunk 
+    - .yamato/_run-all.yml#run_all_project_tests_trunk
+    # Run Runtime tests on desktop players on trunk
+    - .yamato/_run-all.yml#run_all_project_tests_desktop_standalone_trunk
+    # Run Runtime tests on mobile players on trunk
+    - .yamato/_run-all.yml#run_all_project_tests_mobile_standalone_trunk
+    # Run Runtime tests on console players on trunk
+    - .yamato/_run-all.yml#run_all_project_tests_console_standalone_trunk
+    # Build player for webgl platform on trunk
+    - .yamato/_run-all.yml#run_all_webgl_builds_trunk
+    # Build player for webgl platform on trunk
+    - .yamato/project-updated-dependencies-test.yml#updated-dependencies_testproject_NGO_ubuntu_trunk
+
+
+# Run all tests on weekly bases
+# Same subset as develop_nightly but runs per all supported editors as well as executes code coverage test and runs project standards per project
+# It's not running wrench jobs since those will run either way in nightly test run
+# This in contrast to nightly checks will run tests on all editors (not only trunk). Running those on weekly basis and trunk tests nightly should be a good balance between making sure that tests are passing and overhead of running lots of tests
+develop_weekly_trunk:
+  name: "\U0001F319 [Weekly] Run All Tests"
+  triggers:
+    recurring:
+      - branch: develop-2.0.0
+        frequency: weekly
+        rerun: always
   dependencies:
-{% for project in projects -%}
-{% for package in project.packages -%}
-{% if project.validate == "true" -%}
-    - .yamato/project-publish.yml#validate_{{ package.name }}_{{ test_platforms.first.name }}_{{ validation_editor }}
-{% endif -%}
-{% for editor in project.test_editors -%}
-{% if editor != "trunk" -%}
-{% for platform in test_platforms -%}
-    - .yamato/package-tests.yml#test_{{ project.name }}_{{ package.name }}_{{ editor }}_{{ platform.name }}
-{% endfor -%}
-{% endif -%}
-{% endfor -%}
-{% endfor -%}
-{% endfor -%}
+    # Run project standards to verify package/default project
+    - .yamato/_run-all.yml#run_all_projects_standards
+    # Run package EditMode and Playmode tests on desktop platforms
+    - .yamato/_run-all.yml#run_all_package_tests
+    # Run project EditMode and PLaymode tests on desktop platforms
+    - .yamato/_run-all.yml#run_all_project_tests
+    # Run Runtime tests on desktop players
+    - .yamato/_run-all.yml#run_all_project_tests_desktop_standalone
+    # Run Runtime tests on mobile players
+    - .yamato/_run-all.yml#run_all_project_tests_mobile_standalone
+    # Run Runtime tests on console players
+    - .yamato/_run-all.yml#run_all_project_tests_console_standalone
+    # Build player for webgl platform on trunk
+    - .yamato/_run-all.yml#run_all_webgl_builds
+    # Run code coverage test
+    - .yamato/code-coverage.yml#code_coverage_ubuntu_trunk
\ No newline at end of file
diff --git a/.yamato/code-coverage.yml b/.yamato/code-coverage.yml
index a56b3525dd..ced6277452 100644
--- a/.yamato/code-coverage.yml
+++ b/.yamato/code-coverage.yml
@@ -1,25 +1,51 @@
-{% metadata_file .yamato/project.metafile %}
+{% metadata_file .yamato/project.metafile %} # All configuration that is used to create different configurations (used in for loops) is taken from this file.
 ---
-{% for project in projects -%}
-{% if project.has_tests == "true" -%}
-code_coverage_win_{{ project.name }}_{{ validation_editor }}:
-  name: Code Coverage Report - Windows - {{ project.name }} - {{ validation_editor }}
+  
+# DESCRIPTION--------------------------------------------------------------------------
+  # This job is responsible for executing package tests with code coverage analysis enabled.
+  # Coverage analysis provides insights into:
+    # Test coverage metrics for NGO assemblies
+    # Line and branch coverage statistics
+    # Generated HTML reports for coverage visualization
+    # Additional metrics for coverage analysis
+  
+# CONFIGURATION STRUCTURE--------------------------------------------------------------
+  # Jobs are generated using nested loops through:
+    # 1. For default platform only (Ubuntu) since coverage would not vary between platforms (no need for checks on more platforms)
+    # 2. For default editor version (trunk) since coverage would not vary between editors (no need for checks on more editors)
+
+#TECHNICAL CONSIDERATIONS---------------------------------------------------------------
+  # In theory this job also runs package tests, but we don't want to use it as default since is heavier (because of added coverage analysis) and coverage is not changing that often
+  # Requires Unity Editor installation
+  # Burst compilation is disabled to ensure accurate coverage measurement
+  # In order to properly use -coverage-results-path parameter we need to start it with $PWD (which means the absolute path). Otherwise coverage results will not be visible
+  
+# QUALITY CONSIDERATIONS--------------------------------------------------------------------
+  # TODO: somewhere in 2025 we will be able to upload resuls to CodeCov from public repos
+  # To see where this job is included (in trigger job definitions) look into _triggers.yml file
+    
+    
+    
+{% for platform in test_platforms.default -%}
+{% for editor in validation_editors.default -%}
+code_coverage_{{ platform.name }}_{{ editor }}:
+  name: Code Coverage - NGO [{{ platform.name }}, {{ editor }}]
   agent:
-    type: Unity::VM
-    image: package-ci/win10:v4
-    flavor: b1.large
+    type: {{ platform.type }}
+    image: {{ platform.image }}
+    flavor: {{ platform.flavor }}
+{% if platform.model %}
+    model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
+{% endif %}
   commands:
-    - pip config set global.index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
-    - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
-    - pip install unity-downloader-cli --upgrade
-    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
-    - unity-downloader-cli -u {{ validation_editor }} -c editor --wait --fast
-    - upm-ci package test -u .Editor --package-path com.unity.netcode.gameobjects --enable-code-coverage --code-coverage-options 'enableCyclomaticComplexity;generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.Netcode.Editor,+Unity.Netcode.Runtime,+Unity.Netcode.Components'
+    - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models
+    - upm-pvp create-test-project test-project --packages "upm-ci~/packages/*.tgz" --unity .Editor
+    - UnifiedTestRunner --suite=editor --suite=playmode --editor-location=.Editor --testproject=test-project --enable-code-coverage -coverage-results-path=$PWD/test-results/CodeCoverage --coverage-options="generateHtmlReport;generateAdditionalMetrics;assemblyFilters:+Unity.Netcode.Editor,+Unity.Netcode.Runtime" --extra-editor-arg=--burst-disable-compilation --timeout=1800 --reruncount=1 --clean-library-on-rerun --artifacts-path=test-results
   artifacts:
     logs:
       paths:
-        - "upm-ci~/test-results/**/*"
+        - "test-results/**/*"
   dependencies:
-    - .yamato/project-pack.yml#pack_{{ project.name }}
-{% endif -%}
+    - .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }}
+{% endfor -%}
 {% endfor -%}
\ No newline at end of file
diff --git a/.yamato/console-standalone-test.yml b/.yamato/console-standalone-test.yml
new file mode 100644
index 0000000000..ee74bfee0b
--- /dev/null
+++ b/.yamato/console-standalone-test.yml
@@ -0,0 +1,112 @@
+{% metadata_file .yamato/project.metafile %} # All configuration that is used to create different configurations (used in for loops) is taken from this file.
+---
+
+# DESCRIPTION--------------------------------------------------------------------------
+  # This job is responsible for Console platform test validation.
+  # Those tests cover both PlayMode and EditMode tests from package test assemblies.
+  
+# CONFIGURATION STRUCTURE--------------------------------------------------------------
+  # Jobs are generated using nested loops (separate build phase and run phase). Worth noting that run phase uses the build as dependency:
+    # 1. For all console platform (Switch, ps4, ps5, xbox360, xboxOne)
+    # 2. For all supported Unity Editor versions (for NGOv2.X this means 6000.0+ editors)
+    # 3. For the default project.
+
+# TECHNICAL CONSIDERATIONS---------------------------------------------------------------
+  # For console devices a split is required into two phases:
+    # 1. Build Phase: Creates standalone players for console platforms
+    # 2. Run Phase: Executes runtime tests on actual console devices
+  # The Run phase uses build job as dependency
+  
+  # Note: More of a Unity specific but test assemblies need to be included in the build phase command
+  # Note: All builds can be made on x64 machines since those are compatible with ARM64 target devices
+  
+# PLATFORM SPECIFICS-----------------------------------------------------------------
+  # Common Requirements:
+    # All consoles require IL2CPP scripting backend
+    # Platform-specific SDK environment variables
+
+  # Platform-Specific:
+    # Switch: ARM64 architecture only
+    # Other Consoles: x64 architecture
+    # Each console requires specific SDK paths and tools
+  
+# QUALITY THOUGHTS--------------------------------------------------------------------
+  # TODO: consider adding all projects that have tests
+  # To see where this job is included (in trigger job definitions) look into _triggers.yml file
+
+  
+  
+# BUILD PHASE CONFIGURATION------------------------------------------------------------------------------------
+{% for project in projects.default -%}
+{% for platform in test_platforms.console_build -%}
+{% for editor in validation_editors.all -%}
+console_standalone_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
+  name: Build {{ project.name }} - [{{ platform.name }}, {{ editor }}, il2cpp{% if platform.name == "switch" %}, arm64{% endif %}]
+  agent:
+    type: {{ platform.type }}
+    image: {{ platform.image }}
+    flavor: {{ platform.flavor }}
+{% if platform.model %}
+    model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
+{% endif %}
+  commands:
+    - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor -c il2cpp -c {{ platform.name }}
+    - UnifiedTestRunner --testproject={{ project.path }} --architecture={% if platform.name == "switch" %}arm64{% else %}x64{% endif %} --scripting-backend=il2cpp --suite=playmode --platform={{ platform.standalone }} --editor-location=.Editor --artifacts-path=artifacts --player-save-path=build/players --testfilter="Unity.Netcode.RuntimeTests.*" --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --reruncount=1 --clean-library-on-rerun --build-only --timeout=1800
+  variables:
+# PS4 related
+    SCE_ORBIS_SDK_DIR: 'C:\Users\bokken\SCE\ps4_sdk_12_00'
+# PS5 related
+    SCE_PROSPERO_SDK_DIR: 'C:\Program Files (x86)\SCE\Prospero SDKs\9.000'
+    SHADER_COMPILER_PATH: '${SCE_PROSPERO_SDK_DIR}\target\bins'
+    SCE_ROOT_DIR: 'C:\Program Files (x86)\SCE'
+# Switch related
+    NINTENDO_SDK_ROOT: 'C:\Nintendo\nx_sdk-18_3_0\NintendoSDK'
+    UNITY_NINTENDOSDK_CLI_TOOLS: '${NINTENDO_SDK_ROOT}\Tools\CommandLineTools'
+  artifacts:
+    players:
+      paths:
+        - "build/players/**/*"
+    logs:
+      paths:
+        - "artifacts/**/*"
+{% endfor -%}
+{% endfor -%}
+{% endfor -%}
+  
+  
+  
+# RUN PHASE CONFIGURATION------------------------------------------------------------------------------------
+{% for project in projects.default -%}
+{% for platform in test_platforms.console_test -%}
+{% for editor in validation_editors.all -%}
+console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
+  name: Run {{ project.name }} Tests - [{{ platform.name }}, {{ editor }}, il2cpp]
+  agent:
+    type: {{ platform.type }}
+    image: {{ platform.image }}
+    flavor: {{ platform.flavor }}
+{% if platform.model %}
+    model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
+{% endif %}
+  commands:
+    - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor -c il2cpp -c {{ platform.name }}
+    - UnifiedTestRunner --suite=playmode --testproject={{ project.path }} --editor-location=.Editor --artifacts-path=test-results --player-load-path=build/players --fail-on-assert --reruncount=1 --clean-library-on-rerun --timeout=1800
+  variables:
+# PS4 related
+    SCE_ORBIS_SDK_DIR: 'C:\Users\bokken\SCE\ps4_sdk_12_00'
+# PS5 related
+    SCE_PROSPERO_SDK_DIR: 'C:\Program Files (x86)\SCE\Prospero SDKs\9.000'
+    SHADER_COMPILER_PATH: '${SCE_PROSPERO_SDK_DIR}\target\bins'
+    SCE_ROOT_DIR: 'C:\Program Files (x86)\SCE'
+# Switch related
+    NINTENDO_SDK_ROOT: 'C:\Nintendo\nx_sdk-18_3_0\NintendoSDK'
+    UNITY_NINTENDOSDK_CLI_TOOLS: '${NINTENDO_SDK_ROOT}\Tools\CommandLineTools'
+  artifacts:
+    logs:
+      paths:
+        - "test-results/**/*"
+  dependencies:
+    - .yamato/console-standalone-test.yml#console_standalone_build_{{ project.name }}_{{ platform.name }}_{{ editor }}
+{% endfor -%}
+{% endfor -%}
+{% endfor -%}
\ No newline at end of file
diff --git a/.yamato/desktop-standalone-tests.yml b/.yamato/desktop-standalone-tests.yml
new file mode 100644
index 0000000000..b6539b1cbf
--- /dev/null
+++ b/.yamato/desktop-standalone-tests.yml
@@ -0,0 +1,112 @@
+{% metadata_file .yamato/project.metafile %} # All configuration that is used to create different configurations (used in for loops) is taken from this file.
+---
+
+# DESCRIPTION--------------------------------------------------------------------------
+  # This job is responsible for Desktop platform test validation.
+  # Those tests cover both PlayMode and EditMode tests from package test assemblies.
+  
+# CONFIGURATION STRUCTURE--------------------------------------------------------------
+  # Jobs are generated using nested loops (separate build phase and run phase). Worth noting that run phase uses the build as dependency:
+    # 1. For all desktop platform (Windows, macOS, Ubuntu)
+    # 2. For all supported Unity Editor versions (for NGOv2.X this means 6000.0+ editors)
+    # 3. For the default project.
+    # 4. For all scripting backends (mono, il2cpp)
+
+# TECHNICAL CONSIDERATIONS---------------------------------------------------------------
+  # For desktop devices a split is into two phases is not required but we use it for consistency with setup of others standalone platforms:
+    # 1. Build Phase: Creates standalone players for desktop platforms
+    # 2. Run Phase: Executes runtime tests on actual desktop devices
+  # The Run phase uses build job as dependency
+  
+  # Note: More of a Unity specific but test assemblies need to be included in the build phase command
+  # Note: All builds can be made on x64 machines since those are compatible with ARM64 target devices
+
+# QUALITY THOUGHTS--------------------------------------------------------------------
+  # TODO: consider adding all projects that have tests
+  # To see where this job is included (in trigger job definitions) look into _triggers.yml file
+  
+#-----------------------------------------------------------------------------------
+  
+  
+# BUILD PHASE CONFIGURATION------------------------------------------------------------------------------------
+{% for project in projects.default -%}
+{% for platform in test_platforms.desktop -%}
+{% for editor in validation_editors.all -%}
+{% for backend in scripting_backends -%}
+desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }}:
+  name : Standalone Build - NGO {{ project.name }} - [{{ platform.name }}, {{ editor }}, {{ backend }}]
+  agent:
+    type: {% if platform.name == "mac" %} {{ platform.type }} {% else %} {{ platform.type }}::GPU {% endif %}
+    image: {{ platform.image }}
+    flavor: {{ platform.flavor }}
+{% if platform.name == "mac" %}
+    model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
+{% endif %}
+  commands:
+    - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %}
+    - UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --editor-location=.Editor --testproject={{ project.path }} --scripting-backend={{ backend }} --testfilter="Unity.Netcode.RuntimeTests.*" --player-save-path=build/players --artifacts-path=artifacts --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --reruncount=1 --clean-library-on-rerun --build-only --timeout=1800
+  artifacts:
+    players:
+      paths:
+        - "build/players/**/*"
+    logs:
+      paths:
+        - "artifacts/**/*"
+  dependencies:
+    - .yamato/project-pack.yml#project_pack_-_{{ project.name }}_{{ platform.name }}
+{% endfor -%}
+{% endfor -%}
+{% endfor -%}
+{% endfor -%}
+  
+  
+  
+  
+# RUN PHASE CONFIGURATION------------------------------------------------------------------------------------
+{% for project in projects.default -%}
+{% for platform in test_platforms.desktop -%}
+{% for editor in validation_editors.all -%}
+{% for backend in scripting_backends -%}
+desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }}:
+  name : Standalone Test - NGO {{ project.name }} - [{{ platform.name }}, {{ editor }}, {{ backend }}]
+  agent:
+    type: {% if platform.name == "mac" %} {{ platform.type }} {% else %} {{ platform.type }}::GPU {% endif %}
+    image: {{ platform.image }}
+    flavor: {{ platform.flavor }}
+{% if platform.name == "mac" %}
+    model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile). In this case it's specifically for macOS (if used for win/ubuntu then it will cause rust server to fail connecting)
+{% endif %}
+
+# Set additional variables for running the echo server (This is needed ONLY for NGOv2.X because relates to Distributed Authority)
+{% if platform.name != "win" %} # Issues with win and mac are tracked in MTT-11606
+  variables:
+    ECHO_SERVER_PORT: "7788"
+    # Set this to ensure the DA codec tests will fail if they cannot connect to the echo-server
+    # The default is to ignore the codec tests if the echo-server fails to connect
+    ENSURE_CODEC_TESTS: "true"
+{% endif %}
+
+  commands:
+# If ubuntu, run rust echo server (This is needed ONLY for NGOv2.X because relates to Distributed Authority)
+{% if platform.name != "win" %} # Issues with win and mac are tracked in MTT-11606
+    - git clone https://github.com/Unity-Technologies/mps-common-multiplayer-backend.git
+    # Install rust
+    - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+    # Build the echo server
+    - cd ./mps-common-multiplayer-backend/runtime && $HOME/.cargo/bin/cargo build --example ngo_echo_server
+    # Run the echo server in the background - this will reuse the artifacts from the build
+    - cd ./mps-common-multiplayer-backend/runtime && $HOME/.cargo/bin/cargo run --example ngo_echo_server -- --port $ECHO_SERVER_PORT &
+{% endif %}
+
+    - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %} {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models
+    - UnifiedTestRunner --suite=playmode --player-load-path=build/players --artifacts-path=test-results --testproject={{ project.path }} --editor-location=.Editor --playergraphicsapi=Null --fail-on-assert --reruncount=1 --clean-library-on-rerun --timeout=1800
+  artifacts:
+    logs:
+      paths:
+        - "test-results/**/*"
+  dependencies:
+    - .yamato/desktop-standalone-tests.yml#desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }}
+{% endfor -%}
+{% endfor -%}
+{% endfor -%}
+{% endfor -%}
diff --git a/.yamato/disable-burst-if-requested.py b/.yamato/disable-burst-if-requested.py
index fa53669944..edf84d3f26 100644
--- a/.yamato/disable-burst-if-requested.py
+++ b/.yamato/disable-burst-if-requested.py
@@ -1,3 +1,7 @@
+# This file was used before for mobiles and Webgl but was removed (around end of January 2025). The file itself was left here for now in case we would need to use it.
+# This Python script is used to manage Burst AOT (Ahead-Of-Time) compilation settings for Unity builds.
+# An example usage would be "- python .yamato/disable-burst-if-requested.py --project-path {{ project.path }} --platform WebGL"
+
 import argparse
 import json
 import os
diff --git a/.yamato/generated-scripts/infrastructure-instability-detection-linux.sh b/.yamato/generated-scripts/infrastructure-instability-detection-linux.sh
new file mode 100644
index 0000000000..2380121236
--- /dev/null
+++ b/.yamato/generated-scripts/infrastructure-instability-detection-linux.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+# This is an auto-generated script. Do not edit manually!
+set -x
+
+set -e
+if [ -f "infrastructure_instability_detection_standalone.zip" ]; then
+  echo "removed existing archive infrastructure_instability_detection_standalone.zip"
+  rm "infrastructure_instability_detection_standalone.zip" || true
+fi
+
+if [ -d "infrastructure_instability_detection_standalone" ]; then
+  echo "removed existing directory infrastructure_instability_detection_standalone/"
+  rm -rf "infrastructure_instability_detection_standalone" || true
+fi
+
+echo "downloading and extracting infrastructure_instability_detection_standalone@1.0.0"
+curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.0.0/ubuntu.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5 || true
+
+if [ -d "infrastructure_instability_detection" ]; then
+  echo "removing infrastructure_instability_detection folder to avoid name clash"
+  rm -rf infrastructure_instability_detection/ || true
+fi
+
+unzip -qo "infrastructure_instability_detection_standalone.zip" && rm "infrastructure_instability_detection_standalone.zip" || true
+
+echo "downloading and extracting patterns"
+curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/patterns.zip" --output patterns.zip --retry 5 || true
+
+if [ -d "patterns" ]; then
+  echo "removing patterns folder to avoid name clash"
+  rm -rf patterns/ || true
+fi
+
+unzip -q patterns.zip && rm patterns.zip || true
+
+echo "running '$(pwd)/infrastructure_instability_detection'"
+./infrastructure_instability_detection || true
diff --git a/.yamato/generated-scripts/infrastructure-instability-detection-mac.sh b/.yamato/generated-scripts/infrastructure-instability-detection-mac.sh
new file mode 100644
index 0000000000..e37062e974
--- /dev/null
+++ b/.yamato/generated-scripts/infrastructure-instability-detection-mac.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+# This is an auto-generated script. Do not edit manually!
+set -x
+
+set -e
+if [ -f "infrastructure_instability_detection_standalone.zip" ]; then
+  echo "removed existing archive infrastructure_instability_detection_standalone.zip"
+  rm "infrastructure_instability_detection_standalone.zip" || true
+fi
+
+if [ -d "infrastructure_instability_detection_standalone" ]; then
+  echo "removed existing directory infrastructure_instability_detection_standalone/"
+  rm -rf "infrastructure_instability_detection_standalone" || true
+fi
+
+echo "downloading and extracting infrastructure_instability_detection_standalone@1.0.0"
+curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.0.0/macos.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5 || true
+
+if [ -d "infrastructure_instability_detection" ]; then
+  echo "removing infrastructure_instability_detection folder to avoid name clash"
+  rm -rf infrastructure_instability_detection/ || true
+fi
+
+unzip -qo "infrastructure_instability_detection_standalone.zip" && rm "infrastructure_instability_detection_standalone.zip" || true
+
+echo "downloading and extracting patterns"
+curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/patterns.zip" --output patterns.zip --retry 5 || true
+
+if [ -d "patterns" ]; then
+  echo "removing patterns folder to avoid name clash"
+  rm -rf patterns/ || true
+fi
+
+unzip -q patterns.zip && rm patterns.zip || true
+
+echo "running '$(pwd)/infrastructure_instability_detection'"
+./infrastructure_instability_detection || true
diff --git a/.yamato/generated-scripts/infrastructure-instability-detection-win.cmd b/.yamato/generated-scripts/infrastructure-instability-detection-win.cmd
new file mode 100644
index 0000000000..64513447d2
--- /dev/null
+++ b/.yamato/generated-scripts/infrastructure-instability-detection-win.cmd
@@ -0,0 +1,11 @@
+@echo on
+rem This is an auto-generated script. Do not edit manually!
+
+curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.0.0/windows.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5
+IF EXIST "infrastructure_instability_detection" rmdir /s /q infrastructure_instability_detection
+powershell.exe -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('infrastructure_instability_detection_standalone.zip', '.'); }" && DEL "infrastructure_instability_detection_standalone.zip"
+curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/patterns.zip" --output patterns.zip --retry 5
+IF EXIST "patterns" rmdir /s /q patterns
+powershell.exe -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('patterns.zip', '.'); }" && DEL "patterns.zip"
+infrastructure_instability_detection
+exit /b 0
diff --git a/.yamato/mobile-build-and-test.yml b/.yamato/mobile-build-and-test.yml
deleted file mode 100644
index 3f1fbd80cd..0000000000
--- a/.yamato/mobile-build-and-test.yml
+++ /dev/null
@@ -1,157 +0,0 @@
-{% metadata_file .yamato/project.metafile %}
----
-
-{% for project in projects -%}
-{% if project.name == "testproject" -%}
-{% for editor in project.test_editors -%}
-build_{{ project.name }}_tests_{{ editor }}_android:
-  name: Build {{ project.name }} Tests - {{ editor }} - Android
-  agent:
-      type: Unity::VM
-      image: desktop/android-execution-r19:v0.1.1-860408
-      flavor: b1.xlarge
-  commands:
-    - pip config set global.index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
-    - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
-    - pip install unity-downloader-cli --upgrade
-    - curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
-    - python .yamato/disable-burst-if-requested.py --project-path testproject --platform Android
-    - unity-downloader-cli -u {{ editor }} -c editor -c Android -w --fast
-    - |
-       set UTR_VERSION=0.12.0
-       utr.bat --artifacts_path=artifacts --timeout=1800 --testproject={{ project.name }} --editor-location=.Editor --suite=playmode --platform=android --build-only --player-save-path=build/players --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --testfilter=Unity.Netcode.RuntimeTests
-  artifacts:
-    logs:
-      paths:
-      - '*.log'
-      - '*.xml'
-      - artifacts/**/*
-      - testproject/Logs/**
-      - testproject/Library/*.log
-      - testproject/*.log
-      - testproject/Builds/*.log
-      - build/test-results/**
-      - artifacts/**
-      - build/players/**
-  variables:
-    CI: true
-    ENABLE_BURST_COMPILATION: False
-{% endfor -%}
-{% endif -%}
-{% endfor -%}
-
-
-{% for project in projects -%}
-{% if project.name == "testproject" -%}
-{% for editor in project.test_editors -%}
-build_{{ project.name }}_tests_{{ editor }}_iOS:
-  name: Build {{ project.name }} Tests - {{ editor }} - iOS
-  agent:
-    type: Unity::VM::osx
-    image: mobile/ios-macos-11:stable
-    flavor: b1.large
-  commands:
-    - pip config set global.index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
-    - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
-    - pip install unity-downloader-cli --upgrade
-    - unity-downloader-cli -u {{ editor }} -c editor -c iOS -w --fast
-    - curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
-    - chmod +x ./utr
-    - export UTR_VERSION=0.12.0
-    - ./utr --artifacts_path=artifacts --timeout=1800 --testproject={{ project.name }} --editor-location=.Editor --suite=playmode --platform=iOS --build-only --player-save-path=build/players --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --testfilter=Unity.Netcode.RuntimeTests
-  artifacts:
-    logs:
-      paths:
-      - '*.log'
-      - '*.xml'
-      - artifacts/**/*
-      - testproject/Logs/**
-      - testproject/Library/*.log
-      - testproject/*.log
-      - testproject/Builds/*.log
-      - build/test-results/**
-      - artifacts/**
-      - build/players/**
-{% endfor -%}
-{% endif -%}
-{% endfor -%}
-
-
-{% for project in projects -%}
-{% if project.name == "testproject" -%}
-{% for editor in project.test_editors -%}
-run_{{ project.name }}_tests_{{ editor }}_iOS:
-  name: Run {{ project.name }} Tests - {{ editor }} - iOS
-  agent:
-      type: Unity::mobile::iPhone
-      model: SE
-      image: mobile/ios-macos-11:stable
-      flavor: b1.medium
-  # Set a dependency on the build job
-  dependencies:
-    - .yamato/mobile-build-and-test.yml#build_{{ project.name }}_tests_{{ editor }}_iOS
-  commands:
-    # Download standalone UnityTestRunner
-    - curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
-    # Give UTR execution permissions
-    - chmod +x ./utr
-    # Run the test build on the device
-    - export UTR_VERSION=0.12.0
-    - ./utr -artifacts_path=artifacts --testproject={{ project.name }} --editor-location=.Editor --reruncount=2 --suite=playmode --platform=iOS --player-load-path=build/players --testfilter=Unity.Netcode.RuntimeTests
-  artifacts:
-    logs:
-      paths:
-      - '*.log'
-      - '*.xml'
-      - artifacts/**/*
-      - testproject/Logs/**
-      - testproject/Library/*.log
-      - testproject/*.log
-      - testproject/Builds/*.log
-      - build/test-results/**
-      - artifacts/**
-      - build/players/**
-{% endfor -%}
-{% endif -%}
-{% endfor -%}
-
-    
-{% for project in projects -%}
-{% if project.name == "testproject" -%}
-{% for editor in project.test_editors -%}
-run_{{ project.name }}_tests_{{ editor }}_android:
-  name: Run {{ project.name }} Tests - {{ editor }} - Android
-  agent:
-      type: Unity::mobile::shield
-      image: mobile/android-execution-r19:stable
-      flavor: b1.medium
-  # Skip repository cloning
-  skip_checkout: true
-  # Set a dependency on the build job
-  dependencies:
-    - .yamato/mobile-build-and-test.yml#build_{{ project.name }}_tests_{{ editor }}_android
-  commands:
-    - curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
-    - |
-       set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
-       start %ANDROID_SDK_ROOT%\platform-tools\adb.exe connect %BOKKEN_DEVICE_IP%
-       start %ANDROID_SDK_ROOT%\platform-tools\adb.exe devices
-       set UTR_VERSION=0.12.0
-       ./utr --artifacts_path=artifacts --testproject={{ project.name }} --editor-location=.Editor --reruncount=2 --suite=playmode --platform=android --player-connection-ip=%BOKKEN_HOST_IP% --player-load-path=build/players --testfilter=Unity.Netcode.RuntimeTests
-  # Set uploadable artifact paths
-  artifacts:
-    logs:
-      paths:
-      - '*.log'
-      - '*.xml'
-      - artifacts/**/*
-      - testproject/Logs/**
-      - testproject/Library/*.log
-      - testproject/*.log
-      - testproject/Builds/*.log
-      - build/test-results/**
-      - artifacts/**
-      - build/players/**
-{% endfor -%}
-{% endif -%}
-{% endfor -%}
diff --git a/.yamato/mobile-standalone-test.yml b/.yamato/mobile-standalone-test.yml
new file mode 100644
index 0000000000..8169d34e8d
--- /dev/null
+++ b/.yamato/mobile-standalone-test.yml
@@ -0,0 +1,109 @@
+{% metadata_file .yamato/project.metafile %} # All configuration that is used to create different configurations (used in for loops) is taken from this file.
+---
+
+# DESCRIPTION--------------------------------------------------------------------------
+  # This job is responsible for Mobile platform test validation.
+  # Those tests cover both PlayMode and EditMode tests from package test assemblies.
+  
+# CONFIGURATION STRUCTURE--------------------------------------------------------------
+  # Jobs are generated using nested loops through:
+    # 1. For all mobile platform (Android, iOS)
+    # 2. For all supported Unity Editor versions (for NGOv2.X this means 6000.0+ editors)
+    # 3. For the default project.
+  
+# TECHNICAL CONSIDERATIONS---------------------------------------------------------------
+  # For mobile devices a split is required into two phases:
+    # 1. Build Phase: Creates standalone players for mobile platforms
+    # 2. Run Phase: Executes runtime tests on actual mobile devices
+  # The Run phase uses build job as dependency
+  # Note: More of a Unity specific but test assemblies need to be included in the build phase command
+  # Note: All builds can be made on x64 machines since those are compatible with ARM64 target devices
+  
+# PLATFORM SPECIFICS--------------------------------------------------------------------
+  # iOS Requirements:
+    # Must use IL2CPP scripting backend
+    # Only supports ARM64 architecture
+    # Builds on macOS agents only
+
+    # Android Requirements:
+      # Uses IL2CPP scripting backend (recommended over Mono)
+      # Supports both ARM64 and ARMv7 architectures
+      # Can be build on any desktop platform
+  
+# QUALITY CONSIDERATIONS--------------------------------------------------------------------
+  # TODO: consider adding all projects that have tests
+  # To see where this job is included (in trigger job definitions) look into _triggers.yml file
+  
+  
+# BUILD PHASE CONFIGURATION------------------------------------------------------------------------------------
+{% for project in projects.default -%}
+{% for platform in test_platforms.mobile_build -%}
+{% for editor in validation_editors.all -%}
+mobile_standalone_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
+  name: Build {{ project.name }} - [{{ platform.name }}, {{ editor }}, il2cpp]
+  agent:
+      type: {{ platform.type }}
+      image: {{ platform.image }}
+      flavor: {{ platform.flavor }}
+{% if platform.model %}
+      model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
+{% endif %}
+  commands:
+    - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor -c il2cpp {% if platform.base == "mac" %} -c ios {% else %} -c android {% endif %}
+    - UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --testproject={{ project.path }} --architecture={{ platform.architecture }} --scripting-backend=il2cpp --editor-location=.Editor --artifacts-path=artifacts --testfilter="Unity.Netcode.RuntimeTests.*" --player-save-path=build/players --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --reruncount=1 --clean-library-on-rerun --build-only --timeout=1800
+  artifacts:
+    players:
+      paths:
+        - "build/players/**/*"
+    logs:
+      paths:
+        - "artifacts/**/*"
+{% endfor -%}
+{% endfor -%}
+{% endfor -%}
+  
+  
+# RUN PHASE CONFIGURATION------------------------------------------------------------------------------------
+{% for project in projects.default -%}
+{% for platform in test_platforms.mobile_test -%}
+{% for editor in validation_editors.all -%}
+mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
+  name: Run {{ project.name }} Tests - [{{ platform.name }}, {{ editor }},  il2cpp]
+  agent:
+    type: {{ platform.type }}
+    image: {{ platform.image }}
+    flavor: {{ platform.flavor }}
+{% if platform.model %}
+    model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
+{% endif %}
+  commands:
+    # Installing editor. We still need the editor to run tests on standalone build and for that the Editor is required
+    - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor -c il2cpp {% if platform.base == "mac" %} -c ios {% else %} -c android {% endif %}
+      
+{% if platform.standalone == "Android" %}
+    # Download standalone UnityTestRunner and ADB setup
+    - command: wget http://artifactory-slo.bf.unity3d.com/artifactory/mobile-generic/android/ADBKeys.zip!/adbkey.pub -O %USERPROFILE%/.android/adbkey.pub
+    - command: wget http://artifactory-slo.bf.unity3d.com/artifactory/mobile-generic/android/ADBKeys.zip!/adbkey -O %USERPROFILE%/.android/adbkey
+    - command: gsudo NetSh Advfirewall set allprofiles state off
+
+    # Connect to Android device
+    - command: '"%ANDROID_SDK_ROOT%\platform-tools\adb.exe" connect %BOKKEN_DEVICE_IP%'
+
+    # Run tests for Android devices
+    - |
+      set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
+      UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --artifacts-path=test-results --player-load-path=build/players --testproject={{ project.path }} --editor-location=.Editor --player-connection-ip=%BOKKEN_HOST_IP% --fail-on-assert --reruncount=1 --clean-library-on-rerun --timeout=3600
+{% else %}
+
+    # Run tests for non-Android devices
+    - UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --artifacts-path=test-results --player-load-path=build/players --testproject={{ project.path }} --editor-location=.Editor --fail-on-assert --reruncount=1 --clean-library-on-rerun --timeout=3600
+{% endif %}
+  artifacts:
+    logs:
+      paths:
+        - "test-results/**/*"
+  dependencies:
+    - .yamato/mobile-standalone-test.yml#mobile_standalone_build_{{ project.name }}_{{ platform.name }}_{{ editor }}
+{% endfor -%}
+{% endfor -%}
+{% endfor -%}
diff --git a/.yamato/multiprocess-project-tests.yml b/.yamato/multiprocess-project-tests.yml
deleted file mode 100644
index df48259914..0000000000
--- a/.yamato/multiprocess-project-tests.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-{% metadata_file .yamato/project.metafile %}
----
-
-{% for project in projects -%}
-{% if project.name == "testproject" %}
-{% for editor in project.test_editors -%}
-{% for platform in test_platforms -%}
-singlenode_multiprocess_test_testproject_{{ editor }}_{{ platform.name }}:
-  name : Multiprocess Tests - {{ editor }} on {{ platform.name }}
-  agent:
-    type: {{ platform.type }}
-    image: {{ platform.image }}
-    flavor: {{ platform.flavor}}
-  commands:
-    - pip config set global.index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
-    - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
-    - pip install unity-downloader-cli --upgrade
-{% if editor != "trunk" %}
-    - unity-downloader-cli -u {{ editor }} -c editor -w --fast
-    - curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr{% if platform.name == "win" %}.bat --output utr.bat{% endif %}{% if platform.name != "win" %} --output utr && chmod +x ./utr{% endif %}
-    - {{ platform.editorpath }} -projectpath testproject -batchmode -quit -nographics -logfile BuildMultiprocessTestPlayer.log -executeMethod Unity.Netcode.MultiprocessRuntimeTests.BuildMultiprocessTestPlayer.BuildRelease
-{% if platform.name == "mac" %}    -  sudo codesign --force --deep --sign - ./testproject/Builds/MultiprocessTests/MultiprocessTestPlayer.app{% endif %}
-    - {{ platform.utr }} --suite=playmode --testproject=testproject --editor-location=.Editor --testfilter=Unity.Netcode.MultiprocessRuntimeTests --extra-editor-arg=-bypassIgnoreUTR
-{% endif %}
-  after:
-    - echo "After block"
-{% if editor != "trunk" %}
-{% if platform.name == "win" %}    - copy %USERPROFILE%\.multiprocess\logfile* .{% endif %}
-{% if platform.name != "win" %}    - cp $HOME/.multiprocess/logfile* .{% endif %}
-{% endif %}
-  artifacts:
-    logs:
-      paths:
-        - "upm-ci~/test-results/**/*"
-        - BuildMultiprocessTestPlayer.log
-        - "logfile*"
-        - "*.log"
-        - "*.txt"
-  dependencies:
-    - .yamato/project-pack.yml#pack_{{ project.name }}
-{% endfor -%}
-{% endfor -%}
-{% endif -%}
-{% endfor -%}
diff --git a/.yamato/package-pack.yml b/.yamato/package-pack.yml
new file mode 100644
index 0000000000..f4b02dc19a
--- /dev/null
+++ b/.yamato/package-pack.yml
@@ -0,0 +1,50 @@
+{% metadata_file .yamato/project.metafile %} # All configuration that is used to create different configurations (used in for loops) is taken from this file.
+---
+
+# DESCRIPTION--------------------------------------------------------------------------
+  # This job is responsible for packing a specific package. It generates package artifacts (.tgz) required for testing and publishing, ensuring all dependencies are properly bundled and validated before any test execution.
+  # The job itself doesn't test anything specific but rather it prepares project packages that will be consumed by other pipeline jobs.
+  # The job performs additional validation by using Package Verification Pipeline (PVP). It includes x-ray validation for quick package structure verification
+  # Because of that validation we can detect errors at the early stage of testing so not to waste CI resources
+
+# CONFIGURATION STRUCTURE--------------------------------------------------------------
+  # Jobs are generated using nested loops through:
+    # 1. For all desktop platforms (Windows, Ubuntu, macOS)
+
+# TECHNICAL CONSIDERATIONS---------------------------------------------------------------
+  # Job does not require Unity Editor in order to perform packing.
+  # Job uses PVP x-ray for lightweight validation
+  # Job generates both packages artifacts and pvp-results file.
+  # In theory, we could just use one platform for packing projects (for example ubuntu) but in order to reduce confusion we are using same platform as the job utilizing project pack as dependency.
+
+# QUALITY CONSIDERATIONS--------------------------------------------------------------------
+  # To see where this job is included (in trigger job definitions) look into _triggers.yml file
+  # TODO: we should aim to replace target PVP profile from supported to gold
+
+#------------------------------------------------------------------------------------
+
+{% for platform in test_platforms.desktop -%}
+package_pack_-_ngo_{{ platform.name }}:
+  name: Package Pack (and x-ray) - NGO [{{ platform.name }}]
+  agent:
+    type: {{ platform.type }}
+    image: {{ platform.image }}
+    flavor: {{ platform.flavor }}
+{% if platform.model %}
+    model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
+{% endif %}
+  timeout: 0.25
+  variables:
+    XRAY_PROFILE: "supported ./pvpExceptions.json"
+  commands:
+    - upm-pvp pack "com.unity.netcode.gameobjects" --output upm-ci~/packages
+    - upm-pvp xray --packages "upm-ci~/packages/com.unity.netcode.gameobjects*.tgz" --results pvp-results
+    - upm-pvp require {% if platform.name == "win" %}"%XRAY_PROFILE%"{% else %}"$XRAY_PROFILE"{% endif %} --results pvp-results --allow-missing
+  artifacts:
+    logs:
+      paths:
+        - "pvp-results/*"
+    packages:
+      paths:
+        - "upm-ci~/**"
+{% endfor -%}
\ No newline at end of file
diff --git a/.yamato/package-tests.yml b/.yamato/package-tests.yml
index 1779a7008e..2d304ad02e 100644
--- a/.yamato/package-tests.yml
+++ b/.yamato/package-tests.yml
@@ -1,57 +1,59 @@
-{% metadata_file .yamato/project.metafile %}
+{% metadata_file .yamato/project.metafile %} # All configuration that is used to create different configurations (used in for loops) is taken from this file.
 ---
 
-# Go through all platforms, editors and packages in the metadata
-# to generate its independent package tests and validation tests.
-# The idea is to only run validation once per package and not mix.
-# the results with package tests
-{% for project in projects -%}
-{% for package in project.packages -%}
-{% for editor in project.test_editors -%}
-{% for platform in test_platforms -%}
-test_{{project.name}}_{{  package.name }}_{{ editor }}_{{ platform.name }}:
-  name : {{ project.name }} - {{ package.name }} package tests - {{ editor }} on {{ platform.name }}
-  agent:
-    type: {{ platform.type }}
-    image: {{ platform.image }}
-    flavor: {{ platform.flavor}}
-  commands:
-    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
-    - {% if platform.name == "ubuntu" %}DISPLAY=:0 {% endif %}upm-ci project test -u {{ editor }} --type package-tests --project-path {{ project.name }} --package-filter {{ package.name }}
-  artifacts:
-    logs:
-      paths:
-        - "upm-ci~/test-results/**/*"
-  dependencies:
-    - .yamato/project-pack.yml#pack_{{ project.name }}
-{% endfor -%}
-{% endfor -%}
-{% endfor -%}
-{% endfor -%}
+# DESCRIPTION--------------------------------------------------------------------------
+  # This job is responsible for execution of package-specific tests in Unity Editor context
+  # Those tests cover both PlayMode and EditMode tests from package test assemblies
+  # Additionally it combines Package Verification Pipeline (PVP) validation. This ensures that package is compatible with Unity standards
+  
+# CONFIGURATION STRUCTURE--------------------------------------------------------------
+  # Jobs are generated using nested loops through:
+    # 1. For all desktop platforms (Windows, Ubuntu, macOS)
+    # 2. For all supported Unity Editor versions (for NGOv2.X this means 6000.0+ editors)
+  
+# TECHNICAL CONSIDERATIONS---------------------------------------------------------------
+  # This job runs in Editor context only (no player builds required)
+  # No scripting backend variations needed (Editor context)
+  # Architecture variations not applicable (Editor context)
+  # Requires project packaging as prerequisite (dependency job)
+  # Uses PVP for package validation. Specifically it looks for supported profiles which we should conform to but takes ./pvpExceptions.json file into consideration where we note our known issues related to PVP checks
+  
+# QUALITY CONSIDERATIONS--------------------------------------------------------------------
+  # To see where this job is included (in trigger job definitions) look into _triggers.yml file
+  # TODO: we should aim to replace target PVP profile from supported to gold
+  
+#------------------------------------------------------------------------------------
 
-# Test minimal project with different versions of dependencies
-{% for project in projects -%}
-{% if project.name == "minimalproject" -%}
-{% for dependency in dependencies -%}
-{% for editor in dependency.test_editors -%}
-{% for platform in test_platforms -%}
-test_compatibility_{{project.name}}_{{ project.packages.first.name }}_with_{{ dependency.name }}@{{ dependency.version }}_{{ editor }}_{{ platform.name }}:
-  name : {{ project.name }} - {{ project.packages.first.name }} with {{ dependency.name }}@{{ dependency.version }} - {{ editor }} on {{ platform.name }}
+{% for platform in test_platforms.desktop -%}
+{% for editor in validation_editors.all -%}
+package_test_-_ngo_{{ editor }}_{{ platform.name }}:
+  name : Package Test - NGO [{{ platform.name }}, {{ editor }}]
   agent:
     type: {{ platform.type }}
     image: {{ platform.image }}
-    flavor: {{ platform.flavor}}
+    flavor: {{ platform.flavor }}
+{% if platform.model %}
+    model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
+{% endif %}
+  variables:
+    XRAY_PROFILE: "supported ./pvpExceptions.json"
+    UNITY_EXT_LOGGING: 1
   commands:
-    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
-    - {% if platform.name == "ubuntu" %}DISPLAY=:0 {% endif %}upm-ci project test -u {{ editor }} --type project-tests --project-path {{ project.name }} --package-filter {{ project.packages.first.name }}
+    - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models.
+    
+    # Validate PVP checks for package.
+    - upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects" --results pvp-results
+    - upm-pvp require {% if platform.name == "win" %}"%XRAY_PROFILE%"{% else %}"$XRAY_PROFILE"{% endif %} --results pvp-results
+
+    # Run UTR to test packages.
+    - upm-pvp create-test-project test-project --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects" --unity .Editor
+    - UnifiedTestRunner --suite=editor --suite=playmode --editor-location=.Editor --testproject=test-project --artifacts-path=test-results "--ff={ops.upmpvpevidence.enable=true}" --reruncount=1 --clean-library-on-rerun
   artifacts:
     logs:
       paths:
         - "upm-ci~/test-results/**/*"
+        - "pvp-results/*"
   dependencies:
-    - .yamato/project-pack.yml#pack_{{ project.name }}_{{ dependency.name }}@{{ dependency.version }}
-{% endfor -%}
-{% endfor -%}
+    - .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }}
 {% endfor -%}
-{% endif -%}
 {% endfor -%}
\ No newline at end of file
diff --git a/.yamato/performance-tests.yml b/.yamato/performance-tests.yml
new file mode 100644
index 0000000000..26bf8102f4
--- /dev/null
+++ b/.yamato/performance-tests.yml
@@ -0,0 +1,47 @@
+{% metadata_file .yamato/project.metafile %} # All configuration that is used to create different configurations (used in for loops) is taken from this file.
+---
+
+# DESCRIPTION--------------------------------------------------------------------------
+  # This job is responsible for executing performance tests for NGO package.
+  # Its configuration is set to not report any data but just to give results (at least in current state since we don't have any tests to run).
+  # Currently because of lack of performance tests this job will always return "no tests have been selected" and because oif that it's not included in any trigger jobs.
+  
+# CONFIGURATION STRUCTURE--------------------------------------------------------------
+  # Jobs configurations are generated using nested loops through:
+    # 1. For all desktop platforms (Windows, Ubuntu, macOS)
+    # 2. For all supported Unity Editor versions (For NGOv2.X it means 6000+)
+    # 3. For the default project (project is used only as a context for the build). TODO-comment: if performance tests would be included in projects then we should make an approperiate split.
+  
+# TECHNICAL CONSIDERATIONS---------------------------------------------------------------
+  # Tests are run in Editor context only
+  # No performance metrics are reported to monitoring systems
+  
+# QUALITY CONSIDERATIONS--------------------------------------------------------------------
+  # TODO: Currently NGO don't have any performance tests so this job is a placeholder for the future. We should discuss how to approach the topic of performance testing
+  # To see where this job is included (in trigger job definitions) look into _triggers.yml file
+  
+#------------------------------------------------------------------------------------
+
+{% for platform in test_platforms.desktop -%}
+{% for editor in validation_editors.all -%}
+{% for project in projects.default -%}
+performance_editor_tests_-_NGO_{{ platform.name }}_{{ editor }}_no_data_reporting:
+  name : Performance editor Tests - NGO {{ project.name }} [{{ platform.name }}, {{ editor }}] (No Data Reporting)
+  agent:
+    type: {{ platform.type }}
+    image: {{ platform.image }}
+    flavor: {{ platform.flavor }}
+{% if platform.model %}
+    model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
+{% endif %}
+  commands:
+      - unity-downloader-cli -u {{ editor }} -c Editor --wait {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Installing basic editor
+      - UnifiedTestRunner --suite=editor --suite=playmode --testproject={{ project.path }} --editor-location=.Editor --timeout=3600 --artifacts-path=artifacts --extra-editor-arg=-assemblyNames --extra-editor-arg=Unity.NetCode.* --extra-editor-arg=-testCategory --extra-editor-arg=Performance --extra-editor-arg=-enablePackageManagerTraces --reruncount=1 --clean-library-on-rerun --dontreportperformancedata
+      # TODO: when performance tests will be present we need to add actuall execution of this test
+  artifacts:
+    logs:
+      paths:
+        - "artifacts/**/*"
+{% endfor -%}
+{% endfor -%}
+{% endfor -%}
\ No newline at end of file
diff --git a/.yamato/project-pack.yml b/.yamato/project-pack.yml
index 30ded64633..5a0337a6a1 100644
--- a/.yamato/project-pack.yml
+++ b/.yamato/project-pack.yml
@@ -1,50 +1,43 @@
-{% metadata_file .yamato/project.metafile %}
+{% metadata_file .yamato/project.metafile %} # All configuration that is used to create different configurations (used in for loops) is taken from this file.
 ---
-{% for project in projects -%}
-pack_{{ project.name }}:
-  name: Pack {{ project.name }}
-  agent:
-    type: Unity::VM
-    image: package-ci/ubuntu-22.04:v4
-    flavor: b1.small
-  commands:
-    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
-    - upm-ci project pack --project-path {{ project.path }}
-    - upm-pvp xray --packages "upm-ci~/packages/*.tgz" --results upm-ci~/xray
-    - upm-pvp require "$XRAY_PROFILE" --allow-missing --results upm-ci~/xray --exemptions upm-ci~/xray/new-exemptions.json || true
-    - upm-pvp require "$XRAY_PROFILE ./pvp-exemptions.json" --results upm-ci~/xray
-  artifacts:
-    packages:
-      paths:
-        - "upm-ci~/**"
-{% endfor -%}
 
-# Pack minimal project with different versions of dependencies
-{% for project in projects -%}
-{% if project.name == "minimalproject" -%}
-{% for dependency in dependencies -%}
-pack_{{ project.name }}_{{ dependency.name }}@{{ dependency.version }}:
-  name: Pack {{ project.name }} with {{ dependency.name }}@{{ dependency.version }}
+# DESCRIPTION--------------------------------------------------------------------------
+  # This job is responsible for packing a specific project. It generates package artifacts (.tgz) required for testing and publishing, ensuring all dependencies are properly bundled and validated before any test execution.
+  # The job itself doesn't test anything specific but rather it prepares project packages that will be consumed by other pipeline jobs.
+  
+# CONFIGURATION STRUCTURE--------------------------------------------------------------
+  # Jobs configurations are generated using nested loops through:
+    # 1. For all projects (testproject, minimalproject, testproject-tools-integration).
+    # 2. For all desktop platforms (Win, Ubuntu, Mac)
+  
+# TECHNICAL CONSIDERATIONS--------------------------------------------------------------------
+  # Job does not require Unity Editor in order to perform packing.
+  # In theory, we could just use one platform for packing projects (for example ubuntu) but in order to reduce confusion we are using same platform as the job utilizing project pack as dependency.
+  
+# QUALITY CONSIDERATIONS--------------------------------------------------------------------
+  # To see where this job is included (in trigger job definitions) look into _triggers.yml file
+  # TODO: Currently upm-ci is being used but in the future it will be replaced by upm-pvp. Additionally this would allow us to run PVP checks on projects
+  
+  
+#-------------------------------------------------------------------------------------- 
+
+{% for project in projects.all -%}
+{% for platform in test_platforms.desktop -%}
+project_pack_-_{{ project.name }}_{{ platform.name }}:
+  name: Project Pack - {{ project.name }} [{{ platform.name }}]
   agent:
-    type: Unity::VM
-    image: package-ci/ubuntu-22.04:v4
-    flavor: b1.small
+    type: {{ platform.type }}
+    image: {{ platform.image }}
+    flavor: {{ platform.flavor }}
+{% if platform.model %}
+    model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
+{% endif %}
   commands:
-    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
-    - curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
-    - sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list"
-    - sudo apt update
-    - sudo apt install -y unity-config
-    - unity-config settings project-path {{ project.path }}
-    - unity-config project add dependency {{ dependency.name }}@{{ dependency.version }}
+    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm # upm-ci is not preinstalled on the image so we need to download it
     - upm-ci project pack --project-path {{ project.path }}
-    - upm-pvp xray --packages "upm-ci~/packages/*.tgz" --results upm-ci~/xray
-    - upm-pvp require "$XRAY_PROFILE" --allow-missing --results upm-ci~/xray --exemptions upm-ci~/xray/new-exemptions.json || true
-    - upm-pvp require "$XRAY_PROFILE ./pvp-exemptions.json" --results upm-ci~/xray
   artifacts:
     packages:
       paths:
-        - "upm-ci~/**"
+        - "upm-ci~/packages/**/*"
 {% endfor -%}
-{% endif -%}
 {% endfor -%}
\ No newline at end of file
diff --git a/.yamato/project-promotion.yml b/.yamato/project-promotion.yml
deleted file mode 100644
index 8858dbd382..0000000000
--- a/.yamato/project-promotion.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-{% metadata_file .yamato/project.metafile %}
----
-{% for project in projects -%}
-{% if project.publish == "true" -%}
-{% for package in project.packages -%}
-{% for editor in project.test_editors -%}
-{% for platform in test_platforms -%}
-promotion_validate_{{ project.name }}_{{ package.name }}_{{ platform.name }}_{{ editor }}:
-  name : Validate (Vetting Tests) Project {{ project.name }} - Package {{ package.name }} - {{ editor }} on {{ platform.name }}
-  agent:
-    type: {{ platform.type }}
-    image: {{ platform.image }}
-    flavor: {{ platform.flavor}}
-  variables:
-    UPMCI_PROMOTION: 1
-  commands:
-    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
-    - {% if platform.name == "ubuntu" %}DISPLAY=:0 {% endif %}upm-ci project test -u {{ editor }} --project-path {{ project.path }} --type vetting-tests --project-path {{ project.path }} --package-filter {{ package.name }}
-  artifacts:
-    logs:
-      paths:
-        - "upm-ci~/test-results/**/*"
-  dependencies:
-    - .yamato/project-pack.yml#pack_{{ project.name }}
-{% endfor -%}
-{% endfor -%}
-
-promote_{{ project.name }}_{{ package.name }}:
-  name: Promote Project {{ project.name }} - Package {{ package.name }} to Production
-  agent:
-    type: Unity::VM
-    image: package-ci/win10:v4
-    flavor: b1.small
-  variables:
-    UPMCI_PROMOTION: 1
-  commands:
-    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
-    - upm-ci package promote --package-path {{ package.path }}
-  artifacts:
-    artifacts:
-      paths:
-        - "upm-ci~/packages/*.tgz"
-  dependencies:
-    - .yamato/project-pack.yml#pack_{{ project.name }}
-    - .yamato/project-promotion.yml#promotion_validate_{{ project.name }}_{{ package.name }}_{{ test_platforms.first.name }}_{{ validation_editor }}
-    - .yamato/project-promotion.yml#promote_{{ project.name }}_{{ package.name }}_dry_run
-
-promote_{{ project.name }}_{{ package.name }}_dry_run:
-  name: Promote Project {{ project.name }} - Package {{ package.name }} to Production (dry-run)
-  agent:
-    type: Unity::VM
-    image: package-ci/win10:v4
-    flavor: b1.small
-  variables:
-    UPMCI_PROMOTION: 1
-  commands:
-    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
-    - upm-ci package promote --package-path {{ package.path }} --dry-run
-  artifacts:
-    artifacts:
-      paths:
-        - "upm-ci~/packages/*.tgz"
-  dependencies:
-    - .yamato/project-pack.yml#pack_{{ project.name }}
-    - .yamato/project-publish.yml#publish_{{ project.name }}_{{ package.name }}
-{% for editor in project.test_editors -%}
-{% for platform in test_platforms -%}
-    - .yamato/project-promotion.yml#promotion_validate_{{ project.name }}_{{ package.name }}_{{ platform.name }}_{{ editor }}
-{% endfor -%}
-{% endfor -%}
-
-{% endfor -%}
-{% endif -%}
-{% endfor -%}
diff --git a/.yamato/project-publish.yml b/.yamato/project-publish.yml
deleted file mode 100644
index 9f114a9ae6..0000000000
--- a/.yamato/project-publish.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-{% metadata_file .yamato/project.metafile %}
----
-{% for project in projects -%}
-{% if project.publish == "true" -%}
-{% for package in project.packages -%}
-{% for editor in project.test_editors -%}
-{% for platform in test_platforms -%}
-validate_{{ package.name }}_{{ platform.name }}_{{ editor }}:
-  name : Validate (Isolation Tests) Package {{ package.name }} - {{ editor }} on {{ platform.name }}
-  agent:
-    type: {{ platform.type }}
-    image: {{ platform.image }}
-    flavor: {{ platform.flavor}}
-  commands:
-    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
-    - {% if platform.name == "ubuntu" %}DISPLAY=:0 {% endif %}upm-ci project test -u {{ editor }} --type isolation-tests --project-path {{ project.path }} --package-filter {{ package.name }} --platform editmode
-  artifacts:
-    logs:
-      paths:
-        - "upm-ci~/test-results/**/*"
-  dependencies:
-    - .yamato/project-pack.yml#pack_{{ project.name }}
-{% endfor -%}
-{% endfor -%}
-
-publish_{{ project.name }}_{{ package.name }}:
-  name: Publish Project {{project.name }} - Package {{ package.name }} to Internal Registry
-  agent:
-    type: Unity::VM
-    image: package-ci/win10:v4
-    flavor: b1.large
-  commands:
-    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
-    - upm-ci package publish --package-path {{ package.path }}
-  artifacts:
-    artifacts:
-      paths:
-        - "upm-ci~/packages/*.tgz"
-  dependencies:
-    - .yamato/project-pack.yml#pack_{{ project.name }}
-    - .yamato/project-publish.yml#validate_{{ package.name }}_{{ test_platforms.first.name }}_{{ validation_editor }}
-    - .yamato/project-publish.yml#publish_{{ project.name }}_{{ package.name }}_dry_run
-
-publish_{{ project.name }}_{{ package.name }}_dry_run:
-  name: Publish Project {{project.name }} - Package {{ package.name }} to Internal Registry (dry-run)
-  agent:
-    type: Unity::VM
-    image: package-ci/win10:v4
-    flavor: b1.large
-  commands:
-    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
-    - upm-ci package publish --package-path {{ package.path }} --dry-run
-  artifacts:
-    artifacts:
-      paths:
-        - "upm-ci~/packages/*.tgz"
-  dependencies:
-    - .yamato/project-pack.yml#pack_{{ project.name }}
-{% for editor in project.test_editors -%}
-{% for platform in test_platforms -%}
-    - .yamato/project-publish.yml#validate_{{ package.name }}_{{ platform.name }}_{{ editor }}
-{% endfor -%}
-{% endfor -%}
-
-{% endfor -%}
-{% endif -%}
-{% endfor -%}
diff --git a/.yamato/project-standards.yml b/.yamato/project-standards.yml
index 64cf1ecb3e..6a70daf149 100644
--- a/.yamato/project-standards.yml
+++ b/.yamato/project-standards.yml
@@ -1,20 +1,53 @@
-{% metadata_file .yamato/project.metafile %}
+{% metadata_file .yamato/project.metafile %} # All configuration that is used to create different configurations (used in for loops) is taken from this file.
 ---
-standards_{{ projects.first.name }}:
-  name: Standards Check {{ projects.first.name }}
+
+# DESCRIPTION--------------------------------------------------------------------------
+  # This job is responsible for validating project compliance with NGO coding standards and conventions
+  # Standards validation includes:
+    # Code formatting compliance
+    # Project structure validation
+    # Coding convention adherence
+    # Solution file synchronization
+  
+# CONFIGURATION STRUCTURE--------------------------------------------------------------
+  # Jobs configurations are generated using nested loops through:
+    # 1. For all NGO projects (testproject, testproject-tools-interation, minimalproject)
+    # 2. For default platform only (Ubuntu) since standards would not vary between platforms (no need for checks on more platforms)
+    # 3. For default editor version (trunk) since standards would not vary between editors (no need for checks on more editors)
+  
+# TECHNICAL CONSTRAINTS---------------------------------------------------------------
+  # Requires .NET SDK installed (should be preinstalled on the image so we just check for version)
+  # Needs Unity Editor for solution synchronization
+  # Uses custom standards validation tool (netcode.standards)
+  # Generates no test artifacts (pass/fail only). Eventual failure will be visible in the logs
+  
+# QUALITY THOUGHTS--------------------------------------------------------------------
+  # While testproject validation would be sufficient, since it validates both project and package (where package is our main concern) jobs for all projects are being generated to ensure that we conform to quality standards in all projects.
+  # TODO: consider modifying the approach and adding checks for minimal supported editor. In case of NGOv1.X it has proven to yield different results (But since NGOv2.X support starts from 6000.0 editor it's not that time pressuring)
+  # To see where this job is included (in trigger job definitions) look into _triggers.yml file
+  
+#------------------------------------------------------------------------------------
+
+{% for project in projects.all -%}
+{% for platform in test_platforms.default -%}
+{% for editor in validation_editors.default -%}
+standards_{{ platform.name }}_{{ project.name }}_{{ editor }}:
+  name: Standards Check - NGO {{ project.name }} [{{ platform.name }}, {{ editor }}]
   agent:
-    type: Unity::VM
-    image: desktop/logging-testing-linux:v0.1.2-926285
-    flavor: b1.large
+    type: {{ platform.type }}
+    image: {{ platform.image }}
+    flavor: {{ platform.flavor }}
+{% if platform.model %}
+    model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
+{% endif %}
   commands:
+    # .NET environment setup. Ensures required .NET SDK and formatting tools are available
     - dotnet --version
     - dotnet format --version
-    - sudo add-apt-repository -y ppa:deadsnakes/ppa
-    - sudo apt update
-    - sudo apt install -y python3.9
-    - pip3 config set global.index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
-    - pip3 install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
-    - pip3 install unity-downloader-cli --upgrade
-    - unity-downloader-cli -u {{ projects.first.test_editors.first }} -c editor --wait --fast
-    - .Editor/Unity -batchmode -nographics -logFile - -executeMethod Packages.Rider.Editor.RiderScriptEditor.SyncSolution -projectPath {{ projects.first.path }} -quit
-    - dotnet run --project dotnet-tools/netcode.standards -- --project={{ projects.first.path }} --check
+    
+    - unity-downloader-cli --fast --wait -u {{ editor }} -c editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Downloads basic editor
+    - .Editor/Unity -batchmode -nographics -logFile - -executeMethod Packages.Rider.Editor.RiderScriptEditor.SyncSolution -projectPath {{ project.path }} -quit # This command is used to invoke Unity in a "headless" mode. It's used to sync the project
+    - dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --check # Runs standards check
+{% endfor -%}
+{% endfor -%}
+{% endfor -%}
\ No newline at end of file
diff --git a/.yamato/project-tests.yml b/.yamato/project-tests.yml
index 0b03a2d7bb..a39f957480 100644
--- a/.yamato/project-tests.yml
+++ b/.yamato/project-tests.yml
@@ -1,33 +1,53 @@
-{% metadata_file .yamato/project.metafile %}
+{% metadata_file .yamato/project.metafile %} # All configuration that is used to create different configurations (used in for loops) is taken from this file.
 ---
 
-# For every platform and editor version, run its project tests without
-# running package tests too since they are handled on their respective
-# jobs
-{% for project in projects -%}
-{% for editor in project.test_editors -%}
-{% for platform in test_platforms -%}
-test_{{ project.name }}_{{ editor }}_{{ platform.name }}:
-  name : {{ project.name }} project tests - {{ editor }} on {{ platform.name }}
+# DESCRIPTION--------------------------------------------------------------------------
+  # This job executes project-specific tests in Unity Editor context
+  # Those tests cover both PlayMode and EditMode tests from project test assemblies
+  # NGO package tests are NOT being executed within this job (those are handled in separate package test jobs)
+  
+# CONFIGURATION STRUCTURE--------------------------------------------------------------
+  # Jobs configurations are generated using nested loops through:
+    # 1. For all projects WITH TESTS (filtered by has_tests flag) (testproject, testproject-tools-interation) [For more info look into project.metafile configuration]
+    # 2. For all desktop platforms (Windows, Ubuntu, macOS)
+    # 3. For all supported Unity Editor versions (for NGOv2.X this means 6000.0+ editors)
+  
+# TECHNICAL CONSIDERATIONS---------------------------------------------------------------
+  # This job runs in Editor context only (no player builds is required)
+  # No scripting backend variations needed (Editor context)
+  # Architecture variations not applicable (Editor context)
+  # Requires project packaging as prerequisite (dependency job)
+  
+# QUALITY CONSIDERATIONS--------------------------------------------------------------------
+  # TODO: Currently upm-ci is being used but in the future it will be replaced by upm-pvp
+  # To see where this job is included (in trigger job definitions) look into _triggers.yml file
+  
+#------------------------------------------------------------------------------------
+
+{% for project in projects.all -%}
+{% if project.has_tests == "true" -%}
+{% for platform in test_platforms.desktop -%}
+{% for editor in validation_editors.all -%}
+test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
+  name : Project Test - NGO {{ project.name }} [{{ platform.name }}, {{ editor }}]
   agent:
     type: {{ platform.type }}
     image: {{ platform.image }}
-    flavor: {{ platform.flavor}}
+    flavor: {{ platform.flavor }}
+{% if platform.model %}
+    model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
+{% endif %}
   commands:
-    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
-    - pip config set global.index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
-    - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
-    - pip install unity-downloader-cli --upgrade
-    - unity-downloader-cli -u {{ editor }} -c editor -w --fast
-    - {% if platform.name == "ubuntu" %}DISPLAY=:0 && {% endif %}upm-ci project test -u {{ editor }} --project-path {{ project.path }} --type project-tests
+    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm # upm-ci is not preinstalled on the image so we need to download it
+    - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Installing basic editor for tests execution
+    - upm-ci project test -u {{ editor }} --project-path {{ project.path }} --type project-tests --extra-utr-arg="--reruncount=1 --clean-library-on-rerun" # project tests execution via upm-ci
   artifacts:
     logs:
       paths:
         - "upm-ci~/test-results/**/*"
   dependencies:
-    - .yamato/project-pack.yml#pack_{{ project.name }}
-
+    - .yamato/project-pack.yml#project_pack_-_{{ project.name }}_{{ platform.name }}
 {% endfor -%}
 {% endfor -%}
-{% endfor -%}
-
+{% endif -%}
+{% endfor -%}
\ No newline at end of file
diff --git a/.yamato/project-updated-dependencies-test.yml b/.yamato/project-updated-dependencies-test.yml
index bd39d49db0..19ae953e27 100644
--- a/.yamato/project-updated-dependencies-test.yml
+++ b/.yamato/project-updated-dependencies-test.yml
@@ -1,59 +1,48 @@
-{% metadata_file .yamato/project.metafile %}
+{% metadata_file .yamato/project.metafile %} # All configuration that is used to create different configurations (used in for loops) is taken from this file.
 ---
-# Go through all platforms, editors and packages in the metadata
-# to generate its independent package tests and validation tests.
-# The idea is to only run validation once per package and not mix.
-# the results with package tests
-{% for package in projects.first.packages -%}
-{% for editor in projects.first.test_editors -%}
-{% for platform in test_platforms -%}
-dependency_{{ projects.first.name }}_{{ package.name }}_{{ platform.name }}_{{ editor }}:
-  name : Dependency Test of Project {{ projects.first.name }} - Package {{ package.name }} - {{ editor }} on {{ platform.name }}
+
+# DESCRIPTION--------------------------------------------------------------------------
+  # This job is responsible fo validating package compatibility with latest dependency versions.
+  # This helps detect potential breaking changes from dependency updates early
+  
+# CONFIGURATION STRUCTURE--------------------------------------------------------------
+  # Jobs configurations are generated using nested loops through:
+    # 1. For all projects (testproject, minimalproject, testproject-tools-integration).
+    # 2. For all desktop platforms (Win, Ubuntu, Mac)
+    # 3. For all supported editors (For NGOv2.X it means 6000+)
+
+# TECHNICAL CONSIDERATIONS----------------------------------------------------------------
+  # This job requires successful project packaging before execution (job dependency)
+  # This job tests only NGO package dependencies (com.unity.netcode.gameobjects)
+  # The results are being generated in upm-ci~/test-results directory (specific of upm-ci)
+  
+# QUALITY CONSIDERATIONS---------------------------------------------------------------------
+  # TODO: Currently upm-ci is being used but in the future it will be replaced by upm-pvp
+  # To see where this job is included (in trigger job definitions) look into _triggers.yml file
+  
+#-------------------------------------------------------------------------------------- 
+  
+{% for project in projects.all -%}
+{% for platform in test_platforms.desktop -%}
+{% for editor in validation_editors.all -%}
+updated-dependencies_{{ project.name }}_NGO_{{ platform.name }}_{{ editor }}:                   
+  name : Updated Dependencies Test - NGO {{ project.name }} [{{ platform.name }}, {{ editor }}]
   agent:
     type: {{ platform.type }}
     image: {{ platform.image }}
-    flavor: {{ platform.flavor}}
+    flavor: {{ platform.flavor }}
+{% if platform.model %}
+    model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
+{% endif %}
   commands:
-    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
-    - upm-ci project test -u {{ editor }} --project-path {{ projects.first.path }} --type updated-dependencies-tests --package-filter {{ package.name }}
+    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm # upm-ci is not preinstalled on the image so we need to download it
+    - upm-ci project test -u {{ editor }} --project-path {{ project.path }} --type updated-dependencies-tests --package-filter com.unity.netcode.gameobjects
   artifacts:
     logs:
       paths:
         - "upm-ci~/test-results/**/*"
-  triggers:
-    recurring:
-      - branch: master
-        frequency: 20 * * ?
   dependencies:
-    - path: .yamato/project-pack.yml#pack_{{ projects.first.name }}
-      rerun: always
-
-{% endfor -%}
+    - .yamato/project-pack.yml#project_pack_-_{{ project.name }}_{{ platform.name }}
 {% endfor -%}
 {% endfor -%}
-
-dependency_test_trigger_{{ projects.first.name }}:
-  name: Project {{ projects.first.name }} Dependency Tests Trigger
-  agent:
-    type: Unity::VM
-    image: package-ci/ubuntu-22.04:v4
-    flavor: b1.small
-  commands:
-    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
-    - upm-ci project izon -d --project-path {{ projects.first.path }}
-  artifacts:
-    logs:
-      paths:
-        - "upm-ci~/test-results/**/*"
-  triggers:
-    recurring:
-      - branch: master
-        frequency: 22 * * ?
-  dependencies:
-{% for package in projects.first.packages -%}
-{% for editor in projects.first.test_editors -%}
-{% for platform in test_platforms -%}
-    - .yamato/project-updated-dependencies-test.yml#dependency_{{ projects.first.name }}_{{ package.name }}_{{ platform.name }}_{{ editor }}
-{% endfor -%}
 {% endfor -%}
-{% endfor -%}
\ No newline at end of file
diff --git a/.yamato/project.metafile b/.yamato/project.metafile
index c0ec992fc0..a04afbc533 100644
--- a/.yamato/project.metafile
+++ b/.yamato/project.metafile
@@ -1,83 +1,189 @@
-validation_editor: 2021.3
-mobile_validation_editor: 2021.3
+# DESCRIPTION-----------------------------------------------------------------------------------------------------------------
+# This file is the central configuration file defining test environments, platforms, projects, editors and other parameters used.
+# Data from this file is used to generate CI pipeline configurations through templating in other .yamato/ files.
+# This provides consistent environment definitions across all CI jobs. It's easier to modify values in central place (for example image reference) than having to modify every job
 
-# Platforms that will be tested. The first entry in this array will also
-# be used for validation
-test_platforms:
-  - name: win
-    type: Unity::VM
-    image: package-ci/win10:v4
-    flavor: b1.large
-    pathsep: \
-    standalone: StandaloneWindows64
-    editorpath: .Editor\Unity.exe
-    utr: .\utr.bat
-  - name: mac
-    type: Unity::VM::osx
-    image: package-ci/macos-13:v4
-    pathsep: /
-    standalone: StandaloneOSX
-    flavor: b1.large
-    editorpath: .Editor/Unity.app/Contents/MacOS/Unity
-    utr: ./utr
-  - name: ubuntu
-    type: Unity::VM
-    image: package-ci/ubuntu-22.04:v4
-    flavor: b1.large
-    pathsep: /
-    standalone: StandaloneLinux64
-    editorpath: .Editor/Unity
-    utr: ./utr
+# VALUE MEANING----------------------------------------------------------------------------------------------------------------------------
+# Usual fields being defined are
+    # name --> Identifier used to distinguish different configurations in the CI pipeline
+    # type --> Specifies the Bokken agent type (e.g., Unity::VM, Unity::VM::osx, Unity::mobile::shield)
+    # image --> Defines the package-ci Bokken image to use for the environment (e.g., package-ci/ubuntu-22.04:v4). This is basically a device configuration
+    # flavor --> Determines the VM size/resources (e.g., b1.small, b1.large, m1.mac)
+    # standalone --> Specifies the build target platform (e.g., StandaloneLinux64, Android, IOS)
+    # model --> Defines specific hardware model requirements (e.g., rtx2080, SE for iPhone SE)
+    # base --> Indicates the base operating system for build operations (e.g., win, mac)
+    # architecture --> Specifies the target CPU architecture (e.g., armv7, arm64)
 
-# Projects within the repository that will be tested. Name will be used
-# for job ids, so it should not contain spaces/non-supported characters
-projects:
-  - name: testproject
-    path: testproject
-    validate: true
-    publish: true
-    has_tests: true
-    # Packages within a project that will be tested
-    packages:
-      - name: com.unity.netcode.gameobjects
-        path: com.unity.netcode.gameobjects
-    test_editors:
-      - 2021.3
-      - 2022.2
-      - 2023.1
-      - trunk
-  - name: minimalproject
-    path: minimalproject
-    validate: false
-    publish: false
-    has_tests: false
-    packages:
-      - name: com.unity.netcode.gameobjects
-        path: com.unity.netcode.gameobjects
-    test_editors:
-      - 2021.3
-  - name: testproject-tools-integration
-    path: testproject-tools-integration
-    validate: false
-    publish: false
-    has_tests: true
-    test_editors:
-      - 2021.3
-      - 2022.2
-      - trunk
 
-# Package dependencies
-dependencies: 
-  - name: com.unity.transport
-    version: 2.0.0-pre.2
-    test_editors:
-      - 2022.2
-      - trunk
+# SMALL AGENT CONFIGURATION---------------------------------------------------------------------------------------------------
+# The small agent was created to handle jobs that don't involve running Unity and are in general super light when it comes to resource usage (for example pack job).
+# It uses ubuntu since Linux VMs are faster and cheaper to provision than Mac or Windows Virtual Machines (VMs).
+# The b1.small flavour is nearly always sufficient for jobs that don’t involve running Unity Editor.
+small_agent_platform: 
+    - name: ubuntu
+      type: Unity::VM
+      image: package-ci/ubuntu-22.04:v4
+      flavor: b1.small
+
+
+# PLATFORM CONFIGURATIONS----------------------------------------------------------------------------------------------------------------
+# test_platforms specifies platforms that project will/can be tested on.
+# For desktops we include Windows, Ubuntu and Mac, for mobiles we include Android and iOS, for consoles we include ps4, ps5, switch, xbox360 and xboxOne
+# For mobile and console a split was required for build and test jobs and this is also applied for desktops for consistency (though for desktop this split is not required)
+
+
+test_platforms:
+    # Default platform is used for all basic jobs. Ubuntu was chosen since it's fastest and most available
+    default:
+        - name: ubuntu
+          type: Unity::VM
+          image: package-ci/ubuntu-22.04:v4
+          flavor: b1.large
+          standalone: StandaloneLinux64
+    desktop:  
+        - name: ubuntu
+          type: Unity::VM
+          image: package-ci/ubuntu-22.04:v4
+          flavor: b1.large
+          standalone: StandaloneLinux64
+          model: rtx2080
+        - name: win
+          type: Unity::VM
+          image: package-ci/win10:v4
+          flavor: b1.large
+          standalone: StandaloneWindows64
+          model: rtx2080
+        - name: mac
+          type: Unity::VM::osx
+          image: package-ci/macos-13-arm64:v4 # ARM64 to support M1 model (below)
+          flavor: m1.mac
+          standalone: StandaloneOSX
+          model: M1 # The default model (an x64 Intel Mac VM) quite often caused a known issue of doing all the bitflips in packages resulting in failures
+    # For mobile devices there is a split between the build and run phase so there is a need of splitting specification for both
+    # TODO: For android we could consider adding ARM64 configuration
+    mobile_build:
+        - name: android
+          type: Unity::VM
+          image: package-ci/win10:v4
+          flavor: b1.large
+          standalone: Android
+          base: win
+          architecture: armv7
+        # iOS modern builds are ARM64-only, thus no testing with armv7
+        - name: ios-arm64
+          type: Unity::VM::osx
+          image: package-ci/macos-13:v4
+          flavor: m1.mac
+          standalone: IOS
+          base: mac
+          architecture: arm64
+    mobile_test:
+        - name: android
+          type: Unity::mobile::shield
+          image: package-ci/win10:v4
+          flavor: b1.large
+          standalone: Android
+          base: win
+          architecture: armv7
+        - name: ios-arm64
+          type: Unity::mobile::iPhone
+          image: package-ci/macos-13-arm64:v4
+          flavor: m1.mac
+          model: SE
+          standalone: IOS
+          base: mac
+          architecture: arm64
+    console_build:
+        - name: ps4
+          type: Unity::VM
+          image: package-ci/win10-ps4:v4
+          flavor: b1.large
+          standalone: PS4
+        - name: ps5
+          type: Unity::VM
+          image: package-ci/win10-ps5:v4
+          flavor: b1.large
+          standalone: PS5
+        - name: switch
+          type: Unity::VM
+          image: package-ci/win10-switch:v4
+          flavor: b1.large
+          standalone: Switch
+        - name: GameCoreXboxOne
+          type: Unity::VM
+          image: package-ci/win10-xbox:v4
+          flavor: b1.large
+          standalone: GameCoreXboxOne
+        - name: GameCoreScarlett
+          type: Unity::VM
+          image: package-ci/win10-xbox:v4
+          flavor: b1.large
+          standalone: GameCoreScarlett
+    console_test:
+        - name: ps4
+          type: Unity::console::ps4
+          image: package-ci/win10-ps4:v4
+          flavor: b1.large
+          standalone: PS4
+        - name: ps5
+          type:  Unity::console::ps5
+          image: package-ci/win10-ps5:v4
+          flavor: b1.large
+          standalone: PS5
+        - name: switch
+          type: Unity::console::switch
+          image: package-ci/win10-switch:v4
+          flavor: b1.large
+          standalone: Switch
+          base: win
+        - name: GameCoreXboxOne
+          type: Unity::console::xbox
+          image: package-ci/win10-xbox:v4
+          flavor: b1.large
+          standalone: GameCoreXboxOne
+        - name: GameCoreScarlett
+          type: Unity::console::scarlett
+          image: package-ci/win10-xbox:v4
+          flavor: b1.large
+          standalone: GameCoreScarlett
+    
+# EDITOR CONFIGURATIONS-------------------------------------------------------------------------------
+# Editors to be used for testing. NGOv2.X official support started from 6000.0 editor
+# TODO: When a new editor will be released it should be added to this list
+
+validation_editors:
+    default:
+        - trunk
+    all:
+        - 6000.0
+        - 6000.1 
+        - trunk
+        
+        
+# Scripting backends used by Standalone RunTimeTests---------------------------------------------------
 
-# Scripting backends used by Standalone Playmode Tests
 scripting_backends: 
   - mono
   - il2cpp
 
-# Images with build-tools installed required for Standalone Tests - IL2CPP
-win_il2cpp_test_image: dots-player/windows10:latest
+
+# PROJECTS CONFIGURATIONS-------------------------------------------------------------------------------
+# Projects within the repository that will be tested/build.
+# The default project should be used for general validation, code coverage and other tests where choice of project should not matter (because we are interested in NGO package)
+# has_tests --> describes if projects contains any tests to run.
+
+projects:
+    default:
+        - name: testproject
+          path: testproject
+          has_tests: true
+    all:
+        - name: testproject
+          path: testproject
+          has_tests: true
+        - name: minimalproject
+          path: minimalproject
+          has_tests: false
+        - name: testproject-tools-integration
+          path: testproject-tools-integration
+          has_tests: true
\ No newline at end of file
diff --git a/.yamato/standalone-project-tests.yml b/.yamato/standalone-project-tests.yml
deleted file mode 100644
index 578d52be03..0000000000
--- a/.yamato/standalone-project-tests.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-{% metadata_file .yamato/project.metafile %}
----
-
-{% for project in projects -%}
-{% if project.has_tests == "true" -%}
-{% for editor in project.test_editors -%}
-{% for platform in test_platforms -%}
-{% for backend in scripting_backends -%}
-standalone_tests_{{ project.name }}_{{ backend }}_{{ editor }}_{{ platform.name }}:
-  name : Standalone Tests - {{ project.name }} - [{{ backend }}, {{ platform.name }}, {{ editor }}]
-  agent:
-    type: {{ platform.type }}{% if platform.name == "ubuntu" %}::GPU{% endif %}
-{% if platform.name == "ubuntu" %}    model: rtx2080{% endif %}
-    image: {% if platform.name == 'win' and backend == 'il2cpp' %}{{ win_il2cpp_test_image }} {% else %} {{ platform.image }} {% endif %}
-    flavor: {{ platform.flavor}}
-  commands:
-    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
-    - pip config set global.index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
-    - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
-    - pip install unity-downloader-cli --upgrade
-    - curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr{% if platform.name == "win" %}.bat{% endif %} --output utr{% if platform.name == "win" %}.bat{% endif %}
-{% if platform.name != "win" %}
-    - chmod +x ./utr
-{% endif %}
-    - unity-downloader-cli -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp{% endif %} --fast --wait
-    - {% if platform.name != "win" %}./{% endif %}utr --suite=playmode --platform={{ platform.standalone }}  --editor-location=.Editor --testproject=testproject --player-save-path=build/players --artifacts_path=build/logs --scripting-backend={{ backend }} --build-only --testfilter=Unity.Netcode.RuntimeTests --extra-editor-arg=-batchmode --extra-editor-arg=-nographics
-    - |
-      {% if platform.name == "win" %}set{% endif %}{% if platform.name != "win" %}export{% endif %} UTR_VERSION=0.12.0
-      {% if platform.name != "win" %}./{% endif %}utr --suite=playmode --platform={{ platform.standalone }}  --player-load-path=build/players --artifacts_path=build/test-results --scripting-backend={{ backend }} --testfilter=Unity.Netcode.RuntimeTests --playergraphicsapi=Null
-  artifacts:
-    logs:
-      paths:
-        - "upm-ci~/test-results/**/*"
-        - "build/test-results/**"
-  dependencies:
-    - .yamato/project-pack.yml#pack_{{ project.name }}
-
-{% endfor -%}
-{% endfor -%}
-{% endfor -%}
-{% endif -%}
-{% endfor -%}
\ No newline at end of file
diff --git a/.yamato/webgl-build.yml b/.yamato/webgl-build.yml
index acca422b8f..881c433cbe 100644
--- a/.yamato/webgl-build.yml
+++ b/.yamato/webgl-build.yml
@@ -1,41 +1,58 @@
-{% metadata_file .yamato/project.metafile %}
+{% metadata_file .yamato/project.metafile %}  # All configuration that is used to create different configurations (used in for loops) is taken from this file.
 ---
 
-{% for project in projects -%}
-{% if project.name == "testproject" -%}
-{% for editor in project.test_editors -%}
-build_{{ project.name }}_tests_{{ editor }}_webgl:
-  name: Build {{ project.name }} Tests - {{ editor }} - WebGL
+# DESCRIPTION--------------------------------------------------------------------------
+  # This job is responsible for validating a successful building of a player on WebGl standalone platform. 
+  # This job WILL NOT execute any tests, we only validate the building process.
+  # This is because WebGL runs in browser and for tests to be executed we would need to consider having a web server, browser automation and overall complex test setup which currently we don't have. 
+  
+# CONFIGURATION STRUCTURE--------------------------------------------------------------
+  # Jobs configurations are generated using nested loops through:
+    # 1. For the default project (project is used only as a context for the build).
+    # 2. For all desktop platforms (Windows, Ubuntu, macOS)
+    # 3. For all supported Unity Editor versions (For NGOv2.X it means 6000+)
+  
+# TECHNICAL CONSIDERATIONS----------------------------------------------------------------
+  # WebGL requires IL2CPP scripting backend (Mono is not supported)
+  # We are not using ARM64 architectures since we only perform a build action. x64 architectures are preferred for build phase (in order to optimize available resource usage)
+  # We only perform build validation (no runtime testing)
+  
+# QUALITY CONSIDERATIONS--------------------------------------------------------------------
+  # In the future we could try to implement an infrastructure to run test in webgl context but this could be quite complicated and would need to be evaluated if it's worth it
+  # To see where this job is included (in trigger job definitions) look into _triggers.yml file
+  # WebGL jobs were timing up more often in develop-2.0.0 branch (especially on trunk) so we increased the timeout from 1800 to 3600. We should investigate why it times more often in develop-2.0.0/ubuntu/trunk
+  
+#-------------------------------------------------------------------------------------- 
+  
+{% for project in projects.default -%}
+{% for platform in test_platforms.desktop -%}
+{% if platform.name != "mac" -%} # There is an error about "Light baking could not be started because no valid OpenCL device could be found". Tracked in MTT-11726
+{% for editor in validation_editors.all -%}
+webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
+  name: WebGl Build - {{ project.name }} [{{ platform.name }}, {{ editor }}, il2cpp]
   agent:
-      type: Unity::VM
-      image: dots-ci/windows10:v1.493-auto
-      flavor: b1.xlarge
+    type: {{ platform.type }}
+    image: {{ platform.image }}
+    flavor: {{ platform.flavor }}
+{% if platform.model %}
+    model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
+{% endif %}
   commands:
-    - pip config set global.index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
-    - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
-    - pip install unity-downloader-cli --upgrade
-    - curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
-    - python .yamato/disable-burst-if-requested.py --project-path testproject --platform WebGL
-    - unity-downloader-cli -u {{ editor }} -c editor -c webgl -c il2cpp -w --fast
-    - |
-       set UTR_VERSION=0.12.0
-       utr.bat --artifacts_path=artifacts --timeout=1800 --testproject={{ project.name }} --editor-location=.Editor --suite=playmode --platform=WebGL --build-only --player-save-path=build/players --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --scripting-backend=il2cpp --extra-editor-arg="-cloudEnvironment staging"
+    - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor -c webgl -c il2cpp {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Downloading the editor with additional webgl and il2cpp components
+  
+    # The following step builds the player with defined options such as:
+      # Suite parameter if defined since it's a mandatory field to define which test suite should be used, but it doesn't matter in this case since we won't run any tests (--suite)
+      # Editor is run in batchmode, which means that Unity runs command line arguments without the need for human interaction. It also suppresses pop-up windows that require human interaction (such as the Save Scene window). We should always run Unity in batch mode when using command line arguments, because it allows automation to run without interruption. (--extra-editor-arg=-batchmode)
+      # Engine is initialized in ‘nographics’ mode since we don't need any graphics for this case (--extra-editor-arg=-nographics)
+      # In case of failure the job will be rerunned once (--reruncount=1) with clean library (--clean-library-on-rerun) 
+      # This will perform only building phase (--build-only) with a timeout of 3m (--timeout=1800)
+    - UnifiedTestRunner --suite=playmode --platform=WebGL --scripting-backend=il2cpp --testproject={{ project.path }} --editor-location=.Editor --artifacts_path=artifacts --player-save-path=build/players --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --reruncount=1 --clean-library-on-rerun --build-only --timeout=3600
   artifacts:
     logs:
       paths:
-      - '*.log'
-      - '*.xml'
-      - artifacts/**/*
-      - testproject/Logs/**
-      - testproject/Library/*.log
-      - testproject/*.log
-      - testproject/Builds/*.log
-      - build/test-results/**
-      - artifacts/**
-      - build/players/**
-  variables:
-    CI: true
-    ENABLE_BURST_COMPILATION: False
+        - "artifacts/**/*"
+        - "build/players/**/*"
 {% endfor -%}
 {% endif -%}
-{% endfor -%}
\ No newline at end of file
+{% endfor -%}
+{% endfor -%}
diff --git a/.yamato/wrench/api-validation-jobs.yml b/.yamato/wrench/api-validation-jobs.yml
new file mode 100644
index 0000000000..7a6c445e71
--- /dev/null
+++ b/.yamato/wrench/api-validation-jobs.yml
@@ -0,0 +1,58 @@
+# Auto-generated by Recipe Engine, do not modify manually.
+# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
+all_api_validation_jobs:
+  name: All API Validation Jobs
+  dependencies:
+  - path: .yamato/wrench/api-validation-jobs.yml#api_validation_-_netcode_gameobjects_-_6000_0_-_windows
+
+# upm-ci validation tests for API Validation - netcode.gameobjects - 6000.0 - windows (6000.0 - Windows).
+api_validation_-_netcode_gameobjects_-_6000_0_-_windows:
+  name: API Validation - netcode.gameobjects - 6000.0 - windows
+  agent:
+    image: package-ci/win10:default
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
+  - command: 7z x -aoa wrench-localapv.zip
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/print_machine_info.py
+  - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    timeout: 20
+    retries: 10
+  - command: unity-downloader-cli -u 6000.0 -c Editor --fast
+    timeout: 10
+    retries: 3
+  - command: python PythonScripts/PackageJsonCondersor.py
+    timeout: 1
+    retries: 0
+  - command: upm-ci package test -u .Editor --package-path com.unity.netcode.gameobjects --type vetting-tests || exit 0
+    timeout: 30
+    retries: 0
+  - command: python PythonScripts/parse_upm_ci_results.py --package-path=com.unity.netcode.gameobjects
+    timeout: 2
+    retries: 0
+  after:
+  - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
+  artifacts:
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    logs:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - upm-ci~/test-results/**/*
+      - upm-ci~/temp/*/Logs/**
+      - upm-ci~/temp/*/Library/*.log
+      - upm-ci~/temp/*/*.log
+      - upm-ci~/temp/Builds/*.log
+      browsable: onNonSuccess
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
+  variables:
+    UPMPVP_CONTEXT_WRENCH: 0.10.45.0
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.45.0
+
diff --git a/.yamato/wrench/package-pack-jobs.yml b/.yamato/wrench/package-pack-jobs.yml
new file mode 100644
index 0000000000..6413921ce7
--- /dev/null
+++ b/.yamato/wrench/package-pack-jobs.yml
@@ -0,0 +1,28 @@
+# Auto-generated by Recipe Engine, do not modify manually.
+# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
+
+# Pack Netcode for GameObjects
+package_pack_-_netcode_gameobjects:
+  name: Package Pack - netcode.gameobjects
+  agent:
+    image: package-ci/ubuntu-20.04:default
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    timeout: 20
+    retries: 10
+  - command: upm-ci package pack --package-path com.unity.netcode.gameobjects
+  - command: cp upm-ci~/packages/packages.json upm-ci~/packages/com.unity.netcode.gameobjects_packages.json
+  after:
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
+  artifacts:
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+  variables:
+    UPMCI_ACK_LARGE_PACKAGE: 1
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.45.0
+
diff --git a/.yamato/wrench/preview-a-p-v.yml b/.yamato/wrench/preview-a-p-v.yml
new file mode 100644
index 0000000000..aa9d8cc1d5
--- /dev/null
+++ b/.yamato/wrench/preview-a-p-v.yml
@@ -0,0 +1,509 @@
+# Auto-generated by Recipe Engine, do not modify manually.
+# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
+
+# Parent Preview APV Job.
+all_preview_apv_jobs:
+  name: All Preview APV Jobs
+  dependencies:
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_macos
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_ubuntu
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_windows
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_1_-_macos
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_1_-_ubuntu
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_1_-_windows
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_macos
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_ubuntu
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_windows
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.45.0
+
+# Functional tests for dependents found in the latest 6000.0 manifest (MacOS).
+preview_apv_-_6000_0_-_macos:
+  name: Preview APV - 6000.0 - macos
+  agent:
+    image: package-ci/macos-13:default
+    type: Unity::VM::osx
+    flavor: b1.xlarge
+  commands:
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
+  - command: 7z x -aoa wrench-localapv.zip
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/print_machine_info.py
+  - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    timeout: 20
+    retries: 10
+  - command: unity-downloader-cli -u 6000.0 -c Editor --fast
+    timeout: 10
+    retries: 3
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
+  - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
+  after:
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
+  artifacts:
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    logs:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - upm-ci~/test-results/**/*
+      - upm-ci~/temp/*/Logs/**
+      - upm-ci~/temp/*/Library/*.log
+      - upm-ci~/temp/*/*.log
+      - upm-ci~/temp/Builds/*.log
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    PreviewAPVResults:
+      paths:
+      - PreviewApvArtifacts~/**
+      - APVTest/**/manifest.json
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
+  variables:
+    UPMPVP_CONTEXT_WRENCH: 0.10.45.0
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.45.0
+
+# Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu).
+preview_apv_-_6000_0_-_ubuntu:
+  name: Preview APV - 6000.0 - ubuntu
+  agent:
+    image: package-ci/ubuntu-20.04:default
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
+  - command: 7z x -aoa wrench-localapv.zip
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/print_machine_info.py
+  - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    timeout: 20
+    retries: 10
+  - command: unity-downloader-cli -u 6000.0 -c Editor --fast
+    timeout: 10
+    retries: 3
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
+  - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
+  after:
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
+  artifacts:
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    logs:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - upm-ci~/test-results/**/*
+      - upm-ci~/temp/*/Logs/**
+      - upm-ci~/temp/*/Library/*.log
+      - upm-ci~/temp/*/*.log
+      - upm-ci~/temp/Builds/*.log
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    PreviewAPVResults:
+      paths:
+      - PreviewApvArtifacts~/**
+      - APVTest/**/manifest.json
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
+  variables:
+    UPMPVP_CONTEXT_WRENCH: 0.10.45.0
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.45.0
+
+# Functional tests for dependents found in the latest 6000.0 manifest (Windows).
+preview_apv_-_6000_0_-_windows:
+  name: Preview APV - 6000.0 - windows
+  agent:
+    image: package-ci/win10:default
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
+  - command: 7z x -aoa wrench-localapv.zip
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/print_machine_info.py
+  - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    timeout: 20
+    retries: 10
+  - command: unity-downloader-cli -u 6000.0 -c Editor --fast
+    timeout: 10
+    retries: 3
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
+  - command: python PythonScripts/editor_manifest_validator.py --version=6000.0 --wrench-config=.yamato/wrench/wrench_config.json
+  after:
+  - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
+  artifacts:
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    logs:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - upm-ci~/test-results/**/*
+      - upm-ci~/temp/*/Logs/**
+      - upm-ci~/temp/*/Library/*.log
+      - upm-ci~/temp/*/*.log
+      - upm-ci~/temp/Builds/*.log
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    PreviewAPVResults:
+      paths:
+      - PreviewApvArtifacts~/**
+      - APVTest/**/manifest.json
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
+  variables:
+    UPMPVP_CONTEXT_WRENCH: 0.10.45.0
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.45.0
+
+# Functional tests for dependents found in the latest 6000.1 manifest (MacOS).
+preview_apv_-_6000_1_-_macos:
+  name: Preview APV - 6000.1 - macos
+  agent:
+    image: package-ci/macos-13:default
+    type: Unity::VM::osx
+    flavor: b1.xlarge
+  commands:
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
+  - command: 7z x -aoa wrench-localapv.zip
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/print_machine_info.py
+  - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    timeout: 20
+    retries: 10
+  - command: unity-downloader-cli -u 6000.1 -c Editor --fast
+    timeout: 10
+    retries: 3
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.1 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
+  - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
+  after:
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
+  artifacts:
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    logs:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - upm-ci~/test-results/**/*
+      - upm-ci~/temp/*/Logs/**
+      - upm-ci~/temp/*/Library/*.log
+      - upm-ci~/temp/*/*.log
+      - upm-ci~/temp/Builds/*.log
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    PreviewAPVResults:
+      paths:
+      - PreviewApvArtifacts~/**
+      - APVTest/**/manifest.json
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
+  variables:
+    UPMPVP_CONTEXT_WRENCH: 0.10.45.0
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.45.0
+
+# Functional tests for dependents found in the latest 6000.1 manifest (Ubuntu).
+preview_apv_-_6000_1_-_ubuntu:
+  name: Preview APV - 6000.1 - ubuntu
+  agent:
+    image: package-ci/ubuntu-20.04:default
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
+  - command: 7z x -aoa wrench-localapv.zip
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/print_machine_info.py
+  - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    timeout: 20
+    retries: 10
+  - command: unity-downloader-cli -u 6000.1 -c Editor --fast
+    timeout: 10
+    retries: 3
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.1 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
+  - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
+  after:
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
+  artifacts:
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    logs:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - upm-ci~/test-results/**/*
+      - upm-ci~/temp/*/Logs/**
+      - upm-ci~/temp/*/Library/*.log
+      - upm-ci~/temp/*/*.log
+      - upm-ci~/temp/Builds/*.log
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    PreviewAPVResults:
+      paths:
+      - PreviewApvArtifacts~/**
+      - APVTest/**/manifest.json
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
+  variables:
+    UPMPVP_CONTEXT_WRENCH: 0.10.45.0
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.45.0
+
+# Functional tests for dependents found in the latest 6000.1 manifest (Windows).
+preview_apv_-_6000_1_-_windows:
+  name: Preview APV - 6000.1 - windows
+  agent:
+    image: package-ci/win10:default
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
+  - command: 7z x -aoa wrench-localapv.zip
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/print_machine_info.py
+  - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    timeout: 20
+    retries: 10
+  - command: unity-downloader-cli -u 6000.1 -c Editor --fast
+    timeout: 10
+    retries: 3
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.1 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
+  - command: python PythonScripts/editor_manifest_validator.py --version=6000.1 --wrench-config=.yamato/wrench/wrench_config.json
+  after:
+  - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
+  artifacts:
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    logs:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - upm-ci~/test-results/**/*
+      - upm-ci~/temp/*/Logs/**
+      - upm-ci~/temp/*/Library/*.log
+      - upm-ci~/temp/*/*.log
+      - upm-ci~/temp/Builds/*.log
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    PreviewAPVResults:
+      paths:
+      - PreviewApvArtifacts~/**
+      - APVTest/**/manifest.json
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
+  variables:
+    UPMPVP_CONTEXT_WRENCH: 0.10.45.0
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.45.0
+
+# Functional tests for dependents found in the latest 6000.2 manifest (MacOS).
+preview_apv_-_6000_2_-_macos:
+  name: Preview APV - 6000.2 - macos
+  agent:
+    image: package-ci/macos-13:default
+    type: Unity::VM::osx
+    flavor: b1.xlarge
+  commands:
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
+  - command: 7z x -aoa wrench-localapv.zip
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/print_machine_info.py
+  - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    timeout: 20
+    retries: 10
+  - command: unity-downloader-cli -u 6000.2 -c Editor --fast
+    timeout: 10
+    retries: 3
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.2 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
+  - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
+  after:
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
+  artifacts:
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    logs:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - upm-ci~/test-results/**/*
+      - upm-ci~/temp/*/Logs/**
+      - upm-ci~/temp/*/Library/*.log
+      - upm-ci~/temp/*/*.log
+      - upm-ci~/temp/Builds/*.log
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    PreviewAPVResults:
+      paths:
+      - PreviewApvArtifacts~/**
+      - APVTest/**/manifest.json
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
+  variables:
+    UPMPVP_CONTEXT_WRENCH: 0.10.45.0
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.45.0
+
+# Functional tests for dependents found in the latest 6000.2 manifest (Ubuntu).
+preview_apv_-_6000_2_-_ubuntu:
+  name: Preview APV - 6000.2 - ubuntu
+  agent:
+    image: package-ci/ubuntu-20.04:default
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
+  - command: 7z x -aoa wrench-localapv.zip
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/print_machine_info.py
+  - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    timeout: 20
+    retries: 10
+  - command: unity-downloader-cli -u 6000.2 -c Editor --fast
+    timeout: 10
+    retries: 3
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.2 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
+  - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
+  after:
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
+  artifacts:
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    logs:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - upm-ci~/test-results/**/*
+      - upm-ci~/temp/*/Logs/**
+      - upm-ci~/temp/*/Library/*.log
+      - upm-ci~/temp/*/*.log
+      - upm-ci~/temp/Builds/*.log
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    PreviewAPVResults:
+      paths:
+      - PreviewApvArtifacts~/**
+      - APVTest/**/manifest.json
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
+  variables:
+    UPMPVP_CONTEXT_WRENCH: 0.10.45.0
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.45.0
+
+# Functional tests for dependents found in the latest 6000.2 manifest (Windows).
+preview_apv_-_6000_2_-_windows:
+  name: Preview APV - 6000.2 - windows
+  agent:
+    image: package-ci/win10:default
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
+  - command: 7z x -aoa wrench-localapv.zip
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/print_machine_info.py
+  - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    timeout: 20
+    retries: 10
+  - command: unity-downloader-cli -u 6000.2 -c Editor --fast
+    timeout: 10
+    retries: 3
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.2 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
+  - command: python PythonScripts/editor_manifest_validator.py --version=6000.2 --wrench-config=.yamato/wrench/wrench_config.json
+  after:
+  - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
+  artifacts:
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    logs:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - upm-ci~/test-results/**/*
+      - upm-ci~/temp/*/Logs/**
+      - upm-ci~/temp/*/Library/*.log
+      - upm-ci~/temp/*/*.log
+      - upm-ci~/temp/Builds/*.log
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    PreviewAPVResults:
+      paths:
+      - PreviewApvArtifacts~/**
+      - APVTest/**/manifest.json
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
+  variables:
+    UPMPVP_CONTEXT_WRENCH: 0.10.45.0
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.45.0
+
diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml
new file mode 100644
index 0000000000..ddd5e5322f
--- /dev/null
+++ b/.yamato/wrench/promotion-jobs.yml
@@ -0,0 +1,247 @@
+# Auto-generated by Recipe Engine, do not modify manually.
+# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
+
+# Publish Dry Run  for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
+publish_dry_run_netcode_gameobjects:
+  name: Publish Dry Run netcode.gameobjects
+  agent:
+    image: package-ci/ubuntu-20.04:default
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
+  - command: 7z x -aoa wrench-localapv.zip
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/print_machine_info.py
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/report_valid_editors.py
+  - command: python PythonScripts/ignore_existing_package_failure.py
+  - command: python PythonScripts/run_publish_if_any_package_left.py --dry-run
+  after:
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
+  artifacts:
+    logs:
+      paths:
+      - results/UTR/**/*
+      browsable: onNonSuccess
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_0_-_macos
+    specific_options:
+      UTR:
+        location: results/UTR/validate-netcode.gameobjects-6000.0-macos
+        unzip: true
+      pvp-results:
+        location: results/pvp/validate-netcode.gameobjects-6000.0-macos
+        unzip: true
+      packages:
+        ignore_artifact: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_0_-_ubuntu
+    specific_options:
+      UTR:
+        location: results/UTR/validate-netcode.gameobjects-6000.0-ubuntu
+        unzip: true
+      pvp-results:
+        location: results/pvp/validate-netcode.gameobjects-6000.0-ubuntu
+        unzip: true
+      packages:
+        ignore_artifact: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_0_-_windows
+    specific_options:
+      UTR:
+        location: results/UTR/validate-netcode.gameobjects-6000.0-windows
+        unzip: true
+      pvp-results:
+        location: results/pvp/validate-netcode.gameobjects-6000.0-windows
+        unzip: true
+      packages:
+        ignore_artifact: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_1_-_macos
+    specific_options:
+      UTR:
+        location: results/UTR/validate-netcode.gameobjects-6000.1-macos
+        unzip: true
+      pvp-results:
+        location: results/pvp/validate-netcode.gameobjects-6000.1-macos
+        unzip: true
+      packages:
+        ignore_artifact: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_1_-_ubuntu
+    specific_options:
+      UTR:
+        location: results/UTR/validate-netcode.gameobjects-6000.1-ubuntu
+        unzip: true
+      pvp-results:
+        location: results/pvp/validate-netcode.gameobjects-6000.1-ubuntu
+        unzip: true
+      packages:
+        ignore_artifact: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_1_-_windows
+    specific_options:
+      UTR:
+        location: results/UTR/validate-netcode.gameobjects-6000.1-windows
+        unzip: true
+      pvp-results:
+        location: results/pvp/validate-netcode.gameobjects-6000.1-windows
+        unzip: true
+      packages:
+        ignore_artifact: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_macos
+    specific_options:
+      UTR:
+        location: results/UTR/validate-netcode.gameobjects-6000.2-macos
+        unzip: true
+      pvp-results:
+        location: results/pvp/validate-netcode.gameobjects-6000.2-macos
+        unzip: true
+      packages:
+        ignore_artifact: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_ubuntu
+    specific_options:
+      UTR:
+        location: results/UTR/validate-netcode.gameobjects-6000.2-ubuntu
+        unzip: true
+      pvp-results:
+        location: results/pvp/validate-netcode.gameobjects-6000.2-ubuntu
+        unzip: true
+      packages:
+        ignore_artifact: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_windows
+    specific_options:
+      UTR:
+        location: results/UTR/validate-netcode.gameobjects-6000.2-windows
+        unzip: true
+      pvp-results:
+        location: results/pvp/validate-netcode.gameobjects-6000.2-windows
+        unzip: true
+      packages:
+        ignore_artifact: true
+  variables:
+    UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
+    UPMPVP_CONTEXT_WRENCH: 0.10.45.0
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.45.0
+
+# Publish  for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
+publish_netcode_gameobjects:
+  name: Publish netcode.gameobjects
+  agent:
+    image: package-ci/ubuntu-20.04:default
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
+  - command: 7z x -aoa wrench-localapv.zip
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/print_machine_info.py
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/report_valid_editors.py
+  - command: python PythonScripts/ignore_existing_package_failure.py
+  - command: python PythonScripts/run_publish_if_any_package_left.py
+  after:
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
+  artifacts:
+    logs:
+      paths:
+      - results/UTR/**/*
+      browsable: onNonSuccess
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_0_-_macos
+    specific_options:
+      UTR:
+        location: results/UTR/validate-netcode.gameobjects-6000.0-macos
+        unzip: true
+      pvp-results:
+        location: results/pvp/validate-netcode.gameobjects-6000.0-macos
+        unzip: true
+      packages:
+        ignore_artifact: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_0_-_ubuntu
+    specific_options:
+      UTR:
+        location: results/UTR/validate-netcode.gameobjects-6000.0-ubuntu
+        unzip: true
+      pvp-results:
+        location: results/pvp/validate-netcode.gameobjects-6000.0-ubuntu
+        unzip: true
+      packages:
+        ignore_artifact: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_0_-_windows
+    specific_options:
+      UTR:
+        location: results/UTR/validate-netcode.gameobjects-6000.0-windows
+        unzip: true
+      pvp-results:
+        location: results/pvp/validate-netcode.gameobjects-6000.0-windows
+        unzip: true
+      packages:
+        ignore_artifact: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_1_-_macos
+    specific_options:
+      UTR:
+        location: results/UTR/validate-netcode.gameobjects-6000.1-macos
+        unzip: true
+      pvp-results:
+        location: results/pvp/validate-netcode.gameobjects-6000.1-macos
+        unzip: true
+      packages:
+        ignore_artifact: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_1_-_ubuntu
+    specific_options:
+      UTR:
+        location: results/UTR/validate-netcode.gameobjects-6000.1-ubuntu
+        unzip: true
+      pvp-results:
+        location: results/pvp/validate-netcode.gameobjects-6000.1-ubuntu
+        unzip: true
+      packages:
+        ignore_artifact: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_1_-_windows
+    specific_options:
+      UTR:
+        location: results/UTR/validate-netcode.gameobjects-6000.1-windows
+        unzip: true
+      pvp-results:
+        location: results/pvp/validate-netcode.gameobjects-6000.1-windows
+        unzip: true
+      packages:
+        ignore_artifact: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_macos
+    specific_options:
+      UTR:
+        location: results/UTR/validate-netcode.gameobjects-6000.2-macos
+        unzip: true
+      pvp-results:
+        location: results/pvp/validate-netcode.gameobjects-6000.2-macos
+        unzip: true
+      packages:
+        ignore_artifact: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_ubuntu
+    specific_options:
+      UTR:
+        location: results/UTR/validate-netcode.gameobjects-6000.2-ubuntu
+        unzip: true
+      pvp-results:
+        location: results/pvp/validate-netcode.gameobjects-6000.2-ubuntu
+        unzip: true
+      packages:
+        ignore_artifact: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_windows
+    specific_options:
+      UTR:
+        location: results/UTR/validate-netcode.gameobjects-6000.2-windows
+        unzip: true
+      pvp-results:
+        location: results/pvp/validate-netcode.gameobjects-6000.2-windows
+        unzip: true
+      packages:
+        ignore_artifact: true
+  variables:
+    UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
+    UPMPVP_CONTEXT_WRENCH: 0.10.45.0
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.45.0
+
diff --git a/.yamato/wrench/publish-trigger.yml b/.yamato/wrench/publish-trigger.yml
new file mode 100644
index 0000000000..bd7db9bc73
--- /dev/null
+++ b/.yamato/wrench/publish-trigger.yml
@@ -0,0 +1,12 @@
+# Auto-generated by Recipe Engine, do not modify manually.
+# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
+all_promotion_related_jobs_promotiontrigger:
+  name: All Promotion Related Jobs PromotionTrigger
+  dependencies:
+  - path: .yamato/wrench/api-validation-jobs.yml#all_api_validation_jobs
+  - path: .yamato/wrench/preview-a-p-v.yml#all_preview_apv_jobs
+  - path: .yamato/wrench/promotion-jobs.yml#publish_dry_run_netcode_gameobjects
+  triggers:
+    expression: push.branch match "^release/.*"
+    cancel_old_ci: true
+
diff --git a/.yamato/wrench/recipe-regeneration.yml b/.yamato/wrench/recipe-regeneration.yml
new file mode 100644
index 0000000000..7cec6a1ea8
--- /dev/null
+++ b/.yamato/wrench/recipe-regeneration.yml
@@ -0,0 +1,30 @@
+# Auto-generated by Recipe Engine, do not modify manually.
+# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
+
+# Test that Generated Wrench Jobs are up to date.
+test_-_wrench_jobs_up_to_date:
+  name: Test - Wrench Jobs up to date
+  agent:
+    image: package-ci/ubuntu-20.04:default
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - command: dotnet run --project Tools\CI\NGO.Cookbook.csproj
+  - command: |-
+      if [ -n "$(git status --porcelain -- .yamato/wrench)" ]; then
+        git status
+        echo "Your repo is not clean - diff output:"
+        git diff
+        echo "You must run recipe generation after updating recipes to update the generated YAML!"
+        echo "Run 'dotnet run --project Tools\CI\NGO.Cookbook.csproj' from the root of your repository to regenerate all job definitions created by wrench."
+        exit 1
+      fi
+  variables:
+    DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  triggers:
+    expression: push.branch match "^release/.*"
+    cancel_old_ci: true
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.45.0
+
diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml
new file mode 100644
index 0000000000..968b3da71d
--- /dev/null
+++ b/.yamato/wrench/validation-jobs.yml
@@ -0,0 +1,597 @@
+# Auto-generated by Recipe Engine, do not modify manually.
+# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
+
+# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.0 - macos (6000.0 - MacOS).
+validate_-_netcode_gameobjects_-_6000_0_-_macos:
+  name: Validate - netcode.gameobjects - 6000.0 - macos
+  agent:
+    image: package-ci/macos-13:default
+    type: Unity::VM::osx
+    flavor: b1.xlarge
+  commands:
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
+  - command: 7z x -aoa wrench-localapv.zip
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/print_machine_info.py
+  - command: unity-downloader-cli -u 6000.0 -c Editor --fast
+    timeout: 10
+    retries: 3
+  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+    timeout: 10
+    retries: 1
+  - command: echo No internal packages to add.
+  - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
+    timeout: 40
+    retries: 0
+  - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
+    timeout: 5
+    retries: 0
+  - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
+    timeout: 10
+    retries: 0
+  - command: UnifiedTestRunner --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+    timeout: 40
+    retries: 1
+  after:
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
+  artifacts:
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+    UTR:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - artifacts/**/*
+      - test-netcode.gameobjects/Logs/**
+      - test-netcode.gameobjects/Library/*.log
+      - test-netcode.gameobjects/*.log
+      - test-netcode.gameobjects/Builds/*.log
+      - build/test-results/**
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
+  variables:
+    UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
+    UPMPVP_CONTEXT_WRENCH: 0.10.45.0
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.45.0
+  labels:
+  - Packages:netcode.gameobjects
+
+# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.0 - ubuntu (6000.0 - Ubuntu).
+validate_-_netcode_gameobjects_-_6000_0_-_ubuntu:
+  name: Validate - netcode.gameobjects - 6000.0 - ubuntu
+  agent:
+    image: package-ci/ubuntu-20.04:default
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
+  - command: 7z x -aoa wrench-localapv.zip
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/print_machine_info.py
+  - command: unity-downloader-cli -u 6000.0 -c Editor --fast
+    timeout: 10
+    retries: 3
+  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+    timeout: 10
+    retries: 1
+  - command: echo No internal packages to add.
+  - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
+    timeout: 40
+    retries: 0
+  - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
+    timeout: 5
+    retries: 0
+  - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
+    timeout: 10
+    retries: 0
+  - command: UnifiedTestRunner --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+    timeout: 40
+    retries: 1
+  after:
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
+  artifacts:
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+    UTR:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - artifacts/**/*
+      - test-netcode.gameobjects/Logs/**
+      - test-netcode.gameobjects/Library/*.log
+      - test-netcode.gameobjects/*.log
+      - test-netcode.gameobjects/Builds/*.log
+      - build/test-results/**
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
+  variables:
+    UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
+    UPMPVP_CONTEXT_WRENCH: 0.10.45.0
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.45.0
+  labels:
+  - Packages:netcode.gameobjects
+
+# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.0 - windows (6000.0 - Windows).
+validate_-_netcode_gameobjects_-_6000_0_-_windows:
+  name: Validate - netcode.gameobjects - 6000.0 - windows
+  agent:
+    image: package-ci/win10:default
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
+  - command: 7z x -aoa wrench-localapv.zip
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/print_machine_info.py
+  - command: unity-downloader-cli -u 6000.0 -c Editor --fast
+    timeout: 10
+    retries: 3
+  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+    timeout: 10
+    retries: 1
+  - command: echo No internal packages to add.
+  - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
+    timeout: 40
+    retries: 0
+  - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
+    timeout: 5
+    retries: 0
+  - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
+    timeout: 10
+    retries: 0
+  - command: UnifiedTestRunner.exe --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+    timeout: 40
+    retries: 1
+  after:
+  - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
+  artifacts:
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+    UTR:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - artifacts/**/*
+      - test-netcode.gameobjects/Logs/**
+      - test-netcode.gameobjects/Library/*.log
+      - test-netcode.gameobjects/*.log
+      - test-netcode.gameobjects/Builds/*.log
+      - build/test-results/**
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
+  variables:
+    UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
+    UPMPVP_CONTEXT_WRENCH: 0.10.45.0
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.45.0
+  labels:
+  - Packages:netcode.gameobjects
+
+# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.1 - macos (6000.1 - MacOS).
+validate_-_netcode_gameobjects_-_6000_1_-_macos:
+  name: Validate - netcode.gameobjects - 6000.1 - macos
+  agent:
+    image: package-ci/macos-13:default
+    type: Unity::VM::osx
+    flavor: b1.xlarge
+  commands:
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
+  - command: 7z x -aoa wrench-localapv.zip
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/print_machine_info.py
+  - command: unity-downloader-cli -u 6000.1 -c Editor --fast
+    timeout: 10
+    retries: 3
+  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+    timeout: 10
+    retries: 1
+  - command: echo No internal packages to add.
+  - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
+    timeout: 40
+    retries: 0
+  - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
+    timeout: 5
+    retries: 0
+  - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
+    timeout: 10
+    retries: 0
+  - command: UnifiedTestRunner --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+    timeout: 40
+    retries: 1
+  after:
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
+  artifacts:
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+    UTR:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - artifacts/**/*
+      - test-netcode.gameobjects/Logs/**
+      - test-netcode.gameobjects/Library/*.log
+      - test-netcode.gameobjects/*.log
+      - test-netcode.gameobjects/Builds/*.log
+      - build/test-results/**
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
+  variables:
+    UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
+    UPMPVP_CONTEXT_WRENCH: 0.10.45.0
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.45.0
+  labels:
+  - Packages:netcode.gameobjects
+
+# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.1 - ubuntu (6000.1 - Ubuntu).
+validate_-_netcode_gameobjects_-_6000_1_-_ubuntu:
+  name: Validate - netcode.gameobjects - 6000.1 - ubuntu
+  agent:
+    image: package-ci/ubuntu-20.04:default
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
+  - command: 7z x -aoa wrench-localapv.zip
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/print_machine_info.py
+  - command: unity-downloader-cli -u 6000.1 -c Editor --fast
+    timeout: 10
+    retries: 3
+  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+    timeout: 10
+    retries: 1
+  - command: echo No internal packages to add.
+  - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
+    timeout: 40
+    retries: 0
+  - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
+    timeout: 5
+    retries: 0
+  - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
+    timeout: 10
+    retries: 0
+  - command: UnifiedTestRunner --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+    timeout: 40
+    retries: 1
+  after:
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
+  artifacts:
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+    UTR:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - artifacts/**/*
+      - test-netcode.gameobjects/Logs/**
+      - test-netcode.gameobjects/Library/*.log
+      - test-netcode.gameobjects/*.log
+      - test-netcode.gameobjects/Builds/*.log
+      - build/test-results/**
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
+  variables:
+    UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
+    UPMPVP_CONTEXT_WRENCH: 0.10.45.0
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.45.0
+  labels:
+  - Packages:netcode.gameobjects
+
+# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.1 - windows (6000.1 - Windows).
+validate_-_netcode_gameobjects_-_6000_1_-_windows:
+  name: Validate - netcode.gameobjects - 6000.1 - windows
+  agent:
+    image: package-ci/win10:default
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
+  - command: 7z x -aoa wrench-localapv.zip
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/print_machine_info.py
+  - command: unity-downloader-cli -u 6000.1 -c Editor --fast
+    timeout: 10
+    retries: 3
+  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+    timeout: 10
+    retries: 1
+  - command: echo No internal packages to add.
+  - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
+    timeout: 40
+    retries: 0
+  - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
+    timeout: 5
+    retries: 0
+  - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
+    timeout: 10
+    retries: 0
+  - command: UnifiedTestRunner.exe --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+    timeout: 40
+    retries: 1
+  after:
+  - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
+  artifacts:
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+    UTR:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - artifacts/**/*
+      - test-netcode.gameobjects/Logs/**
+      - test-netcode.gameobjects/Library/*.log
+      - test-netcode.gameobjects/*.log
+      - test-netcode.gameobjects/Builds/*.log
+      - build/test-results/**
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
+  variables:
+    UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
+    UPMPVP_CONTEXT_WRENCH: 0.10.45.0
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.45.0
+  labels:
+  - Packages:netcode.gameobjects
+
+# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.2 - macos (6000.2 - MacOS).
+validate_-_netcode_gameobjects_-_6000_2_-_macos:
+  name: Validate - netcode.gameobjects - 6000.2 - macos
+  agent:
+    image: package-ci/macos-13:default
+    type: Unity::VM::osx
+    flavor: b1.xlarge
+  commands:
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
+  - command: 7z x -aoa wrench-localapv.zip
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/print_machine_info.py
+  - command: unity-downloader-cli -u 6000.2 -c Editor --fast
+    timeout: 10
+    retries: 3
+  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+    timeout: 10
+    retries: 1
+  - command: echo No internal packages to add.
+  - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
+    timeout: 40
+    retries: 0
+  - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
+    timeout: 5
+    retries: 0
+  - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
+    timeout: 10
+    retries: 0
+  - command: UnifiedTestRunner --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+    timeout: 40
+    retries: 1
+  after:
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
+  artifacts:
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+    UTR:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - artifacts/**/*
+      - test-netcode.gameobjects/Logs/**
+      - test-netcode.gameobjects/Library/*.log
+      - test-netcode.gameobjects/*.log
+      - test-netcode.gameobjects/Builds/*.log
+      - build/test-results/**
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
+  variables:
+    UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
+    UPMPVP_CONTEXT_WRENCH: 0.10.45.0
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.45.0
+  labels:
+  - Packages:netcode.gameobjects
+
+# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.2 - ubuntu (6000.2 - Ubuntu).
+validate_-_netcode_gameobjects_-_6000_2_-_ubuntu:
+  name: Validate - netcode.gameobjects - 6000.2 - ubuntu
+  agent:
+    image: package-ci/ubuntu-20.04:default
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
+  - command: 7z x -aoa wrench-localapv.zip
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/print_machine_info.py
+  - command: unity-downloader-cli -u 6000.2 -c Editor --fast
+    timeout: 10
+    retries: 3
+  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+    timeout: 10
+    retries: 1
+  - command: echo No internal packages to add.
+  - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
+    timeout: 40
+    retries: 0
+  - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
+    timeout: 5
+    retries: 0
+  - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
+    timeout: 10
+    retries: 0
+  - command: UnifiedTestRunner --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+    timeout: 40
+    retries: 1
+  after:
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
+  artifacts:
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+    UTR:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - artifacts/**/*
+      - test-netcode.gameobjects/Logs/**
+      - test-netcode.gameobjects/Library/*.log
+      - test-netcode.gameobjects/*.log
+      - test-netcode.gameobjects/Builds/*.log
+      - build/test-results/**
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
+  variables:
+    UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
+    UPMPVP_CONTEXT_WRENCH: 0.10.45.0
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.45.0
+  labels:
+  - Packages:netcode.gameobjects
+
+# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.2 - windows (6000.2 - Windows).
+validate_-_netcode_gameobjects_-_6000_2_-_windows:
+  name: Validate - netcode.gameobjects - 6000.2 - windows
+  agent:
+    image: package-ci/win10:default
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
+  - command: 7z x -aoa wrench-localapv.zip
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/print_machine_info.py
+  - command: unity-downloader-cli -u 6000.2 -c Editor --fast
+    timeout: 10
+    retries: 3
+  - command: upm-pvp create-test-project test-netcode.gameobjects --packages "upm-ci~/packages/*.tgz" --unity .Editor
+    timeout: 10
+    retries: 1
+  - command: echo No internal packages to add.
+  - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
+    timeout: 40
+    retries: 0
+  - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
+    timeout: 5
+    retries: 0
+  - command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
+    timeout: 10
+    retries: 0
+  - command: UnifiedTestRunner.exe --testproject=test-netcode.gameobjects --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}"
+    timeout: 40
+    retries: 1
+  after:
+  - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
+  artifacts:
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+    UTR:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - artifacts/**/*
+      - test-netcode.gameobjects/Logs/**
+      - test-netcode.gameobjects/Library/*.log
+      - test-netcode.gameobjects/*.log
+      - test-netcode.gameobjects/Builds/*.log
+      - build/test-results/**
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
+  variables:
+    UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
+    UPMPVP_CONTEXT_WRENCH: 0.10.45.0
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 0.10.45.0
+  labels:
+  - Packages:netcode.gameobjects
+
diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json
new file mode 100644
index 0000000000..b25762e36c
--- /dev/null
+++ b/.yamato/wrench/wrench_config.json
@@ -0,0 +1,37 @@
+{
+  "schema_version": 0.7,
+  "packages": {
+    "com.unity.netcode.gameobjects": {
+      "directory": "com.unity.netcode.gameobjects/",
+      "prePackCommands": [],
+      "preTestCommands": {
+        "MacOS": [],
+        "Ubuntu": [],
+        "Windows": []
+      },
+      "InternalOnly": false,
+      "NeverPublish": false,
+      "MaxEditorVersion": "",
+      "coverageEnabled": false,
+      "coverageCommands": [
+        "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:ASSEMBLY_NAME;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:YAMATO_SOURCE_DIR/Packages;"
+      ],
+      "dependantsToIgnoreInPreviewApv": {}
+    }
+  },
+  "releasing_packages": [
+    "com.unity.netcode.gameobjects"
+  ],
+  "jobs_to_monitor": {
+    "com.unity.netcode.gameobjects": [
+      ".yamato/wrench/api-validation-jobs.yml#api_validation_-_netcode_gameobjects_-_6000_0_-_windows",
+      ".yamato/wrench/preview-a-p-v.yml#all_preview_apv_jobs",
+      ".yamato/wrench/promotion-jobs.yml#publish_dry_run_netcode_gameobjects"
+    ]
+  },
+  "publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_netcode_gameobjects",
+  "branch_pattern": "ReleaseSlash",
+  "wrench_version": "0.10.45.0",
+  "pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json",
+  "cs_project_path": "Tools\\CI\\NGO.Cookbook.csproj"
+}
\ No newline at end of file
diff --git a/Examples/CharacterControllerMovingBodies/.gitignore b/Examples/CharacterControllerMovingBodies/.gitignore
new file mode 100644
index 0000000000..2800399634
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/.gitignore
@@ -0,0 +1,83 @@
+# This .gitignore file should be placed at the root of your Unity project directory
+#
+# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
+#
+/[Ll]ibrary/
+/[Tt]emp/
+/[Oo]bj/
+/[Bb]uild/
+/[Bb]uilds/
+/[Ll]ogs/
+/[Uu]ser[Ss]ettings/
+
+# MemoryCaptures can get excessive in size.
+# They also could contain extremely sensitive data
+/[Mm]emoryCaptures/
+
+# Asset meta data should only be ignored when the corresponding asset is also ignored
+!/[Aa]ssets/**/*.meta
+
+# Uncomment this line if you wish to ignore the asset store tools plugin
+# /[Aa]ssets/AssetStoreTools*
+
+# Autogenerated Jetbrains Rider plugin
+/[Aa]ssets/Plugins/Editor/JetBrains*
+
+# Visual Studio cache directory
+.vs/
+
+# Gradle cache directory
+.gradle/
+
+# Autogenerated VS/MD/Consulo solution and project files
+ExportedObj/
+.consulo/
+*.csproj
+*.unityproj
+*.sln
+*.suo
+*.tmp
+*.user
+*.userprefs
+*.pidb
+*.booproj
+*.svd
+*.pdb
+*.mdb
+*.opendb
+*.VC.db
+
+# Unity3D generated meta files
+*.pidb.meta
+*.pdb.meta
+*.mdb.meta
+
+# Unity3D generated file on crash reports
+sysinfo.txt
+
+# Builds
+*.apk
+*.aab
+*.unitypackage
+
+# Crashlytics generated file
+crashlytics-build.properties
+
+# Packed Addressables
+/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
+
+# Temporary auto-generated Android Assets
+/[Aa]ssets/[Ss]treamingAssets/aa.meta
+/[Aa]ssets/[Ss]treamingAssets/aa/*
+/[Aa]ssets/[Ss]treamingAssets/BuildInfo.json
+/[Aa]ssets/[Ss]treamingAssets/BuildInfo.json.meta
+
+# Secrets
+*.pem
+*.pem.meta
+
+InitTestScene*
+
+boot.config
+SceneTemplateSettings.json
+*BurstAotSettings*.json
diff --git a/Examples/CharacterControllerMovingBodies/Assets/DefaultNetworkPrefabs.asset b/Examples/CharacterControllerMovingBodies/Assets/DefaultNetworkPrefabs.asset
new file mode 100644
index 0000000000..073f4484e8
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/DefaultNetworkPrefabs.asset
@@ -0,0 +1,31 @@
+%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: DefaultNetworkPrefabs
+  m_EditorClassIdentifier: 
+  IsDefault: 1
+  List:
+  - Override: 0
+    Prefab: {fileID: 2522762726852386808, guid: 380c984d34fc8664c8f53fc1d8733a25, type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
+  - Override: 0
+    Prefab: {fileID: 8921789205124766477, guid: 89b57e576a8d47643b2dbd45b1f8cab1, type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
+  - Override: 0
+    Prefab: {fileID: 3439633038736912633, guid: 398aad09d8b2a47eba664a076763cdcc, type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
diff --git a/Examples/CharacterControllerMovingBodies/Assets/DefaultNetworkPrefabs.asset.meta b/Examples/CharacterControllerMovingBodies/Assets/DefaultNetworkPrefabs.asset.meta
new file mode 100644
index 0000000000..fee27b3ade
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/DefaultNetworkPrefabs.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: aa82390bfdde2564f828b8e5be375282
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.netcode.gameobjects/Components/Messages.meta b/Examples/CharacterControllerMovingBodies/Assets/Materials.meta
similarity index 77%
rename from com.unity.netcode.gameobjects/Components/Messages.meta
rename to Examples/CharacterControllerMovingBodies/Assets/Materials.meta
index fcf8b73d3a..463de70d61 100644
--- a/com.unity.netcode.gameobjects/Components/Messages.meta
+++ b/Examples/CharacterControllerMovingBodies/Assets/Materials.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a9db1d18fa0117f4da5e8e65386b894a
+guid: d5b7ad71451c27e4291295cfffc10328
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Materials/ChildLocal.mat b/Examples/CharacterControllerMovingBodies/Assets/Materials/ChildLocal.mat
new file mode 100644
index 0000000000..b6fd2dd9a1
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Materials/ChildLocal.mat
@@ -0,0 +1,86 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ChildLocal
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _ALPHAPREMULTIPLY_ON
+  - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 3
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 1
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0.8980392, g: 0.039215658, b: 0.7682729, a: 0.2509804}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Materials/ChildLocal.mat.meta b/Examples/CharacterControllerMovingBodies/Assets/Materials/ChildLocal.mat.meta
new file mode 100644
index 0000000000..35e4d565be
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Materials/ChildLocal.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 45fc555bc05bfee4ab8b0d536799ecee
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Materials/ChildLocalNoParentSync.mat b/Examples/CharacterControllerMovingBodies/Assets/Materials/ChildLocalNoParentSync.mat
new file mode 100644
index 0000000000..c44172e7a7
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Materials/ChildLocalNoParentSync.mat
@@ -0,0 +1,86 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ChildLocalNoParentSync
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _ALPHAPREMULTIPLY_ON
+  - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 3
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 1
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0.039215658, g: 0.78592235, b: 0.8980392, a: 0.2509804}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Materials/ChildLocalNoParentSync.mat.meta b/Examples/CharacterControllerMovingBodies/Assets/Materials/ChildLocalNoParentSync.mat.meta
new file mode 100644
index 0000000000..3a26e43d98
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Materials/ChildLocalNoParentSync.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: affef70511a06dd46b8f52636020af4a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Materials/ChildWorld.mat b/Examples/CharacterControllerMovingBodies/Assets/Materials/ChildWorld.mat
new file mode 100644
index 0000000000..0c2bf4b187
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Materials/ChildWorld.mat
@@ -0,0 +1,86 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ChildWorld
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _ALPHAPREMULTIPLY_ON
+  - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 3
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 1
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0.3783494, g: 0.039215658, b: 0.8980392, a: 0.2509804}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Materials/ChildWorld.mat.meta b/Examples/CharacterControllerMovingBodies/Assets/Materials/ChildWorld.mat.meta
new file mode 100644
index 0000000000..9a00ded8c6
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Materials/ChildWorld.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 15d0bda12a233964086aee5c0c357e24
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Materials/ChildWorldNoParentSync.mat b/Examples/CharacterControllerMovingBodies/Assets/Materials/ChildWorldNoParentSync.mat
new file mode 100644
index 0000000000..86b27eb5c9
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Materials/ChildWorldNoParentSync.mat
@@ -0,0 +1,86 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ChildWorldNoParentSync
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _ALPHAPREMULTIPLY_ON
+  - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 3
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 1
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0.039215658, g: 0.8980392, b: 0.09095798, a: 0.2509804}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Materials/ChildWorldNoParentSync.mat.meta b/Examples/CharacterControllerMovingBodies/Assets/Materials/ChildWorldNoParentSync.mat.meta
new file mode 100644
index 0000000000..5ab7ff2e72
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Materials/ChildWorldNoParentSync.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a5e199307b2e0894294d9c8bee99a691
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Materials/Direction.mat b/Examples/CharacterControllerMovingBodies/Assets/Materials/Direction.mat
new file mode 100644
index 0000000000..ed5ed117c3
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Materials/Direction.mat
@@ -0,0 +1,84 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Direction
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 1
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.8962264, g: 0.52830994, b: 0.038047332, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Materials/Direction.mat.meta b/Examples/CharacterControllerMovingBodies/Assets/Materials/Direction.mat.meta
new file mode 100644
index 0000000000..c93791fac0
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Materials/Direction.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5324c76c2bab7344badd5ea27a40bcb5
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Materials/GridBlue.mat b/Examples/CharacterControllerMovingBodies/Assets/Materials/GridBlue.mat
new file mode 100644
index 0000000000..9009817e26
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Materials/GridBlue.mat
@@ -0,0 +1,138 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-2624353793879203111
+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: 7
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: GridBlue
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _EMISSION
+  - _GLOSSYREFLECTIONS_OFF
+  - _NORMALMAP
+  m_InvalidKeywords: []
+  m_LightmapFlags: 2
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 2800000, guid: b94463ba36040ec4082132c54dd1bbad, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 2800000, guid: 8bf2cf149563066489e749ea032dbca7, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: e71f43865e91e6b418bd0d67be2445dc, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 1
+    - _Glossiness: 0.477
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 0
+    - _Parallax: 0.02
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _UVSec: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 0.5438323, g: 0.88474977, b: 0.9528302, a: 1}
+    - _EmissionColor: {r: 0, g: 0.6988592, b: 1, a: 1}
+    - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Materials/GridBlue.mat.meta b/Examples/CharacterControllerMovingBodies/Assets/Materials/GridBlue.mat.meta
new file mode 100644
index 0000000000..b8caf3cbac
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Materials/GridBlue.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1448a5da57523ce4bbc377143e02fe3c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Materials/GridOrange.mat b/Examples/CharacterControllerMovingBodies/Assets/Materials/GridOrange.mat
new file mode 100644
index 0000000000..38a4e9808b
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Materials/GridOrange.mat
@@ -0,0 +1,138 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-2624353793879203111
+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: 7
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: GridOrange
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _EMISSION
+  - _GLOSSYREFLECTIONS_OFF
+  - _NORMALMAP
+  m_InvalidKeywords: []
+  m_LightmapFlags: 2
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 2800000, guid: b94463ba36040ec4082132c54dd1bbad, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 2800000, guid: 8bf2cf149563066489e749ea032dbca7, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: e71f43865e91e6b418bd0d67be2445dc, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 1
+    - _Glossiness: 0.477
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 0
+    - _Parallax: 0.02
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _UVSec: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 0.49475378, b: 0, a: 1}
+    - _EmissionColor: {r: 0.990566, g: 0.48359674, b: 0.378471, a: 1}
+    - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Materials/GridOrange.mat.meta b/Examples/CharacterControllerMovingBodies/Assets/Materials/GridOrange.mat.meta
new file mode 100644
index 0000000000..bf2873069e
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Materials/GridOrange.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2e2c886f4af8e304eb9a1e2e50d023b3
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Materials/GridPattern.mat b/Examples/CharacterControllerMovingBodies/Assets/Materials/GridPattern.mat
new file mode 100644
index 0000000000..f44981f387
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Materials/GridPattern.mat
@@ -0,0 +1,85 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: GridPattern
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _GLOSSYREFLECTIONS_OFF
+  - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 1
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 6, y: 6}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: a092c5fa8c60ed04aa1d72555f1740bc, type: 3}
+        m_Scale: {x: 6, y: 6}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0.785
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 1
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0.254717, g: 0.23188858, b: 0.23188858, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Materials/GridPattern.mat.meta b/Examples/CharacterControllerMovingBodies/Assets/Materials/GridPattern.mat.meta
new file mode 100644
index 0000000000..cbca0f4485
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Materials/GridPattern.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 42c4a0ad1f9d67a45b12f68697321aad
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Materials/GridWhite.mat b/Examples/CharacterControllerMovingBodies/Assets/Materials/GridWhite.mat
new file mode 100644
index 0000000000..7345253099
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Materials/GridWhite.mat
@@ -0,0 +1,138 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-2624353793879203111
+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: 7
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: GridWhite
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _EMISSION
+  - _GLOSSYREFLECTIONS_OFF
+  - _NORMALMAP
+  m_InvalidKeywords: []
+  m_LightmapFlags: 2
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 2800000, guid: b94463ba36040ec4082132c54dd1bbad, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 2800000, guid: 8bf2cf149563066489e749ea032dbca7, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: e71f43865e91e6b418bd0d67be2445dc, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 1
+    - _Glossiness: 0.477
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 0
+    - _Parallax: 0.02
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _UVSec: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Materials/GridWhite.mat.meta b/Examples/CharacterControllerMovingBodies/Assets/Materials/GridWhite.mat.meta
new file mode 100644
index 0000000000..4559482bba
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Materials/GridWhite.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a53ba8919fa78c14caac473c7e7ce7d3
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Materials/Ground.mat b/Examples/CharacterControllerMovingBodies/Assets/Materials/Ground.mat
new file mode 100644
index 0000000000..252ea1a0ed
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Materials/Ground.mat
@@ -0,0 +1,79 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Ground
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.14769986, g: 0.1509434, b: 0.1473834, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Materials/Ground.mat.meta b/Examples/CharacterControllerMovingBodies/Assets/Materials/Ground.mat.meta
new file mode 100644
index 0000000000..6dbcac16d3
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Materials/Ground.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9c73b921ea39f4344a19c2d1c7d6b314
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Materials/PlayerMaterial.mat b/Examples/CharacterControllerMovingBodies/Assets/Materials/PlayerMaterial.mat
new file mode 100644
index 0000000000..e7f5729956
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Materials/PlayerMaterial.mat
@@ -0,0 +1,80 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: PlayerMaterial
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Materials/PlayerMaterial.mat.meta b/Examples/CharacterControllerMovingBodies/Assets/Materials/PlayerMaterial.mat.meta
new file mode 100644
index 0000000000..1ceca58536
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Materials/PlayerMaterial.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 44e292334941fe148b997ca2b01b5789
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Materials/ShaderGraphGrid_01_Mat.mat b/Examples/CharacterControllerMovingBodies/Assets/Materials/ShaderGraphGrid_01_Mat.mat
new file mode 100644
index 0000000000..5161ac9b8e
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Materials/ShaderGraphGrid_01_Mat.mat
@@ -0,0 +1,134 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ShaderGraphGrid_01_Mat
+  m_Shader: {fileID: -6465566751694194690, guid: b8d7679189d4a5940af46004f3870920, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - Texture2D_C5E3E723:
+        m_Texture: {fileID: 2800000, guid: d4d6919451fe3e24388816386a6d15a4, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Grid_Normal_Map:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: d9c0dd5cdac07b145be73329e489869a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0.004, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - Boolean_35A71344: 0
+    - Boolean_7A5F3F39: 1
+    - Boolean_7AC8D832: 1
+    - Vector1_3402D67A: 1
+    - Vector1_3655428E: 5
+    - Vector1_5B05FA1F: 0.062
+    - Vector1_6B67A8FF: -20
+    - Vector1_7810F718: 1
+    - Vector1_B6126E6E: 0.335
+    - Vector1_CA7D5F3: 30
+    - Vector1_D5FBE925: 0.3
+    - Vector1_F2A922B4: 1.73
+    - Vector1_F5FD9210: 33.9
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.119
+    - _GlossyReflections: 1
+    - _Grid_Normal_Strength: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 0
+    - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - Color_2B671050: {r: 0.23202202, g: 0.6245157, b: 0.745283, a: 0}
+    - Color_30A0CA2F: {r: 0.02745098, g: 1, b: 0.7565653, a: 0}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
+--- !u!114 &6450197988115792188
+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: 7
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Materials/ShaderGraphGrid_01_Mat.mat.meta b/Examples/CharacterControllerMovingBodies/Assets/Materials/ShaderGraphGrid_01_Mat.mat.meta
new file mode 100644
index 0000000000..efd03db61f
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Materials/ShaderGraphGrid_01_Mat.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7be68f3cac640fd40a7663ac97380a9c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.netcode.gameobjects/Samples.meta b/Examples/CharacterControllerMovingBodies/Assets/Models.meta
similarity index 77%
rename from com.unity.netcode.gameobjects/Samples.meta
rename to Examples/CharacterControllerMovingBodies/Assets/Models.meta
index 5a5e3b286a..21910d8d7a 100644
--- a/com.unity.netcode.gameobjects/Samples.meta
+++ b/Examples/CharacterControllerMovingBodies/Assets/Models.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d48e3f2a8be084f8aae6470ef87063d9
+guid: bd50c879f39d9d94b92706513b4f56ef
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Models/Ramp_100x100x200_Mesh.fbx b/Examples/CharacterControllerMovingBodies/Assets/Models/Ramp_100x100x200_Mesh.fbx
new file mode 100644
index 0000000000..2fa479b052
Binary files /dev/null and b/Examples/CharacterControllerMovingBodies/Assets/Models/Ramp_100x100x200_Mesh.fbx differ
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Models/Ramp_100x100x200_Mesh.fbx.meta b/Examples/CharacterControllerMovingBodies/Assets/Models/Ramp_100x100x200_Mesh.fbx.meta
new file mode 100644
index 0000000000..2ebb0bb69b
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Models/Ramp_100x100x200_Mesh.fbx.meta
@@ -0,0 +1,107 @@
+fileFormatVersion: 2
+guid: 4c31b0c9eb3dcdf4890cd904bf277cdf
+ModelImporter:
+  serializedVersion: 22200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Models/Ramp_Mesh.fbx b/Examples/CharacterControllerMovingBodies/Assets/Models/Ramp_Mesh.fbx
new file mode 100644
index 0000000000..ac24ee24d6
Binary files /dev/null and b/Examples/CharacterControllerMovingBodies/Assets/Models/Ramp_Mesh.fbx differ
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Models/Ramp_Mesh.fbx.meta b/Examples/CharacterControllerMovingBodies/Assets/Models/Ramp_Mesh.fbx.meta
new file mode 100644
index 0000000000..f9aabd0c03
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Models/Ramp_Mesh.fbx.meta
@@ -0,0 +1,107 @@
+fileFormatVersion: 2
+guid: 5d8449220d5795b448a4cee5cbde4b56
+ModelImporter:
+  serializedVersion: 22200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Models/Tunnel_Mesh.fbx b/Examples/CharacterControllerMovingBodies/Assets/Models/Tunnel_Mesh.fbx
new file mode 100644
index 0000000000..7ec9d4bb74
Binary files /dev/null and b/Examples/CharacterControllerMovingBodies/Assets/Models/Tunnel_Mesh.fbx differ
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Models/Tunnel_Mesh.fbx.meta b/Examples/CharacterControllerMovingBodies/Assets/Models/Tunnel_Mesh.fbx.meta
new file mode 100644
index 0000000000..75c9997470
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Models/Tunnel_Mesh.fbx.meta
@@ -0,0 +1,107 @@
+fileFormatVersion: 2
+guid: 63fcabcd345d556498e09f748683088e
+ModelImporter:
+  serializedVersion: 22200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Models/Wall_Mesh.fbx b/Examples/CharacterControllerMovingBodies/Assets/Models/Wall_Mesh.fbx
new file mode 100644
index 0000000000..0bfc7f6493
Binary files /dev/null and b/Examples/CharacterControllerMovingBodies/Assets/Models/Wall_Mesh.fbx differ
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Models/Wall_Mesh.fbx.meta b/Examples/CharacterControllerMovingBodies/Assets/Models/Wall_Mesh.fbx.meta
new file mode 100644
index 0000000000..15452589e0
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Models/Wall_Mesh.fbx.meta
@@ -0,0 +1,107 @@
+fileFormatVersion: 2
+guid: 34560503bf9d61046b252db98a8cf770
+ModelImporter:
+  serializedVersion: 22200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Prefabs.meta b/Examples/CharacterControllerMovingBodies/Assets/Prefabs.meta
new file mode 100644
index 0000000000..c867cd3a70
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Prefabs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4b97118ef11ec3347bc72b8d681e094b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Prefabs/Floor.physicMaterial b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/Floor.physicMaterial
new file mode 100644
index 0000000000..5aeefdde15
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/Floor.physicMaterial
@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!134 &13400000
+PhysicsMaterial:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Floor
+  serializedVersion: 2
+  m_DynamicFriction: 2.5
+  m_StaticFriction: 2
+  m_Bounciness: 0
+  m_FrictionCombine: 3
+  m_BounceCombine: 2
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Prefabs/Floor.physicMaterial.meta b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/Floor.physicMaterial.meta
new file mode 100644
index 0000000000..a55550d94a
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/Floor.physicMaterial.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2c574f6ade946d94f9ec0183e3bc4579
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 13400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Prefabs/PlayerNoRigidbody.prefab b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/PlayerNoRigidbody.prefab
new file mode 100644
index 0000000000..ca1d2b414e
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/PlayerNoRigidbody.prefab
@@ -0,0 +1,960 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2819221948576051598
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8815849029736207364}
+  - component: {fileID: 3042900316038666559}
+  - component: {fileID: 1437858011576020080}
+  - component: {fileID: 8264281895793262867}
+  m_Layer: 0
+  m_Name: PlayerBallChild1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8815849029736207364
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2819221948576051598}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 1, y: 0, z: 0}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 394823601370723229}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &3042900316038666559
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2819221948576051598}
+  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &1437858011576020080
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2819221948576051598}
+  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: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  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 &8264281895793262867
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2819221948576051598}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 792d7ce524eb358469373fe12babef88, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  AuthorityMode: 1
+  TickSyncChildren: 0
+  UseUnreliableDeltas: 0
+  SyncPositionX: 1
+  SyncPositionY: 1
+  SyncPositionZ: 1
+  SyncRotAngleX: 1
+  SyncRotAngleY: 1
+  SyncRotAngleZ: 1
+  SyncScaleX: 1
+  SyncScaleY: 1
+  SyncScaleZ: 1
+  PositionThreshold: 0.001
+  RotAngleThreshold: 0.01
+  ScaleThreshold: 0.01
+  UseQuaternionSynchronization: 1
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 0
+  InLocalSpace: 1
+  SwitchTransformSpaceWhenParented: 0
+  Interpolate: 1
+  SlerpPosition: 1
+  ExpandPlayerBallMotion: 1
+  ExpandNetworkTransform: 1
+  RotationAxis: 2
+  RotationSpeed: 1.5
+--- !u!1 &3959781627078922459
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 394823601370723229}
+  - component: {fileID: 1530657457870194733}
+  - component: {fileID: 8179170832269307327}
+  - component: {fileID: 8231288296501785146}
+  m_Layer: 0
+  m_Name: PlayerBallPrime
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &394823601370723229
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3959781627078922459}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 1.25, y: 0, z: 0}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8815849029736207364}
+  - {fileID: 7136463849438099188}
+  - {fileID: 5551906405844277949}
+  m_Father: {fileID: 8921789205124766473}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &1530657457870194733
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3959781627078922459}
+  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &8179170832269307327
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3959781627078922459}
+  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: a53ba8919fa78c14caac473c7e7ce7d3, 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 &8231288296501785146
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3959781627078922459}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 792d7ce524eb358469373fe12babef88, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  AuthorityMode: 1
+  TickSyncChildren: 0
+  UseUnreliableDeltas: 0
+  SyncPositionX: 1
+  SyncPositionY: 1
+  SyncPositionZ: 1
+  SyncRotAngleX: 1
+  SyncRotAngleY: 1
+  SyncRotAngleZ: 1
+  SyncScaleX: 1
+  SyncScaleY: 1
+  SyncScaleZ: 1
+  PositionThreshold: 0.001
+  RotAngleThreshold: 0.01
+  ScaleThreshold: 0.01
+  UseQuaternionSynchronization: 1
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 0
+  InLocalSpace: 1
+  SwitchTransformSpaceWhenParented: 0
+  Interpolate: 1
+  SlerpPosition: 1
+  ExpandPlayerBallMotion: 1
+  ExpandNetworkTransform: 1
+  RotationAxis: 0
+  RotationSpeed: 1.5
+--- !u!1 &3973637191948275635
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8797190989880117053}
+  - component: {fileID: 1956256172504790623}
+  - component: {fileID: 2171905566637076429}
+  m_Layer: 0
+  m_Name: ParentedText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8797190989880117053
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3973637191948275635}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.91, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8921789205124766473}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &1956256172504790623
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3973637191948275635}
+  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: 10100, guid: 0000000000000000e000000000000000, type: 0}
+  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!102 &2171905566637076429
+TextMesh:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3973637191948275635}
+  m_Text: "Hello \nWorld"
+  m_OffsetZ: 0
+  m_CharacterSize: 0.15
+  m_LineSpacing: 1
+  m_Anchor: 4
+  m_Alignment: 1
+  m_TabSize: 4
+  m_FontSize: 20
+  m_FontStyle: 1
+  m_RichText: 1
+  m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+  m_Color:
+    serializedVersion: 2
+    rgba: 4294967295
+--- !u!1 &7133739606324490315
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5551906405844277949}
+  - component: {fileID: 1792842414970541714}
+  - component: {fileID: 6744917009213370100}
+  - component: {fileID: 6571689152541036907}
+  m_Layer: 0
+  m_Name: PlayerBallChild3
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5551906405844277949
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7133739606324490315}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 1}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 394823601370723229}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &1792842414970541714
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7133739606324490315}
+  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &6744917009213370100
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7133739606324490315}
+  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: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  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 &6571689152541036907
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7133739606324490315}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 792d7ce524eb358469373fe12babef88, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  AuthorityMode: 1
+  TickSyncChildren: 0
+  UseUnreliableDeltas: 0
+  SyncPositionX: 1
+  SyncPositionY: 1
+  SyncPositionZ: 1
+  SyncRotAngleX: 1
+  SyncRotAngleY: 1
+  SyncRotAngleZ: 1
+  SyncScaleX: 1
+  SyncScaleY: 1
+  SyncScaleZ: 1
+  PositionThreshold: 0.001
+  RotAngleThreshold: 0.01
+  ScaleThreshold: 0.01
+  UseQuaternionSynchronization: 1
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 0
+  InLocalSpace: 1
+  SwitchTransformSpaceWhenParented: 0
+  Interpolate: 1
+  SlerpPosition: 1
+  ExpandPlayerBallMotion: 1
+  ExpandNetworkTransform: 1
+  RotationAxis: 1
+  RotationSpeed: 1.5
+--- !u!1 &7484009658662050968
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7136463849438099188}
+  - component: {fileID: 8767029715903736994}
+  - component: {fileID: 186997181429634371}
+  - component: {fileID: 4424954456620528769}
+  m_Layer: 0
+  m_Name: PlayerBallChild2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7136463849438099188
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7484009658662050968}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -1, y: 0, z: 0}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 394823601370723229}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &8767029715903736994
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7484009658662050968}
+  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &186997181429634371
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7484009658662050968}
+  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: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  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 &4424954456620528769
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7484009658662050968}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 792d7ce524eb358469373fe12babef88, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  AuthorityMode: 1
+  TickSyncChildren: 0
+  UseUnreliableDeltas: 0
+  SyncPositionX: 1
+  SyncPositionY: 1
+  SyncPositionZ: 1
+  SyncRotAngleX: 1
+  SyncRotAngleY: 1
+  SyncRotAngleZ: 1
+  SyncScaleX: 1
+  SyncScaleY: 1
+  SyncScaleZ: 1
+  PositionThreshold: 0.001
+  RotAngleThreshold: 0.01
+  ScaleThreshold: 0.01
+  UseQuaternionSynchronization: 1
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 0
+  InLocalSpace: 1
+  SwitchTransformSpaceWhenParented: 0
+  Interpolate: 1
+  SlerpPosition: 1
+  ExpandPlayerBallMotion: 0
+  ExpandNetworkTransform: 1
+  RotationAxis: 0
+  RotationSpeed: 1.5
+--- !u!1 &8837707216906300506
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3256164543801378073}
+  - component: {fileID: 5138046720836505354}
+  - component: {fileID: 1048758437790369019}
+  - component: {fileID: 3232232006964461868}
+  m_Layer: 0
+  m_Name: Direction
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3256164543801378073
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8837707216906300506}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.529, z: 0.36}
+  m_LocalScale: {x: 0.5, y: 0.35, z: 0.5}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8921789205124766473}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &5138046720836505354
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8837707216906300506}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &1048758437790369019
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8837707216906300506}
+  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: 5324c76c2bab7344badd5ea27a40bcb5, 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!65 &3232232006964461868
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8837707216906300506}
+  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: 0
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &8921789205124766477
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8921789205124766473}
+  - component: {fileID: 8921789205124766472}
+  - component: {fileID: 8921789205124766479}
+  - component: {fileID: 8921789205124766478}
+  - component: {fileID: 3121348088455848731}
+  - component: {fileID: 8921789205124766474}
+  - component: {fileID: 871737567343884637}
+  - component: {fileID: 571224925323069553}
+  - component: {fileID: 2509722539211228765}
+  m_Layer: 0
+  m_Name: PlayerNoRigidbody
+  m_TagString: Player
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8921789205124766473
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8921789205124766477}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3256164543801378073}
+  - {fileID: 8797190989880117053}
+  - {fileID: 394823601370723229}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &8921789205124766472
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8921789205124766477}
+  m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &8921789205124766479
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8921789205124766477}
+  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: 44e292334941fe148b997ca2b01b5789, 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!136 &8921789205124766478
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8921789205124766477}
+  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.5
+  m_Height: 2
+  m_Direction: 1
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!143 &3121348088455848731
+CharacterController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8921789205124766477}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Height: 2
+  m_Radius: 0.5
+  m_SlopeLimit: 45
+  m_StepOffset: 0.3
+  m_SkinWidth: 0.08
+  m_MinMoveDistance: 0.001
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &8921789205124766474
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8921789205124766477}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  GlobalObjectIdHash: 2508530451
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 0
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
+  SyncOwnerTransformWhenParented: 0
+  AllowOwnerToParent: 1
+--- !u!114 &871737567343884637
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8921789205124766477}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8e5128237997be649af0cc87dd0eb563, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ApplyColorToChildren: 1
+  IgnoreChildren:
+  - {fileID: 8837707216906300506}
+--- !u!114 &571224925323069553
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8921789205124766477}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5ce25b0b3f15e6446a88a85787c2f94a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  AuthorityMode: 1
+  TickSyncChildren: 1
+  UseUnreliableDeltas: 0
+  SyncPositionX: 1
+  SyncPositionY: 1
+  SyncPositionZ: 1
+  SyncRotAngleX: 1
+  SyncRotAngleY: 1
+  SyncRotAngleZ: 1
+  SyncScaleX: 1
+  SyncScaleY: 1
+  SyncScaleZ: 1
+  PositionThreshold: 0.01
+  RotAngleThreshold: 0.01
+  ScaleThreshold: 0.1
+  UseQuaternionSynchronization: 1
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 0
+  InLocalSpace: 0
+  SwitchTransformSpaceWhenParented: 1
+  Interpolate: 1
+  SlerpPosition: 0
+  ExpandMoverScriptNoRigidbody: 0
+  ExpandNetworkTransform: 1
+  SpawnRadius: 10
+  Increment: 1
+  RotationSpeed: 1.26
+  MovementSpeed: 15
+  JumpSpeed: 10
+  AirSpeedFactor: 0.35
+  Gravity: -9.8
+--- !u!65 &2509722539211228765
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8921789205124766477}
+  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_Size: {x: 1, y: 1.4, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Prefabs/PlayerNoRigidbody.prefab.meta b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/PlayerNoRigidbody.prefab.meta
new file mode 100644
index 0000000000..9199f72759
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/PlayerNoRigidbody.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8ae02ac62e2067144b8ff06d48aeb47a
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Prefabs/Ramp_Prefab.prefab b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/Ramp_Prefab.prefab
new file mode 100644
index 0000000000..edcdf3071c
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/Ramp_Prefab.prefab
@@ -0,0 +1,111 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8924170145835402666
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8111781018561290000}
+  - component: {fileID: 5133274882688487605}
+  - component: {fileID: 6978882906433643647}
+  - component: {fileID: 894093325933845257}
+  m_Layer: 0
+  m_Name: Ramp_Prefab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 73
+  m_IsActive: 1
+--- !u!4 &8111781018561290000
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8924170145835402666}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.000000021855694, 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!33 &5133274882688487605
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8924170145835402666}
+  m_Mesh: {fileID: -6265776187016570482, guid: 4c31b0c9eb3dcdf4890cd904bf277cdf, type: 3}
+--- !u!23 &6978882906433643647
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8924170145835402666}
+  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: 2e2c886f4af8e304eb9a1e2e50d023b3, 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: 2
+  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!64 &894093325933845257
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8924170145835402666}
+  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: 5
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -8512782951310809723, guid: 426a2785f8a940049aac2c246661cf09, type: 3}
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Prefabs/Ramp_Prefab.prefab.meta b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/Ramp_Prefab.prefab.meta
new file mode 100644
index 0000000000..14e8009f6b
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/Ramp_Prefab.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7ab2ae375810b5641a36d327b9f022cf
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Prefabs/RotatingBody.physicMaterial b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/RotatingBody.physicMaterial
new file mode 100644
index 0000000000..f76e8e1f5a
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/RotatingBody.physicMaterial
@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!134 &13400000
+PhysicsMaterial:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: RotatingBody
+  serializedVersion: 2
+  m_DynamicFriction: 2.5
+  m_StaticFriction: 2
+  m_Bounciness: 0
+  m_FrictionCombine: 3
+  m_BounceCombine: 2
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Prefabs/RotatingBody.physicMaterial.meta b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/RotatingBody.physicMaterial.meta
new file mode 100644
index 0000000000..4650ebf5b0
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/RotatingBody.physicMaterial.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c16e8d98094923449892b28a230ddb9c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 13400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Prefabs/RotatingBody.prefab b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/RotatingBody.prefab
new file mode 100644
index 0000000000..73c04c02fa
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/RotatingBody.prefab
@@ -0,0 +1,1138 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &755183729697733696
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 522841341294848418}
+  - component: {fileID: 6376943934387906635}
+  - component: {fileID: 4793038284696412839}
+  m_Layer: 0
+  m_Name: WallPusherA_Inner
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 73
+  m_IsActive: 1
+--- !u!4 &522841341294848418
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 755183729697733696}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 4.05, y: 2.27, z: 0}
+  m_LocalScale: {x: 4, y: 2, z: 2}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4291553105548296809}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &6376943934387906635
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 755183729697733696}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 0.2, y: 2.25, z: 6}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &4793038284696412839
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 755183729697733696}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2c40721ca0fd31645a742e5ad0e0cdc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  PushDirection: 1
+  ToCenterDirOrig: {x: 0, y: 0, z: 0}
+  ToCenterDirCalc: {x: 0, y: 0, z: 0}
+  ToCenterDirTrans: {x: 0, y: 0, z: 0}
+--- !u!1 &1070469363212057228
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4967607898511807569}
+  - component: {fileID: 4081511419635538304}
+  - component: {fileID: 3264090684553753291}
+  - component: {fileID: 2074962368930179783}
+  - component: {fileID: 2659845886479429441}
+  - component: {fileID: 365707591732078506}
+  m_Layer: 0
+  m_Name: Tunnel_Prefab (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 73
+  m_IsActive: 1
+--- !u!4 &4967607898511807569
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1070469363212057228}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: 0, y: 5, z: 0}
+  m_LocalScale: {x: 4, y: 2, z: 2}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4291553105548296809}
+  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!33 &4081511419635538304
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1070469363212057228}
+  m_Mesh: {fileID: 5060444177187149915, guid: 63fcabcd345d556498e09f748683088e, type: 3}
+--- !u!23 &3264090684553753291
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1070469363212057228}
+  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: 2e2c886f4af8e304eb9a1e2e50d023b3, 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: 2
+  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!65 &2074962368930179783
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1070469363212057228}
+  m_Material: {fileID: 13400000, guid: c16e8d98094923449892b28a230ddb9c, type: 2}
+  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_Size: {x: 2.502674, y: 6.0000024, z: 0.25225586}
+  m_Center: {x: 0, y: -5.4553292e-15, z: 2.3838842}
+--- !u!65 &2659845886479429441
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1070469363212057228}
+  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_Size: {x: 0.19382703, y: 6.0000024, z: 2.2399507}
+  m_Center: {x: -1.1314733, y: -1.7786642e-15, z: 1.1251621}
+--- !u!65 &365707591732078506
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1070469363212057228}
+  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_Size: {x: 0.16720939, y: 6.0000024, z: 2.256102}
+  m_Center: {x: 1.1123942, y: -1.893427e-15, z: 1.1332378}
+--- !u!1 &1227036625448805321
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6179387521291227856}
+  - component: {fileID: 6043205804484853104}
+  - component: {fileID: 7583159525709273484}
+  - component: {fileID: 8095289646395249164}
+  m_Layer: 0
+  m_Name: Ramp_PrefabA
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 73
+  m_IsActive: 1
+--- !u!4 &6179387521291227856
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1227036625448805321}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.25, z: 7.993}
+  m_LocalScale: {x: 8, y: 0.5, z: 2}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3394725634534525932}
+  m_Father: {fileID: 4291553105548296809}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &6043205804484853104
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1227036625448805321}
+  m_Mesh: {fileID: -6265776187016570482, guid: 4c31b0c9eb3dcdf4890cd904bf277cdf, type: 3}
+--- !u!23 &7583159525709273484
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1227036625448805321}
+  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: 2e2c886f4af8e304eb9a1e2e50d023b3, 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: 2
+  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!64 &8095289646395249164
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1227036625448805321}
+  m_Material: {fileID: 13400000, guid: c16e8d98094923449892b28a230ddb9c, type: 2}
+  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: 5
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -6265776187016570482, guid: 4c31b0c9eb3dcdf4890cd904bf277cdf, type: 3}
+--- !u!1 &1451894099667441545
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3394725634534525932}
+  - component: {fileID: 2385627259374300527}
+  m_Layer: 0
+  m_Name: BridgeGap
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3394725634534525932
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1451894099667441545}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: 1, z: -0.000000021855694, w: 0}
+  m_LocalPosition: {x: 0, y: 0.14, z: -1.0100002}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6179387521291227856}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!136 &2385627259374300527
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1451894099667441545}
+  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.1
+  m_Height: 1.15
+  m_Direction: 0
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &2406660182425334495
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1877966211327071347}
+  - component: {fileID: 3334163744623252575}
+  - component: {fileID: 5776191766534439988}
+  - component: {fileID: 6535282611511474253}
+  - component: {fileID: 8963258823839906869}
+  - component: {fileID: 7304575238635320140}
+  m_Layer: 0
+  m_Name: Tunnel_Prefab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 73
+  m_IsActive: 1
+--- !u!4 &1877966211327071347
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2406660182425334495}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0, y: 4.96, z: 0}
+  m_LocalScale: {x: 4, y: 2, z: 2}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4291553105548296809}
+  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
+--- !u!33 &3334163744623252575
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2406660182425334495}
+  m_Mesh: {fileID: 5060444177187149915, guid: 63fcabcd345d556498e09f748683088e, type: 3}
+--- !u!23 &5776191766534439988
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2406660182425334495}
+  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: 2e2c886f4af8e304eb9a1e2e50d023b3, 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: 2
+  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!65 &6535282611511474253
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2406660182425334495}
+  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_Size: {x: 2.502674, y: 6.0000024, z: 0.258326}
+  m_Center: {x: 0, y: 5.4121983e-15, z: 2.3808491}
+--- !u!65 &8963258823839906869
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2406660182425334495}
+  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_Size: {x: 0.2527809, y: 6.0000024, z: 2.2399507}
+  m_Center: {x: -1.1249466, y: 1.7786642e-15, z: 1.1251621}
+--- !u!65 &7304575238635320140
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2406660182425334495}
+  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_Size: {x: 0.26525307, y: 6.0000024, z: 2.256102}
+  m_Center: {x: 1.1187105, y: 1.893427e-15, z: 1.1332378}
+--- !u!1 &2492174073242389836
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6182591213277846585}
+  - component: {fileID: 3395949877673187758}
+  m_Layer: 0
+  m_Name: BridgeGap (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6182591213277846585
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2492174073242389836}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -1, z: 0.000000021855694, w: 0}
+  m_LocalPosition: {x: 0, y: 0.14, z: -1.01}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7826839884382864090}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!136 &3395949877673187758
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2492174073242389836}
+  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.1
+  m_Height: 1.15
+  m_Direction: 0
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &3038314618705458857
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3570252208687936609}
+  - component: {fileID: 4156819582579138816}
+  - component: {fileID: 2806575150631930745}
+  m_Layer: 0
+  m_Name: WallPusherB_Inner
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 73
+  m_IsActive: 1
+--- !u!4 &3570252208687936609
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3038314618705458857}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -4.07, y: 2.27, z: 0}
+  m_LocalScale: {x: 4, y: 2, z: 2}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4291553105548296809}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &4156819582579138816
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3038314618705458857}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 0.2, y: 2.25, z: 6}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &2806575150631930745
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3038314618705458857}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2c40721ca0fd31645a742e5ad0e0cdc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  PushDirection: 0
+  ToCenterDirOrig: {x: 0, y: 0, z: 0}
+  ToCenterDirCalc: {x: 0, y: 0, z: 0}
+  ToCenterDirTrans: {x: 0, y: 0, z: 0}
+--- !u!1 &4405129256840456534
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5628673131512617452}
+  - component: {fileID: 1065561891622964567}
+  - component: {fileID: 4468158207537748033}
+  m_Layer: 0
+  m_Name: WallPusherA_Outer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 73
+  m_IsActive: 1
+--- !u!4 &5628673131512617452
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4405129256840456534}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 4.89, y: 2.27, z: 0}
+  m_LocalScale: {x: 4, y: 2, z: 2}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4291553105548296809}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &1065561891622964567
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4405129256840456534}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 0.2, y: 2.25, z: 6}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &4468158207537748033
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4405129256840456534}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2c40721ca0fd31645a742e5ad0e0cdc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  PushDirection: 0
+  ToCenterDirOrig: {x: 0, y: 0, z: 0}
+  ToCenterDirCalc: {x: 0, y: 0, z: 0}
+  ToCenterDirTrans: {x: 0, y: 0, z: 0}
+--- !u!1 &5415449980466536476
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4291553105548296809}
+  - component: {fileID: 8134939553748259768}
+  - component: {fileID: 3307166493715739449}
+  - component: {fileID: 850162744905636139}
+  m_Layer: 0
+  m_Name: RotatingBody
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4291553105548296809
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5415449980466536476}
+  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:
+  - {fileID: 1877966211327071347}
+  - {fileID: 4967607898511807569}
+  - {fileID: 522841341294848418}
+  - {fileID: 5628673131512617452}
+  - {fileID: 3570252208687936609}
+  - {fileID: 5389614242607036533}
+  - {fileID: 6179387521291227856}
+  - {fileID: 7826839884382864090}
+  - {fileID: 2053800158975384476}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &8134939553748259768
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5415449980466536476}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 8.023605, y: 8.144613, z: 20.106205}
+  m_Center: {x: -0.03800702, y: 4.1726913, z: -0.02903366}
+--- !u!114 &3307166493715739449
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5415449980466536476}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  GlobalObjectIdHash: 1921503253
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 2
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 1
+  AutoObjectParentSync: 1
+  SyncOwnerTransformWhenParented: 1
+--- !u!114 &850162744905636139
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5415449980466536476}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 374ac199eb18f0f468bc018a722775c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  AuthorityMode: 1
+  TickSyncChildren: 1
+  UseUnreliableDeltas: 0
+  SyncPositionX: 1
+  SyncPositionY: 1
+  SyncPositionZ: 1
+  SyncRotAngleX: 1
+  SyncRotAngleY: 1
+  SyncRotAngleZ: 1
+  SyncScaleX: 1
+  SyncScaleY: 1
+  SyncScaleZ: 1
+  PositionThreshold: 0.1
+  RotAngleThreshold: 0.01
+  ScaleThreshold: 0.1
+  UseQuaternionSynchronization: 1
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 0
+  InLocalSpace: 0
+  SwitchTransformSpaceWhenParented: 0
+  Interpolate: 1
+  SlerpPosition: 0
+  RotationSpeed: 0.25
+  RotateDirection: 0
+  ZAxisMove: 0
+--- !u!1 &5463907175177238004
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2053800158975384476}
+  - component: {fileID: 2688281628964240045}
+  m_Layer: 0
+  m_Name: Point Light
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2053800158975384476
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5463907175177238004}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 6.54, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4291553105548296809}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!108 &2688281628964240045
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5463907175177238004}
+  m_Enabled: 1
+  serializedVersion: 11
+  m_Type: 2
+  m_Color: {r: 0.9622642, g: 0.9622642, b: 0.9622642, a: 1}
+  m_Intensity: 2
+  m_Range: 20
+  m_SpotAngle: 30
+  m_InnerSpotAngle: 21.80208
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 0
+    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!1 &6529740436184164063
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7826839884382864090}
+  - component: {fileID: 2797882924116045225}
+  - component: {fileID: 1097787484049525257}
+  - component: {fileID: 570708159460268413}
+  m_Layer: 0
+  m_Name: Ramp_PrefabB
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 73
+  m_IsActive: 1
+--- !u!4 &7826839884382864090
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6529740436184164063}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
+  m_LocalPosition: {x: 0, y: 0.25, z: -7.993}
+  m_LocalScale: {x: 8, y: 0.5, z: 2}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6182591213277846585}
+  m_Father: {fileID: 4291553105548296809}
+  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+--- !u!33 &2797882924116045225
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6529740436184164063}
+  m_Mesh: {fileID: -6265776187016570482, guid: 4c31b0c9eb3dcdf4890cd904bf277cdf, type: 3}
+--- !u!23 &1097787484049525257
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6529740436184164063}
+  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: 2e2c886f4af8e304eb9a1e2e50d023b3, 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: 2
+  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!64 &570708159460268413
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6529740436184164063}
+  m_Material: {fileID: 13400000, guid: c16e8d98094923449892b28a230ddb9c, type: 2}
+  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: 5
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -6265776187016570482, guid: 4c31b0c9eb3dcdf4890cd904bf277cdf, type: 3}
+--- !u!1 &8002386465640125644
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5389614242607036533}
+  - component: {fileID: 4101224782146625552}
+  - component: {fileID: 6895917012766152111}
+  m_Layer: 0
+  m_Name: WallPusherB_Outer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 73
+  m_IsActive: 1
+--- !u!4 &5389614242607036533
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8002386465640125644}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -4.83, y: 2.27, z: 0}
+  m_LocalScale: {x: 4, y: 2, z: 2}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4291553105548296809}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &4101224782146625552
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8002386465640125644}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 0.2, y: 2.25, z: 6}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &6895917012766152111
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8002386465640125644}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2c40721ca0fd31645a742e5ad0e0cdc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  PushDirection: 1
+  ToCenterDirOrig: {x: 0, y: 0, z: 0}
+  ToCenterDirCalc: {x: 0, y: 0, z: 0}
+  ToCenterDirTrans: {x: 0, y: 0, z: 0}
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Prefabs/RotatingBody.prefab.meta b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/RotatingBody.prefab.meta
new file mode 100644
index 0000000000..d22d47036e
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/RotatingBody.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0123d7125346c274da00b38e950a266b
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Prefabs/SceneLevelGeometry.prefab b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/SceneLevelGeometry.prefab
new file mode 100644
index 0000000000..f636c60a54
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/SceneLevelGeometry.prefab
@@ -0,0 +1,794 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &910007655143077103
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6283120762215196916}
+  - component: {fileID: 3739510624437302406}
+  m_Layer: 0
+  m_Name: CornerBumper (1)
+  m_TagString: Boundary
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6283120762215196916
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 910007655143077103}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0.9244967, z: -0, w: -0.38119}
+  m_LocalPosition: {x: -29.72, y: 0.98, z: 29.82}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: -224.815, z: 0}
+--- !u!65 &3739510624437302406
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 910007655143077103}
+  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_Size: {x: 4, y: 2, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &1854705290947220173
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2290144462706082272}
+  - component: {fileID: 4559046433245738380}
+  m_Layer: 0
+  m_Name: CornerBumper (2)
+  m_TagString: Boundary
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2290144462706082272
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1854705290947220173}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0.3771283, z: -0, w: -0.92616105}
+  m_LocalPosition: {x: -29.53, y: 0.98, z: -29.71}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: -315.688, z: 0}
+--- !u!65 &4559046433245738380
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1854705290947220173}
+  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_Size: {x: 4, y: 2, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &4012615691354089848
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4012615691354089844}
+  - component: {fileID: 4012615691354089845}
+  - component: {fileID: 4012615691354089850}
+  - component: {fileID: 4012615691354089851}
+  m_Layer: 0
+  m_Name: Floor
+  m_TagString: Floor
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4012615691354089844
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691354089848}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.50000006, z: 0}
+  m_LocalScale: {x: 60, y: 1, z: 60}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &4012615691354089845
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691354089848}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &4012615691354089850
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691354089848}
+  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: 42c4a0ad1f9d67a45b12f68697321aad, 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!65 &4012615691354089851
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691354089848}
+  m_Material: {fileID: 13400000, guid: 2c574f6ade946d94f9ec0183e3bc4579, type: 2}
+  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_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &4012615691503252843
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4012615691503252839}
+  - component: {fileID: 4012615691503252836}
+  - component: {fileID: 4012615691503252837}
+  - component: {fileID: 4012615691503252842}
+  m_Layer: 0
+  m_Name: Side
+  m_TagString: Boundary
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4012615691503252839
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691503252843}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -30.5, y: 0.49999994, z: 0}
+  m_LocalScale: {x: 1, y: 3, z: 62}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &4012615691503252836
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691503252843}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &4012615691503252837
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691503252843}
+  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: 9c73b921ea39f4344a19c2d1c7d6b314, 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!65 &4012615691503252842
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691503252843}
+  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_Size: {x: 2, y: 1, z: 1}
+  m_Center: {x: -0.5, y: 0, z: 0}
+--- !u!1 &4012615691965054905
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4012615691965054901}
+  - component: {fileID: 4012615691965054906}
+  - component: {fileID: 4012615691965054907}
+  - component: {fileID: 4012615691965054904}
+  m_Layer: 0
+  m_Name: Side
+  m_TagString: Boundary
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4012615691965054901
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691965054905}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.49999994, z: 30.5}
+  m_LocalScale: {x: 60, y: 3, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &4012615691965054906
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691965054905}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &4012615691965054907
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691965054905}
+  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: 9c73b921ea39f4344a19c2d1c7d6b314, 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!65 &4012615691965054904
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691965054905}
+  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_Size: {x: 1, y: 1, z: 2}
+  m_Center: {x: 0, y: 0, z: 0.5}
+--- !u!1 &4012615692269653858
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4012615692269653854}
+  - component: {fileID: 4012615692269653855}
+  - component: {fileID: 4012615692269653852}
+  - component: {fileID: 4012615692269653853}
+  m_Layer: 0
+  m_Name: Side
+  m_TagString: Boundary
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4012615692269653854
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692269653858}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.49999994, z: -30.5}
+  m_LocalScale: {x: 60, y: 3, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &4012615692269653855
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692269653858}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &4012615692269653852
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692269653858}
+  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: 9c73b921ea39f4344a19c2d1c7d6b314, 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!65 &4012615692269653853
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692269653858}
+  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_Size: {x: 1, y: 1, z: 2}
+  m_Center: {x: 0, y: 0, z: -0.5}
+--- !u!1 &4012615692778511854
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4012615692778511849}
+  m_Layer: 0
+  m_Name: SceneLevelGeometry
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4012615692778511849
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692778511854}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.000000059604645, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4012615691354089844}
+  - {fileID: 4012615691965054901}
+  - {fileID: 4012615692269653854}
+  - {fileID: 4012615691503252839}
+  - {fileID: 4012615692791378778}
+  - {fileID: 3910294717376836327}
+  - {fileID: 6283120762215196916}
+  - {fileID: 2290144462706082272}
+  - {fileID: 6959258897999621209}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &4012615692791378782
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4012615692791378778}
+  - component: {fileID: 4012615692791378779}
+  - component: {fileID: 4012615692791378776}
+  - component: {fileID: 4012615692791378777}
+  m_Layer: 0
+  m_Name: Side
+  m_TagString: Boundary
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4012615692791378778
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692791378782}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 30.5, y: 0.49999994, z: 0}
+  m_LocalScale: {x: 1, y: 3, z: 62}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &4012615692791378779
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692791378782}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &4012615692791378776
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692791378782}
+  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: 9c73b921ea39f4344a19c2d1c7d6b314, 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!65 &4012615692791378777
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692791378782}
+  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_Size: {x: 2, y: 1, z: 1}
+  m_Center: {x: 0.5, y: 0, z: 0}
+--- !u!1 &4674276234353933548
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3910294717376836327}
+  - component: {fileID: 3136259738973340924}
+  m_Layer: 0
+  m_Name: CornerBumper
+  m_TagString: Boundary
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3910294717376836327
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4674276234353933548}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: -0.38268343, z: 0, w: 0.92387956}
+  m_LocalPosition: {x: 29.7, y: 0.98, z: -29.61}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: -45, z: 0}
+--- !u!65 &3136259738973340924
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4674276234353933548}
+  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_Size: {x: 4, y: 2, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &7080625901286762351
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6959258897999621209}
+  - component: {fileID: 7672408768716900064}
+  m_Layer: 0
+  m_Name: CornerBumper (3)
+  m_TagString: Boundary
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6959258897999621209
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7080625901286762351}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: 0.93588465, z: -0, w: -0.35230666}
+  m_LocalPosition: {x: 29.26, y: 0.98, z: 29.45}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: -498.74298, z: 0}
+--- !u!65 &7672408768716900064
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7080625901286762351}
+  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_Size: {x: 4, y: 2, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Prefabs/SceneLevelGeometry.prefab.meta b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/SceneLevelGeometry.prefab.meta
new file mode 100644
index 0000000000..154fd718e7
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/SceneLevelGeometry.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3ec484313a7a6754dac871e620df8db2
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Prefabs/Tunnel_Prefab.prefab b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/Tunnel_Prefab.prefab
new file mode 100644
index 0000000000..c596d7333d
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/Tunnel_Prefab.prefab
@@ -0,0 +1,154 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1604908963751126680
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2093637950428003362}
+  - component: {fileID: 3071950872142852999}
+  - component: {fileID: 956227959320364877}
+  - component: {fileID: 4985949235297978144}
+  - component: {fileID: 8456313914433245678}
+  - component: {fileID: 1138964657491743937}
+  m_Layer: 0
+  m_Name: Tunnel_Prefab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 73
+  m_IsActive: 1
+--- !u!4 &2093637950428003362
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1604908963751126680}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
+  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: -90.00001, y: 0, z: 0}
+--- !u!33 &3071950872142852999
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1604908963751126680}
+  m_Mesh: {fileID: 5060444177187149915, guid: 63fcabcd345d556498e09f748683088e, type: 3}
+--- !u!23 &956227959320364877
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1604908963751126680}
+  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: 2e2c886f4af8e304eb9a1e2e50d023b3, 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: 2
+  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!65 &4985949235297978144
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1604908963751126680}
+  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_Size: {x: 2.502674, y: 6.0000024, z: 0.258326}
+  m_Center: {x: 0, y: 5.4121983e-15, z: 2.3808491}
+--- !u!65 &8456313914433245678
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1604908963751126680}
+  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_Size: {x: 0.2527809, y: 6.0000024, z: 2.2399507}
+  m_Center: {x: -1.1249466, y: 1.7786642e-15, z: 1.1251621}
+--- !u!65 &1138964657491743937
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1604908963751126680}
+  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_Size: {x: 0.26525307, y: 6.0000024, z: 2.256102}
+  m_Center: {x: 1.1187105, y: 1.893427e-15, z: 1.1332378}
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Prefabs/Tunnel_Prefab.prefab.meta b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/Tunnel_Prefab.prefab.meta
new file mode 100644
index 0000000000..58def4a902
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/Tunnel_Prefab.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4b50ff3d475fc3f4fa77ac6aa6e679f2
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Prefabs/Wall_Prefab.prefab b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/Wall_Prefab.prefab
new file mode 100644
index 0000000000..f8dde4effc
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/Wall_Prefab.prefab
@@ -0,0 +1,132 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &7993119983977949264
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7324705577624711914}
+  - component: {fileID: 5911343394670230863}
+  - component: {fileID: 8497650616581704069}
+  - component: {fileID: 9105854698657379725}
+  - component: {fileID: 1277700310800588604}
+  m_Layer: 0
+  m_Name: Wall_Prefab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 73
+  m_IsActive: 1
+--- !u!4 &7324705577624711914
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7993119983977949264}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.000000021855694, 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!33 &5911343394670230863
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7993119983977949264}
+  m_Mesh: {fileID: 6352809919239313146, guid: 34560503bf9d61046b252db98a8cf770, type: 3}
+--- !u!23 &8497650616581704069
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7993119983977949264}
+  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: 2e2c886f4af8e304eb9a1e2e50d023b3, 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: 2
+  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!65 &9105854698657379725
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7993119983977949264}
+  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_Size: {x: 0.25, y: 1.0095696, z: 2.9958286}
+  m_Center: {x: 0, y: 0.5047848, z: 1.5020857}
+--- !u!65 &1277700310800588604
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7993119983977949264}
+  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_Size: {x: 0.25, y: 2.0055175, z: 3.000146}
+  m_Center: {x: 0, y: 1.0027587, z: -1.499927}
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Prefabs/Wall_Prefab.prefab.meta b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/Wall_Prefab.prefab.meta
new file mode 100644
index 0000000000..42ef5284f2
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Prefabs/Wall_Prefab.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3b9516be83427084ca3fffca42e7b6da
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Resources.meta b/Examples/CharacterControllerMovingBodies/Assets/Resources.meta
new file mode 100644
index 0000000000..edebf21a13
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Resources.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6a51a9fbd254e544eb3e85853865f80d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Resources/BillingMode.json b/Examples/CharacterControllerMovingBodies/Assets/Resources/BillingMode.json
new file mode 100644
index 0000000000..6f4bfb7103
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Resources/BillingMode.json
@@ -0,0 +1 @@
+{"androidStore":"GooglePlay"}
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/ValidationExceptions.json.meta b/Examples/CharacterControllerMovingBodies/Assets/Resources/BillingMode.json.meta
similarity index 75%
rename from com.unity.netcode.gameobjects/ValidationExceptions.json.meta
rename to Examples/CharacterControllerMovingBodies/Assets/Resources/BillingMode.json.meta
index 3316cf20bd..557e7d707c 100644
--- a/com.unity.netcode.gameobjects/ValidationExceptions.json.meta
+++ b/Examples/CharacterControllerMovingBodies/Assets/Resources/BillingMode.json.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2a43005be301c9043aab7034757d4868
+guid: a1890189503409a4bb24dd4f0eab1f0a
 TextScriptImporter:
   externalObjects: {}
   userData: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Scenes.meta b/Examples/CharacterControllerMovingBodies/Assets/Scenes.meta
new file mode 100644
index 0000000000..b398c5b4ab
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Scenes.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9bb955f9d9ef9c34d897f353c8643a1d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Scenes/Camera.preset b/Examples/CharacterControllerMovingBodies/Assets/Scenes/Camera.preset
new file mode 100644
index 0000000000..b8bbae0a72
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Scenes/Camera.preset
@@ -0,0 +1,195 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!181963792 &2655988077585873504
+Preset:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Camera
+  m_TargetType:
+    m_NativeTypeID: 20
+    m_ManagedTypePPtr: {fileID: 0}
+    m_ManagedTypeFallback: 
+  m_Properties:
+  - target: {fileID: 0}
+    propertyPath: m_Enabled
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_ClearFlags
+    value: 2
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_BackGroundColor.r
+    value: 0.066037714
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_BackGroundColor.g
+    value: 0.066037714
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_BackGroundColor.b
+    value: 0.066037714
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_BackGroundColor.a
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_projectionMatrixMode
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_GateFitMode
+    value: 2
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_FOVAxisMode
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_Iso
+    value: 200
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_ShutterSpeed
+    value: 0.005
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_Aperture
+    value: 16
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_FocusDistance
+    value: 10
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_FocalLength
+    value: 50
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_BladeCount
+    value: 5
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_Curvature.x
+    value: 2
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_Curvature.y
+    value: 11
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_BarrelClipping
+    value: 0.25
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_Anamorphism
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SensorSize.x
+    value: 36
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SensorSize.y
+    value: 24
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_LensShift.x
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_LensShift.y
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_NormalizedViewPortRect.x
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_NormalizedViewPortRect.y
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_NormalizedViewPortRect.width
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_NormalizedViewPortRect.height
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: near clip plane
+    value: 0.3
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: far clip plane
+    value: 1000
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: field of view
+    value: 60
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: orthographic
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: orthographic size
+    value: 5
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_Depth
+    value: -1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_CullingMask.m_Bits
+    value: 4294967295
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_RenderingPath
+    value: -1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_TargetTexture
+    value: 
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_TargetDisplay
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_TargetEye
+    value: 3
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_HDR
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_AllowMSAA
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_AllowDynamicResolution
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_ForceIntoRT
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_OcclusionCulling
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_StereoConvergence
+    value: 10
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_StereoSeparation
+    value: 0.022
+    objectReference: {fileID: 0}
+  m_ExcludedProperties: []
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Scenes/Camera.preset.meta b/Examples/CharacterControllerMovingBodies/Assets/Scenes/Camera.preset.meta
new file mode 100644
index 0000000000..3e327ecf36
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Scenes/Camera.preset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1807b530602915743868e6c3bdc1a93c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2655988077585873504
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Scenes/CharacterController.unity b/Examples/CharacterControllerMovingBodies/Assets/Scenes/CharacterController.unity
new file mode 100644
index 0000000000..cca8cabbeb
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Scenes/CharacterController.unity
@@ -0,0 +1,1434 @@
+%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: 705507994}
+  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: 500
+    m_PVRBounces: 2
+    m_PVREnvironmentSampleCount: 500
+    m_PVREnvironmentReferencePointCount: 2048
+    m_PVRFilteringMode: 2
+    m_PVRDenoiserTypeDirect: 0
+    m_PVRDenoiserTypeIndirect: 0
+    m_PVRDenoiserTypeAO: 0
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVREnvironmentMIS: 0
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
+  m_LightingDataAsset: {fileID: 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 &28232985
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 28232986}
+  - component: {fileID: 28232988}
+  - component: {fileID: 28232987}
+  - component: {fileID: 28232989}
+  - component: {fileID: 28232990}
+  m_Layer: 5
+  m_Name: ServerHostClientDisplay
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &28232986
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 28232985}
+  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: 479361665}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 40}
+  m_SizeDelta: {x: 180, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &28232987
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 28232985}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 23
+    m_FontStyle: 1
+    m_BestFit: 1
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+--- !u!222 &28232988
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 28232985}
+  m_CullTransparentMesh: 1
+--- !u!114 &28232989
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 28232985}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  GlobalObjectIdHash: 536662705
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 1
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
+  SyncOwnerTransformWhenParented: 1
+  AllowOwnerToParent: 0
+--- !u!114 &28232990
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 28232985}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6637cd674efb56a48a3d4d545d23a8d3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ShowTopMostFoldoutHeaderGroup: 1
+--- !u!1001 &45185844
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: RotationSpeed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: OnExitTransferParentOnStay
+      value: 
+      objectReference: {fileID: 621748559}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: DontDeparentIfParentedByOtherBody
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3307166493715739449, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: GlobalObjectIdHash
+      value: 3246499739
+      objectReference: {fileID: 0}
+    - target: {fileID: 3307166493715739449, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: InScenePlacedSourceGlobalObjectIdHash
+      value: 1084435762
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -60
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.34
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -49.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5415449980466536476, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_Name
+      value: StationaryBody-B
+      objectReference: {fileID: 0}
+    - target: {fileID: 8134939553748259768, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_Size.z
+      value: 19.891119
+      objectReference: {fileID: 0}
+    - target: {fileID: 8134939553748259768, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_Center.x
+      value: -0.038006783
+      objectReference: {fileID: 0}
+    - target: {fileID: 8134939553748259768, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_Center.z
+      value: -0.13657665
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+--- !u!1001 &66674670
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: RotationSpeed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: OnExitTransferParentOnStay
+      value: 
+      objectReference: {fileID: 520394643}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: DontDeparentIfParentedByOtherBody
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3307166493715739449, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: GlobalObjectIdHash
+      value: 4013775021
+      objectReference: {fileID: 0}
+    - target: {fileID: 3307166493715739449, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: InScenePlacedSourceGlobalObjectIdHash
+      value: 1084435762
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -60
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.34
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -33.32
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5415449980466536476, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_Name
+      value: StationaryBody-A
+      objectReference: {fileID: 0}
+    - target: {fileID: 8134939553748259768, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_Size.z
+      value: 19.906477
+      objectReference: {fileID: 0}
+    - target: {fileID: 8134939553748259768, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_Center.x
+      value: -0.038006783
+      objectReference: {fileID: 0}
+    - target: {fileID: 8134939553748259768, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_Center.z
+      value: 0.070830345
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+--- !u!1 &455857869
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 455857870}
+  - component: {fileID: 455857875}
+  - component: {fileID: 455857871}
+  m_Layer: 0
+  m_Name: ExtendedNetworkManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &455857870
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 455857869}
+  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 &455857871
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 455857869}
+  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: 128
+  m_MaxPayloadSize: 6144
+  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 &455857875
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 455857869}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e4d8d44c602b97b47ba488a40c66267c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  NetworkManagerExpanded: 0
+  NetworkConfig:
+    ProtocolVersion: 0
+    NetworkTransport: {fileID: 455857871}
+    PlayerPrefab: {fileID: 8921789205124766477, guid: 8ae02ac62e2067144b8ff06d48aeb47a, type: 3}
+    Prefabs:
+      NetworkPrefabsLists:
+      - {fileID: 11400000, guid: aa82390bfdde2564f828b8e5be375282, 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: 0
+    UseCMBService: 0
+    AutoSpawnPlayerPrefabClientSide: 1
+    NetworkProfilingMetrics: 1
+    OldPrefabList: []
+  RunInBackground: 1
+  LogLevel: 1
+  ExtendedNetworkManagerExpanded: 1
+  ConnectionType: 1
+  TargetFrameRate: 100
+  EnableVSync: 0
+  m_OriginalVSyncCount: 1
+--- !u!1 &479361661
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 479361665}
+  - component: {fileID: 479361664}
+  - component: {fileID: 479361663}
+  - component: {fileID: 479361662}
+  m_Layer: 5
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &479361662
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 479361661}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &479361663
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 479361661}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!223 &479361664
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 479361661}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!224 &479361665
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 479361661}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 28232986}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!114 &520394643 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+  m_PrefabInstance: {fileID: 45185844}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 374ac199eb18f0f468bc018a722775c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &537610708
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 537610709}
+  m_Layer: 0
+  m_Name: PointA
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &537610709
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 537610708}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 10.9, y: -0.34, z: 70}
+  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 &621748559 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+  m_PrefabInstance: {fileID: 66674670}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 374ac199eb18f0f468bc018a722775c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &705507993
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 705507995}
+  - component: {fileID: 705507994}
+  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 &705507994
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 705507993}
+  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: 1
+  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 &705507995
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 705507993}
+  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!1001 &748186899
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.25
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511854, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_Name
+      value: SceneLevelGeometry
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+--- !u!1001 &857399335
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: RotationSpeed
+      value: 0.25
+      objectReference: {fileID: 0}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: RotateDirection
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3307166493715739449, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: GlobalObjectIdHash
+      value: 1449196534
+      objectReference: {fileID: 0}
+    - target: {fileID: 3307166493715739449, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: InScenePlacedSourceGlobalObjectIdHash
+      value: 1084435762
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -60.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.34
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 56.8
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5415449980466536476, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_Name
+      value: RotatingBody
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+--- !u!1 &946793187
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 946793188}
+  m_Layer: 0
+  m_Name: PointE
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &946793188
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 946793187}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 60.5, y: -0.34, z: 70}
+  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 &963194225
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 963194228}
+  - component: {fileID: 963194227}
+  - component: {fileID: 963194226}
+  m_Layer: 0
+  m_Name: Main Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!81 &963194226
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 963194225}
+  m_Enabled: 1
+--- !u!20 &963194227
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 963194225}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 0.066037714, g: 0.066037714, b: 0.066037714, 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: -1
+  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 &963194228
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 963194225}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.15212336, y: 0, z: 0, w: 0.98836154}
+  m_LocalPosition: {x: 0, y: 4.5, z: -5.5}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 17.5, y: 0, z: 0}
+--- !u!1 &1049334975
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1049334976}
+  m_Layer: 0
+  m_Name: PointF
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1049334976
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1049334975}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 60.5, y: -0.34, z: -68.5}
+  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 &1055951929
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1055951930}
+  m_Layer: 0
+  m_Name: PointD
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1055951930
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1055951929}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 10.9, y: -0.34, z: -70}
+  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 &1184702125
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1184702128}
+  - component: {fileID: 1184702127}
+  - component: {fileID: 1184702126}
+  m_Layer: 0
+  m_Name: EventSystem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1184702126
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1184702125}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_SendPointerHoverToParent: 1
+  m_HorizontalAxis: Horizontal
+  m_VerticalAxis: Vertical
+  m_SubmitButton: Submit
+  m_CancelButton: Cancel
+  m_InputActionsPerSecond: 10
+  m_RepeatDelay: 0.5
+  m_ForceModuleActive: 0
+--- !u!114 &1184702127
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1184702125}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_FirstSelected: {fileID: 0}
+  m_sendNavigationEvents: 1
+  m_DragThreshold: 10
+--- !u!4 &1184702128
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1184702125}
+  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 &1281267714
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1281267715}
+  m_Layer: 0
+  m_Name: PointB
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1281267715
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1281267714}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 10.9, y: 40.6, z: 70}
+  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!1001 &1591298748
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: ZAxisMove
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: RotationSpeed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: PathMovement.Array.size
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: 'PathMovement.Array.data[0]'
+      value: 
+      objectReference: {fileID: 537610708}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: 'PathMovement.Array.data[1]'
+      value: 
+      objectReference: {fileID: 1281267714}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: 'PathMovement.Array.data[2]'
+      value: 
+      objectReference: {fileID: 1727671589}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: 'PathMovement.Array.data[3]'
+      value: 
+      objectReference: {fileID: 1055951929}
+    - target: {fileID: 3307166493715739449, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: GlobalObjectIdHash
+      value: 4258258070
+      objectReference: {fileID: 0}
+    - target: {fileID: 3307166493715739449, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: InScenePlacedSourceGlobalObjectIdHash
+      value: 1084435762
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 10.9
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.34
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 70
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5415449980466536476, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_Name
+      value: 'ElevatorBody '
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+--- !u!1 &1727671589
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1727671590}
+  m_Layer: 0
+  m_Name: PointC
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1727671590
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1727671589}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 10.9, y: 40.6, z: -70}
+  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!1001 &1968567121
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: ZAxisMove
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: RotationSpeed
+      value: 0.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: PathMovement.Array.size
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: RotatingBodyLogicExpanded
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: 'PathMovement.Array.data[0]'
+      value: 
+      objectReference: {fileID: 946793187}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: 'PathMovement.Array.data[1]'
+      value: 
+      objectReference: {fileID: 1049334975}
+    - target: {fileID: 3307166493715739449, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: GlobalObjectIdHash
+      value: 1259759422
+      objectReference: {fileID: 0}
+    - target: {fileID: 3307166493715739449, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: InScenePlacedSourceGlobalObjectIdHash
+      value: 1084435762
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 60
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.34
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 70
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5415449980466536476, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_Name
+      value: MovingRotatingBody
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 963194228}
+  - {fileID: 705507995}
+  - {fileID: 455857870}
+  - {fileID: 479361665}
+  - {fileID: 1184702128}
+  - {fileID: 748186899}
+  - {fileID: 857399335}
+  - {fileID: 66674670}
+  - {fileID: 45185844}
+  - {fileID: 1968567121}
+  - {fileID: 1591298748}
+  - {fileID: 537610709}
+  - {fileID: 1281267715}
+  - {fileID: 1727671590}
+  - {fileID: 1055951930}
+  - {fileID: 946793188}
+  - {fileID: 1049334976}
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Scenes/CharacterController.unity.meta b/Examples/CharacterControllerMovingBodies/Assets/Scenes/CharacterController.unity.meta
new file mode 100644
index 0000000000..952bd1e9e1
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Scenes/CharacterController.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9fc0d4010bbf28b4594072e72b8655ab
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Scenes/SampleScenePrefabs.asset b/Examples/CharacterControllerMovingBodies/Assets/Scenes/SampleScenePrefabs.asset
new file mode 100644
index 0000000000..26e47a6487
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Scenes/SampleScenePrefabs.asset
@@ -0,0 +1,16 @@
+%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: SampleScenePrefabs
+  m_EditorClassIdentifier: 
+  IsDefault: 0
+  List: []
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Scenes/SampleScenePrefabs.asset.meta b/Examples/CharacterControllerMovingBodies/Assets/Scenes/SampleScenePrefabs.asset.meta
new file mode 100644
index 0000000000..402e4425d7
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Scenes/SampleScenePrefabs.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3d25a2b1f6c12ee47bf7601c2edd7e70
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Scripts.meta b/Examples/CharacterControllerMovingBodies/Assets/Scripts.meta
new file mode 100644
index 0000000000..528b6db2ae
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Scripts.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8f0135d923712c4438b2facb3ce21fb6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Scripts/ExtendedNetworkManager.cs b/Examples/CharacterControllerMovingBodies/Assets/Scripts/ExtendedNetworkManager.cs
new file mode 100644
index 0000000000..2c291bbe89
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Scripts/ExtendedNetworkManager.cs
@@ -0,0 +1,427 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Unity.Netcode;
+using Unity.Services.Authentication;
+using Unity.Services.Core;
+using Unity.Services.Multiplayer;
+using UnityEngine;
+using SessionState = Unity.Services.Multiplayer.SessionState;
+
+#if UNITY_EDITOR
+using Unity.Netcode.Editor;
+using UnityEditor;
+
+/// <summary>
+/// The custom editor for the <see cref="ExtendedNetworkManager"/> component.
+/// </summary>
+[CustomEditor(typeof(ExtendedNetworkManager), true)]
+[CanEditMultipleObjects]
+public class ExtendedNetworkManagerEditor : NetworkManagerEditor
+{
+    private SerializedProperty m_ConnectionType;
+    private SerializedProperty m_TargetFrameRate;
+    private SerializedProperty m_EnableVSync;
+
+    public override void OnEnable()
+    {
+        m_ConnectionType = serializedObject.FindProperty(nameof(ExtendedNetworkManager.ConnectionType));
+        m_TargetFrameRate = serializedObject.FindProperty(nameof(ExtendedNetworkManager.TargetFrameRate));
+        m_EnableVSync = serializedObject.FindProperty(nameof(ExtendedNetworkManager.EnableVSync));
+        base.OnEnable();
+    }
+
+    private void DisplayExtendedNetworkManagerProperties()
+    {
+        EditorGUILayout.PropertyField(m_ConnectionType);
+        EditorGUILayout.PropertyField(m_TargetFrameRate);
+        EditorGUILayout.PropertyField(m_EnableVSync);
+    }
+
+    public override void OnInspectorGUI()
+    {
+        var extendedNetworkManager = target as ExtendedNetworkManager;
+        // Handle switching the appropriate connection type based on the network topology
+        // Host connectio type can be set for client-server and distributed authority
+        // Live Service can only be used with distributed authority
+        // Client-server can only be used with a host connection type
+        var connectionTypes = Enum.GetValues(typeof(ExtendedNetworkManager.ConnectionTypes));
+        var connectionType = ExtendedNetworkManager.ConnectionTypes.LiveService;
+        if (m_ConnectionType.enumValueIndex > 0 && m_ConnectionType.enumValueIndex < connectionTypes.Length)
+        {
+            connectionType = (ExtendedNetworkManager.ConnectionTypes)connectionTypes.GetValue(m_ConnectionType.enumValueIndex);
+        }
+        void SetExpanded(bool expanded) { extendedNetworkManager.ExtendedNetworkManagerExpanded = expanded; };
+        DrawFoldOutGroup<ExtendedNetworkManager>(extendedNetworkManager.GetType(), DisplayExtendedNetworkManagerProperties, extendedNetworkManager.ExtendedNetworkManagerExpanded, SetExpanded);
+
+        var updatedConnectedType = (ExtendedNetworkManager.ConnectionTypes)connectionTypes.GetValue(m_ConnectionType.enumValueIndex);
+        if (connectionType == updatedConnectedType && updatedConnectedType == ExtendedNetworkManager.ConnectionTypes.LiveService && extendedNetworkManager.NetworkConfig.NetworkTopology == NetworkTopologyTypes.ClientServer)
+        {
+            extendedNetworkManager.ConnectionType = ExtendedNetworkManager.ConnectionTypes.Host;
+        }
+        else if (connectionType == ExtendedNetworkManager.ConnectionTypes.Host && updatedConnectedType == ExtendedNetworkManager.ConnectionTypes.LiveService && extendedNetworkManager.NetworkConfig.NetworkTopology == NetworkTopologyTypes.ClientServer)
+        {
+            extendedNetworkManager.NetworkConfig.NetworkTopology = NetworkTopologyTypes.DistributedAuthority;
+        }
+        base.OnInspectorGUI();
+    }
+}
+#endif
+
+
+
+public class ExtendedNetworkManager : NetworkManager
+{
+#if UNITY_EDITOR
+    // Inspector view expand/collapse settings for this derived child class
+    [HideInInspector]
+    public bool ExtendedNetworkManagerExpanded;
+#endif
+
+    public static ExtendedNetworkManager Instance;
+
+    public enum ConnectionTypes
+    {
+        LiveService,
+        Host,
+    }
+    public ConnectionTypes ConnectionType;
+
+    public int TargetFrameRate = 100;
+    public bool EnableVSync = false;
+
+    [HideInInspector]
+    [SerializeField]
+    private int m_OriginalVSyncCount;
+
+#if UNITY_EDITOR
+
+    protected override void OnValidateComponent()
+    {
+        m_OriginalVSyncCount = QualitySettings.vSyncCount;
+        base.OnValidateComponent();
+    }
+#endif
+
+    private ISession m_CurrentSession;
+
+    private string m_SessionName;
+    private string m_ProfileName;
+    private Task m_SessionTask;
+
+    private enum ConnectionStates
+    {
+        None,
+        Connecting,
+        Connected,
+    }
+
+    private ConnectionStates m_ConnectionState;
+
+    public static string GetRandomString(int length)
+    {
+        var r = new System.Random();
+        return new string(Enumerable.Range(0, length).Select(_ => (char)r.Next('a', 'z')).ToArray());
+    }
+
+    public void SetFrameRate(int targetFrameRate, bool enableVsync)
+    {
+        Application.targetFrameRate = targetFrameRate;
+        QualitySettings.vSyncCount = enableVsync ? m_OriginalVSyncCount : 0;
+    }
+
+    private void Awake()
+    {
+        Screen.SetResolution((int)(Screen.currentResolution.width * 0.40f), (int)(Screen.currentResolution.height * 0.40f), FullScreenMode.Windowed);
+        SetFrameRate(TargetFrameRate, EnableVSync);
+        SetSingleton();
+    }
+
+    private async void Start()
+    {
+        OnClientConnectedCallback += OnClientConnected;
+        OnClientDisconnectCallback += OnClientDisconnect;
+        OnConnectionEvent += OnClientConnectionEvent;
+        if (UnityServices.Instance != null && UnityServices.Instance.State != ServicesInitializationState.Initialized)
+        {
+            await UnityServices.InitializeAsync();
+        }
+        if (!AuthenticationService.Instance.IsSignedIn)
+        {
+            AuthenticationService.Instance.SignInFailed += SignInFailed;
+            AuthenticationService.Instance.SignedIn += SignedIn;
+            if (string.IsNullOrEmpty(m_ProfileName))
+            {
+                m_ProfileName = GetRandomString(5);
+            }
+            AuthenticationService.Instance.SwitchProfile(m_ProfileName);
+            await AuthenticationService.Instance.SignInAnonymouslyAsync();
+        }
+    }
+
+    private void OnDestroy()
+    {
+        OnClientConnectedCallback -= OnClientConnected;
+        OnClientDisconnectCallback -= OnClientDisconnect;
+        OnConnectionEvent -= OnClientConnectionEvent;
+    }
+
+    private void SignedIn()
+    {
+        AuthenticationService.Instance.SignedIn -= SignedIn;
+        Debug.Log($"Signed in anonymously with profile {m_ProfileName}");
+    }
+
+    private void SignInFailed(RequestFailedException error)
+    {
+        AuthenticationService.Instance.SignInFailed -= SignInFailed;
+        Debug.LogError($"Failed to sign in {m_ProfileName} anonymously: {error}");
+    }
+
+    private void OnDrawLiveServiceGUI()
+    {
+        m_SessionName = GUILayout.TextField(m_SessionName);
+
+        if (GUILayout.Button("Create or Connect To Session"))
+        {
+            NetworkConfig.UseCMBService = true;
+            OnClientStopped += ClientStopped;
+            OnClientStarted += ClientStarted;
+            m_SessionTask = ConnectThroughLiveService();
+            m_ConnectionState = ConnectionStates.Connecting;
+            LogMessage($"Connecting to session {m_SessionName}...");
+        }
+    }
+
+    private void OnDrawDAHostGUI()
+    {
+        if (GUILayout.Button("Start Host"))
+        {
+            OnClientStopped += ClientStopped;
+            OnClientStarted += ClientStarted;
+            StartHost();
+        }
+
+        if (GUILayout.Button("Start Client"))
+        {
+            OnClientStopped += ClientStopped;
+            OnClientStarted += ClientStarted;
+            StartClient();
+        }
+    }
+
+    private void OnUpdateGUIDisconnected()
+    {
+        GUILayout.BeginArea(new Rect(10, 10, 300, 800));
+
+        GUILayout.Label("Session Name", GUILayout.Width(100));
+
+        var connectionType = ConnectionType;
+        if (NetworkConfig.NetworkTopology == NetworkTopologyTypes.ClientServer && connectionType != ConnectionTypes.Host)
+        {
+            connectionType = ConnectionTypes.Host;
+        }
+
+        switch (connectionType)
+        {
+            case ConnectionTypes.LiveService:
+                {
+                    OnDrawLiveServiceGUI();
+                    break;
+                }
+            case ConnectionTypes.Host:
+                {
+                    OnDrawDAHostGUI();
+                    break;
+                }
+        }
+
+        GUILayout.EndArea();
+
+        GUILayout.BeginArea(new Rect(10, Display.main.renderingHeight - 40, Display.main.renderingWidth - 10, 30));
+        var scenesPreloaded = new System.Text.StringBuilder();
+        scenesPreloaded.Append("Scenes Preloaded: ");
+        for (int i = 0; i < UnityEngine.SceneManagement.SceneManager.sceneCount; i++)
+        {
+            var scene = UnityEngine.SceneManagement.SceneManager.GetSceneAt(i);
+            scenesPreloaded.Append($"[{scene.name}]");
+        }
+        GUILayout.Label(scenesPreloaded.ToString());
+        GUILayout.EndArea();
+    }
+
+    private void OnUpdateGUIConnected()
+    {
+        if (CMBServiceConnection)
+        {
+            GUILayout.BeginArea(new Rect(10, 10, 800, 800));
+            GUILayout.Label($"Session: {m_SessionName}");
+            GUILayout.EndArea();
+        }
+        else
+        {
+            GUILayout.BeginArea(new Rect(10, 10, 800, 800));
+            if (DistributedAuthorityMode)
+            {
+                GUILayout.Label($"DAHosted Session");
+            }
+            else
+            {
+                GUILayout.Label($"Client-Server Session");
+            }
+
+            GUILayout.EndArea();
+        }
+
+        GUILayout.BeginArea(new Rect(Display.main.renderingWidth - 160, 10, 150, 80));
+
+        if (GUILayout.Button("Disconnect"))
+        {
+            if (m_CurrentSession != null && m_CurrentSession.State == SessionState.Connected)
+            {
+                m_CurrentSession.LeaveAsync();
+                m_CurrentSession = null;
+            }
+            else
+            {
+                Shutdown();
+            }
+        }
+
+        GUILayout.EndArea();
+    }
+
+    private void OnGUI()
+    {
+        var yAxisOffset = 10;
+        switch (m_ConnectionState)
+        {
+            case ConnectionStates.None:
+                {
+                    yAxisOffset = 80;
+                    OnUpdateGUIDisconnected();
+                    break;
+                }
+            case ConnectionStates.Connected:
+                {
+                    yAxisOffset = 40;
+                    OnUpdateGUIConnected();
+                    break;
+                }
+        }
+
+        GUILayout.BeginArea(new Rect(10, yAxisOffset, 600, 800));
+        if (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();
+    }
+
+    private void ClientStarted()
+    {
+        OnClientStarted -= ClientStarted;
+        m_ConnectionState = ConnectionStates.Connected;
+        LogMessage($"Connected to session {m_SessionName}.");
+    }
+
+    private void ClientStopped(bool isHost)
+    {
+        OnClientStopped -= ClientStopped;
+        m_ConnectionState = ConnectionStates.None;
+        m_SessionTask = null;
+        m_CurrentSession = null;
+    }
+
+    private async Task<ISession> ConnectThroughLiveService()
+    {
+        try
+        {
+            var options = new SessionOptions()
+            {
+                Name = m_SessionName,
+                MaxPlayers = 32
+            }.WithDistributedAuthorityNetwork();
+
+            m_CurrentSession = await MultiplayerService.Instance.CreateOrJoinSessionAsync(m_SessionName, options);
+            return m_CurrentSession;
+        }
+        catch (Exception e)
+        {
+            LogMessage($"{e.Message}");
+            Debug.LogException(e);
+        }
+        return null;
+    }
+
+    private void Update()
+    {
+        if (m_MessageLogs.Count == 0)
+        {
+            return;
+        }
+
+        for (int i = m_MessageLogs.Count - 1; i >= 0; i--)
+        {
+            if (m_MessageLogs[i].ExpirationTime < Time.realtimeSinceStartup)
+            {
+                m_MessageLogs.RemoveAt(i);
+            }
+        }
+    }
+
+    private void OnClientConnectionEvent(NetworkManager networkManager, ConnectionEventData eventData)
+    {
+        LogMessage($"[{Time.realtimeSinceStartup}] Connection event {eventData.EventType} for Client-{eventData.ClientId}.");
+    }
+
+    private void OnClientConnected(ulong clientId)
+    {
+        LogMessage($"[{Time.realtimeSinceStartup}] Connected event invoked for Client-{clientId}.");
+    }
+
+    private void OnClientDisconnect(ulong clientId)
+    {
+        LogMessage($"[{Time.realtimeSinceStartup}] Disconnected event invoked for Client-{clientId}.");
+    }
+
+    private List<MessageLog> m_MessageLogs = new List<MessageLog>();
+
+    private class MessageLog
+    {
+        public string Message { get; private set; }
+        public float ExpirationTime { get; private set; }
+
+        public MessageLog(string msg, float timeToLive)
+        {
+            Message = msg;
+            ExpirationTime = Time.realtimeSinceStartup + timeToLive;
+        }
+    }
+
+    public void LogMessage(string msg, float timeToLive = 10.0f)
+    {
+        if (m_MessageLogs.Count > 0)
+        {
+            m_MessageLogs.Insert(0, new MessageLog(msg, timeToLive));
+        }
+        else
+        {
+            m_MessageLogs.Add(new MessageLog(msg, timeToLive));
+        }
+
+        Debug.Log(msg);
+    }
+
+    public ExtendedNetworkManager()
+    {
+        Instance = this;
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Components/AssemblyInfo.cs.meta b/Examples/CharacterControllerMovingBodies/Assets/Scripts/ExtendedNetworkManager.cs.meta
similarity index 83%
rename from com.unity.netcode.gameobjects/Components/AssemblyInfo.cs.meta
rename to Examples/CharacterControllerMovingBodies/Assets/Scripts/ExtendedNetworkManager.cs.meta
index 36524ba59b..6c3e265735 100644
--- a/com.unity.netcode.gameobjects/Components/AssemblyInfo.cs.meta
+++ b/Examples/CharacterControllerMovingBodies/Assets/Scripts/ExtendedNetworkManager.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5b8086dc75d86473f9e3c928dd773733
+guid: e4d8d44c602b97b47ba488a40c66267c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Scripts/MoverScriptNoRigidbody.cs b/Examples/CharacterControllerMovingBodies/Assets/Scripts/MoverScriptNoRigidbody.cs
new file mode 100644
index 0000000000..555ed20113
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Scripts/MoverScriptNoRigidbody.cs
@@ -0,0 +1,363 @@
+using UnityEngine;
+using Unity.Netcode.Components;
+using Unity.Netcode;
+#if UNITY_EDITOR
+using Unity.Netcode.Editor;
+using UnityEditor;
+
+/// <summary>
+/// The custom editor for the <see cref="MoverScriptNoRigidbody"/> component.
+/// </summary>
+[CustomEditor(typeof(MoverScriptNoRigidbody), true)]
+[CanEditMultipleObjects]
+public class MoverScriptNoRigidbodyEditor : NetworkTransformEditor
+{
+    private SerializedProperty m_Radius;
+    private SerializedProperty m_Increment;
+    private SerializedProperty m_RotateSpeed;
+    private SerializedProperty m_MovementSpeed;
+    private SerializedProperty m_AirSpeedFactor;
+    private SerializedProperty m_Gravity;
+    private SerializedProperty m_ContinualChildMotion;
+
+
+    public override void OnEnable()
+    {
+        m_Radius = serializedObject.FindProperty(nameof(MoverScriptNoRigidbody.SpawnRadius));
+        m_Increment = serializedObject.FindProperty(nameof(MoverScriptNoRigidbody.Increment));
+        m_RotateSpeed = serializedObject.FindProperty(nameof(MoverScriptNoRigidbody.RotationSpeed));
+        m_MovementSpeed = serializedObject.FindProperty(nameof(MoverScriptNoRigidbody.MovementSpeed));
+        m_AirSpeedFactor = serializedObject.FindProperty(nameof(MoverScriptNoRigidbody.AirSpeedFactor));
+        m_Gravity = serializedObject.FindProperty(nameof(MoverScriptNoRigidbody.Gravity));
+        m_ContinualChildMotion = serializedObject.FindProperty(nameof(MoverScriptNoRigidbody.ContinualChildMotion));
+
+        base.OnEnable();
+    }
+
+    private void DisplayerMoverScriptNoRigidbodyProperties()
+    {
+        EditorGUILayout.PropertyField(m_Radius);
+        EditorGUILayout.PropertyField(m_Increment);
+        EditorGUILayout.PropertyField(m_RotateSpeed);
+        EditorGUILayout.PropertyField(m_MovementSpeed);
+        EditorGUILayout.PropertyField(m_AirSpeedFactor);
+        EditorGUILayout.PropertyField(m_Gravity);
+        EditorGUILayout.PropertyField(m_ContinualChildMotion);
+    }
+
+    public override void OnInspectorGUI()
+    {
+        var moverScriptNoRigidbody = target as MoverScriptNoRigidbody;
+        void SetExpanded(bool expanded) { moverScriptNoRigidbody.MoverScriptNoRigidbodyExpanded = expanded; };
+        DrawFoldOutGroup<MoverScriptNoRigidbody>(moverScriptNoRigidbody.GetType(), DisplayerMoverScriptNoRigidbodyProperties, moverScriptNoRigidbody.MoverScriptNoRigidbodyExpanded, SetExpanded);
+        base.OnInspectorGUI();
+    }
+}
+#endif
+
+/// <summary>
+/// The player controller for the player prefab
+/// </summary>
+public class MoverScriptNoRigidbody : NetworkTransform
+{
+#if UNITY_EDITOR
+    // Inspector view expand/collapse settings for this derived child class
+    [HideInInspector]
+    public bool MoverScriptNoRigidbodyExpanded;
+#endif
+
+    private static bool s_EnablePlayerParentingText = true;
+
+    [Tooltip("Radius range a player will spawn within.")]
+    [Range(1.0f, 40.0f)]
+    public float SpawnRadius = 10.0f;
+
+    [Range(0.001f, 10.0f)]
+    public float Increment = 1.0f;
+
+    [Tooltip("The rotation speed multiplier.")]
+    [Range(0.01f, 2.0f)]
+    public float RotationSpeed = 1.0f;
+
+    [Tooltip("The forward movement speed.")]
+    [Range(0.01f, 30.0f)]
+    public float MovementSpeed = 15.0f;
+
+    [Tooltip("The jump launching speed.")]
+    [Range(1.0f, 20f)]
+    public float JumpSpeed = 10.0f;
+
+    [Tooltip("Determines how much the player's motion is applied when in the air.")]
+    [Range(0.01f, 1.0f)]
+    public float AirSpeedFactor = 0.35f;
+
+    [Range(-20.0f, 20.0f)]
+    public float Gravity = -9.8f;
+
+    [Tooltip("When enabled, the child spheres will continually move. When disabled, the child spheres will only move when the player moves.")]
+    public bool ContinualChildMotion = true;
+
+
+    private TextMesh m_ParentedText;
+    private PlayerColor m_PlayerColor;
+    private float m_JumpDelay;
+    private Vector3 m_WorldMotion = Vector3.zero;
+    private Vector3 m_CameraOriginalPosition;
+    private Quaternion m_CameraOriginalRotation;
+    private CharacterController m_CharacterController;
+    private PlayerBallMotion m_PlayerBallMotion;
+
+    protected override void Awake()
+    {
+        m_ParentedText = GetComponentInChildren<TextMesh>();
+        m_ParentedText?.gameObject.SetActive(false);
+        m_PlayerColor = GetComponent<PlayerColor>();
+        m_PlayerBallMotion = GetComponentInChildren<PlayerBallMotion>();
+        base.Awake();
+    }
+
+    /// <summary>
+    /// Invoked after being instantiated, we can do other pre-spawn related
+    /// initilization tasks here.
+    /// </summary>
+    /// <remarks>
+    /// This provides you with a reference to the current <see cref="NetworkManager"/>
+    /// since that is not set on the <see cref="NetworkBehaviour"/> until it is spawned.
+    /// </remarks>
+    /// <param name="networkManager"></param>
+    protected override void OnNetworkPreSpawn(ref NetworkManager networkManager)
+    {
+        m_CharacterController = GetComponent<CharacterController>();
+        // By default, we always disable the CharacterController and only enable it on the
+        // owner/authority side.
+        m_CharacterController.enabled = false;
+        base.OnNetworkPreSpawn(ref networkManager);
+    }
+
+    /// <summary>
+    /// We are using post spawn to handle any final spawn initializations.
+    /// At this point we know all NetworkBehaviours on this instance has 
+    /// been spawned.
+    /// </summary>
+    protected override void OnNetworkPostSpawn()
+    {
+        m_CharacterController.enabled = CanCommitToTransform;
+        if (CanCommitToTransform)
+        {
+            m_PlayerBallMotion.SetContinualMotion(ContinualChildMotion);
+            Random.InitState((int)System.DateTime.Now.Ticks);
+            transform.position += new Vector3(Random.Range(-SpawnRadius, SpawnRadius), 1.25f, Random.Range(0, SpawnRadius));
+            SetState(transform.position, null, null, false);
+            if (IsLocalPlayer)
+            {
+                NetworkObject.DontDestroyWithOwner = false;
+                m_CameraOriginalPosition = Camera.main.transform.position;
+                m_CameraOriginalRotation = Camera.main.transform.rotation;
+                Camera.main.transform.SetParent(transform, false);
+            }
+        }
+
+        if (NetworkObject.IsPlayerObject)
+        {
+            gameObject.name = $"Player-{OwnerClientId}";
+        }
+
+        m_ParentedText?.gameObject.SetActive(true);
+        UpdateParentedText();
+        base.OnNetworkPostSpawn();
+    }
+
+    public override void OnNetworkDespawn()
+    {
+        if (IsLocalPlayer)
+        {
+            m_CharacterController.enabled = false;
+            Camera.main.transform.SetParent(null, false);
+            Camera.main.transform.position = m_CameraOriginalPosition;
+            Camera.main.transform.rotation = m_CameraOriginalRotation;
+        }
+        base.OnNetworkDespawn();
+    }
+
+    /// <summary>
+    /// Bypass NetworkTransform's OnNetworkObjectParentChanged
+    /// </summary>
+    public override void OnNetworkObjectParentChanged(NetworkObject parentNetworkObject)
+    {
+        if (parentNetworkObject != null)
+        {
+            Debug.Log($"Parented under {parentNetworkObject.name}");
+        }
+        UpdateParentedText();
+        base.OnNetworkObjectParentChanged(parentNetworkObject);
+    }
+
+    /// <summary>
+    /// This method handles both client-server and distributed authority network topologies
+    /// client-server: If we are not the server, then we need to send an Rpc to the server to handle parenting since the Character controller is disabled on the server for all client CharacterControllers (i.e. won't trigger).
+    /// distributed authority: If we are the authority, then handle parenting locally.
+    /// </summary>
+    /// <param name="parent"></param>
+    public void SetParent(NetworkObject parent)
+    {
+        if ((!NetworkManager.DistributedAuthorityMode && (IsServer || (NetworkObject.AllowOwnerToParent && IsOwner))) || (NetworkManager.DistributedAuthorityMode && HasAuthority))
+        {
+            if (parent != null)
+            {
+                NetworkObject.TrySetParent(parent);
+            }
+            else
+            {
+                NetworkObject.TryRemoveParent();
+            }
+        }
+        else if (!NetworkManager.DistributedAuthorityMode && !IsServer)
+        {
+            SetParentRpc(new NetworkObjectReference(parent));
+        }
+    }
+
+    [Rpc(SendTo.Server)]
+    public void SetParentRpc(NetworkObjectReference parentReference, RpcParams rpcParams = default)
+    {
+        var parent = (NetworkObject)null;
+        parentReference.TryGet(out parent, NetworkManager);
+        if (parent != null)
+        {
+            NetworkObject.TrySetParent(parent);
+        }
+        else
+        {
+            NetworkObject.TryRemoveParent();
+        }
+    }
+
+
+    private void Update()
+    {
+        if (!IsSpawned || !CanCommitToTransform)
+        {
+            return;
+        }
+        ApplyInput();
+    }
+
+
+    private Vector3 m_PushMotion = Vector3.zero;
+    /// <summary>
+    /// Since <see cref="CharacterController"/> has issues with collisions and rotating bodies,
+    /// we have to simulate the collision using triggers.
+    /// </summary>
+    /// <remarks>
+    /// <see cref="TriggerPush"/>
+    /// </remarks>
+    /// <param name="normal">direction to push away from</param>
+    public void PushAwayFrom(Vector3 normal)
+    {
+        m_PushMotion += normal * MovementSpeed * 0.10f * Time.deltaTime;
+    }
+
+    /// <summary>
+    /// Handles player input
+    /// </summary>
+    private void ApplyInput()
+    {
+        // Simple rotation:
+        // Since the forward vector is perpendicular to the right vector of the player, we can just
+        // apply the +/- value to our forward direction and lerp our right vector towards that direction
+        // in order to get a reasonably smooth rotation.
+        var rotation = transform.forward;
+        m_WorldMotion = Vector3.Lerp(m_WorldMotion, m_CharacterController.isGrounded ? Vector3.zero : Vector3.up * Gravity, Time.deltaTime * 2f);
+        var motion = m_WorldMotion * Time.deltaTime + m_PushMotion;
+        var moveMotion = 0.0f;
+
+        if (Input.GetKey(KeyCode.W) || Input.GetKey(KeyCode.UpArrow))
+        {
+            motion += transform.forward * MovementSpeed * Time.deltaTime * (m_CharacterController.isGrounded ? 1.0f : AirSpeedFactor);
+            moveMotion = 1.0f;
+            m_CharacterController.Move(motion);
+        }
+        if (Input.GetKey(KeyCode.S) || Input.GetKey(KeyCode.DownArrow))
+        {
+            motion += (transform.forward * -MovementSpeed) * Time.deltaTime * (m_CharacterController.isGrounded ? 1.0f : AirSpeedFactor);
+            moveMotion = -1.0f;
+            m_CharacterController.Move(motion);
+        }
+
+        if (!m_CharacterController.isGrounded || m_JumpDelay > Time.realtimeSinceStartup || m_PushMotion.magnitude > 0.01f)
+        {
+            m_CharacterController.Move(motion);
+        }
+
+        if (Input.GetKeyDown(KeyCode.Space) && m_CharacterController.isGrounded)
+        {
+            m_JumpDelay = Time.realtimeSinceStartup + 0.5f;
+            m_WorldMotion = motion + Vector3.up * JumpSpeed;
+        }
+
+        if (Input.GetKey(KeyCode.A) || Input.GetKey(KeyCode.LeftArrow))
+        {
+            transform.right = Vector3.Lerp(transform.right, rotation * RotationSpeed, Time.deltaTime).normalized;
+        }
+        if (Input.GetKey(KeyCode.D) || Input.GetKey(KeyCode.RightArrow))
+        {
+            transform.right = Vector3.Lerp(transform.right, rotation * -RotationSpeed, Time.deltaTime).normalized;
+        }
+
+        // Enabled/Disable player name, transform space, and parent TextMesh
+        if (Input.GetKeyDown(KeyCode.P))
+        {
+            s_EnablePlayerParentingText = !s_EnablePlayerParentingText;
+        }
+
+        if (Input.GetKeyDown(KeyCode.C))
+        {
+            ContinualChildMotion = !ContinualChildMotion;
+            m_PlayerBallMotion.SetContinualMotion(ContinualChildMotion);
+        }
+
+        m_PushMotion = Vector3.Lerp(m_PushMotion, Vector3.zero, 0.35f);
+
+        m_PlayerBallMotion.HasMotion(moveMotion);
+    }
+
+    /// <summary>
+    /// Updates player TextMesh relative to each client's camera view
+    /// </summary>
+    private void OnGUI()
+    {
+        if (m_ParentedText != null)
+        {
+            if (m_ParentedText.gameObject.activeInHierarchy != s_EnablePlayerParentingText)
+            {
+                m_ParentedText.gameObject.SetActive(s_EnablePlayerParentingText);
+            }
+            if (s_EnablePlayerParentingText)
+            {
+                var position = Camera.main.transform.position;
+                position.y = m_ParentedText.transform.position.y;
+                m_ParentedText.transform.LookAt(position, transform.up);
+                m_ParentedText.transform.forward = -m_ParentedText.transform.forward;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Updates the contents of the parented <see cref="TextMesh"/>
+    /// </summary>
+    private void UpdateParentedText()
+    {
+        if (m_ParentedText)
+        {
+            m_ParentedText.color = m_PlayerColor.Color;
+            if (transform.parent)
+            {
+                m_ParentedText.text = $"{gameObject.name}\n Local Space\n Parent: {transform.parent.name}";
+            }
+            else
+            {
+                m_ParentedText.text = $"{gameObject.name}\n WorldSpace\n Parent: None";
+            }
+        }
+    }
+}
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Scripts/MoverScriptNoRigidbody.cs.meta b/Examples/CharacterControllerMovingBodies/Assets/Scripts/MoverScriptNoRigidbody.cs.meta
new file mode 100644
index 0000000000..d1b709a9fb
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Scripts/MoverScriptNoRigidbody.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 5ce25b0b3f15e6446a88a85787c2f94a
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Scripts/PlayerBallMotion.cs b/Examples/CharacterControllerMovingBodies/Assets/Scripts/PlayerBallMotion.cs
new file mode 100644
index 0000000000..7e525d6c33
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Scripts/PlayerBallMotion.cs
@@ -0,0 +1,126 @@
+using System.Collections.Generic;
+using Unity.Netcode.Components;
+using UnityEngine;
+using System.Linq;
+
+
+#if UNITY_EDITOR
+using Unity.Netcode.Editor;
+using UnityEditor;
+
+/// <summary>
+/// The custom editor for the <see cref="MoverScriptNoRigidbody"/> component.
+/// </summary>
+[CustomEditor(typeof(PlayerBallMotion), true)]
+[CanEditMultipleObjects]
+public class PlayerBallMotionEditor : NetworkTransformEditor
+{
+    private SerializedProperty m_RotationAxis;
+    private SerializedProperty m_RotationSpeed;
+    
+
+    public override void OnEnable()
+    {
+        m_RotationAxis = serializedObject.FindProperty(nameof(PlayerBallMotion.RotationAxis));
+        m_RotationSpeed = serializedObject.FindProperty(nameof(PlayerBallMotion.RotationSpeed));
+        base.OnEnable();
+    }
+
+    private void DrawPlayerBallMotionProperties()
+    {
+        EditorGUILayout.PropertyField(m_RotationAxis);
+        EditorGUILayout.PropertyField(m_RotationSpeed);
+    }
+
+    public override void OnInspectorGUI()
+    {
+        var playerBallMotion = target as PlayerBallMotion;
+        void SetExpanded(bool expanded) { playerBallMotion.ExpandPlayerBallMotion = expanded; };
+        DrawFoldOutGroup< PlayerBallMotion>(playerBallMotion.GetType(), DrawPlayerBallMotionProperties, playerBallMotion.ExpandPlayerBallMotion, SetExpanded);
+        base.OnInspectorGUI();
+    }
+}
+#endif
+
+public class PlayerBallMotion : NetworkTransform
+{
+#if UNITY_EDITOR
+    public bool ExpandPlayerBallMotion;
+    public bool ExpandNetworkTransform;
+#endif
+    public enum RotateAroundAxis
+    {
+        Up,
+        Right,
+        Forward
+    }
+
+    public RotateAroundAxis RotationAxis;
+    public float RotationSpeed = 1.5f;
+
+    private Vector3 m_AxisRotation = Vector3.zero;
+    private List<PlayerBallMotion> m_Children;
+
+    private bool m_ContinualMotion;
+    private float m_CurrentRotionMotion = 1.0f;
+    public void SetContinualMotion(bool continualMotion)
+    {
+        m_ContinualMotion = continualMotion;
+        foreach (var child in m_Children)
+        {
+            child.SetContinualMotion(continualMotion);
+        }
+    }
+
+    protected override void Awake()
+    {
+        m_Children = GetComponentsInChildren<PlayerBallMotion>().Where((c)=> c != this).ToList();
+        base.Awake();
+    }
+
+    private void SetRotationAixs()
+    {
+        switch (RotationAxis)
+        {
+            case RotateAroundAxis.Up:
+                {
+                    m_AxisRotation = transform.parent.up;
+                    break;
+                }
+            case RotateAroundAxis.Right:
+                {
+                    m_AxisRotation = transform.parent.right;
+                    break;
+                }
+            case RotateAroundAxis.Forward:
+                {
+                    m_AxisRotation = transform.parent.forward;
+                    break;
+                }
+        }
+    }
+
+    public void HasMotion(float direction)
+    {
+        if (direction == 0.0f)
+        {
+            if(!m_ContinualMotion)
+            {
+                return;
+            }
+        }
+        else
+        {
+            m_CurrentRotionMotion = RotationSpeed * direction;
+        }
+
+
+        transform.LookAt(transform.parent);
+        SetRotationAixs();
+        transform.RotateAround(transform.parent.position, m_AxisRotation, m_CurrentRotionMotion);
+        foreach(var child in m_Children)
+        {
+            child.HasMotion(direction);
+        }
+    }
+}
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Scripts/PlayerBallMotion.cs.meta b/Examples/CharacterControllerMovingBodies/Assets/Scripts/PlayerBallMotion.cs.meta
new file mode 100644
index 0000000000..407e0adf7b
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Scripts/PlayerBallMotion.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 792d7ce524eb358469373fe12babef88
\ No newline at end of file
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Scripts/PlayerColor.cs b/Examples/CharacterControllerMovingBodies/Assets/Scripts/PlayerColor.cs
new file mode 100644
index 0000000000..3e2fa5b00a
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Scripts/PlayerColor.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using Unity.Netcode;
+using UnityEngine;
+
+
+public class PlayerColor : NetworkBehaviour
+{
+    private static Color[] s_Colors = { Color.red, Color.green, Color.blue, Color.cyan, Color.magenta, Color.yellow};
+    public bool ApplyColorToChildren;
+    public Color Color { get; private set; }
+    public List<GameObject> IgnoreChildren;
+
+    public override void OnNetworkSpawn()
+    {
+        MeshRenderer meshRenderer = GetComponent<MeshRenderer>();
+        ulong myId = GetComponent<NetworkObject>().OwnerClientId - (ulong)(NetworkManager.DistributedAuthorityMode && NetworkManager.CMBServiceConnection ? 1 : 0);
+        Color = s_Colors[myId % Convert.ToUInt64(s_Colors.Length)];
+        meshRenderer.material.color = Color;
+        if (ApplyColorToChildren)
+        {
+            var meshRenderers = GetComponentsInChildren<MeshRenderer>();
+            foreach (var childMeshRenderer in meshRenderers)
+            {
+                if (IgnoreChildren != null && IgnoreChildren.Contains(childMeshRenderer.gameObject))
+                {
+                    continue;
+                }
+                childMeshRenderer.material.color = Color;
+            }
+        }
+
+        if (IsLocalPlayer)
+        {
+            var gameObject = GameObject.Find("ServerHostClientDisplay");
+            if (gameObject != null)
+            {
+                var serverHost = gameObject.GetComponent<ServerHostClientText>();
+                serverHost?.SetColor(Color);
+            }
+        }
+        base.OnNetworkSpawn();
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableCollectionsTests.cs.meta b/Examples/CharacterControllerMovingBodies/Assets/Scripts/PlayerColor.cs.meta
similarity index 83%
rename from com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableCollectionsTests.cs.meta
rename to Examples/CharacterControllerMovingBodies/Assets/Scripts/PlayerColor.cs.meta
index 8a0dfc0af6..90b6ca4628 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableCollectionsTests.cs.meta
+++ b/Examples/CharacterControllerMovingBodies/Assets/Scripts/PlayerColor.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 939ac41f36685f84e94a4b66ebbb6d8c
+guid: 8e5128237997be649af0cc87dd0eb563
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Scripts/RotatingBodyLogic.cs b/Examples/CharacterControllerMovingBodies/Assets/Scripts/RotatingBodyLogic.cs
new file mode 100644
index 0000000000..eaa32a77d6
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Scripts/RotatingBodyLogic.cs
@@ -0,0 +1,201 @@
+using System.Collections.Generic;
+using Unity.Netcode;
+using Unity.Netcode.Components;
+using UnityEngine;
+#if UNITY_EDITOR
+using Unity.Netcode.Editor;
+using UnityEditor;
+
+/// <summary>
+/// The custom editor for the <see cref="RotatingBodyLogic"/> component.
+/// </summary>
+[CustomEditor(typeof(RotatingBodyLogic), true)]
+[CanEditMultipleObjects]
+public class RotatingBodyLogicEditor : NetworkTransformEditor
+{
+    private SerializedProperty m_RotationSpeed;
+    private SerializedProperty m_RotateDirection;
+    private SerializedProperty m_OnExitTransferParentOnStay;
+    private SerializedProperty m_PathMotion;
+
+
+    public override void OnEnable()
+    {
+        m_RotationSpeed = serializedObject.FindProperty(nameof(RotatingBodyLogic.RotationSpeed));
+        m_RotateDirection = serializedObject.FindProperty(nameof(RotatingBodyLogic.RotateDirection));
+        m_OnExitTransferParentOnStay = serializedObject.FindProperty(nameof(RotatingBodyLogic.OnExitTransferParentOnStay));
+        m_PathMotion = serializedObject.FindProperty(nameof(RotatingBodyLogic.PathMovement));
+        base.OnEnable();
+    }
+
+    private void DisplayRotatingBodyLogicProperties()
+    {
+        EditorGUILayout.PropertyField(m_RotationSpeed);
+        EditorGUILayout.PropertyField(m_RotateDirection);
+        EditorGUILayout.PropertyField(m_OnExitTransferParentOnStay);
+        EditorGUILayout.PropertyField(m_PathMotion);
+    }
+
+    public override void OnInspectorGUI()
+    {
+        var rotatingBodyLogic = target as RotatingBodyLogic;
+        void SetExpanded(bool expanded) { rotatingBodyLogic.RotatingBodyLogicExpanded = expanded; };
+        DrawFoldOutGroup<RotatingBodyLogic>(rotatingBodyLogic.GetType(), DisplayRotatingBodyLogicProperties, rotatingBodyLogic.RotatingBodyLogicExpanded, SetExpanded);
+        base.OnInspectorGUI();
+    }
+}
+#endif
+
+/// <summary>
+/// Handles rotating the large in-scene placed platform/tunnels and parenting/deparenting players
+/// </summary>
+public class RotatingBodyLogic : NetworkTransform
+{
+#if UNITY_EDITOR
+    // Inspector view expand/collapse settings for this derived child class
+    [HideInInspector]
+    public bool RotatingBodyLogicExpanded;
+#endif
+
+    public enum RotationDirections
+    {
+        Clockwise,
+        CounterClockwise
+    }
+
+    [Range(0.0f, 2.0f)]
+    public float RotationSpeed = 1.0f;
+    public RotationDirections RotateDirection;
+    public RotatingBodyLogic OnExitTransferParentOnStay;
+    public List<GameObject> PathMovement;
+
+    private TagHandle m_TagHandle;
+    private float m_RotationDirection;
+
+    private int m_CurrentPathObject = -1;
+    private GameObject m_CurrentNavPoint;
+
+    protected override void OnNetworkPreSpawn(ref NetworkManager networkManager)
+    {
+        m_TagHandle = TagHandle.GetExistingTag("Player");
+        m_RotationDirection = RotateDirection == RotationDirections.Clockwise ? 1.0f : -1.0f;
+        SetNextPoint();
+        base.OnNetworkPreSpawn(ref networkManager);
+    }
+
+    private void SetNextPoint()
+    {
+        if (PathMovement == null || PathMovement.Count == 0)
+        {
+            return;
+        }
+        m_CurrentPathObject++;
+        m_CurrentPathObject %= PathMovement.Count;
+        m_CurrentNavPoint = PathMovement[m_CurrentPathObject];
+    }
+
+
+    /// <summary>
+    /// When triggered, the player is parented under the rotating body.
+    /// </summary>
+    /// <remarks>
+    /// This is only triggered on the owner side since we disable the CharacterController
+    /// on all non-owner instances.
+    /// </remarks>
+    private void OnTriggerEnter(Collider other)
+    {
+        if (!IsSpawned || !other.CompareTag(m_TagHandle))
+        {
+            return;
+        }
+        var nonRigidPlayerMover = other.GetComponent<MoverScriptNoRigidbody>();
+        if (nonRigidPlayerMover != null)
+        {
+            nonRigidPlayerMover.SetParent(NetworkObject);
+        }
+    }
+
+    // This is used to handle NetworkObject to NetworkObject parenting detection
+    private List<MoverScriptNoRigidbody> m_TriggerStayBodies = new List<MoverScriptNoRigidbody>();
+
+    private void OnTriggerStay(Collider other)
+    {
+        if (!IsSpawned || !other.CompareTag(m_TagHandle))
+        {
+            return;
+        }
+        var nonRigidPlayerMover = other.GetComponent<MoverScriptNoRigidbody>();
+        if (nonRigidPlayerMover != null)
+        {
+            if (!m_TriggerStayBodies.Contains(nonRigidPlayerMover))
+            {
+                m_TriggerStayBodies.Add(nonRigidPlayerMover);
+            }
+        }
+    }
+
+    internal bool HandleParentingForTriggerStayBodies(MoverScriptNoRigidbody moverScriptNoRigidbody)
+    {
+        if (m_TriggerStayBodies.Contains(moverScriptNoRigidbody))
+        {
+            moverScriptNoRigidbody.SetParent(NetworkObject);
+            return true;
+        }
+        return false;
+    }
+
+    /// <summary>
+    /// When triggered, the player is deparented from the rotating body.
+    /// </summary>
+    /// <remarks>
+    /// This is only triggered on the owner side since we disable the CharacterController
+    /// on all non-owner instances.
+    /// </remarks>
+    private void OnTriggerExit(Collider other)
+    {
+        if (!IsSpawned || !other.CompareTag(m_TagHandle))
+        {
+            return;
+        }
+
+        var nonRigidPlayerMover = other.GetComponent<MoverScriptNoRigidbody>();
+        if (nonRigidPlayerMover != null)
+        {
+            m_TriggerStayBodies.Remove(nonRigidPlayerMover);
+            if (OnExitTransferParentOnStay && OnExitTransferParentOnStay.HandleParentingForTriggerStayBodies(nonRigidPlayerMover))
+            {
+                return;
+            }
+            // Otherwise, set parent back to root
+            nonRigidPlayerMover.SetParent(null);
+        }
+    }
+
+    /// <summary>
+    /// We rotate the body during late update to avoid fighting between the host/owner (depending upon network topology)
+    /// motion and the body's motion/rotation.
+    /// </summary>
+    private void LateUpdate()
+    {
+        if (!IsSpawned || !CanCommitToTransform)
+        {
+            return;
+        }
+
+        if (m_CurrentNavPoint != null)
+        {
+            if (Vector3.Distance(m_CurrentNavPoint.transform.position, transform.position) <= 0.05f)
+            {
+                SetNextPoint();
+            }
+
+            var direction = (m_CurrentNavPoint.transform.position - transform.position).normalized;
+            transform.position = Vector3.Lerp(transform.position, transform.position + direction * 10, Time.deltaTime);
+        }
+
+        if (RotationSpeed > 0.0f)
+        {
+            transform.right = Vector3.Lerp(transform.right, transform.forward * m_RotationDirection, Time.deltaTime * RotationSpeed);
+        }
+    }
+}
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Scripts/RotatingBodyLogic.cs.meta b/Examples/CharacterControllerMovingBodies/Assets/Scripts/RotatingBodyLogic.cs.meta
new file mode 100644
index 0000000000..ce0ea09165
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Scripts/RotatingBodyLogic.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 374ac199eb18f0f468bc018a722775c2
\ No newline at end of file
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Scripts/ServerHostClientText.cs b/Examples/CharacterControllerMovingBodies/Assets/Scripts/ServerHostClientText.cs
new file mode 100644
index 0000000000..e2ff41dfa6
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Scripts/ServerHostClientText.cs
@@ -0,0 +1,79 @@
+using Unity.Netcode;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class ServerHostClientText : NetworkBehaviour
+{
+    private Text m_DisplayText;
+
+    private Color m_Color;
+    private Color m_ColorAlpha;
+    private Vector3 m_LocalPosition;
+
+    public void SetColor(Color color)
+    {
+        m_Color = color;
+        m_ColorAlpha = color;
+        m_ColorAlpha.a = 0.35f;
+    }
+
+    private void Awake()
+    {
+        m_LocalPosition = transform.localPosition;
+        m_DisplayText = GetComponent<Text>();
+    }
+
+    private void Start()
+    {
+        if (m_DisplayText != null)
+        {
+            m_DisplayText.text = string.Empty;
+            SetColor(m_DisplayText.color);
+        }
+    }
+
+    public override void OnNetworkSpawn()
+    {
+        if (m_DisplayText != null)
+        {
+            if (NetworkManager.IsServer)
+            {
+                m_DisplayText.text = NetworkManager.IsHost ? "Host" : "Server";
+            }
+            else if (NetworkManager.IsClient)
+            {
+                m_DisplayText.text = $"Client-{NetworkManager.LocalClientId}";
+            }
+        }
+        transform.localPosition = m_LocalPosition;
+    }
+
+    public override void OnNetworkDespawn()
+    {
+        if (m_DisplayText != null)
+        {
+            m_DisplayText.text = string.Empty;
+        }
+        base.OnNetworkDespawn();
+    }
+
+    private bool m_LastFocusedValue;
+    private void OnGUI()
+    {
+        if (!IsSpawned || m_LastFocusedValue == Application.isFocused)
+        {
+            return;
+        }
+
+        m_LastFocusedValue = Application.isFocused;
+
+        if (m_LastFocusedValue)
+        {
+            m_DisplayText.color = m_Color;
+        }
+        else
+        {
+            m_DisplayText.color = m_ColorAlpha;
+        }
+    }
+}
diff --git a/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerFixValidationTests.cs.meta b/Examples/CharacterControllerMovingBodies/Assets/Scripts/ServerHostClientText.cs.meta
similarity index 83%
rename from testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerFixValidationTests.cs.meta
rename to Examples/CharacterControllerMovingBodies/Assets/Scripts/ServerHostClientText.cs.meta
index 9e35df982a..081f5a96a8 100644
--- a/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerFixValidationTests.cs.meta
+++ b/Examples/CharacterControllerMovingBodies/Assets/Scripts/ServerHostClientText.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 501dfd0e05e51184e8938bba980d3f88
+guid: 6637cd674efb56a48a3d4d545d23a8d3
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Scripts/TriggerPush.cs b/Examples/CharacterControllerMovingBodies/Assets/Scripts/TriggerPush.cs
new file mode 100644
index 0000000000..ade22f3ed6
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Scripts/TriggerPush.cs
@@ -0,0 +1,63 @@
+using UnityEngine;
+
+/// <summary>
+/// This helper class is used to push a player away from a rotating body.
+/// <see cref="CharacterController"/>s without a <see cref="Rigidbody"/> don't
+/// handle collision with rotating bodies. This simulates a "collision".
+/// </summary>
+public class TriggerPush : MonoBehaviour
+{    
+    public enum RightOrLeft
+    {
+        Right,
+        Left
+    }
+
+    [Tooltip("Determines if this trigger will push the player to the left or right of the root transform")]
+    public RightOrLeft PushDirection;
+
+    private TagHandle m_TagHandle;
+
+    private void Awake()
+    {
+        m_TagHandle = TagHandle.GetExistingTag("Player");
+    }
+
+    private void PushObject(Collider other, bool isInside = false)
+    {
+        var nonRigidPlayerMover = other.GetComponent<MoverScriptNoRigidbody>();
+        if (nonRigidPlayerMover != null && nonRigidPlayerMover.CanCommitToTransform)
+        {
+            // We determine the direction to push and if within a trigger we push a little more to prevent from
+            // completely clipping through the object.
+            var direction = (PushDirection == RightOrLeft.Right ? 1.0f : -1.0f) * (isInside ? 1.75f : 1.0f);
+            nonRigidPlayerMover.PushAwayFrom(transform.parent.right * direction);
+        }
+    }
+
+    /// <summary>
+    /// Pushes the player away from the object
+    /// </summary>
+    private void OnTriggerEnter(Collider other)
+    {
+        if (!other.CompareTag(m_TagHandle))
+        {
+            return;
+        }
+        PushObject(other);
+    }
+
+    /// <summary>
+    /// When the trigger is in a "stay" state, we need to signal that
+    /// the amount to "push away" should be increased.
+    /// </summary>
+    /// <param name="other"></param>
+    private void OnTriggerStay(Collider other)
+    {
+        if (!other.CompareTag(m_TagHandle))
+        {
+            return;
+        }
+        PushObject(other, true);
+    }
+}
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Scripts/TriggerPush.cs.meta b/Examples/CharacterControllerMovingBodies/Assets/Scripts/TriggerPush.cs.meta
new file mode 100644
index 0000000000..7c07b1ebfc
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Scripts/TriggerPush.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 2c40721ca0fd31645a742e5ad0e0cdc5
\ No newline at end of file
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Textures.meta b/Examples/CharacterControllerMovingBodies/Assets/Textures.meta
new file mode 100644
index 0000000000..84caff0700
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Textures.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 22c34a08d52a0644fae5e90dbcc0ba52
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Textures/GridPattern.png b/Examples/CharacterControllerMovingBodies/Assets/Textures/GridPattern.png
new file mode 100644
index 0000000000..e2f648aacc
Binary files /dev/null and b/Examples/CharacterControllerMovingBodies/Assets/Textures/GridPattern.png differ
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Textures/GridPattern.png.meta b/Examples/CharacterControllerMovingBodies/Assets/Textures/GridPattern.png.meta
new file mode 100644
index 0000000000..305bd2392c
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Textures/GridPattern.png.meta
@@ -0,0 +1,153 @@
+fileFormatVersion: 2
+guid: a092c5fa8c60ed04aa1d72555f1740bc
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Textures/Grid_01_BaseMap.png b/Examples/CharacterControllerMovingBodies/Assets/Textures/Grid_01_BaseMap.png
new file mode 100644
index 0000000000..3f311d2225
Binary files /dev/null and b/Examples/CharacterControllerMovingBodies/Assets/Textures/Grid_01_BaseMap.png differ
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Textures/Grid_01_BaseMap.png.meta b/Examples/CharacterControllerMovingBodies/Assets/Textures/Grid_01_BaseMap.png.meta
new file mode 100644
index 0000000000..3a05497054
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Textures/Grid_01_BaseMap.png.meta
@@ -0,0 +1,130 @@
+fileFormatVersion: 2
+guid: e71f43865e91e6b418bd0d67be2445dc
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: WindowsStoreApps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Textures/Grid_01_Emissive.png b/Examples/CharacterControllerMovingBodies/Assets/Textures/Grid_01_Emissive.png
new file mode 100644
index 0000000000..df81ac1268
Binary files /dev/null and b/Examples/CharacterControllerMovingBodies/Assets/Textures/Grid_01_Emissive.png differ
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Textures/Grid_01_Emissive.png.meta b/Examples/CharacterControllerMovingBodies/Assets/Textures/Grid_01_Emissive.png.meta
new file mode 100644
index 0000000000..bcfe13d8d7
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Textures/Grid_01_Emissive.png.meta
@@ -0,0 +1,130 @@
+fileFormatVersion: 2
+guid: 8bf2cf149563066489e749ea032dbca7
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: WindowsStoreApps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Textures/Grid_01_Normal.png b/Examples/CharacterControllerMovingBodies/Assets/Textures/Grid_01_Normal.png
new file mode 100644
index 0000000000..1d060fba61
Binary files /dev/null and b/Examples/CharacterControllerMovingBodies/Assets/Textures/Grid_01_Normal.png differ
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Textures/Grid_01_Normal.png.meta b/Examples/CharacterControllerMovingBodies/Assets/Textures/Grid_01_Normal.png.meta
new file mode 100644
index 0000000000..4a5b2ad61c
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Textures/Grid_01_Normal.png.meta
@@ -0,0 +1,130 @@
+fileFormatVersion: 2
+guid: b94463ba36040ec4082132c54dd1bbad
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 0
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 1
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: WindowsStoreApps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Textures/Grid_02_BaseMap.png b/Examples/CharacterControllerMovingBodies/Assets/Textures/Grid_02_BaseMap.png
new file mode 100644
index 0000000000..b3069b03d1
Binary files /dev/null and b/Examples/CharacterControllerMovingBodies/Assets/Textures/Grid_02_BaseMap.png differ
diff --git a/Examples/CharacterControllerMovingBodies/Assets/Textures/Grid_02_BaseMap.png.meta b/Examples/CharacterControllerMovingBodies/Assets/Textures/Grid_02_BaseMap.png.meta
new file mode 100644
index 0000000000..7fbedef673
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Assets/Textures/Grid_02_BaseMap.png.meta
@@ -0,0 +1,130 @@
+fileFormatVersion: 2
+guid: 844faea9c35b2464c8ecb09f66e2e2f8
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: WindowsStoreApps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/CharacterControllerMovingBodies/Packages/manifest.json b/Examples/CharacterControllerMovingBodies/Packages/manifest.json
new file mode 100644
index 0000000000..de9d632e57
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Packages/manifest.json
@@ -0,0 +1,55 @@
+{
+  "dependencies": {
+    "com.unity.2d.sprite": "1.0.0",
+    "com.unity.2d.tilemap": "1.0.0",
+    "com.unity.ads": "4.4.2",
+    "com.unity.ai.navigation": "2.0.3",
+    "com.unity.analytics": "3.8.1",
+    "com.unity.collab-proxy": "2.4.4",
+    "com.unity.feature.development": "1.0.2",
+    "com.unity.ide.rider": "3.0.31",
+    "com.unity.ide.visualstudio": "2.0.22",
+    "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.purchasing": "4.12.2",
+    "com.unity.services.multiplayer": "1.0.0-pre.1",
+    "com.unity.test-framework": "1.4.5",
+    "com.unity.timeline": "1.8.7",
+    "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.9",
+    "com.unity.transport": "2.3.0",
+    "com.unity.ugui": "2.0.0",
+    "com.unity.visualscripting": "1.9.4",
+    "com.unity.xr.legacyinputhelpers": "2.1.10",
+    "com.unity.modules.accessibility": "1.0.0",
+    "com.unity.modules.ai": "1.0.0",
+    "com.unity.modules.androidjni": "1.0.0",
+    "com.unity.modules.animation": "1.0.0",
+    "com.unity.modules.assetbundle": "1.0.0",
+    "com.unity.modules.audio": "1.0.0",
+    "com.unity.modules.cloth": "1.0.0",
+    "com.unity.modules.director": "1.0.0",
+    "com.unity.modules.imageconversion": "1.0.0",
+    "com.unity.modules.imgui": "1.0.0",
+    "com.unity.modules.jsonserialize": "1.0.0",
+    "com.unity.modules.particlesystem": "1.0.0",
+    "com.unity.modules.physics": "1.0.0",
+    "com.unity.modules.physics2d": "1.0.0",
+    "com.unity.modules.screencapture": "1.0.0",
+    "com.unity.modules.terrain": "1.0.0",
+    "com.unity.modules.terrainphysics": "1.0.0",
+    "com.unity.modules.tilemap": "1.0.0",
+    "com.unity.modules.ui": "1.0.0",
+    "com.unity.modules.uielements": "1.0.0",
+    "com.unity.modules.umbra": "1.0.0",
+    "com.unity.modules.unityanalytics": "1.0.0",
+    "com.unity.modules.unitywebrequest": "1.0.0",
+    "com.unity.modules.unitywebrequestassetbundle": "1.0.0",
+    "com.unity.modules.unitywebrequestaudio": "1.0.0",
+    "com.unity.modules.unitywebrequesttexture": "1.0.0",
+    "com.unity.modules.unitywebrequestwww": "1.0.0",
+    "com.unity.modules.vehicles": "1.0.0",
+    "com.unity.modules.video": "1.0.0",
+    "com.unity.modules.vr": "1.0.0",
+    "com.unity.modules.wind": "1.0.0",
+    "com.unity.modules.xr": "1.0.0"
+  }
+}
diff --git a/Examples/CharacterControllerMovingBodies/ProjectSettings/EditorBuildSettings.asset b/Examples/CharacterControllerMovingBodies/ProjectSettings/EditorBuildSettings.asset
new file mode 100644
index 0000000000..a6cd971819
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/ProjectSettings/EditorBuildSettings.asset
@@ -0,0 +1,12 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1045 &1
+EditorBuildSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Scenes:
+  - enabled: 1
+    path: Assets/Scenes/CharacterController.unity
+    guid: 9fc0d4010bbf28b4594072e72b8655ab
+  m_configObjects: {}
+  m_UseUCBPForAssetBundles: 0
diff --git a/Examples/CharacterControllerMovingBodies/ProjectSettings/ProjectSettings.asset b/Examples/CharacterControllerMovingBodies/ProjectSettings/ProjectSettings.asset
new file mode 100644
index 0000000000..b12ab6ff29
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/ProjectSettings/ProjectSettings.asset
@@ -0,0 +1,687 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!129 &1
+PlayerSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 28
+  productGUID: 6859c206e4885eb4d9a885722be3daa1
+  AndroidProfiler: 0
+  AndroidFilterTouchesWhenObscured: 0
+  AndroidEnableSustainedPerformanceMode: 0
+  defaultScreenOrientation: 4
+  targetDevice: 2
+  useOnDemandResources: 0
+  accelerometerFrequency: 60
+  companyName: DefaultCompany
+  productName: CharacterControllerMovingBodies
+  defaultCursor: {fileID: 0}
+  cursorHotspot: {x: 0, y: 0}
+  m_SplashScreenBackgroundColor: {r: 0.12156863, g: 0.12156863, b: 0.1254902, a: 1}
+  m_ShowUnitySplashScreen: 1
+  m_ShowUnitySplashLogo: 1
+  m_SplashScreenOverlayOpacity: 1
+  m_SplashScreenAnimation: 1
+  m_SplashScreenLogoStyle: 1
+  m_SplashScreenDrawMode: 0
+  m_SplashScreenBackgroundAnimationZoom: 1
+  m_SplashScreenLogoAnimationZoom: 1
+  m_SplashScreenBackgroundLandscapeAspect: 1
+  m_SplashScreenBackgroundPortraitAspect: 1
+  m_SplashScreenBackgroundLandscapeUvs:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  m_SplashScreenBackgroundPortraitUvs:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  m_SplashScreenLogos: []
+  m_VirtualRealitySplashScreen: {fileID: 0}
+  m_HolographicTrackingLossScreen: {fileID: 0}
+  defaultScreenWidth: 1920
+  defaultScreenHeight: 1080
+  defaultScreenWidthWeb: 960
+  defaultScreenHeightWeb: 600
+  m_StereoRenderingPath: 0
+  m_ActiveColorSpace: 0
+  unsupportedMSAAFallback: 0
+  m_SpriteBatchVertexThreshold: 300
+  m_MTRendering: 1
+  mipStripping: 0
+  numberOfMipsStripped: 0
+  numberOfMipsStrippedPerMipmapLimitGroup: {}
+  m_StackTraceTypes: 010000000100000001000000010000000100000001000000
+  iosShowActivityIndicatorOnLoading: -1
+  androidShowActivityIndicatorOnLoading: -1
+  iosUseCustomAppBackgroundBehavior: 0
+  allowedAutorotateToPortrait: 1
+  allowedAutorotateToPortraitUpsideDown: 1
+  allowedAutorotateToLandscapeRight: 1
+  allowedAutorotateToLandscapeLeft: 1
+  useOSAutorotation: 1
+  use32BitDisplayBuffer: 1
+  preserveFramebufferAlpha: 0
+  disableDepthAndStencilBuffers: 0
+  androidStartInFullscreen: 1
+  androidRenderOutsideSafeArea: 1
+  androidUseSwappy: 1
+  androidBlitType: 0
+  androidResizeableActivity: 1
+  androidDefaultWindowWidth: 1920
+  androidDefaultWindowHeight: 1080
+  androidMinimumWindowWidth: 400
+  androidMinimumWindowHeight: 300
+  androidFullscreenMode: 1
+  androidAutoRotationBehavior: 1
+  androidPredictiveBackSupport: 0
+  androidApplicationEntry: 2
+  defaultIsNativeResolution: 1
+  macRetinaSupport: 1
+  runInBackground: 0
+  captureSingleScreen: 0
+  muteOtherAudioSources: 0
+  Prepare IOS For Recording: 0
+  Force IOS Speakers When Recording: 0
+  deferSystemGesturesMode: 0
+  hideHomeButton: 0
+  submitAnalytics: 1
+  usePlayerLog: 1
+  dedicatedServerOptimizations: 1
+  bakeCollisionMeshes: 0
+  forceSingleInstance: 0
+  useFlipModelSwapchain: 1
+  resizableWindow: 0
+  useMacAppStoreValidation: 0
+  macAppStoreCategory: public.app-category.games
+  gpuSkinning: 1
+  meshDeformation: 1
+  xboxPIXTextureCapture: 0
+  xboxEnableAvatar: 0
+  xboxEnableKinect: 0
+  xboxEnableKinectAutoTracking: 0
+  xboxEnableFitness: 0
+  visibleInBackground: 1
+  allowFullscreenSwitch: 1
+  fullscreenMode: 1
+  xboxSpeechDB: 0
+  xboxEnableHeadOrientation: 0
+  xboxEnableGuest: 0
+  xboxEnablePIXSampling: 0
+  metalFramebufferOnly: 0
+  xboxOneResolution: 0
+  xboxOneSResolution: 0
+  xboxOneXResolution: 3
+  xboxOneMonoLoggingLevel: 0
+  xboxOneLoggingLevel: 1
+  xboxOneDisableEsram: 0
+  xboxOneEnableTypeOptimization: 0
+  xboxOnePresentImmediateThreshold: 0
+  switchQueueCommandMemory: 1048576
+  switchQueueControlMemory: 16384
+  switchQueueComputeMemory: 262144
+  switchNVNShaderPoolsGranularity: 33554432
+  switchNVNDefaultPoolsGranularity: 16777216
+  switchNVNOtherPoolsGranularity: 16777216
+  switchGpuScratchPoolGranularity: 2097152
+  switchAllowGpuScratchShrinking: 0
+  switchNVNMaxPublicTextureIDCount: 0
+  switchNVNMaxPublicSamplerIDCount: 0
+  switchMaxWorkerMultiple: 8
+  switchNVNGraphicsFirmwareMemory: 32
+  vulkanNumSwapchainBuffers: 3
+  vulkanEnableSetSRGBWrite: 0
+  vulkanEnablePreTransform: 0
+  vulkanEnableLateAcquireNextImage: 0
+  vulkanEnableCommandBufferRecycling: 1
+  loadStoreDebugModeEnabled: 0
+  visionOSBundleVersion: 1.0
+  tvOSBundleVersion: 1.0
+  bundleVersion: 1.0
+  preloadedAssets: []
+  metroInputSource: 0
+  wsaTransparentSwapchain: 0
+  m_HolographicPauseOnTrackingLoss: 1
+  xboxOneDisableKinectGpuReservation: 1
+  xboxOneEnable7thCore: 1
+  vrSettings:
+    enable360StereoCapture: 0
+  isWsaHolographicRemotingEnabled: 0
+  enableFrameTimingStats: 0
+  enableOpenGLProfilerGPURecorders: 1
+  allowHDRDisplaySupport: 0
+  useHDRDisplay: 0
+  hdrBitDepth: 0
+  m_ColorGamuts: 00000000
+  targetPixelDensity: 30
+  resolutionScalingMode: 0
+  resetResolutionOnWindowResize: 0
+  androidSupportedAspectRatio: 1
+  androidMaxAspectRatio: 2.1
+  androidMinAspectRatio: 1
+  applicationIdentifier:
+    Standalone: com.DefaultCompany.CharacterControllerMovingBodies
+  buildNumber:
+    Standalone: 0
+    VisionOS: 0
+    iPhone: 0
+    tvOS: 0
+  overrideDefaultApplicationIdentifier: 0
+  AndroidBundleVersionCode: 1
+  AndroidMinSdkVersion: 23
+  AndroidTargetSdkVersion: 0
+  AndroidPreferredInstallLocation: 1
+  aotOptions: 
+  stripEngineCode: 1
+  iPhoneStrippingLevel: 0
+  iPhoneScriptCallOptimization: 0
+  ForceInternetPermission: 0
+  ForceSDCardPermission: 0
+  CreateWallpaper: 0
+  androidSplitApplicationBinary: 0
+  keepLoadedShadersAlive: 0
+  StripUnusedMeshComponents: 0
+  strictShaderVariantMatching: 0
+  VertexChannelCompressionMask: 4054
+  iPhoneSdkVersion: 988
+  iOSSimulatorArchitecture: 0
+  iOSTargetOSVersionString: 13.0
+  tvOSSdkVersion: 0
+  tvOSSimulatorArchitecture: 0
+  tvOSRequireExtendedGameController: 0
+  tvOSTargetOSVersionString: 13.0
+  VisionOSSdkVersion: 0
+  VisionOSTargetOSVersionString: 1.0
+  uIPrerenderedIcon: 0
+  uIRequiresPersistentWiFi: 0
+  uIRequiresFullScreen: 1
+  uIStatusBarHidden: 1
+  uIExitOnSuspend: 0
+  uIStatusBarStyle: 0
+  appleTVSplashScreen: {fileID: 0}
+  appleTVSplashScreen2x: {fileID: 0}
+  tvOSSmallIconLayers: []
+  tvOSSmallIconLayers2x: []
+  tvOSLargeIconLayers: []
+  tvOSLargeIconLayers2x: []
+  tvOSTopShelfImageLayers: []
+  tvOSTopShelfImageLayers2x: []
+  tvOSTopShelfImageWideLayers: []
+  tvOSTopShelfImageWideLayers2x: []
+  iOSLaunchScreenType: 0
+  iOSLaunchScreenPortrait: {fileID: 0}
+  iOSLaunchScreenLandscape: {fileID: 0}
+  iOSLaunchScreenBackgroundColor:
+    serializedVersion: 2
+    rgba: 0
+  iOSLaunchScreenFillPct: 100
+  iOSLaunchScreenSize: 100
+  iOSLaunchScreeniPadType: 0
+  iOSLaunchScreeniPadImage: {fileID: 0}
+  iOSLaunchScreeniPadBackgroundColor:
+    serializedVersion: 2
+    rgba: 0
+  iOSLaunchScreeniPadFillPct: 100
+  iOSLaunchScreeniPadSize: 100
+  iOSLaunchScreenCustomStoryboardPath: 
+  iOSLaunchScreeniPadCustomStoryboardPath: 
+  iOSDeviceRequirements: []
+  iOSURLSchemes: []
+  macOSURLSchemes: []
+  iOSBackgroundModes: 0
+  iOSMetalForceHardShadows: 0
+  metalEditorSupport: 1
+  metalAPIValidation: 1
+  metalCompileShaderBinary: 0
+  iOSRenderExtraFrameOnPause: 0
+  iosCopyPluginsCodeInsteadOfSymlink: 0
+  appleDeveloperTeamID: 
+  iOSManualSigningProvisioningProfileID: 
+  tvOSManualSigningProvisioningProfileID: 
+  VisionOSManualSigningProvisioningProfileID: 
+  iOSManualSigningProvisioningProfileType: 0
+  tvOSManualSigningProvisioningProfileType: 0
+  VisionOSManualSigningProvisioningProfileType: 0
+  appleEnableAutomaticSigning: 0
+  iOSRequireARKit: 0
+  iOSAutomaticallyDetectAndAddCapabilities: 1
+  appleEnableProMotion: 0
+  shaderPrecisionModel: 0
+  clonedFromGUID: 00000000000000000000000000000000
+  templatePackageId: 
+  templateDefaultScene: 
+  useCustomMainManifest: 0
+  useCustomLauncherManifest: 0
+  useCustomMainGradleTemplate: 0
+  useCustomLauncherGradleManifest: 0
+  useCustomBaseGradleTemplate: 0
+  useCustomGradlePropertiesTemplate: 0
+  useCustomGradleSettingsTemplate: 0
+  useCustomProguardFile: 0
+  AndroidTargetArchitectures: 2
+  AndroidSplashScreenScale: 0
+  androidSplashScreen: {fileID: 0}
+  AndroidKeystoreName: 
+  AndroidKeyaliasName: 
+  AndroidEnableArmv9SecurityFeatures: 0
+  AndroidEnableArm64MTE: 0
+  AndroidBuildApkPerCpuArchitecture: 0
+  AndroidTVCompatibility: 0
+  AndroidIsGame: 1
+  AndroidEnableTango: 0
+  androidEnableBanner: 1
+  androidUseLowAccuracyLocation: 0
+  androidUseCustomKeystore: 0
+  m_AndroidBanners:
+  - width: 320
+    height: 180
+    banner: {fileID: 0}
+  androidGamepadSupportLevel: 0
+  AndroidMinifyRelease: 0
+  AndroidMinifyDebug: 0
+  AndroidValidateAppBundleSize: 1
+  AndroidAppBundleSizeToValidate: 200
+  AndroidReportGooglePlayAppDependencies: 1
+  androidSymbolsSizeThreshold: 800
+  m_BuildTargetIcons: []
+  m_BuildTargetPlatformIcons: []
+  m_BuildTargetBatching: []
+  m_BuildTargetShaderSettings: []
+  m_BuildTargetGraphicsJobs: []
+  m_BuildTargetGraphicsJobMode: []
+  m_BuildTargetGraphicsAPIs: []
+  m_BuildTargetVRSettings: []
+  m_DefaultShaderChunkSizeInMB: 16
+  m_DefaultShaderChunkCount: 0
+  openGLRequireES31: 0
+  openGLRequireES31AEP: 0
+  openGLRequireES32: 0
+  m_TemplateCustomTags: {}
+  mobileMTRendering:
+    Android: 1
+    VisionOS: 1
+    iPhone: 1
+    tvOS: 1
+  m_BuildTargetGroupLightmapEncodingQuality: []
+  m_BuildTargetGroupLightmapSettings: []
+  m_BuildTargetGroupLoadStoreDebugModeSettings: []
+  m_BuildTargetNormalMapEncoding: []
+  m_BuildTargetDefaultTextureCompressionFormat: []
+  playModeTestRunnerEnabled: 0
+  runPlayModeTestAsEditModeTest: 0
+  actionOnDotNetUnhandledException: 1
+  enableInternalProfiler: 0
+  logObjCUncaughtExceptions: 1
+  enableCrashReportAPI: 0
+  cameraUsageDescription: 
+  locationUsageDescription: 
+  microphoneUsageDescription: 
+  bluetoothUsageDescription: 
+  macOSTargetOSVersion: 11.0
+  switchNMETAOverride: 
+  switchNetLibKey: 
+  switchSocketMemoryPoolSize: 6144
+  switchSocketAllocatorPoolSize: 128
+  switchSocketConcurrencyLimit: 14
+  switchScreenResolutionBehavior: 2
+  switchUseCPUProfiler: 0
+  switchEnableFileSystemTrace: 0
+  switchLTOSetting: 0
+  switchApplicationID: 0x01004b9000490000
+  switchNSODependencies: 
+  switchCompilerFlags: 
+  switchTitleNames_0: 
+  switchTitleNames_1: 
+  switchTitleNames_2: 
+  switchTitleNames_3: 
+  switchTitleNames_4: 
+  switchTitleNames_5: 
+  switchTitleNames_6: 
+  switchTitleNames_7: 
+  switchTitleNames_8: 
+  switchTitleNames_9: 
+  switchTitleNames_10: 
+  switchTitleNames_11: 
+  switchTitleNames_12: 
+  switchTitleNames_13: 
+  switchTitleNames_14: 
+  switchTitleNames_15: 
+  switchPublisherNames_0: 
+  switchPublisherNames_1: 
+  switchPublisherNames_2: 
+  switchPublisherNames_3: 
+  switchPublisherNames_4: 
+  switchPublisherNames_5: 
+  switchPublisherNames_6: 
+  switchPublisherNames_7: 
+  switchPublisherNames_8: 
+  switchPublisherNames_9: 
+  switchPublisherNames_10: 
+  switchPublisherNames_11: 
+  switchPublisherNames_12: 
+  switchPublisherNames_13: 
+  switchPublisherNames_14: 
+  switchPublisherNames_15: 
+  switchIcons_0: {fileID: 0}
+  switchIcons_1: {fileID: 0}
+  switchIcons_2: {fileID: 0}
+  switchIcons_3: {fileID: 0}
+  switchIcons_4: {fileID: 0}
+  switchIcons_5: {fileID: 0}
+  switchIcons_6: {fileID: 0}
+  switchIcons_7: {fileID: 0}
+  switchIcons_8: {fileID: 0}
+  switchIcons_9: {fileID: 0}
+  switchIcons_10: {fileID: 0}
+  switchIcons_11: {fileID: 0}
+  switchIcons_12: {fileID: 0}
+  switchIcons_13: {fileID: 0}
+  switchIcons_14: {fileID: 0}
+  switchIcons_15: {fileID: 0}
+  switchSmallIcons_0: {fileID: 0}
+  switchSmallIcons_1: {fileID: 0}
+  switchSmallIcons_2: {fileID: 0}
+  switchSmallIcons_3: {fileID: 0}
+  switchSmallIcons_4: {fileID: 0}
+  switchSmallIcons_5: {fileID: 0}
+  switchSmallIcons_6: {fileID: 0}
+  switchSmallIcons_7: {fileID: 0}
+  switchSmallIcons_8: {fileID: 0}
+  switchSmallIcons_9: {fileID: 0}
+  switchSmallIcons_10: {fileID: 0}
+  switchSmallIcons_11: {fileID: 0}
+  switchSmallIcons_12: {fileID: 0}
+  switchSmallIcons_13: {fileID: 0}
+  switchSmallIcons_14: {fileID: 0}
+  switchSmallIcons_15: {fileID: 0}
+  switchManualHTML: 
+  switchAccessibleURLs: 
+  switchLegalInformation: 
+  switchMainThreadStackSize: 1048576
+  switchPresenceGroupId: 
+  switchLogoHandling: 0
+  switchReleaseVersion: 0
+  switchDisplayVersion: 1.0.0
+  switchStartupUserAccount: 0
+  switchSupportedLanguagesMask: 0
+  switchLogoType: 0
+  switchApplicationErrorCodeCategory: 
+  switchUserAccountSaveDataSize: 0
+  switchUserAccountSaveDataJournalSize: 0
+  switchApplicationAttribute: 0
+  switchCardSpecSize: -1
+  switchCardSpecClock: -1
+  switchRatingsMask: 0
+  switchRatingsInt_0: 0
+  switchRatingsInt_1: 0
+  switchRatingsInt_2: 0
+  switchRatingsInt_3: 0
+  switchRatingsInt_4: 0
+  switchRatingsInt_5: 0
+  switchRatingsInt_6: 0
+  switchRatingsInt_7: 0
+  switchRatingsInt_8: 0
+  switchRatingsInt_9: 0
+  switchRatingsInt_10: 0
+  switchRatingsInt_11: 0
+  switchRatingsInt_12: 0
+  switchLocalCommunicationIds_0: 
+  switchLocalCommunicationIds_1: 
+  switchLocalCommunicationIds_2: 
+  switchLocalCommunicationIds_3: 
+  switchLocalCommunicationIds_4: 
+  switchLocalCommunicationIds_5: 
+  switchLocalCommunicationIds_6: 
+  switchLocalCommunicationIds_7: 
+  switchParentalControl: 0
+  switchAllowsScreenshot: 1
+  switchAllowsVideoCapturing: 1
+  switchAllowsRuntimeAddOnContentInstall: 0
+  switchDataLossConfirmation: 0
+  switchUserAccountLockEnabled: 0
+  switchSystemResourceMemory: 16777216
+  switchSupportedNpadStyles: 22
+  switchNativeFsCacheSize: 32
+  switchIsHoldTypeHorizontal: 1
+  switchSupportedNpadCount: 8
+  switchEnableTouchScreen: 1
+  switchSocketConfigEnabled: 0
+  switchTcpInitialSendBufferSize: 32
+  switchTcpInitialReceiveBufferSize: 64
+  switchTcpAutoSendBufferSizeMax: 256
+  switchTcpAutoReceiveBufferSizeMax: 256
+  switchUdpSendBufferSize: 9
+  switchUdpReceiveBufferSize: 42
+  switchSocketBufferEfficiency: 4
+  switchSocketInitializeEnabled: 1
+  switchNetworkInterfaceManagerInitializeEnabled: 1
+  switchDisableHTCSPlayerConnection: 0
+  switchUseNewStyleFilepaths: 1
+  switchUseLegacyFmodPriorities: 0
+  switchUseMicroSleepForYield: 1
+  switchEnableRamDiskSupport: 0
+  switchMicroSleepForYieldTime: 25
+  switchRamDiskSpaceSize: 12
+  switchUpgradedPlayerSettingsToNMETA: 0
+  ps4NPAgeRating: 12
+  ps4NPTitleSecret: 
+  ps4NPTrophyPackPath: 
+  ps4ParentalLevel: 11
+  ps4ContentID: ED1633-NPXX51362_00-0000000000000000
+  ps4Category: 0
+  ps4MasterVersion: 01.00
+  ps4AppVersion: 01.00
+  ps4AppType: 0
+  ps4ParamSfxPath: 
+  ps4VideoOutPixelFormat: 0
+  ps4VideoOutInitialWidth: 1920
+  ps4VideoOutBaseModeInitialWidth: 1920
+  ps4VideoOutReprojectionRate: 60
+  ps4PronunciationXMLPath: 
+  ps4PronunciationSIGPath: 
+  ps4BackgroundImagePath: 
+  ps4StartupImagePath: 
+  ps4StartupImagesFolder: 
+  ps4IconImagesFolder: 
+  ps4SaveDataImagePath: 
+  ps4SdkOverride: 
+  ps4BGMPath: 
+  ps4ShareFilePath: 
+  ps4ShareOverlayImagePath: 
+  ps4PrivacyGuardImagePath: 
+  ps4ExtraSceSysFile: 
+  ps4NPtitleDatPath: 
+  ps4RemotePlayKeyAssignment: -1
+  ps4RemotePlayKeyMappingDir: 
+  ps4PlayTogetherPlayerCount: 0
+  ps4EnterButtonAssignment: 2
+  ps4ApplicationParam1: 0
+  ps4ApplicationParam2: 0
+  ps4ApplicationParam3: 0
+  ps4ApplicationParam4: 0
+  ps4DownloadDataSize: 0
+  ps4GarlicHeapSize: 2048
+  ps4ProGarlicHeapSize: 2560
+  playerPrefsMaxSize: 32768
+  ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
+  ps4pnSessions: 1
+  ps4pnPresence: 1
+  ps4pnFriends: 1
+  ps4pnGameCustomData: 1
+  playerPrefsSupport: 0
+  enableApplicationExit: 0
+  resetTempFolder: 1
+  restrictedAudioUsageRights: 0
+  ps4UseResolutionFallback: 0
+  ps4ReprojectionSupport: 0
+  ps4UseAudio3dBackend: 0
+  ps4UseLowGarlicFragmentationMode: 1
+  ps4SocialScreenEnabled: 0
+  ps4ScriptOptimizationLevel: 2
+  ps4Audio3dVirtualSpeakerCount: 14
+  ps4attribCpuUsage: 0
+  ps4PatchPkgPath: 
+  ps4PatchLatestPkgPath: 
+  ps4PatchChangeinfoPath: 
+  ps4PatchDayOne: 0
+  ps4attribUserManagement: 0
+  ps4attribMoveSupport: 0
+  ps4attrib3DSupport: 0
+  ps4attribShareSupport: 0
+  ps4attribExclusiveVR: 0
+  ps4disableAutoHideSplash: 0
+  ps4videoRecordingFeaturesUsed: 0
+  ps4contentSearchFeaturesUsed: 0
+  ps4CompatibilityPS5: 0
+  ps4AllowPS5Detection: 0
+  ps4GPU800MHz: 1
+  ps4attribEyeToEyeDistanceSettingVR: 0
+  ps4IncludedModules: []
+  ps4attribVROutputEnabled: 0
+  monoEnv: 
+  splashScreenBackgroundSourceLandscape: {fileID: 0}
+  splashScreenBackgroundSourcePortrait: {fileID: 0}
+  blurSplashScreenBackground: 1
+  spritePackerPolicy: 
+  webGLMemorySize: 32
+  webGLExceptionSupport: 1
+  webGLNameFilesAsHashes: 0
+  webGLShowDiagnostics: 0
+  webGLDataCaching: 1
+  webGLDebugSymbols: 0
+  webGLEmscriptenArgs: 
+  webGLModulesDirectory: 
+  webGLTemplate: APPLICATION:Default
+  webGLAnalyzeBuildSize: 0
+  webGLUseEmbeddedResources: 0
+  webGLCompressionFormat: 1
+  webGLWasmArithmeticExceptions: 0
+  webGLLinkerTarget: 1
+  webGLThreadsSupport: 0
+  webGLDecompressionFallback: 0
+  webGLInitialMemorySize: 32
+  webGLMaximumMemorySize: 2048
+  webGLMemoryGrowthMode: 2
+  webGLMemoryLinearGrowthStep: 16
+  webGLMemoryGeometricGrowthStep: 0.2
+  webGLMemoryGeometricGrowthCap: 96
+  webGLEnableWebGPU: 0
+  webGLPowerPreference: 2
+  webGLWebAssemblyTable: 0
+  webGLWebAssemblyBigInt: 0
+  webGLCloseOnQuit: 0
+  webWasm2023: 0
+  scriptingDefineSymbols: {}
+  additionalCompilerArguments: {}
+  platformArchitecture: {}
+  scriptingBackend: {}
+  il2cppCompilerConfiguration: {}
+  il2cppCodeGeneration: {}
+  il2cppStacktraceInformation: {}
+  managedStrippingLevel: {}
+  incrementalIl2cppBuild: {}
+  suppressCommonWarnings: 1
+  allowUnsafeCode: 0
+  useDeterministicCompilation: 1
+  additionalIl2CppArgs: 
+  scriptingRuntimeVersion: 1
+  gcIncremental: 1
+  gcWBarrierValidation: 0
+  apiCompatibilityLevelPerPlatform: {}
+  editorAssembliesCompatibilityLevel: 1
+  m_RenderingPath: 1
+  m_MobileRenderingPath: 1
+  metroPackageName: CharacterControllerMovingBodies
+  metroPackageVersion: 1.0.0.0
+  metroCertificatePath: 
+  metroCertificatePassword: 
+  metroCertificateSubject: 
+  metroCertificateIssuer: 
+  metroCertificateNotAfter: 0000000000000000
+  metroApplicationDescription: CharacterControllerMovingBodies
+  wsaImages: {}
+  metroTileShortName: CharacterControllerMovingBodies
+  metroTileShowName: 0
+  metroMediumTileShowName: 0
+  metroLargeTileShowName: 0
+  metroWideTileShowName: 0
+  metroSupportStreamingInstall: 0
+  metroLastRequiredScene: 0
+  metroDefaultTileSize: 1
+  metroTileForegroundText: 2
+  metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0}
+  metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1}
+  metroSplashScreenUseBackgroundColor: 0
+  syncCapabilities: 0
+  platformCapabilities: {}
+  metroTargetDeviceFamilies: {}
+  metroFTAName: 
+  metroFTAFileTypes: []
+  metroProtocolName: 
+  vcxProjDefaultLanguage: 
+  XboxOneProductId: 
+  XboxOneUpdateKey: 
+  XboxOneSandboxId: 
+  XboxOneContentId: 
+  XboxOneTitleId: 
+  XboxOneSCId: 
+  XboxOneGameOsOverridePath: 
+  XboxOnePackagingOverridePath: 
+  XboxOneAppManifestOverridePath: 
+  XboxOneVersion: 1.0.0.0
+  XboxOnePackageEncryption: 0
+  XboxOnePackageUpdateGranularity: 2
+  XboxOneDescription: 
+  XboxOneLanguage:
+  - enus
+  XboxOneCapability: []
+  XboxOneGameRating: {}
+  XboxOneIsContentPackage: 0
+  XboxOneEnhancedXboxCompatibilityMode: 0
+  XboxOneEnableGPUVariability: 1
+  XboxOneSockets: {}
+  XboxOneSplashScreen: {fileID: 0}
+  XboxOneAllowedProductIds: []
+  XboxOnePersistentLocalStorageSize: 0
+  XboxOneXTitleMemory: 8
+  XboxOneOverrideIdentityName: 
+  XboxOneOverrideIdentityPublisher: 
+  vrEditorSettings: {}
+  cloudServicesEnabled: {}
+  luminIcon:
+    m_Name: 
+    m_ModelFolderPath: 
+    m_PortalFolderPath: 
+  luminCert:
+    m_CertPath: 
+    m_SignPackage: 1
+  luminIsChannelApp: 0
+  luminVersion:
+    m_VersionCode: 1
+    m_VersionName: 
+  hmiPlayerDataPath: 
+  hmiForceSRGBBlit: 0
+  embeddedLinuxEnableGamepadInput: 0
+  hmiCpuConfiguration: 
+  hmiLogStartupTiming: 0
+  qnxGraphicConfPath: 
+  apiCompatibilityLevel: 6
+  captureStartupLogs: {}
+  activeInputHandler: 0
+  windowsGamepadBackendHint: 0
+  cloudProjectId: 
+  framebufferDepthMemorylessMode: 0
+  qualitySettingsNames: []
+  projectName: 
+  organizationId: 
+  cloudEnabled: 0
+  legacyClampBlendShapeWeights: 0
+  hmiLoadingImage: {fileID: 0}
+  platformRequiresReadableAssets: 0
+  virtualTexturingSupportEnabled: 0
+  insecureHttpOption: 0
+  androidVulkanDenyFilterList: []
+  androidVulkanAllowFilterList: []
diff --git a/Examples/CharacterControllerMovingBodies/Readme.md b/Examples/CharacterControllerMovingBodies/Readme.md
new file mode 100644
index 0000000000..2403b27a35
--- /dev/null
+++ b/Examples/CharacterControllerMovingBodies/Readme.md
@@ -0,0 +1,27 @@
+# Netcode for GameObjects Smooth Transform Space Transitions
+## Non-Rigidbody CharacterController Parenting with Moving Bodies
+![image](https://github.com/user-attachments/assets/096953ca-5d7d-40d5-916b-72212575d258)
+This example provides you with the fundamental building blocks for smooth synchronized transitions between two non-rigidbody based objects. This includes transitioning from world to local, local to world, and local to local transform spaces. 
+
+### The `CharacterController`
+![image](https://github.com/user-attachments/assets/13c627bd-920d-40c8-8947-69aa37b44ebf)
+The `CharacterController` component is assigned to the `PlayerNoRigidbody` player prefab. It includes a `MoverScriptNoRigidbody` that handles all of the player's motion and includes some additional "non-rigidbody to non-rigidbody" collision handling logic that is applied when a player bumps into a rotation and/or moving body. The player prefab includes a child "PlayerBallPrime" that rotates around the player in local space (nested `NetworkTransform`), and the "PlayerBallPrime" has 3 children ("PlayerBallChild1-3") that each rotates around a different axis of the "PlayerBallPrime". While the end resulting effect is kind of cool looking, they provide a point of reference as to whether there is any deviation of each child's given axial path relative to each parent level. Additionally, it shows how tick synchronized nested `NetworkTransform` components keep synchronized with their parent and how that persists when the parent is parented or has its parent removed.
+
+### Rotating Bodies
+#### StationaryBodyA&B
+The stationary bodies are representative of changing the parenting of a `NetworkObject` between two `NetworkObject` instances while remaining in local space, interpolating, and smoothly transitioning between the two parents.
+![image](https://github.com/user-attachments/assets/1b234fdc-efc9-4053-a947-531c4fe5dd96)
+
+#### RotatingBody
+The RotatingBody are just provide an example of a rotating non-Rigidbody object and one way to handle a rotation based collision. This also tests world to local and local to world transform space updates.
+![image](https://github.com/user-attachments/assets/f5da2374-08b6-4eeb-9a4a-cddc67ecb33b)
+
+#### MovingRotatingBody & ElevatorBody
+Both of these bodies use a simple path to follow.
+The MovingRotatingBody moves between two points on the world Z-axis and rotates while moving. The ElevatorBody moves between 4 points (forming a rectangular path) to show motion on more than one axis.
+![image](https://github.com/user-attachments/assets/146912eb-0dcc-4089-a6ba-3e0dbb51fd4e)
+
+
+### Example Limitations
+This example is primarily to provide a starting point for anyone interested in exploring a non-Rigidbody motion based project and is not to be considered a full working solution but more of a place to start. As an example. you might notice there is no consideration of Y-axis motion when on the elevator so it impacts the `MoverScriptNoRigidbody` jumping. This could be extended to take into consideration the bodies within the `RotatingBodyLogic` script that would increase the upward velocity amount when on a moving body that does move in the Y Axis. This could be further extended by adding a `MonoBehaviour` component to the path points that define its direction of movement or by a normalized direction vector between points to determine the movement of the body. These kind of details are left up to you to determine what style best fits your project.
+
diff --git a/Examples/OverridingScenesAndPrefabs/.gitignore b/Examples/OverridingScenesAndPrefabs/.gitignore
new file mode 100644
index 0000000000..2800399634
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/.gitignore
@@ -0,0 +1,83 @@
+# This .gitignore file should be placed at the root of your Unity project directory
+#
+# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
+#
+/[Ll]ibrary/
+/[Tt]emp/
+/[Oo]bj/
+/[Bb]uild/
+/[Bb]uilds/
+/[Ll]ogs/
+/[Uu]ser[Ss]ettings/
+
+# MemoryCaptures can get excessive in size.
+# They also could contain extremely sensitive data
+/[Mm]emoryCaptures/
+
+# Asset meta data should only be ignored when the corresponding asset is also ignored
+!/[Aa]ssets/**/*.meta
+
+# Uncomment this line if you wish to ignore the asset store tools plugin
+# /[Aa]ssets/AssetStoreTools*
+
+# Autogenerated Jetbrains Rider plugin
+/[Aa]ssets/Plugins/Editor/JetBrains*
+
+# Visual Studio cache directory
+.vs/
+
+# Gradle cache directory
+.gradle/
+
+# Autogenerated VS/MD/Consulo solution and project files
+ExportedObj/
+.consulo/
+*.csproj
+*.unityproj
+*.sln
+*.suo
+*.tmp
+*.user
+*.userprefs
+*.pidb
+*.booproj
+*.svd
+*.pdb
+*.mdb
+*.opendb
+*.VC.db
+
+# Unity3D generated meta files
+*.pidb.meta
+*.pdb.meta
+*.mdb.meta
+
+# Unity3D generated file on crash reports
+sysinfo.txt
+
+# Builds
+*.apk
+*.aab
+*.unitypackage
+
+# Crashlytics generated file
+crashlytics-build.properties
+
+# Packed Addressables
+/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
+
+# Temporary auto-generated Android Assets
+/[Aa]ssets/[Ss]treamingAssets/aa.meta
+/[Aa]ssets/[Ss]treamingAssets/aa/*
+/[Aa]ssets/[Ss]treamingAssets/BuildInfo.json
+/[Aa]ssets/[Ss]treamingAssets/BuildInfo.json.meta
+
+# Secrets
+*.pem
+*.pem.meta
+
+InitTestScene*
+
+boot.config
+SceneTemplateSettings.json
+*BurstAotSettings*.json
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/DefaultNetworkPrefabs.asset b/Examples/OverridingScenesAndPrefabs/Assets/DefaultNetworkPrefabs.asset
new file mode 100644
index 0000000000..56426e31b7
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/DefaultNetworkPrefabs.asset
@@ -0,0 +1,46 @@
+%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: DefaultNetworkPrefabs
+  m_EditorClassIdentifier: 
+  IsDefault: 1
+  List:
+  - Override: 0
+    Prefab: {fileID: 8921789205124766477, guid: a279f80620d4e6a4ab02c1a9c96ff460, type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
+  - Override: 0
+    Prefab: {fileID: 5415449980466536476, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
+  - Override: 0
+    Prefab: {fileID: 8921789205124766477, guid: 8ae02ac62e2067144b8ff06d48aeb47a, type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
+  - Override: 0
+    Prefab: {fileID: 3439633038736912633, guid: 398aad09d8b2a47eba664a076763cdcc, type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
+  - Override: 0
+    Prefab: {fileID: 4710599683293591777, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
+  - Override: 0
+    Prefab: {fileID: 6472733969592893139, guid: 3e5167b6e6bcb5645abb2dbc0078091e, type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/DefaultNetworkPrefabs.asset.meta b/Examples/OverridingScenesAndPrefabs/Assets/DefaultNetworkPrefabs.asset.meta
new file mode 100644
index 0000000000..fee27b3ade
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/DefaultNetworkPrefabs.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: aa82390bfdde2564f828b8e5be375282
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Materials.meta b/Examples/OverridingScenesAndPrefabs/Assets/Materials.meta
new file mode 100644
index 0000000000..463de70d61
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Materials.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d5b7ad71451c27e4291295cfffc10328
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Materials/ChildLocal.mat b/Examples/OverridingScenesAndPrefabs/Assets/Materials/ChildLocal.mat
new file mode 100644
index 0000000000..b6fd2dd9a1
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Materials/ChildLocal.mat
@@ -0,0 +1,86 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ChildLocal
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _ALPHAPREMULTIPLY_ON
+  - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 3
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 1
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0.8980392, g: 0.039215658, b: 0.7682729, a: 0.2509804}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Materials/ChildLocal.mat.meta b/Examples/OverridingScenesAndPrefabs/Assets/Materials/ChildLocal.mat.meta
new file mode 100644
index 0000000000..35e4d565be
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Materials/ChildLocal.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 45fc555bc05bfee4ab8b0d536799ecee
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Materials/ChildLocalNoParentSync.mat b/Examples/OverridingScenesAndPrefabs/Assets/Materials/ChildLocalNoParentSync.mat
new file mode 100644
index 0000000000..c44172e7a7
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Materials/ChildLocalNoParentSync.mat
@@ -0,0 +1,86 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ChildLocalNoParentSync
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _ALPHAPREMULTIPLY_ON
+  - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 3
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 1
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0.039215658, g: 0.78592235, b: 0.8980392, a: 0.2509804}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Materials/ChildLocalNoParentSync.mat.meta b/Examples/OverridingScenesAndPrefabs/Assets/Materials/ChildLocalNoParentSync.mat.meta
new file mode 100644
index 0000000000..3a26e43d98
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Materials/ChildLocalNoParentSync.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: affef70511a06dd46b8f52636020af4a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Materials/ChildWorld.mat b/Examples/OverridingScenesAndPrefabs/Assets/Materials/ChildWorld.mat
new file mode 100644
index 0000000000..0c2bf4b187
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Materials/ChildWorld.mat
@@ -0,0 +1,86 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ChildWorld
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _ALPHAPREMULTIPLY_ON
+  - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 3
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 1
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0.3783494, g: 0.039215658, b: 0.8980392, a: 0.2509804}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Materials/ChildWorld.mat.meta b/Examples/OverridingScenesAndPrefabs/Assets/Materials/ChildWorld.mat.meta
new file mode 100644
index 0000000000..9a00ded8c6
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Materials/ChildWorld.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 15d0bda12a233964086aee5c0c357e24
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Materials/ChildWorldNoParentSync.mat b/Examples/OverridingScenesAndPrefabs/Assets/Materials/ChildWorldNoParentSync.mat
new file mode 100644
index 0000000000..86b27eb5c9
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Materials/ChildWorldNoParentSync.mat
@@ -0,0 +1,86 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ChildWorldNoParentSync
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _ALPHAPREMULTIPLY_ON
+  - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 3
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 1
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0.039215658, g: 0.8980392, b: 0.09095798, a: 0.2509804}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Materials/ChildWorldNoParentSync.mat.meta b/Examples/OverridingScenesAndPrefabs/Assets/Materials/ChildWorldNoParentSync.mat.meta
new file mode 100644
index 0000000000..5ab7ff2e72
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Materials/ChildWorldNoParentSync.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a5e199307b2e0894294d9c8bee99a691
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Materials/Direction.mat b/Examples/OverridingScenesAndPrefabs/Assets/Materials/Direction.mat
new file mode 100644
index 0000000000..ed5ed117c3
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Materials/Direction.mat
@@ -0,0 +1,84 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Direction
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 1
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.8962264, g: 0.52830994, b: 0.038047332, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Materials/Direction.mat.meta b/Examples/OverridingScenesAndPrefabs/Assets/Materials/Direction.mat.meta
new file mode 100644
index 0000000000..c93791fac0
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Materials/Direction.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5324c76c2bab7344badd5ea27a40bcb5
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Materials/GridBlue.mat b/Examples/OverridingScenesAndPrefabs/Assets/Materials/GridBlue.mat
new file mode 100644
index 0000000000..9009817e26
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Materials/GridBlue.mat
@@ -0,0 +1,138 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-2624353793879203111
+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: 7
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: GridBlue
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _EMISSION
+  - _GLOSSYREFLECTIONS_OFF
+  - _NORMALMAP
+  m_InvalidKeywords: []
+  m_LightmapFlags: 2
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 2800000, guid: b94463ba36040ec4082132c54dd1bbad, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 2800000, guid: 8bf2cf149563066489e749ea032dbca7, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: e71f43865e91e6b418bd0d67be2445dc, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 1
+    - _Glossiness: 0.477
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 0
+    - _Parallax: 0.02
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _UVSec: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 0.5438323, g: 0.88474977, b: 0.9528302, a: 1}
+    - _EmissionColor: {r: 0, g: 0.6988592, b: 1, a: 1}
+    - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Materials/GridBlue.mat.meta b/Examples/OverridingScenesAndPrefabs/Assets/Materials/GridBlue.mat.meta
new file mode 100644
index 0000000000..b8caf3cbac
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Materials/GridBlue.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1448a5da57523ce4bbc377143e02fe3c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Materials/GridOrange.mat b/Examples/OverridingScenesAndPrefabs/Assets/Materials/GridOrange.mat
new file mode 100644
index 0000000000..38a4e9808b
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Materials/GridOrange.mat
@@ -0,0 +1,138 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-2624353793879203111
+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: 7
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: GridOrange
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _EMISSION
+  - _GLOSSYREFLECTIONS_OFF
+  - _NORMALMAP
+  m_InvalidKeywords: []
+  m_LightmapFlags: 2
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 2800000, guid: b94463ba36040ec4082132c54dd1bbad, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 2800000, guid: 8bf2cf149563066489e749ea032dbca7, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: e71f43865e91e6b418bd0d67be2445dc, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 1
+    - _Glossiness: 0.477
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 0
+    - _Parallax: 0.02
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _UVSec: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 0.49475378, b: 0, a: 1}
+    - _EmissionColor: {r: 0.990566, g: 0.48359674, b: 0.378471, a: 1}
+    - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Materials/GridOrange.mat.meta b/Examples/OverridingScenesAndPrefabs/Assets/Materials/GridOrange.mat.meta
new file mode 100644
index 0000000000..bf2873069e
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Materials/GridOrange.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2e2c886f4af8e304eb9a1e2e50d023b3
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Materials/GridPattern.mat b/Examples/OverridingScenesAndPrefabs/Assets/Materials/GridPattern.mat
new file mode 100644
index 0000000000..f44981f387
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Materials/GridPattern.mat
@@ -0,0 +1,85 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: GridPattern
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _GLOSSYREFLECTIONS_OFF
+  - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 1
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 6, y: 6}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: a092c5fa8c60ed04aa1d72555f1740bc, type: 3}
+        m_Scale: {x: 6, y: 6}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0.785
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 1
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0.254717, g: 0.23188858, b: 0.23188858, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Materials/GridPattern.mat.meta b/Examples/OverridingScenesAndPrefabs/Assets/Materials/GridPattern.mat.meta
new file mode 100644
index 0000000000..cbca0f4485
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Materials/GridPattern.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 42c4a0ad1f9d67a45b12f68697321aad
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Materials/GridWhite.mat b/Examples/OverridingScenesAndPrefabs/Assets/Materials/GridWhite.mat
new file mode 100644
index 0000000000..6e1b52a2c0
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Materials/GridWhite.mat
@@ -0,0 +1,138 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-2624353793879203111
+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: 7
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: GridWhite
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _EMISSION
+  - _GLOSSYREFLECTIONS_OFF
+  - _NORMALMAP
+  m_InvalidKeywords: []
+  m_LightmapFlags: 2
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 2800000, guid: b94463ba36040ec4082132c54dd1bbad, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 2800000, guid: 8bf2cf149563066489e749ea032dbca7, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0.03}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 844faea9c35b2464c8ecb09f66e2e2f8, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0.03}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0.24
+    - _Glossiness: 0.846
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 0
+    - _Parallax: 0.02
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _UVSec: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Materials/GridWhite.mat.meta b/Examples/OverridingScenesAndPrefabs/Assets/Materials/GridWhite.mat.meta
new file mode 100644
index 0000000000..4559482bba
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Materials/GridWhite.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a53ba8919fa78c14caac473c7e7ce7d3
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Materials/Ground.mat b/Examples/OverridingScenesAndPrefabs/Assets/Materials/Ground.mat
new file mode 100644
index 0000000000..252ea1a0ed
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Materials/Ground.mat
@@ -0,0 +1,79 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Ground
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.14769986, g: 0.1509434, b: 0.1473834, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Materials/Ground.mat.meta b/Examples/OverridingScenesAndPrefabs/Assets/Materials/Ground.mat.meta
new file mode 100644
index 0000000000..6dbcac16d3
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Materials/Ground.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9c73b921ea39f4344a19c2d1c7d6b314
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Materials/PlayerMaterial.mat b/Examples/OverridingScenesAndPrefabs/Assets/Materials/PlayerMaterial.mat
new file mode 100644
index 0000000000..bc67e92539
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Materials/PlayerMaterial.mat
@@ -0,0 +1,84 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: PlayerMaterial
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
+  m_AllowLocking: 1
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Materials/PlayerMaterial.mat.meta b/Examples/OverridingScenesAndPrefabs/Assets/Materials/PlayerMaterial.mat.meta
new file mode 100644
index 0000000000..1ceca58536
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Materials/PlayerMaterial.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 44e292334941fe148b997ca2b01b5789
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Materials/ShaderGraphGrid_01_Mat.mat b/Examples/OverridingScenesAndPrefabs/Assets/Materials/ShaderGraphGrid_01_Mat.mat
new file mode 100644
index 0000000000..5161ac9b8e
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Materials/ShaderGraphGrid_01_Mat.mat
@@ -0,0 +1,134 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ShaderGraphGrid_01_Mat
+  m_Shader: {fileID: -6465566751694194690, guid: b8d7679189d4a5940af46004f3870920, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - Texture2D_C5E3E723:
+        m_Texture: {fileID: 2800000, guid: d4d6919451fe3e24388816386a6d15a4, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Grid_Normal_Map:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: d9c0dd5cdac07b145be73329e489869a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0.004, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - Boolean_35A71344: 0
+    - Boolean_7A5F3F39: 1
+    - Boolean_7AC8D832: 1
+    - Vector1_3402D67A: 1
+    - Vector1_3655428E: 5
+    - Vector1_5B05FA1F: 0.062
+    - Vector1_6B67A8FF: -20
+    - Vector1_7810F718: 1
+    - Vector1_B6126E6E: 0.335
+    - Vector1_CA7D5F3: 30
+    - Vector1_D5FBE925: 0.3
+    - Vector1_F2A922B4: 1.73
+    - Vector1_F5FD9210: 33.9
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.119
+    - _GlossyReflections: 1
+    - _Grid_Normal_Strength: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 0
+    - _Parallax: 0.02
+    - _QueueControl: 0
+    - _QueueOffset: 0
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - Color_2B671050: {r: 0.23202202, g: 0.6245157, b: 0.745283, a: 0}
+    - Color_30A0CA2F: {r: 0.02745098, g: 1, b: 0.7565653, a: 0}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
+--- !u!114 &6450197988115792188
+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: 7
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Materials/ShaderGraphGrid_01_Mat.mat.meta b/Examples/OverridingScenesAndPrefabs/Assets/Materials/ShaderGraphGrid_01_Mat.mat.meta
new file mode 100644
index 0000000000..efd03db61f
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Materials/ShaderGraphGrid_01_Mat.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7be68f3cac640fd40a7663ac97380a9c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Models.meta b/Examples/OverridingScenesAndPrefabs/Assets/Models.meta
new file mode 100644
index 0000000000..21910d8d7a
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Models.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bd50c879f39d9d94b92706513b4f56ef
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Models/Ramp_100x100x200_Mesh.fbx b/Examples/OverridingScenesAndPrefabs/Assets/Models/Ramp_100x100x200_Mesh.fbx
new file mode 100644
index 0000000000..2fa479b052
Binary files /dev/null and b/Examples/OverridingScenesAndPrefabs/Assets/Models/Ramp_100x100x200_Mesh.fbx differ
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Models/Ramp_100x100x200_Mesh.fbx.meta b/Examples/OverridingScenesAndPrefabs/Assets/Models/Ramp_100x100x200_Mesh.fbx.meta
new file mode 100644
index 0000000000..2ebb0bb69b
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Models/Ramp_100x100x200_Mesh.fbx.meta
@@ -0,0 +1,107 @@
+fileFormatVersion: 2
+guid: 4c31b0c9eb3dcdf4890cd904bf277cdf
+ModelImporter:
+  serializedVersion: 22200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Models/Ramp_Mesh.fbx b/Examples/OverridingScenesAndPrefabs/Assets/Models/Ramp_Mesh.fbx
new file mode 100644
index 0000000000..ac24ee24d6
Binary files /dev/null and b/Examples/OverridingScenesAndPrefabs/Assets/Models/Ramp_Mesh.fbx differ
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Models/Ramp_Mesh.fbx.meta b/Examples/OverridingScenesAndPrefabs/Assets/Models/Ramp_Mesh.fbx.meta
new file mode 100644
index 0000000000..f9aabd0c03
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Models/Ramp_Mesh.fbx.meta
@@ -0,0 +1,107 @@
+fileFormatVersion: 2
+guid: 5d8449220d5795b448a4cee5cbde4b56
+ModelImporter:
+  serializedVersion: 22200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Models/Tunnel_Mesh.fbx b/Examples/OverridingScenesAndPrefabs/Assets/Models/Tunnel_Mesh.fbx
new file mode 100644
index 0000000000..7ec9d4bb74
Binary files /dev/null and b/Examples/OverridingScenesAndPrefabs/Assets/Models/Tunnel_Mesh.fbx differ
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Models/Tunnel_Mesh.fbx.meta b/Examples/OverridingScenesAndPrefabs/Assets/Models/Tunnel_Mesh.fbx.meta
new file mode 100644
index 0000000000..75c9997470
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Models/Tunnel_Mesh.fbx.meta
@@ -0,0 +1,107 @@
+fileFormatVersion: 2
+guid: 63fcabcd345d556498e09f748683088e
+ModelImporter:
+  serializedVersion: 22200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Models/Wall_Mesh.fbx b/Examples/OverridingScenesAndPrefabs/Assets/Models/Wall_Mesh.fbx
new file mode 100644
index 0000000000..0bfc7f6493
Binary files /dev/null and b/Examples/OverridingScenesAndPrefabs/Assets/Models/Wall_Mesh.fbx differ
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Models/Wall_Mesh.fbx.meta b/Examples/OverridingScenesAndPrefabs/Assets/Models/Wall_Mesh.fbx.meta
new file mode 100644
index 0000000000..15452589e0
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Models/Wall_Mesh.fbx.meta
@@ -0,0 +1,107 @@
+fileFormatVersion: 2
+guid: 34560503bf9d61046b252db98a8cf770
+ModelImporter:
+  serializedVersion: 22200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Prefabs.meta b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs.meta
new file mode 100644
index 0000000000..c867cd3a70
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4b97118ef11ec3347bc72b8d681e094b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/ClientPlayer.prefab b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/ClientPlayer.prefab
new file mode 100644
index 0000000000..78723f0b08
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/ClientPlayer.prefab
@@ -0,0 +1,468 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &1768978093373392434
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4710599683293591777, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      propertyPath: m_Name
+      value: ClientPlayer
+      objectReference: {fileID: 0}
+    - target: {fileID: 5488962521685982563, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      propertyPath: GlobalObjectIdHash
+      value: 3304021165
+      objectReference: {fileID: 0}
+    - target: {fileID: 6582615468703263770, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      propertyPath: GlobalObjectIdHash
+      value: 3304021165
+      objectReference: {fileID: 0}
+    - target: {fileID: 7209693128479548322, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7209693128479548322, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7209693128479548322, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7209693128479548322, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7209693128479548322, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7209693128479548322, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7209693128479548322, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7209693128479548322, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7209693128479548322, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7209693128479548322, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 4710599683293591777, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 916832828106534790}
+    - targetCorrespondingSourceObject: {fileID: 4710599683293591777, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 4315296084954952915}
+    - targetCorrespondingSourceObject: {fileID: 4710599683293591777, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 8226639525103180092}
+    - targetCorrespondingSourceObject: {fileID: 3385537716926926172, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      insertIndex: 1
+      addedObject: {fileID: 1499413778802221178}
+    - targetCorrespondingSourceObject: {fileID: 3385537716926926172, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      insertIndex: 2
+      addedObject: {fileID: 3977729948622378772}
+    - targetCorrespondingSourceObject: {fileID: 9153294333356437960, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      insertIndex: 1
+      addedObject: {fileID: 1444122194983607567}
+    - targetCorrespondingSourceObject: {fileID: 9153294333356437960, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      insertIndex: 2
+      addedObject: {fileID: 2160506865115608745}
+    - targetCorrespondingSourceObject: {fileID: 324680519892629439, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      insertIndex: 1
+      addedObject: {fileID: 204575060996785653}
+    - targetCorrespondingSourceObject: {fileID: 324680519892629439, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      insertIndex: 2
+      addedObject: {fileID: 544477718306327008}
+    - targetCorrespondingSourceObject: {fileID: 1574061277261592297, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      insertIndex: 1
+      addedObject: {fileID: 8023734133310089212}
+    - targetCorrespondingSourceObject: {fileID: 1574061277261592297, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      insertIndex: 2
+      addedObject: {fileID: 5358980426924378504}
+    - targetCorrespondingSourceObject: {fileID: 7170742296219383225, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      insertIndex: 1
+      addedObject: {fileID: 8116266233139283823}
+    - targetCorrespondingSourceObject: {fileID: 7170742296219383225, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+      insertIndex: 2
+      addedObject: {fileID: 6061467578651748175}
+  m_SourcePrefab: {fileID: 100100000, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+--- !u!1 &960564489074766043 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1574061277261592297, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+  m_PrefabInstance: {fileID: 1768978093373392434}
+  m_PrefabAsset: {fileID: 0}
+--- !u!33 &8023734133310089212
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 960564489074766043}
+  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &5358980426924378504
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 960564489074766043}
+  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: a53ba8919fa78c14caac473c7e7ce7d3, 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!1 &2021503815370961293 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 324680519892629439, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+  m_PrefabInstance: {fileID: 1768978093373392434}
+  m_PrefabAsset: {fileID: 0}
+--- !u!33 &204575060996785653
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2021503815370961293}
+  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &544477718306327008
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2021503815370961293}
+  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: a53ba8919fa78c14caac473c7e7ce7d3, 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!1 &3924733872325380974 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3385537716926926172, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+  m_PrefabInstance: {fileID: 1768978093373392434}
+  m_PrefabAsset: {fileID: 0}
+--- !u!33 &1499413778802221178
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3924733872325380974}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &3977729948622378772
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3924733872325380974}
+  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: 5324c76c2bab7344badd5ea27a40bcb5, 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!1 &6472733969592893139 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4710599683293591777, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+  m_PrefabInstance: {fileID: 1768978093373392434}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &916832828106534790
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6472733969592893139}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bb9a9987a689bbe43a05463cf3713b22, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ServerOnly: 0
+  UniqueLocalInstanceContent: ' Local content specific to ClientPlayer'
+--- !u!33 &4315296084954952915
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6472733969592893139}
+  m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &8226639525103180092
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6472733969592893139}
+  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: a53ba8919fa78c14caac473c7e7ce7d3, 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!1 &7461238108046391290 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 9153294333356437960, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+  m_PrefabInstance: {fileID: 1768978093373392434}
+  m_PrefabAsset: {fileID: 0}
+--- !u!33 &1444122194983607567
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7461238108046391290}
+  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &2160506865115608745
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7461238108046391290}
+  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: a53ba8919fa78c14caac473c7e7ce7d3, 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!1 &8867363453312856971 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7170742296219383225, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+  m_PrefabInstance: {fileID: 1768978093373392434}
+  m_PrefabAsset: {fileID: 0}
+--- !u!33 &8116266233139283823
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8867363453312856971}
+  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &6061467578651748175
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8867363453312856971}
+  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: a53ba8919fa78c14caac473c7e7ce7d3, 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}
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/ClientPlayer.prefab.meta b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/ClientPlayer.prefab.meta
new file mode 100644
index 0000000000..75b0f6a314
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/ClientPlayer.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3e5167b6e6bcb5645abb2dbc0078091e
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/Floor.physicMaterial b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/Floor.physicMaterial
new file mode 100644
index 0000000000..5aeefdde15
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/Floor.physicMaterial
@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!134 &13400000
+PhysicsMaterial:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Floor
+  serializedVersion: 2
+  m_DynamicFriction: 2.5
+  m_StaticFriction: 2
+  m_Bounciness: 0
+  m_FrictionCombine: 3
+  m_BounceCombine: 2
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/Floor.physicMaterial.meta b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/Floor.physicMaterial.meta
new file mode 100644
index 0000000000..a55550d94a
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/Floor.physicMaterial.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2c574f6ade946d94f9ec0183e3bc4579
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 13400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/Ramp_Prefab.prefab b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/Ramp_Prefab.prefab
new file mode 100644
index 0000000000..edcdf3071c
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/Ramp_Prefab.prefab
@@ -0,0 +1,111 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8924170145835402666
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8111781018561290000}
+  - component: {fileID: 5133274882688487605}
+  - component: {fileID: 6978882906433643647}
+  - component: {fileID: 894093325933845257}
+  m_Layer: 0
+  m_Name: Ramp_Prefab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 73
+  m_IsActive: 1
+--- !u!4 &8111781018561290000
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8924170145835402666}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.000000021855694, 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!33 &5133274882688487605
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8924170145835402666}
+  m_Mesh: {fileID: -6265776187016570482, guid: 4c31b0c9eb3dcdf4890cd904bf277cdf, type: 3}
+--- !u!23 &6978882906433643647
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8924170145835402666}
+  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: 2e2c886f4af8e304eb9a1e2e50d023b3, 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: 2
+  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!64 &894093325933845257
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8924170145835402666}
+  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: 5
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -8512782951310809723, guid: 426a2785f8a940049aac2c246661cf09, type: 3}
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/Ramp_Prefab.prefab.meta b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/Ramp_Prefab.prefab.meta
new file mode 100644
index 0000000000..14e8009f6b
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/Ramp_Prefab.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7ab2ae375810b5641a36d327b9f022cf
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/RotatingBody.physicMaterial b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/RotatingBody.physicMaterial
new file mode 100644
index 0000000000..f76e8e1f5a
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/RotatingBody.physicMaterial
@@ -0,0 +1,15 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!134 &13400000
+PhysicsMaterial:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: RotatingBody
+  serializedVersion: 2
+  m_DynamicFriction: 2.5
+  m_StaticFriction: 2
+  m_Bounciness: 0
+  m_FrictionCombine: 3
+  m_BounceCombine: 2
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/RotatingBody.physicMaterial.meta b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/RotatingBody.physicMaterial.meta
new file mode 100644
index 0000000000..4650ebf5b0
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/RotatingBody.physicMaterial.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c16e8d98094923449892b28a230ddb9c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 13400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/RotatingBody.prefab b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/RotatingBody.prefab
new file mode 100644
index 0000000000..73c04c02fa
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/RotatingBody.prefab
@@ -0,0 +1,1138 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &755183729697733696
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 522841341294848418}
+  - component: {fileID: 6376943934387906635}
+  - component: {fileID: 4793038284696412839}
+  m_Layer: 0
+  m_Name: WallPusherA_Inner
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 73
+  m_IsActive: 1
+--- !u!4 &522841341294848418
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 755183729697733696}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 4.05, y: 2.27, z: 0}
+  m_LocalScale: {x: 4, y: 2, z: 2}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4291553105548296809}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &6376943934387906635
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 755183729697733696}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 0.2, y: 2.25, z: 6}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &4793038284696412839
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 755183729697733696}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2c40721ca0fd31645a742e5ad0e0cdc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  PushDirection: 1
+  ToCenterDirOrig: {x: 0, y: 0, z: 0}
+  ToCenterDirCalc: {x: 0, y: 0, z: 0}
+  ToCenterDirTrans: {x: 0, y: 0, z: 0}
+--- !u!1 &1070469363212057228
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4967607898511807569}
+  - component: {fileID: 4081511419635538304}
+  - component: {fileID: 3264090684553753291}
+  - component: {fileID: 2074962368930179783}
+  - component: {fileID: 2659845886479429441}
+  - component: {fileID: 365707591732078506}
+  m_Layer: 0
+  m_Name: Tunnel_Prefab (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 73
+  m_IsActive: 1
+--- !u!4 &4967607898511807569
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1070469363212057228}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: 0, y: 5, z: 0}
+  m_LocalScale: {x: 4, y: 2, z: 2}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4291553105548296809}
+  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!33 &4081511419635538304
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1070469363212057228}
+  m_Mesh: {fileID: 5060444177187149915, guid: 63fcabcd345d556498e09f748683088e, type: 3}
+--- !u!23 &3264090684553753291
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1070469363212057228}
+  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: 2e2c886f4af8e304eb9a1e2e50d023b3, 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: 2
+  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!65 &2074962368930179783
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1070469363212057228}
+  m_Material: {fileID: 13400000, guid: c16e8d98094923449892b28a230ddb9c, type: 2}
+  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_Size: {x: 2.502674, y: 6.0000024, z: 0.25225586}
+  m_Center: {x: 0, y: -5.4553292e-15, z: 2.3838842}
+--- !u!65 &2659845886479429441
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1070469363212057228}
+  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_Size: {x: 0.19382703, y: 6.0000024, z: 2.2399507}
+  m_Center: {x: -1.1314733, y: -1.7786642e-15, z: 1.1251621}
+--- !u!65 &365707591732078506
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1070469363212057228}
+  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_Size: {x: 0.16720939, y: 6.0000024, z: 2.256102}
+  m_Center: {x: 1.1123942, y: -1.893427e-15, z: 1.1332378}
+--- !u!1 &1227036625448805321
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6179387521291227856}
+  - component: {fileID: 6043205804484853104}
+  - component: {fileID: 7583159525709273484}
+  - component: {fileID: 8095289646395249164}
+  m_Layer: 0
+  m_Name: Ramp_PrefabA
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 73
+  m_IsActive: 1
+--- !u!4 &6179387521291227856
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1227036625448805321}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.25, z: 7.993}
+  m_LocalScale: {x: 8, y: 0.5, z: 2}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3394725634534525932}
+  m_Father: {fileID: 4291553105548296809}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &6043205804484853104
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1227036625448805321}
+  m_Mesh: {fileID: -6265776187016570482, guid: 4c31b0c9eb3dcdf4890cd904bf277cdf, type: 3}
+--- !u!23 &7583159525709273484
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1227036625448805321}
+  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: 2e2c886f4af8e304eb9a1e2e50d023b3, 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: 2
+  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!64 &8095289646395249164
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1227036625448805321}
+  m_Material: {fileID: 13400000, guid: c16e8d98094923449892b28a230ddb9c, type: 2}
+  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: 5
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -6265776187016570482, guid: 4c31b0c9eb3dcdf4890cd904bf277cdf, type: 3}
+--- !u!1 &1451894099667441545
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3394725634534525932}
+  - component: {fileID: 2385627259374300527}
+  m_Layer: 0
+  m_Name: BridgeGap
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3394725634534525932
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1451894099667441545}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: 1, z: -0.000000021855694, w: 0}
+  m_LocalPosition: {x: 0, y: 0.14, z: -1.0100002}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6179387521291227856}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!136 &2385627259374300527
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1451894099667441545}
+  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.1
+  m_Height: 1.15
+  m_Direction: 0
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &2406660182425334495
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1877966211327071347}
+  - component: {fileID: 3334163744623252575}
+  - component: {fileID: 5776191766534439988}
+  - component: {fileID: 6535282611511474253}
+  - component: {fileID: 8963258823839906869}
+  - component: {fileID: 7304575238635320140}
+  m_Layer: 0
+  m_Name: Tunnel_Prefab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 73
+  m_IsActive: 1
+--- !u!4 &1877966211327071347
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2406660182425334495}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0, y: 4.96, z: 0}
+  m_LocalScale: {x: 4, y: 2, z: 2}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4291553105548296809}
+  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
+--- !u!33 &3334163744623252575
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2406660182425334495}
+  m_Mesh: {fileID: 5060444177187149915, guid: 63fcabcd345d556498e09f748683088e, type: 3}
+--- !u!23 &5776191766534439988
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2406660182425334495}
+  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: 2e2c886f4af8e304eb9a1e2e50d023b3, 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: 2
+  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!65 &6535282611511474253
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2406660182425334495}
+  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_Size: {x: 2.502674, y: 6.0000024, z: 0.258326}
+  m_Center: {x: 0, y: 5.4121983e-15, z: 2.3808491}
+--- !u!65 &8963258823839906869
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2406660182425334495}
+  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_Size: {x: 0.2527809, y: 6.0000024, z: 2.2399507}
+  m_Center: {x: -1.1249466, y: 1.7786642e-15, z: 1.1251621}
+--- !u!65 &7304575238635320140
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2406660182425334495}
+  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_Size: {x: 0.26525307, y: 6.0000024, z: 2.256102}
+  m_Center: {x: 1.1187105, y: 1.893427e-15, z: 1.1332378}
+--- !u!1 &2492174073242389836
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6182591213277846585}
+  - component: {fileID: 3395949877673187758}
+  m_Layer: 0
+  m_Name: BridgeGap (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6182591213277846585
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2492174073242389836}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -1, z: 0.000000021855694, w: 0}
+  m_LocalPosition: {x: 0, y: 0.14, z: -1.01}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7826839884382864090}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!136 &3395949877673187758
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2492174073242389836}
+  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.1
+  m_Height: 1.15
+  m_Direction: 0
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &3038314618705458857
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3570252208687936609}
+  - component: {fileID: 4156819582579138816}
+  - component: {fileID: 2806575150631930745}
+  m_Layer: 0
+  m_Name: WallPusherB_Inner
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 73
+  m_IsActive: 1
+--- !u!4 &3570252208687936609
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3038314618705458857}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -4.07, y: 2.27, z: 0}
+  m_LocalScale: {x: 4, y: 2, z: 2}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4291553105548296809}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &4156819582579138816
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3038314618705458857}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 0.2, y: 2.25, z: 6}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &2806575150631930745
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3038314618705458857}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2c40721ca0fd31645a742e5ad0e0cdc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  PushDirection: 0
+  ToCenterDirOrig: {x: 0, y: 0, z: 0}
+  ToCenterDirCalc: {x: 0, y: 0, z: 0}
+  ToCenterDirTrans: {x: 0, y: 0, z: 0}
+--- !u!1 &4405129256840456534
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5628673131512617452}
+  - component: {fileID: 1065561891622964567}
+  - component: {fileID: 4468158207537748033}
+  m_Layer: 0
+  m_Name: WallPusherA_Outer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 73
+  m_IsActive: 1
+--- !u!4 &5628673131512617452
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4405129256840456534}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 4.89, y: 2.27, z: 0}
+  m_LocalScale: {x: 4, y: 2, z: 2}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4291553105548296809}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &1065561891622964567
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4405129256840456534}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 0.2, y: 2.25, z: 6}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &4468158207537748033
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4405129256840456534}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2c40721ca0fd31645a742e5ad0e0cdc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  PushDirection: 0
+  ToCenterDirOrig: {x: 0, y: 0, z: 0}
+  ToCenterDirCalc: {x: 0, y: 0, z: 0}
+  ToCenterDirTrans: {x: 0, y: 0, z: 0}
+--- !u!1 &5415449980466536476
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4291553105548296809}
+  - component: {fileID: 8134939553748259768}
+  - component: {fileID: 3307166493715739449}
+  - component: {fileID: 850162744905636139}
+  m_Layer: 0
+  m_Name: RotatingBody
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4291553105548296809
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5415449980466536476}
+  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:
+  - {fileID: 1877966211327071347}
+  - {fileID: 4967607898511807569}
+  - {fileID: 522841341294848418}
+  - {fileID: 5628673131512617452}
+  - {fileID: 3570252208687936609}
+  - {fileID: 5389614242607036533}
+  - {fileID: 6179387521291227856}
+  - {fileID: 7826839884382864090}
+  - {fileID: 2053800158975384476}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &8134939553748259768
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5415449980466536476}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 8.023605, y: 8.144613, z: 20.106205}
+  m_Center: {x: -0.03800702, y: 4.1726913, z: -0.02903366}
+--- !u!114 &3307166493715739449
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5415449980466536476}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  GlobalObjectIdHash: 1921503253
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 2
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 1
+  AutoObjectParentSync: 1
+  SyncOwnerTransformWhenParented: 1
+--- !u!114 &850162744905636139
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5415449980466536476}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 374ac199eb18f0f468bc018a722775c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  AuthorityMode: 1
+  TickSyncChildren: 1
+  UseUnreliableDeltas: 0
+  SyncPositionX: 1
+  SyncPositionY: 1
+  SyncPositionZ: 1
+  SyncRotAngleX: 1
+  SyncRotAngleY: 1
+  SyncRotAngleZ: 1
+  SyncScaleX: 1
+  SyncScaleY: 1
+  SyncScaleZ: 1
+  PositionThreshold: 0.1
+  RotAngleThreshold: 0.01
+  ScaleThreshold: 0.1
+  UseQuaternionSynchronization: 1
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 0
+  InLocalSpace: 0
+  SwitchTransformSpaceWhenParented: 0
+  Interpolate: 1
+  SlerpPosition: 0
+  RotationSpeed: 0.25
+  RotateDirection: 0
+  ZAxisMove: 0
+--- !u!1 &5463907175177238004
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2053800158975384476}
+  - component: {fileID: 2688281628964240045}
+  m_Layer: 0
+  m_Name: Point Light
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2053800158975384476
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5463907175177238004}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 6.54, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4291553105548296809}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!108 &2688281628964240045
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5463907175177238004}
+  m_Enabled: 1
+  serializedVersion: 11
+  m_Type: 2
+  m_Color: {r: 0.9622642, g: 0.9622642, b: 0.9622642, a: 1}
+  m_Intensity: 2
+  m_Range: 20
+  m_SpotAngle: 30
+  m_InnerSpotAngle: 21.80208
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 0
+    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!1 &6529740436184164063
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7826839884382864090}
+  - component: {fileID: 2797882924116045225}
+  - component: {fileID: 1097787484049525257}
+  - component: {fileID: 570708159460268413}
+  m_Layer: 0
+  m_Name: Ramp_PrefabB
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 73
+  m_IsActive: 1
+--- !u!4 &7826839884382864090
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6529740436184164063}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
+  m_LocalPosition: {x: 0, y: 0.25, z: -7.993}
+  m_LocalScale: {x: 8, y: 0.5, z: 2}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6182591213277846585}
+  m_Father: {fileID: 4291553105548296809}
+  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+--- !u!33 &2797882924116045225
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6529740436184164063}
+  m_Mesh: {fileID: -6265776187016570482, guid: 4c31b0c9eb3dcdf4890cd904bf277cdf, type: 3}
+--- !u!23 &1097787484049525257
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6529740436184164063}
+  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: 2e2c886f4af8e304eb9a1e2e50d023b3, 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: 2
+  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!64 &570708159460268413
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6529740436184164063}
+  m_Material: {fileID: 13400000, guid: c16e8d98094923449892b28a230ddb9c, type: 2}
+  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: 5
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -6265776187016570482, guid: 4c31b0c9eb3dcdf4890cd904bf277cdf, type: 3}
+--- !u!1 &8002386465640125644
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5389614242607036533}
+  - component: {fileID: 4101224782146625552}
+  - component: {fileID: 6895917012766152111}
+  m_Layer: 0
+  m_Name: WallPusherB_Outer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 73
+  m_IsActive: 1
+--- !u!4 &5389614242607036533
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8002386465640125644}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -4.83, y: 2.27, z: 0}
+  m_LocalScale: {x: 4, y: 2, z: 2}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4291553105548296809}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &4101224782146625552
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8002386465640125644}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 0.2, y: 2.25, z: 6}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &6895917012766152111
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8002386465640125644}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2c40721ca0fd31645a742e5ad0e0cdc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  PushDirection: 1
+  ToCenterDirOrig: {x: 0, y: 0, z: 0}
+  ToCenterDirCalc: {x: 0, y: 0, z: 0}
+  ToCenterDirTrans: {x: 0, y: 0, z: 0}
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/RotatingBody.prefab.meta b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/RotatingBody.prefab.meta
new file mode 100644
index 0000000000..d22d47036e
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/RotatingBody.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0123d7125346c274da00b38e950a266b
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/SceneLevelGeometry.prefab b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/SceneLevelGeometry.prefab
new file mode 100644
index 0000000000..f636c60a54
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/SceneLevelGeometry.prefab
@@ -0,0 +1,794 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &910007655143077103
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6283120762215196916}
+  - component: {fileID: 3739510624437302406}
+  m_Layer: 0
+  m_Name: CornerBumper (1)
+  m_TagString: Boundary
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6283120762215196916
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 910007655143077103}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0.9244967, z: -0, w: -0.38119}
+  m_LocalPosition: {x: -29.72, y: 0.98, z: 29.82}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: -224.815, z: 0}
+--- !u!65 &3739510624437302406
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 910007655143077103}
+  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_Size: {x: 4, y: 2, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &1854705290947220173
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2290144462706082272}
+  - component: {fileID: 4559046433245738380}
+  m_Layer: 0
+  m_Name: CornerBumper (2)
+  m_TagString: Boundary
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2290144462706082272
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1854705290947220173}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0.3771283, z: -0, w: -0.92616105}
+  m_LocalPosition: {x: -29.53, y: 0.98, z: -29.71}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: -315.688, z: 0}
+--- !u!65 &4559046433245738380
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1854705290947220173}
+  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_Size: {x: 4, y: 2, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &4012615691354089848
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4012615691354089844}
+  - component: {fileID: 4012615691354089845}
+  - component: {fileID: 4012615691354089850}
+  - component: {fileID: 4012615691354089851}
+  m_Layer: 0
+  m_Name: Floor
+  m_TagString: Floor
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4012615691354089844
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691354089848}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.50000006, z: 0}
+  m_LocalScale: {x: 60, y: 1, z: 60}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &4012615691354089845
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691354089848}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &4012615691354089850
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691354089848}
+  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: 42c4a0ad1f9d67a45b12f68697321aad, 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!65 &4012615691354089851
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691354089848}
+  m_Material: {fileID: 13400000, guid: 2c574f6ade946d94f9ec0183e3bc4579, type: 2}
+  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_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &4012615691503252843
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4012615691503252839}
+  - component: {fileID: 4012615691503252836}
+  - component: {fileID: 4012615691503252837}
+  - component: {fileID: 4012615691503252842}
+  m_Layer: 0
+  m_Name: Side
+  m_TagString: Boundary
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4012615691503252839
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691503252843}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -30.5, y: 0.49999994, z: 0}
+  m_LocalScale: {x: 1, y: 3, z: 62}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &4012615691503252836
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691503252843}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &4012615691503252837
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691503252843}
+  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: 9c73b921ea39f4344a19c2d1c7d6b314, 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!65 &4012615691503252842
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691503252843}
+  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_Size: {x: 2, y: 1, z: 1}
+  m_Center: {x: -0.5, y: 0, z: 0}
+--- !u!1 &4012615691965054905
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4012615691965054901}
+  - component: {fileID: 4012615691965054906}
+  - component: {fileID: 4012615691965054907}
+  - component: {fileID: 4012615691965054904}
+  m_Layer: 0
+  m_Name: Side
+  m_TagString: Boundary
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4012615691965054901
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691965054905}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.49999994, z: 30.5}
+  m_LocalScale: {x: 60, y: 3, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &4012615691965054906
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691965054905}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &4012615691965054907
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691965054905}
+  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: 9c73b921ea39f4344a19c2d1c7d6b314, 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!65 &4012615691965054904
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691965054905}
+  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_Size: {x: 1, y: 1, z: 2}
+  m_Center: {x: 0, y: 0, z: 0.5}
+--- !u!1 &4012615692269653858
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4012615692269653854}
+  - component: {fileID: 4012615692269653855}
+  - component: {fileID: 4012615692269653852}
+  - component: {fileID: 4012615692269653853}
+  m_Layer: 0
+  m_Name: Side
+  m_TagString: Boundary
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4012615692269653854
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692269653858}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.49999994, z: -30.5}
+  m_LocalScale: {x: 60, y: 3, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &4012615692269653855
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692269653858}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &4012615692269653852
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692269653858}
+  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: 9c73b921ea39f4344a19c2d1c7d6b314, 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!65 &4012615692269653853
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692269653858}
+  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_Size: {x: 1, y: 1, z: 2}
+  m_Center: {x: 0, y: 0, z: -0.5}
+--- !u!1 &4012615692778511854
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4012615692778511849}
+  m_Layer: 0
+  m_Name: SceneLevelGeometry
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4012615692778511849
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692778511854}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.000000059604645, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4012615691354089844}
+  - {fileID: 4012615691965054901}
+  - {fileID: 4012615692269653854}
+  - {fileID: 4012615691503252839}
+  - {fileID: 4012615692791378778}
+  - {fileID: 3910294717376836327}
+  - {fileID: 6283120762215196916}
+  - {fileID: 2290144462706082272}
+  - {fileID: 6959258897999621209}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &4012615692791378782
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4012615692791378778}
+  - component: {fileID: 4012615692791378779}
+  - component: {fileID: 4012615692791378776}
+  - component: {fileID: 4012615692791378777}
+  m_Layer: 0
+  m_Name: Side
+  m_TagString: Boundary
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4012615692791378778
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692791378782}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 30.5, y: 0.49999994, z: 0}
+  m_LocalScale: {x: 1, y: 3, z: 62}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &4012615692791378779
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692791378782}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &4012615692791378776
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692791378782}
+  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: 9c73b921ea39f4344a19c2d1c7d6b314, 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!65 &4012615692791378777
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692791378782}
+  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_Size: {x: 2, y: 1, z: 1}
+  m_Center: {x: 0.5, y: 0, z: 0}
+--- !u!1 &4674276234353933548
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3910294717376836327}
+  - component: {fileID: 3136259738973340924}
+  m_Layer: 0
+  m_Name: CornerBumper
+  m_TagString: Boundary
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3910294717376836327
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4674276234353933548}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: -0.38268343, z: 0, w: 0.92387956}
+  m_LocalPosition: {x: 29.7, y: 0.98, z: -29.61}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: -45, z: 0}
+--- !u!65 &3136259738973340924
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4674276234353933548}
+  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_Size: {x: 4, y: 2, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &7080625901286762351
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6959258897999621209}
+  - component: {fileID: 7672408768716900064}
+  m_Layer: 0
+  m_Name: CornerBumper (3)
+  m_TagString: Boundary
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6959258897999621209
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7080625901286762351}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: 0.93588465, z: -0, w: -0.35230666}
+  m_LocalPosition: {x: 29.26, y: 0.98, z: 29.45}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: -498.74298, z: 0}
+--- !u!65 &7672408768716900064
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7080625901286762351}
+  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_Size: {x: 4, y: 2, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/SceneLevelGeometry.prefab.meta b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/SceneLevelGeometry.prefab.meta
new file mode 100644
index 0000000000..154fd718e7
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/SceneLevelGeometry.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3ec484313a7a6754dac871e620df8db2
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/ServerPlayer.prefab b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/ServerPlayer.prefab
new file mode 100644
index 0000000000..8e6ca8383c
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/ServerPlayer.prefab
@@ -0,0 +1,656 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &324680519892629439
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7909757205025274661}
+  - component: {fileID: 4497278534226153218}
+  m_Layer: 0
+  m_Name: PlayerBallChild1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7909757205025274661
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 324680519892629439}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 1, y: 0, z: 0}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8978127728034846793}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4497278534226153218
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 324680519892629439}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 792d7ce524eb358469373fe12babef88, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ShowTopMostFoldoutHeaderGroup: 1
+  NetworkTransformExpanded: 0
+  AuthorityMode: 1
+  TickSyncChildren: 0
+  UseUnreliableDeltas: 0
+  SyncPositionX: 1
+  SyncPositionY: 1
+  SyncPositionZ: 1
+  SyncRotAngleX: 1
+  SyncRotAngleY: 1
+  SyncRotAngleZ: 1
+  SyncScaleX: 1
+  SyncScaleY: 1
+  SyncScaleZ: 1
+  PositionThreshold: 0.001
+  RotAngleThreshold: 0.01
+  ScaleThreshold: 0.01
+  UseQuaternionSynchronization: 1
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 0
+  InLocalSpace: 1
+  SwitchTransformSpaceWhenParented: 0
+  Interpolate: 1
+  SlerpPosition: 1
+  ExpandPlayerBallMotion: 1
+  ExpandNetworkTransform: 1
+  RotationAxis: 2
+  RotationSpeed: 1.5
+--- !u!1 &1574061277261592297
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2851817463696415024}
+  - component: {fileID: 8353621747658706578}
+  m_Layer: 0
+  m_Name: PlayerBallChild2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2851817463696415024
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1574061277261592297}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -1, y: 0, z: 0}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8978127728034846793}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8353621747658706578
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1574061277261592297}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 792d7ce524eb358469373fe12babef88, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ShowTopMostFoldoutHeaderGroup: 1
+  NetworkTransformExpanded: 0
+  AuthorityMode: 1
+  TickSyncChildren: 0
+  UseUnreliableDeltas: 0
+  SyncPositionX: 1
+  SyncPositionY: 1
+  SyncPositionZ: 1
+  SyncRotAngleX: 1
+  SyncRotAngleY: 1
+  SyncRotAngleZ: 1
+  SyncScaleX: 1
+  SyncScaleY: 1
+  SyncScaleZ: 1
+  PositionThreshold: 0.001
+  RotAngleThreshold: 0.01
+  ScaleThreshold: 0.01
+  UseQuaternionSynchronization: 1
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 0
+  InLocalSpace: 1
+  SwitchTransformSpaceWhenParented: 0
+  Interpolate: 1
+  SlerpPosition: 1
+  ExpandPlayerBallMotion: 0
+  ExpandNetworkTransform: 1
+  RotationAxis: 0
+  RotationSpeed: 1.5
+--- !u!1 &3152047010790481352
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2530875210329125868}
+  - component: {fileID: 7166766943079311595}
+  - component: {fileID: 2218667139823191844}
+  m_Layer: 0
+  m_Name: ParentedText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2530875210329125868
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3152047010790481352}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.91, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7209693128479548322}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!23 &7166766943079311595
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3152047010790481352}
+  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: 10100, guid: 0000000000000000e000000000000000, type: 0}
+  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!102 &2218667139823191844
+TextMesh:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3152047010790481352}
+  m_Text: "Hello \nWorld"
+  m_OffsetZ: 0
+  m_CharacterSize: 0.15
+  m_LineSpacing: 1
+  m_Anchor: 4
+  m_Alignment: 1
+  m_TabSize: 4
+  m_FontSize: 20
+  m_FontStyle: 1
+  m_RichText: 1
+  m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+  m_Color:
+    serializedVersion: 2
+    rgba: 4294967295
+--- !u!1 &3385537716926926172
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6528377011520223688}
+  - component: {fileID: 7760305833775493645}
+  m_Layer: 0
+  m_Name: Direction
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6528377011520223688
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3385537716926926172}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.529, z: 0.36}
+  m_LocalScale: {x: 0.5, y: 0.35, z: 0.5}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7209693128479548322}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &7760305833775493645
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3385537716926926172}
+  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: 0
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &4710599683293591777
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7209693128479548322}
+  - component: {fileID: 2033351919148783259}
+  - component: {fileID: 1689822717476917681}
+  - component: {fileID: 6582615468703263770}
+  - component: {fileID: 996823777406759075}
+  - component: {fileID: 4107659158848356731}
+  - component: {fileID: 8869001495323625783}
+  - component: {fileID: 769922645502876198}
+  m_Layer: 0
+  m_Name: ServerPlayer
+  m_TagString: Player
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7209693128479548322
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4710599683293591777}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6528377011520223688}
+  - {fileID: 2530875210329125868}
+  - {fileID: 8978127728034846793}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!136 &2033351919148783259
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4710599683293591777}
+  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.5
+  m_Height: 2
+  m_Direction: 1
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!143 &1689822717476917681
+CharacterController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4710599683293591777}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Height: 2
+  m_Radius: 0.5
+  m_SlopeLimit: 45
+  m_StepOffset: 0.3
+  m_SkinWidth: 0.08
+  m_MinMoveDistance: 0.001
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &6582615468703263770
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4710599683293591777}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  GlobalObjectIdHash: 2883015141
+  InScenePlacedSourceGlobalObjectIdHash: 2508530451
+  DeferredDespawnTick: 0
+  Ownership: 0
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
+  SyncOwnerTransformWhenParented: 0
+  AllowOwnerToParent: 1
+--- !u!114 &996823777406759075
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4710599683293591777}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8e5128237997be649af0cc87dd0eb563, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ShowTopMostFoldoutHeaderGroup: 1
+  ApplyColorToChildren: 1
+  IgnoreChildren:
+  - {fileID: 3385537716926926172}
+--- !u!114 &4107659158848356731
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4710599683293591777}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5ce25b0b3f15e6446a88a85787c2f94a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ShowTopMostFoldoutHeaderGroup: 1
+  NetworkTransformExpanded: 0
+  AuthorityMode: 1
+  TickSyncChildren: 1
+  UseUnreliableDeltas: 0
+  SyncPositionX: 1
+  SyncPositionY: 1
+  SyncPositionZ: 1
+  SyncRotAngleX: 1
+  SyncRotAngleY: 1
+  SyncRotAngleZ: 1
+  SyncScaleX: 1
+  SyncScaleY: 1
+  SyncScaleZ: 1
+  PositionThreshold: 0.01
+  RotAngleThreshold: 0.01
+  ScaleThreshold: 0.1
+  UseQuaternionSynchronization: 1
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 0
+  InLocalSpace: 0
+  SwitchTransformSpaceWhenParented: 1
+  Interpolate: 1
+  SlerpPosition: 0
+  MoverScriptNoRigidbodyExpanded: 0
+  SpawnRadius: 10
+  Increment: 1
+  RotationSpeed: 1.26
+  MovementSpeed: 15
+  JumpSpeed: 10
+  AirSpeedFactor: 0.35
+  Gravity: -9.8
+  ContinualChildMotion: 1
+--- !u!65 &8869001495323625783
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4710599683293591777}
+  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_Size: {x: 1, y: 1.4, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &769922645502876198
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4710599683293591777}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bb9a9987a689bbe43a05463cf3713b22, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ServerOnly: 1
+  UniqueLocalInstanceContent: ServerPlayer specific local content
+--- !u!1 &7170742296219383225
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5575000075487772256}
+  - component: {fileID: 974108613365902635}
+  m_Layer: 0
+  m_Name: PlayerBallChild3
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5575000075487772256
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7170742296219383225}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 1}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8978127728034846793}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &974108613365902635
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7170742296219383225}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 792d7ce524eb358469373fe12babef88, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ShowTopMostFoldoutHeaderGroup: 1
+  NetworkTransformExpanded: 0
+  AuthorityMode: 1
+  TickSyncChildren: 0
+  UseUnreliableDeltas: 0
+  SyncPositionX: 1
+  SyncPositionY: 1
+  SyncPositionZ: 1
+  SyncRotAngleX: 1
+  SyncRotAngleY: 1
+  SyncRotAngleZ: 1
+  SyncScaleX: 1
+  SyncScaleY: 1
+  SyncScaleZ: 1
+  PositionThreshold: 0.001
+  RotAngleThreshold: 0.01
+  ScaleThreshold: 0.01
+  UseQuaternionSynchronization: 1
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 0
+  InLocalSpace: 1
+  SwitchTransformSpaceWhenParented: 0
+  Interpolate: 1
+  SlerpPosition: 1
+  ExpandPlayerBallMotion: 1
+  ExpandNetworkTransform: 1
+  RotationAxis: 1
+  RotationSpeed: 1.5
+--- !u!1 &9153294333356437960
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8978127728034846793}
+  - component: {fileID: 9124254747570484083}
+  m_Layer: 0
+  m_Name: PlayerBallPrime
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8978127728034846793
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9153294333356437960}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 1.25, y: 0, z: 0}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7909757205025274661}
+  - {fileID: 2851817463696415024}
+  - {fileID: 5575000075487772256}
+  m_Father: {fileID: 7209693128479548322}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &9124254747570484083
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9153294333356437960}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 792d7ce524eb358469373fe12babef88, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ShowTopMostFoldoutHeaderGroup: 1
+  NetworkTransformExpanded: 0
+  AuthorityMode: 1
+  TickSyncChildren: 0
+  UseUnreliableDeltas: 0
+  SyncPositionX: 1
+  SyncPositionY: 1
+  SyncPositionZ: 1
+  SyncRotAngleX: 1
+  SyncRotAngleY: 1
+  SyncRotAngleZ: 1
+  SyncScaleX: 1
+  SyncScaleY: 1
+  SyncScaleZ: 1
+  PositionThreshold: 0.001
+  RotAngleThreshold: 0.01
+  ScaleThreshold: 0.01
+  UseQuaternionSynchronization: 1
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 0
+  InLocalSpace: 1
+  SwitchTransformSpaceWhenParented: 0
+  Interpolate: 1
+  SlerpPosition: 1
+  ExpandPlayerBallMotion: 1
+  ExpandNetworkTransform: 1
+  RotationAxis: 0
+  RotationSpeed: 1.5
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/ServerPlayer.prefab.meta b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/ServerPlayer.prefab.meta
new file mode 100644
index 0000000000..c28eb79b02
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/ServerPlayer.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 90bfa3cd2cce8f14ead59b4dbdae92bb
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/Tunnel_Prefab.prefab b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/Tunnel_Prefab.prefab
new file mode 100644
index 0000000000..c596d7333d
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/Tunnel_Prefab.prefab
@@ -0,0 +1,154 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1604908963751126680
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2093637950428003362}
+  - component: {fileID: 3071950872142852999}
+  - component: {fileID: 956227959320364877}
+  - component: {fileID: 4985949235297978144}
+  - component: {fileID: 8456313914433245678}
+  - component: {fileID: 1138964657491743937}
+  m_Layer: 0
+  m_Name: Tunnel_Prefab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 73
+  m_IsActive: 1
+--- !u!4 &2093637950428003362
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1604908963751126680}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
+  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: -90.00001, y: 0, z: 0}
+--- !u!33 &3071950872142852999
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1604908963751126680}
+  m_Mesh: {fileID: 5060444177187149915, guid: 63fcabcd345d556498e09f748683088e, type: 3}
+--- !u!23 &956227959320364877
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1604908963751126680}
+  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: 2e2c886f4af8e304eb9a1e2e50d023b3, 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: 2
+  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!65 &4985949235297978144
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1604908963751126680}
+  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_Size: {x: 2.502674, y: 6.0000024, z: 0.258326}
+  m_Center: {x: 0, y: 5.4121983e-15, z: 2.3808491}
+--- !u!65 &8456313914433245678
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1604908963751126680}
+  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_Size: {x: 0.2527809, y: 6.0000024, z: 2.2399507}
+  m_Center: {x: -1.1249466, y: 1.7786642e-15, z: 1.1251621}
+--- !u!65 &1138964657491743937
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1604908963751126680}
+  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_Size: {x: 0.26525307, y: 6.0000024, z: 2.256102}
+  m_Center: {x: 1.1187105, y: 1.893427e-15, z: 1.1332378}
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/Tunnel_Prefab.prefab.meta b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/Tunnel_Prefab.prefab.meta
new file mode 100644
index 0000000000..58def4a902
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/Tunnel_Prefab.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4b50ff3d475fc3f4fa77ac6aa6e679f2
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/Wall_Prefab.prefab b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/Wall_Prefab.prefab
new file mode 100644
index 0000000000..f8dde4effc
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/Wall_Prefab.prefab
@@ -0,0 +1,132 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &7993119983977949264
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7324705577624711914}
+  - component: {fileID: 5911343394670230863}
+  - component: {fileID: 8497650616581704069}
+  - component: {fileID: 9105854698657379725}
+  - component: {fileID: 1277700310800588604}
+  m_Layer: 0
+  m_Name: Wall_Prefab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 73
+  m_IsActive: 1
+--- !u!4 &7324705577624711914
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7993119983977949264}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.000000021855694, 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!33 &5911343394670230863
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7993119983977949264}
+  m_Mesh: {fileID: 6352809919239313146, guid: 34560503bf9d61046b252db98a8cf770, type: 3}
+--- !u!23 &8497650616581704069
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7993119983977949264}
+  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: 2e2c886f4af8e304eb9a1e2e50d023b3, 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: 2
+  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!65 &9105854698657379725
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7993119983977949264}
+  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_Size: {x: 0.25, y: 1.0095696, z: 2.9958286}
+  m_Center: {x: 0, y: 0.5047848, z: 1.5020857}
+--- !u!65 &1277700310800588604
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7993119983977949264}
+  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_Size: {x: 0.25, y: 2.0055175, z: 3.000146}
+  m_Center: {x: 0, y: 1.0027587, z: -1.499927}
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/Wall_Prefab.prefab.meta b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/Wall_Prefab.prefab.meta
new file mode 100644
index 0000000000..42ef5284f2
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Prefabs/Wall_Prefab.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3b9516be83427084ca3fffca42e7b6da
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Resources.meta b/Examples/OverridingScenesAndPrefabs/Assets/Resources.meta
new file mode 100644
index 0000000000..edebf21a13
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Resources.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6a51a9fbd254e544eb3e85853865f80d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Resources/BillingMode.json b/Examples/OverridingScenesAndPrefabs/Assets/Resources/BillingMode.json
new file mode 100644
index 0000000000..6f4bfb7103
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Resources/BillingMode.json
@@ -0,0 +1 @@
+{"androidStore":"GooglePlay"}
\ No newline at end of file
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Resources/BillingMode.json.meta b/Examples/OverridingScenesAndPrefabs/Assets/Resources/BillingMode.json.meta
new file mode 100644
index 0000000000..557e7d707c
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Resources/BillingMode.json.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a1890189503409a4bb24dd4f0eab1f0a
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scenes.meta b/Examples/OverridingScenesAndPrefabs/Assets/Scenes.meta
new file mode 100644
index 0000000000..b398c5b4ab
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scenes.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9bb955f9d9ef9c34d897f353c8643a1d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scenes/BootstrapScene.unity b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/BootstrapScene.unity
new file mode 100644
index 0000000000..1493ee48f9
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/BootstrapScene.unity
@@ -0,0 +1,282 @@
+%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: 13
+  m_BakeOnSceneLoad: 0
+  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 &455857869
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 455857870}
+  - component: {fileID: 455857873}
+  - component: {fileID: 455857874}
+  - component: {fileID: 455857872}
+  - component: {fileID: 455857871}
+  m_Layer: 0
+  m_Name: NetworkManagerBootstrapper
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &455857870
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 455857869}
+  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 &455857871
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 455857869}
+  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: 128
+  m_MaxPayloadSize: 6144
+  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 &455857872
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 455857869}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7db19e0e150e50d4ab23c69a086b8b6e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  NetworkManagerExpanded: 1
+  NetworkConfig:
+    ProtocolVersion: 0
+    NetworkTransport: {fileID: 455857871}
+    PlayerPrefab: {fileID: 4710599683293591777, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+    Prefabs:
+      NetworkPrefabsLists:
+      - {fileID: 11400000, guid: 3d25a2b1f6c12ee47bf7601c2edd7e70, 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: 0
+    UseCMBService: 0
+    AutoSpawnPlayerPrefabClientSide: 1
+    NetworkProfilingMetrics: 1
+    OldPrefabList: []
+  RunInBackground: 1
+  LogLevel: 1
+  NetworkManagerBootstrapperExpanded: 1
+  TargetFrameRate: 100
+  EnableVSync: 0
+  m_OriginalVSyncCount: 1
+  m_ServicesRegistered: 1
+--- !u!114 &455857873
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 455857869}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c4251d3d650053a419a5c503babb13a6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  SceneBootstrapLoaderExpanded: 0
+  MainMenuSceneAsset: {fileID: 102900000, guid: 1ec6afcedd7df124e91af7bfbcea59b2, type: 3}
+  ServerSceneDefines:
+    DefaultActiveScene: SharedScene
+    LocalScenes:
+    - ServerScene
+    DefaultActiveSceneAsset: {fileID: 102900000, guid: 9fc0d4010bbf28b4594072e72b8655ab, type: 3}
+    LocalSceneAssets:
+    - {fileID: 102900000, guid: ee7bfa213000a594bb8011364915602e, type: 3}
+    SharedScenes: []
+    SharedSceneAssets: []
+  ClientSceneDefines:
+    DefaultActiveScene: SharedScene
+    LocalScenes:
+    - ClientScene
+    DefaultActiveSceneAsset: {fileID: 102900000, guid: 9fc0d4010bbf28b4594072e72b8655ab, type: 3}
+    LocalSceneAssets:
+    - {fileID: 102900000, guid: d8ac305138d51a84dbbb734b81c4054e, type: 3}
+  m_MainMenuScene: MainMenu
+--- !u!114 &455857874
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 455857869}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5c472ff64b067344893ed2e632d0f9f1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  NetworkPrefab: {fileID: 4710599683293591777, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+  NetworkPrefabOverride: {fileID: 6472733969592893139, guid: 3e5167b6e6bcb5645abb2dbc0078091e, type: 3}
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 455857870}
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scenes/BootstrapScene.unity.meta b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/BootstrapScene.unity.meta
new file mode 100644
index 0000000000..e2c316c516
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/BootstrapScene.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8077653236d44fd4b92cd4a96193e8b6
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scenes/Camera.preset b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/Camera.preset
new file mode 100644
index 0000000000..b8bbae0a72
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/Camera.preset
@@ -0,0 +1,195 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!181963792 &2655988077585873504
+Preset:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Camera
+  m_TargetType:
+    m_NativeTypeID: 20
+    m_ManagedTypePPtr: {fileID: 0}
+    m_ManagedTypeFallback: 
+  m_Properties:
+  - target: {fileID: 0}
+    propertyPath: m_Enabled
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_ClearFlags
+    value: 2
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_BackGroundColor.r
+    value: 0.066037714
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_BackGroundColor.g
+    value: 0.066037714
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_BackGroundColor.b
+    value: 0.066037714
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_BackGroundColor.a
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_projectionMatrixMode
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_GateFitMode
+    value: 2
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_FOVAxisMode
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_Iso
+    value: 200
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_ShutterSpeed
+    value: 0.005
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_Aperture
+    value: 16
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_FocusDistance
+    value: 10
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_FocalLength
+    value: 50
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_BladeCount
+    value: 5
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_Curvature.x
+    value: 2
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_Curvature.y
+    value: 11
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_BarrelClipping
+    value: 0.25
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_Anamorphism
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SensorSize.x
+    value: 36
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SensorSize.y
+    value: 24
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_LensShift.x
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_LensShift.y
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_NormalizedViewPortRect.x
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_NormalizedViewPortRect.y
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_NormalizedViewPortRect.width
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_NormalizedViewPortRect.height
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: near clip plane
+    value: 0.3
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: far clip plane
+    value: 1000
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: field of view
+    value: 60
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: orthographic
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: orthographic size
+    value: 5
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_Depth
+    value: -1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_CullingMask.m_Bits
+    value: 4294967295
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_RenderingPath
+    value: -1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_TargetTexture
+    value: 
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_TargetDisplay
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_TargetEye
+    value: 3
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_HDR
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_AllowMSAA
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_AllowDynamicResolution
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_ForceIntoRT
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_OcclusionCulling
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_StereoConvergence
+    value: 10
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_StereoSeparation
+    value: 0.022
+    objectReference: {fileID: 0}
+  m_ExcludedProperties: []
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scenes/Camera.preset.meta b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/Camera.preset.meta
new file mode 100644
index 0000000000..3e327ecf36
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/Camera.preset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1807b530602915743868e6c3bdc1a93c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2655988077585873504
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scenes/ClientScene.unity b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/ClientScene.unity
new file mode 100644
index 0000000000..06eaad444d
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/ClientScene.unity
@@ -0,0 +1,382 @@
+%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: 13
+  m_BakeOnSceneLoad: 0
+  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!1001 &27008424
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.25
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511854, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_Name
+      value: SceneLevelGeometry (1)
+      objectReference: {fileID: 0}
+    m_RemovedComponents:
+    - {fileID: 4012615691354089851, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+    - {fileID: 4012615692791378777, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+    - {fileID: 4012615691503252842, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+    - {fileID: 4012615692269653853, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+    - {fileID: 4012615691965054904, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+    m_RemovedGameObjects:
+    - {fileID: 7080625901286762351, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+    - {fileID: 1854705290947220173, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+    - {fileID: 910007655143077103, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+    - {fileID: 4674276234353933548, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+--- !u!1 &638077906
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 638077907}
+  - component: {fileID: 638077911}
+  - component: {fileID: 638077910}
+  m_Layer: 5
+  m_Name: ClientContent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &638077907
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 638077906}
+  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: 1082114250}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -32}
+  m_SizeDelta: {x: 180, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &638077910
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 638077906}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.8396226, g: 0.48815125, b: 0.019802418, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 23
+    m_FontStyle: 1
+    m_BestFit: 1
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Client Canvas Content
+--- !u!222 &638077911
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 638077906}
+  m_CullTransparentMesh: 1
+--- !u!1 &1082114246
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1082114250}
+  - component: {fileID: 1082114249}
+  - component: {fileID: 1082114248}
+  - component: {fileID: 1082114247}
+  m_Layer: 5
+  m_Name: ClientCanvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1082114247
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1082114246}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &1082114248
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1082114246}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!223 &1082114249
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1082114246}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!224 &1082114250
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1082114246}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 638077907}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 1082114250}
+  - {fileID: 27008424}
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scenes/ClientScene.unity.meta b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/ClientScene.unity.meta
new file mode 100644
index 0000000000..65393dbc64
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/ClientScene.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d8ac305138d51a84dbbb734b81c4054e
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scenes/MainMenu.unity b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/MainMenu.unity
new file mode 100644
index 0000000000..45e6ae776b
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/MainMenu.unity
@@ -0,0 +1,607 @@
+%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: 13
+  m_BakeOnSceneLoad: 0
+  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 &559666861
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 559666865}
+  - component: {fileID: 559666864}
+  - component: {fileID: 559666863}
+  - component: {fileID: 559666862}
+  m_Layer: 5
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &559666862
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 559666861}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &559666863
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 559666861}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!223 &559666864
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 559666861}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!224 &559666865
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 559666861}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1419645487}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!1 &1031380542
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1031380545}
+  - component: {fileID: 1031380544}
+  - component: {fileID: 1031380543}
+  m_Layer: 0
+  m_Name: EventSystem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1031380543
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1031380542}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_SendPointerHoverToParent: 1
+  m_HorizontalAxis: Horizontal
+  m_VerticalAxis: Vertical
+  m_SubmitButton: Submit
+  m_CancelButton: Cancel
+  m_InputActionsPerSecond: 10
+  m_RepeatDelay: 0.5
+  m_ForceModuleActive: 0
+--- !u!114 &1031380544
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1031380542}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_FirstSelected: {fileID: 0}
+  m_sendNavigationEvents: 1
+  m_DragThreshold: 10
+--- !u!4 &1031380545
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1031380542}
+  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 &1273064315
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1273064318}
+  - component: {fileID: 1273064317}
+  - component: {fileID: 1273064316}
+  m_Layer: 0
+  m_Name: Main Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!81 &1273064316
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1273064315}
+  m_Enabled: 1
+--- !u!20 &1273064317
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1273064315}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 0.16037738, g: 0.16037738, b: 0.16037738, a: 1}
+  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: -1
+  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 &1273064318
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1273064315}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1, z: -10}
+  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 &1346095180
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1346095182}
+  - component: {fileID: 1346095181}
+  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 &1346095181
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1346095180}
+  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 &1346095182
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1346095180}
+  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!1 &1419645486
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1419645487}
+  - component: {fileID: 1419645491}
+  - component: {fileID: 1419645490}
+  - component: {fileID: 1419645489}
+  - component: {fileID: 1419645488}
+  m_Layer: 5
+  m_Name: MainMenu
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1419645487
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1419645486}
+  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: 559666865}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 180, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1419645488
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1419645486}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6637cd674efb56a48a3d4d545d23a8d3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ShowTopMostFoldoutHeaderGroup: 1
+--- !u!114 &1419645489
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1419645486}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  GlobalObjectIdHash: 622675322
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 1
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
+  SyncOwnerTransformWhenParented: 1
+  AllowOwnerToParent: 0
+--- !u!114 &1419645490
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1419645486}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.8396226, g: 0.48815125, b: 0.019802418, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 23
+    m_FontStyle: 1
+    m_BestFit: 1
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 'Mock Main Menu '
+--- !u!222 &1419645491
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1419645486}
+  m_CullTransparentMesh: 1
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 1273064318}
+  - {fileID: 1346095182}
+  - {fileID: 559666865}
+  - {fileID: 1031380545}
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scenes/MainMenu.unity.meta b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/MainMenu.unity.meta
new file mode 100644
index 0000000000..f89877b055
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/MainMenu.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1ec6afcedd7df124e91af7bfbcea59b2
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scenes/ProjectPrefabs.asset b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/ProjectPrefabs.asset
new file mode 100644
index 0000000000..afdf3f97be
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/ProjectPrefabs.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: ProjectPrefabs
+  m_EditorClassIdentifier: 
+  IsDefault: 0
+  List:
+  - Override: 0
+    Prefab: {fileID: 4710599683293591777, guid: 90bfa3cd2cce8f14ead59b4dbdae92bb, type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
+  - Override: 0
+    Prefab: {fileID: 6472733969592893139, guid: 3e5167b6e6bcb5645abb2dbc0078091e, type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scenes/ProjectPrefabs.asset.meta b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/ProjectPrefabs.asset.meta
new file mode 100644
index 0000000000..402e4425d7
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/ProjectPrefabs.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3d25a2b1f6c12ee47bf7601c2edd7e70
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scenes/ServerScene.unity b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/ServerScene.unity
new file mode 100644
index 0000000000..577973e816
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/ServerScene.unity
@@ -0,0 +1,402 @@
+%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: 13
+  m_BakeOnSceneLoad: 0
+  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 &405623521
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 405623522}
+  - component: {fileID: 405623526}
+  - component: {fileID: 405623525}
+  m_Layer: 5
+  m_Name: ConnectedPlayers
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &405623522
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 405623521}
+  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: 1605560297}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -116, y: 27}
+  m_SizeDelta: {x: 180, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &405623525
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 405623521}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.8396226, g: 0.48815125, b: 0.019802418, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 'Players: 0'
+--- !u!222 &405623526
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 405623521}
+  m_CullTransparentMesh: 1
+--- !u!1 &1516152272
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1516152273}
+  - component: {fileID: 1516152277}
+  - component: {fileID: 1516152276}
+  m_Layer: 5
+  m_Name: ServerRuntime
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1516152273
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1516152272}
+  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: 1605560297}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -116, y: 61}
+  m_SizeDelta: {x: 180, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1516152276
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1516152272}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.8396226, g: 0.48815125, b: 0.019802418, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 'NetworkTick: 0'
+--- !u!222 &1516152277
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1516152272}
+  m_CullTransparentMesh: 1
+--- !u!1 &1605560293
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1605560297}
+  - component: {fileID: 1605560296}
+  - component: {fileID: 1605560295}
+  - component: {fileID: 1605560294}
+  - component: {fileID: 1605560298}
+  m_Layer: 5
+  m_Name: ServerCanvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1605560294
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1605560293}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &1605560295
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1605560293}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!223 &1605560296
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1605560293}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!224 &1605560297
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1605560293}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1516152273}
+  - {fileID: 405623522}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!114 &1605560298
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1605560293}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d370147e4c421014cb5dd4eee3b6a373, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ServerTime: {fileID: 1516152276}
+  PlayerCount: {fileID: 405623525}
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 1605560297}
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scenes/ServerScene.unity.meta b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/ServerScene.unity.meta
new file mode 100644
index 0000000000..21ce0ed652
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/ServerScene.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ee7bfa213000a594bb8011364915602e
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scenes/SharedScene.unity b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/SharedScene.unity
new file mode 100644
index 0000000000..1af0fa5fa5
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/SharedScene.unity
@@ -0,0 +1,1343 @@
+%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: 705507994}
+  m_UseRadianceAmbientProbe: 0
+--- !u!157 &3
+LightmapSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 13
+  m_BakeOnSceneLoad: 0
+  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: 500
+    m_PVRBounces: 2
+    m_PVREnvironmentSampleCount: 500
+    m_PVREnvironmentReferencePointCount: 2048
+    m_PVRFilteringMode: 2
+    m_PVRDenoiserTypeDirect: 0
+    m_PVRDenoiserTypeIndirect: 0
+    m_PVRDenoiserTypeAO: 0
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVREnvironmentMIS: 0
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
+  m_LightingDataAsset: {fileID: 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 &28232985
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 28232986}
+  - component: {fileID: 28232988}
+  - component: {fileID: 28232987}
+  - component: {fileID: 28232989}
+  - component: {fileID: 28232990}
+  m_Layer: 5
+  m_Name: ServerHostClientDisplay
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &28232986
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 28232985}
+  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: 479361665}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 20.5}
+  m_SizeDelta: {x: 180, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &28232987
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 28232985}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 23
+    m_FontStyle: 1
+    m_BestFit: 1
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+--- !u!222 &28232988
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 28232985}
+  m_CullTransparentMesh: 1
+--- !u!114 &28232989
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 28232985}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  GlobalObjectIdHash: 536662705
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 1
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 0
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 1
+  AutoObjectParentSync: 0
+  SyncOwnerTransformWhenParented: 0
+  AllowOwnerToParent: 0
+--- !u!114 &28232990
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 28232985}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6637cd674efb56a48a3d4d545d23a8d3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ShowTopMostFoldoutHeaderGroup: 1
+--- !u!1001 &45185844
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: RotationSpeed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: OnExitTransferParentOnStay
+      value: 
+      objectReference: {fileID: 621748559}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: DontDeparentIfParentedByOtherBody
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3307166493715739449, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: GlobalObjectIdHash
+      value: 3246499739
+      objectReference: {fileID: 0}
+    - target: {fileID: 3307166493715739449, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: InScenePlacedSourceGlobalObjectIdHash
+      value: 1084435762
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -60
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.34
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -49.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5415449980466536476, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_Name
+      value: StationaryBody-B
+      objectReference: {fileID: 0}
+    - target: {fileID: 8134939553748259768, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_Size.z
+      value: 19.891119
+      objectReference: {fileID: 0}
+    - target: {fileID: 8134939553748259768, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_Center.x
+      value: -0.038006783
+      objectReference: {fileID: 0}
+    - target: {fileID: 8134939553748259768, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_Center.z
+      value: -0.13657665
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+--- !u!1001 &66674670
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: RotationSpeed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: OnExitTransferParentOnStay
+      value: 
+      objectReference: {fileID: 520394643}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: DontDeparentIfParentedByOtherBody
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3307166493715739449, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: GlobalObjectIdHash
+      value: 4013775021
+      objectReference: {fileID: 0}
+    - target: {fileID: 3307166493715739449, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: InScenePlacedSourceGlobalObjectIdHash
+      value: 1084435762
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -60
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.34
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -33.32
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5415449980466536476, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_Name
+      value: StationaryBody-A
+      objectReference: {fileID: 0}
+    - target: {fileID: 8134939553748259768, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_Size.z
+      value: 19.906477
+      objectReference: {fileID: 0}
+    - target: {fileID: 8134939553748259768, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_Center.x
+      value: -0.038006783
+      objectReference: {fileID: 0}
+    - target: {fileID: 8134939553748259768, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_Center.z
+      value: 0.070830345
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+--- !u!1 &479361661
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 479361665}
+  - component: {fileID: 479361664}
+  - component: {fileID: 479361663}
+  - component: {fileID: 479361662}
+  m_Layer: 5
+  m_Name: SharedCanvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &479361662
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 479361661}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &479361663
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 479361661}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!223 &479361664
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 479361661}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!224 &479361665
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 479361661}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 28232986}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!114 &520394643 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+  m_PrefabInstance: {fileID: 45185844}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 374ac199eb18f0f468bc018a722775c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &621748559 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+  m_PrefabInstance: {fileID: 66674670}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 374ac199eb18f0f468bc018a722775c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &705507993
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 705507995}
+  - component: {fileID: 705507994}
+  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 &705507994
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 705507993}
+  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: 1
+  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 &705507995
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 705507993}
+  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!1 &737227285
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 737227286}
+  m_Layer: 0
+  m_Name: PointF
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &737227286
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 737227285}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 60.5, y: -0.34, z: -68.5}
+  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!1001 &748186899
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.25
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511854, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_Name
+      value: SceneLevelGeometry
+      objectReference: {fileID: 0}
+    m_RemovedComponents:
+    - {fileID: 4012615691354089850, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+    - {fileID: 4012615691354089845, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+    - {fileID: 4012615692791378779, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+    - {fileID: 4012615691503252836, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+    - {fileID: 4012615692269653855, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+    - {fileID: 4012615691965054906, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+    - {fileID: 4012615692791378776, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+    - {fileID: 4012615691503252837, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+    - {fileID: 4012615692269653852, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+    - {fileID: 4012615691965054907, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+--- !u!1001 &857399335
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: RotationSpeed
+      value: 0.25
+      objectReference: {fileID: 0}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: RotateDirection
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3307166493715739449, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: GlobalObjectIdHash
+      value: 1449196534
+      objectReference: {fileID: 0}
+    - target: {fileID: 3307166493715739449, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: InScenePlacedSourceGlobalObjectIdHash
+      value: 1084435762
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -60.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.34
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 56.8
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5415449980466536476, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_Name
+      value: RotatingBody
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+--- !u!1 &963194225
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 963194228}
+  - component: {fileID: 963194227}
+  - component: {fileID: 963194226}
+  m_Layer: 0
+  m_Name: Main Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!81 &963194226
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 963194225}
+  m_Enabled: 1
+--- !u!20 &963194227
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 963194225}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1}
+  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: -1
+  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 &963194228
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 963194225}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.15212336, y: 0, z: 0, w: 0.98836154}
+  m_LocalPosition: {x: 0, y: 4.5, z: -5.5}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 17.5, y: 0, z: 0}
+--- !u!1 &1184702125
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1184702128}
+  - component: {fileID: 1184702127}
+  - component: {fileID: 1184702126}
+  m_Layer: 0
+  m_Name: EventSystem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1184702126
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1184702125}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_SendPointerHoverToParent: 1
+  m_HorizontalAxis: Horizontal
+  m_VerticalAxis: Vertical
+  m_SubmitButton: Submit
+  m_CancelButton: Cancel
+  m_InputActionsPerSecond: 10
+  m_RepeatDelay: 0.5
+  m_ForceModuleActive: 0
+--- !u!114 &1184702127
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1184702125}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_FirstSelected: {fileID: 0}
+  m_sendNavigationEvents: 1
+  m_DragThreshold: 10
+--- !u!4 &1184702128
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1184702125}
+  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 &1364678139
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1364678140}
+  m_Layer: 0
+  m_Name: PointC
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1364678140
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1364678139}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 10.9, y: 40.6, z: -70}
+  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 &1525255853
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1525255854}
+  m_Layer: 0
+  m_Name: PointD
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1525255854
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1525255853}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 10.9, y: -0.34, z: -70}
+  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!1001 &1591298748
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: ZAxisMove
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: RotationSpeed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: PathMovement.Array.size
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: NetworkTransformExpanded
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: RotatingBodyLogicExpanded
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: 'PathMovement.Array.data[0]'
+      value: 
+      objectReference: {fileID: 1851254366}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: 'PathMovement.Array.data[1]'
+      value: 
+      objectReference: {fileID: 1939125342}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: 'PathMovement.Array.data[2]'
+      value: 
+      objectReference: {fileID: 1364678139}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: 'PathMovement.Array.data[3]'
+      value: 
+      objectReference: {fileID: 1525255853}
+    - target: {fileID: 3307166493715739449, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: GlobalObjectIdHash
+      value: 4258258070
+      objectReference: {fileID: 0}
+    - target: {fileID: 3307166493715739449, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: InScenePlacedSourceGlobalObjectIdHash
+      value: 1084435762
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 10.9
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.34
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 70
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5415449980466536476, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_Name
+      value: 'ElevatorBody '
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+--- !u!1 &1851254366
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1851254367}
+  m_Layer: 0
+  m_Name: PointA
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1851254367
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1851254366}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 10.9, y: -0.34, z: 70}
+  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 &1900905072
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1900905073}
+  m_Layer: 0
+  m_Name: PointE
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1900905073
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1900905072}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 60.5, y: -0.34, z: 70}
+  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 &1939125342
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1939125343}
+  m_Layer: 0
+  m_Name: PointB
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1939125343
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1939125342}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 10.9, y: 40.6, z: 70}
+  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!1001 &1968567121
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: ZAxisMove
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: RotationSpeed
+      value: 0.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: PathMovement.Array.size
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: RotatingBodyLogicExpanded
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: 'PathMovement.Array.data[0]'
+      value: 
+      objectReference: {fileID: 1900905072}
+    - target: {fileID: 850162744905636139, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: 'PathMovement.Array.data[1]'
+      value: 
+      objectReference: {fileID: 737227285}
+    - target: {fileID: 3307166493715739449, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: GlobalObjectIdHash
+      value: 1259759422
+      objectReference: {fileID: 0}
+    - target: {fileID: 3307166493715739449, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: InScenePlacedSourceGlobalObjectIdHash
+      value: 1084435762
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 60
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.34
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 70
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4291553105548296809, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5415449980466536476, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+      propertyPath: m_Name
+      value: MovingRotatingBody
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 0123d7125346c274da00b38e950a266b, type: 3}
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 963194228}
+  - {fileID: 705507995}
+  - {fileID: 479361665}
+  - {fileID: 1184702128}
+  - {fileID: 748186899}
+  - {fileID: 857399335}
+  - {fileID: 66674670}
+  - {fileID: 45185844}
+  - {fileID: 1968567121}
+  - {fileID: 1591298748}
+  - {fileID: 1851254367}
+  - {fileID: 1939125343}
+  - {fileID: 1364678140}
+  - {fileID: 1525255854}
+  - {fileID: 1900905073}
+  - {fileID: 737227286}
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scenes/SharedScene.unity.meta b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/SharedScene.unity.meta
new file mode 100644
index 0000000000..952bd1e9e1
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scenes/SharedScene.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9fc0d4010bbf28b4594072e72b8655ab
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scripts.meta b/Examples/OverridingScenesAndPrefabs/Assets/Scripts.meta
new file mode 100644
index 0000000000..528b6db2ae
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scripts.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8f0135d923712c4438b2facb3ce21fb6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scripts/InstanceTypeLocalBehavior.cs b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/InstanceTypeLocalBehavior.cs
new file mode 100644
index 0000000000..e8bee77712
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/InstanceTypeLocalBehavior.cs
@@ -0,0 +1,108 @@
+using Unity.Netcode;
+using UnityEngine;
+
+
+/// <summary>
+/// An example of how to get server or client specific behaviors without
+/// directly using a <see cref="NetworkBehaviour"/> but still associating
+/// with a <see cref="NetworkBehaviour"/>.
+/// </summary>
+public class InstanceTypeLocalBehavior : MonoBehaviour, INetworkUpdateSystem
+{
+    [Tooltip("When enabled, this will run only on a server or host. When disabled, this will only run on the owner of the local client player (including host).")]
+    public bool ServerOnly;
+
+    [Tooltip("This is the unique message example text displayed when running locally.")]
+    public string UniqueLocalInstanceContent;
+
+    private MoverScriptNoRigidbody m_MoverScriptNoRigidbody;
+    private NetworkManager m_NetworkManager;
+    private float m_NextTimeToLogMessage;
+
+    private void Awake()
+    {
+        m_MoverScriptNoRigidbody = GetComponent<MoverScriptNoRigidbody>();
+        m_MoverScriptNoRigidbody.NotifySpawnStatusChanged += OnSpawnStatusChanged;
+    }
+
+    /// <summary>
+    /// Adjust this logic to fit your needs.
+    /// This example makes the InstanceTypeLocalBehavior only update if:
+    /// - It is a server (including host) and is marked for ServerOnly
+    /// - It is a client (including host), is not marked for ServerOnly, and the local client is the owner of MoverScriptNoRigidbody.
+    /// - It is in distributed authority mode, is not marked for ServerOnly, and the local client has authority of the MoverScriptNoRigidbody.
+    /// </summary>
+    private bool HasAuthority()
+    {
+        if (m_NetworkManager == null)
+        {
+            return false;
+        }
+
+        if (!ServerOnly && m_NetworkManager.DistributedAuthorityMode && m_MoverScriptNoRigidbody.HasAuthority)
+        {
+            return true;
+        }
+        else
+        {
+            if (ServerOnly && m_NetworkManager.IsServer)
+            {
+                return true;
+            }
+            else if (!ServerOnly && m_MoverScriptNoRigidbody.IsOwner)
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /// <summary>
+    ///  <see cref="MoverScriptNoRigidbody.NotifySpawnStatusChanged"/>
+    ///  Isolate the spawning status to the <see cref="NetworkBehaviour"/> and just
+    ///  use actions, ecents, or delegates to notify non-shared behaviors that are
+    ///  only on a server or client version of a network prefab that has a <see cref="NetworkPrefabOverrideHandler"/>.
+    /// </summary>
+    /// <param name="spawned"></param>
+    private void OnSpawnStatusChanged(bool spawned)
+    {
+        if (spawned)
+        {
+            m_NetworkManager = m_MoverScriptNoRigidbody.NetworkManager;
+            if (HasAuthority())
+            {
+                NetworkUpdateLoop.RegisterNetworkUpdate(this, NetworkUpdateStage.Update);
+            }
+        }
+        else
+        {
+            // Whether registered or not, it is easier to just unregister always.
+            NetworkUpdateLoop.UnregisterAllNetworkUpdates(this);
+            m_NetworkManager = null;
+        }
+    }
+
+    /// <summary>
+    /// Invoked only on the instance(s) that have authority to update.
+    /// <see cref="HasAuthority"/>
+    /// </summary>
+    /// <param name="updateStage"></param>
+    public void NetworkUpdate(NetworkUpdateStage updateStage)
+    {
+        if (updateStage == NetworkUpdateStage.Update)
+        {
+            OnUpdate();
+        }
+    }
+
+
+    private void OnUpdate()
+    {
+        if (m_NextTimeToLogMessage < Time.realtimeSinceStartup)
+        {
+            var serverClient = m_MoverScriptNoRigidbody.IsServer ? "Server" : "Client";
+            NetworkManagerBootstrapper.Instance.LogMessage($"[{Time.realtimeSinceStartup}][{serverClient}-{m_MoverScriptNoRigidbody.name}] {UniqueLocalInstanceContent}");
+            m_NextTimeToLogMessage = Time.realtimeSinceStartup + 5.0f;
+        }
+    }
+}
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scripts/InstanceTypeLocalBehavior.cs.meta b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/InstanceTypeLocalBehavior.cs.meta
new file mode 100644
index 0000000000..e4a7e879ac
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/InstanceTypeLocalBehavior.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: bb9a9987a689bbe43a05463cf3713b22
\ No newline at end of file
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scripts/MoverScriptNoRigidbody.cs b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/MoverScriptNoRigidbody.cs
new file mode 100644
index 0000000000..5cc3865bfd
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/MoverScriptNoRigidbody.cs
@@ -0,0 +1,382 @@
+using System;
+using Unity.Netcode.Components;
+using Unity.Netcode;
+using UnityEngine;
+using Random = UnityEngine.Random;
+using Debug = UnityEngine.Debug;
+
+#region MoverScriptNoRigidbody Custom Editor 
+#if UNITY_EDITOR
+using Unity.Netcode.Editor;
+using UnityEditor;
+
+/// <summary>
+/// The custom editor for the <see cref="MoverScriptNoRigidbody"/> component.
+/// </summary>
+[CustomEditor(typeof(MoverScriptNoRigidbody), true)]
+[CanEditMultipleObjects]
+public class MoverScriptNoRigidbodyEditor : NetworkTransformEditor
+{
+    private SerializedProperty m_Radius;
+    private SerializedProperty m_Increment;
+    private SerializedProperty m_RotateSpeed;
+    private SerializedProperty m_MovementSpeed;
+    private SerializedProperty m_AirSpeedFactor;
+    private SerializedProperty m_Gravity;
+    private SerializedProperty m_ContinualChildMotion;
+
+
+    public override void OnEnable()
+    {
+        m_Radius = serializedObject.FindProperty(nameof(MoverScriptNoRigidbody.SpawnRadius));
+        m_Increment = serializedObject.FindProperty(nameof(MoverScriptNoRigidbody.Increment));
+        m_RotateSpeed = serializedObject.FindProperty(nameof(MoverScriptNoRigidbody.RotationSpeed));
+        m_MovementSpeed = serializedObject.FindProperty(nameof(MoverScriptNoRigidbody.MovementSpeed));
+        m_AirSpeedFactor = serializedObject.FindProperty(nameof(MoverScriptNoRigidbody.AirSpeedFactor));
+        m_Gravity = serializedObject.FindProperty(nameof(MoverScriptNoRigidbody.Gravity));
+        m_ContinualChildMotion = serializedObject.FindProperty(nameof(MoverScriptNoRigidbody.ContinualChildMotion));
+
+        base.OnEnable();
+    }
+
+    private void DisplayerMoverScriptNoRigidbodyProperties()
+    {
+        EditorGUILayout.PropertyField(m_Radius);
+        EditorGUILayout.PropertyField(m_Increment);
+        EditorGUILayout.PropertyField(m_RotateSpeed);
+        EditorGUILayout.PropertyField(m_MovementSpeed);
+        EditorGUILayout.PropertyField(m_AirSpeedFactor);
+        EditorGUILayout.PropertyField(m_Gravity);
+        EditorGUILayout.PropertyField(m_ContinualChildMotion);
+    }
+
+    public override void OnInspectorGUI()
+    {
+        var moverScriptNoRigidbody = target as MoverScriptNoRigidbody;
+        void SetExpanded(bool expanded) { moverScriptNoRigidbody.MoverScriptNoRigidbodyExpanded = expanded; };
+        DrawFoldOutGroup<MoverScriptNoRigidbody>(moverScriptNoRigidbody.GetType(), DisplayerMoverScriptNoRigidbodyProperties, moverScriptNoRigidbody.MoverScriptNoRigidbodyExpanded, SetExpanded);
+        base.OnInspectorGUI();
+    }
+}
+#endif
+#endregion
+
+/// <summary>
+/// The player controller for the player prefab
+/// </summary>
+public class MoverScriptNoRigidbody : NetworkTransform
+{
+#if UNITY_EDITOR
+    // Inspector view expand/collapse settings for this derived child class
+    [HideInInspector]
+    public bool MoverScriptNoRigidbodyExpanded;
+#endif
+
+    private static bool s_EnablePlayerParentingText = true;
+
+    [Tooltip("Radius range a player will spawn within.")]
+    [Range(1.0f, 40.0f)]
+    public float SpawnRadius = 10.0f;
+
+    [Range(0.001f, 10.0f)]
+    public float Increment = 1.0f;
+
+    [Tooltip("The rotation speed multiplier.")]
+    [Range(0.01f, 2.0f)]
+    public float RotationSpeed = 1.0f;
+
+    [Tooltip("The forward movement speed.")]
+    [Range(0.01f, 30.0f)]
+    public float MovementSpeed = 15.0f;
+
+    [Tooltip("The jump launching speed.")]
+    [Range(1.0f, 20f)]
+    public float JumpSpeed = 10.0f;
+
+    [Tooltip("Determines how much the player's motion is applied when in the air.")]
+    [Range(0.01f, 1.0f)]
+    public float AirSpeedFactor = 0.35f;
+
+    [Range(-20.0f, 20.0f)]
+    public float Gravity = -9.8f;
+
+    [Tooltip("When enabled, the child spheres will continually move. When disabled, the child spheres will only move when the player moves.")]
+    public bool ContinualChildMotion = true;
+
+
+    private TextMesh m_ParentedText;
+    private PlayerColor m_PlayerColor;
+    private float m_JumpDelay;
+    private Vector3 m_WorldMotion = Vector3.zero;
+    private Vector3 m_CameraOriginalPosition;
+    private Quaternion m_CameraOriginalRotation;
+    private CharacterController m_CharacterController;
+    private PlayerBallMotion m_PlayerBallMotion;
+
+    public event Action<bool> NotifySpawnStatusChanged;
+
+    protected override void Awake()
+    {
+        m_ParentedText = GetComponentInChildren<TextMesh>();
+        m_ParentedText?.gameObject.SetActive(false);
+        m_PlayerColor = GetComponent<PlayerColor>();
+        m_PlayerBallMotion = GetComponentInChildren<PlayerBallMotion>();
+        base.Awake();
+    }
+
+    /// <summary>
+    /// Invoked after being instantiated, we can do other pre-spawn related
+    /// initilization tasks here.
+    /// </summary>
+    /// <remarks>
+    /// This provides you with a reference to the current <see cref="NetworkManager"/>
+    /// since that is not set on the <see cref="NetworkBehaviour"/> until it is spawned.
+    /// </remarks>
+    /// <param name="networkManager"></param>
+    protected override void OnNetworkPreSpawn(ref NetworkManager networkManager)
+    {
+        m_CharacterController = GetComponent<CharacterController>();
+        // By default, we always disable the CharacterController and only enable it on the
+        // owner/authority side.
+        m_CharacterController.enabled = false;
+        base.OnNetworkPreSpawn(ref networkManager);
+    }
+
+    /// <summary>
+    /// We are using post spawn to handle any final spawn initializations.
+    /// At this point we know all NetworkBehaviours on this instance has 
+    /// been spawned.
+    /// </summary>
+    protected override void OnNetworkPostSpawn()
+    {
+        // Authority of this object sends local notifications to any non-networkbehaviour subscribers
+        NotifySpawnStatusChanged?.Invoke(true);
+
+        m_CharacterController.enabled = CanCommitToTransform;
+        if (CanCommitToTransform)
+        {
+            m_PlayerBallMotion.SetContinualMotion(ContinualChildMotion);
+            Random.InitState((int)DateTime.Now.Ticks);
+            transform.position += new Vector3(Random.Range(-SpawnRadius, SpawnRadius), 1.25f, Random.Range(0, SpawnRadius));
+            SetState(transform.position, null, null, false);
+            if (IsLocalPlayer)
+            {
+                NetworkObject.DontDestroyWithOwner = false;
+                m_CameraOriginalPosition = Camera.main.transform.position;
+                m_CameraOriginalRotation = Camera.main.transform.rotation;
+                Camera.main.transform.SetParent(transform, false);
+            }
+        }
+
+        if (NetworkObject.IsPlayerObject)
+        {
+            gameObject.name = $"Player-{OwnerClientId}";
+        }
+
+        m_ParentedText?.gameObject.SetActive(true);
+#if !DEDICATED_SERVER
+        UpdateParentedText();
+#endif
+        base.OnNetworkPostSpawn();
+    }
+
+    public override void OnNetworkDespawn()
+    {
+        // Notify any client or server specific componant that this instance has despawned.
+        NotifySpawnStatusChanged?.Invoke(false);
+        if (IsLocalPlayer)
+        {
+            m_CharacterController.enabled = false;
+            Camera.main.transform.SetParent(null, false);
+            Camera.main.transform.position = m_CameraOriginalPosition;
+            Camera.main.transform.rotation = m_CameraOriginalRotation;
+        }
+        base.OnNetworkDespawn();
+    }
+
+    /// <summary>
+    /// Bypass NetworkTransform's OnNetworkObjectParentChanged
+    /// </summary>
+    public override void OnNetworkObjectParentChanged(NetworkObject parentNetworkObject)
+    {
+        if (parentNetworkObject != null)
+        {
+            Debug.Log($"Parented under {parentNetworkObject.name}");
+        }
+#if !DEDICATED_SERVER
+        UpdateParentedText();
+#endif
+        base.OnNetworkObjectParentChanged(parentNetworkObject);
+    }
+
+    /// <summary>
+    /// This method handles both client-server and distributed authority network topologies
+    /// client-server: If we are not the server, then we need to send an Rpc to the server to handle parenting since the Character controller is disabled on the server for all client CharacterControllers (i.e. won't trigger).
+    /// distributed authority: If we are the authority, then handle parenting locally.
+    /// </summary>
+    /// <param name="parent"></param>
+    public void SetParent(NetworkObject parent)
+    {
+        if ((!NetworkManager.DistributedAuthorityMode && (IsServer || (NetworkObject.AllowOwnerToParent && IsOwner))) || (NetworkManager.DistributedAuthorityMode && HasAuthority))
+        {
+            if (parent != null)
+            {
+                NetworkObject.TrySetParent(parent);
+            }
+            else
+            {
+                NetworkObject.TryRemoveParent();
+            }
+        }
+        else if (!NetworkManager.DistributedAuthorityMode && !IsServer)
+        {
+            SetParentRpc(new NetworkObjectReference(parent));
+        }
+    }
+
+    [Rpc(SendTo.Server)]
+    public void SetParentRpc(NetworkObjectReference parentReference, RpcParams rpcParams = default)
+    {
+        var parent = (NetworkObject)null;
+        parentReference.TryGet(out parent, NetworkManager);
+        if (parent != null)
+        {
+            NetworkObject.TrySetParent(parent);
+        }
+        else
+        {
+            NetworkObject.TryRemoveParent();
+        }
+    }
+
+
+    private void Update()
+    {
+        if (!IsSpawned || !CanCommitToTransform)
+        {
+            return;
+        }
+        ApplyInput();
+    }
+
+
+    private Vector3 m_PushMotion = Vector3.zero;
+    /// <summary>
+    /// Since <see cref="CharacterController"/> has issues with collisions and rotating bodies,
+    /// we have to simulate the collision using triggers.
+    /// </summary>
+    /// <remarks>
+    /// <see cref="TriggerPush"/>
+    /// </remarks>
+    /// <param name="normal">direction to push away from</param>
+    public void PushAwayFrom(Vector3 normal)
+    {
+        m_PushMotion += normal * MovementSpeed * 0.10f * Time.deltaTime;
+    }
+
+    /// <summary>
+    /// Handles player input
+    /// </summary>
+    private void ApplyInput()
+    {
+        // Simple rotation:
+        // Since the forward vector is perpendicular to the right vector of the player, we can just
+        // apply the +/- value to our forward direction and lerp our right vector towards that direction
+        // in order to get a reasonably smooth rotation.
+        var rotation = transform.forward;
+        m_WorldMotion = Vector3.Lerp(m_WorldMotion, m_CharacterController.isGrounded ? Vector3.zero : Vector3.up * Gravity, Time.deltaTime * 2f);
+        var motion = m_WorldMotion * Time.deltaTime + m_PushMotion;
+        var moveMotion = 0.0f;
+
+        if (Input.GetKey(KeyCode.W) || Input.GetKey(KeyCode.UpArrow))
+        {
+            motion += transform.forward * MovementSpeed * Time.deltaTime * (m_CharacterController.isGrounded ? 1.0f : AirSpeedFactor);
+            moveMotion = 1.0f;
+            m_CharacterController.Move(motion);
+        }
+        if (Input.GetKey(KeyCode.S) || Input.GetKey(KeyCode.DownArrow))
+        {
+            motion += (transform.forward * -MovementSpeed) * Time.deltaTime * (m_CharacterController.isGrounded ? 1.0f : AirSpeedFactor);
+            moveMotion = -1.0f;
+            m_CharacterController.Move(motion);
+        }
+
+        if (!m_CharacterController.isGrounded || m_JumpDelay > Time.realtimeSinceStartup || m_PushMotion.magnitude > 0.01f)
+        {
+            m_CharacterController.Move(motion);
+        }
+
+        if (Input.GetKeyDown(KeyCode.Space) && m_CharacterController.isGrounded)
+        {
+            m_JumpDelay = Time.realtimeSinceStartup + 0.5f;
+            m_WorldMotion = motion + Vector3.up * JumpSpeed;
+        }
+
+        if (Input.GetKey(KeyCode.A) || Input.GetKey(KeyCode.LeftArrow))
+        {
+            transform.right = Vector3.Lerp(transform.right, rotation * RotationSpeed, Time.deltaTime).normalized;
+        }
+        if (Input.GetKey(KeyCode.D) || Input.GetKey(KeyCode.RightArrow))
+        {
+            transform.right = Vector3.Lerp(transform.right, rotation * -RotationSpeed, Time.deltaTime).normalized;
+        }
+
+        // Enabled/Disable player name, transform space, and parent TextMesh
+        if (Input.GetKeyDown(KeyCode.P))
+        {
+            s_EnablePlayerParentingText = !s_EnablePlayerParentingText;
+        }
+
+        if (Input.GetKeyDown(KeyCode.C))
+        {
+            ContinualChildMotion = !ContinualChildMotion;
+            m_PlayerBallMotion.SetContinualMotion(ContinualChildMotion);
+        }
+
+        m_PushMotion = Vector3.Lerp(m_PushMotion, Vector3.zero, 0.35f);
+
+        m_PlayerBallMotion.HasMotion(moveMotion);
+    }
+
+#if !DEDICATED_SERVER
+    /// <summary>
+    /// Updates player TextMesh relative to each client's camera view
+    /// </summary>
+    private void OnGUI()
+    {
+        if (m_ParentedText != null)
+        {
+            if (m_ParentedText.gameObject.activeInHierarchy != s_EnablePlayerParentingText)
+            {
+                m_ParentedText.gameObject.SetActive(s_EnablePlayerParentingText);
+            }
+            if (s_EnablePlayerParentingText)
+            {
+                var position = Camera.main.transform.position;
+                position.y = m_ParentedText.transform.position.y;
+                m_ParentedText.transform.LookAt(position, transform.up);
+                m_ParentedText.transform.forward = -m_ParentedText.transform.forward;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Updates the contents of the parented <see cref="TextMesh"/>
+    /// </summary>
+    private void UpdateParentedText()
+    {
+        if (m_ParentedText)
+        {
+            m_ParentedText.color = m_PlayerColor.Color;
+            if (transform.parent)
+            {
+                m_ParentedText.text = $"{gameObject.name}\n Local Space\n Parent: {transform.parent.name}";
+            }
+            else
+            {
+                m_ParentedText.text = $"{gameObject.name}\n WorldSpace\n Parent: None";
+            }
+        }
+    }
+#endif
+}
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scripts/MoverScriptNoRigidbody.cs.meta b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/MoverScriptNoRigidbody.cs.meta
new file mode 100644
index 0000000000..d1b709a9fb
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/MoverScriptNoRigidbody.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 5ce25b0b3f15e6446a88a85787c2f94a
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scripts/NetworkManagerBootstrapper.cs b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/NetworkManagerBootstrapper.cs
new file mode 100644
index 0000000000..da858b14ef
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/NetworkManagerBootstrapper.cs
@@ -0,0 +1,716 @@
+#if !DEDICATED_SERVER || (DEDICATED_SERVER && !UNITY_EDITOR)
+using System;
+#endif
+using System.Collections.Generic;
+using System.Linq;
+#if !DEDICATED_SERVER
+using System.Threading.Tasks;
+#endif
+using Unity.Netcode;
+#if !DEDICATED_SERVER
+using Unity.Services.Authentication;
+using Unity.Services.Core;
+using Unity.Services.Multiplayer;
+#else
+using Unity.Netcode.Transports.UTP;
+#endif
+using UnityEngine;
+#if !DEDICATED_SERVER
+using SessionState = Unity.Services.Multiplayer.SessionState;
+#endif
+
+#region NetworkManagerBootstrapperEditor
+#if UNITY_EDITOR
+using Unity.Netcode.Editor;
+using UnityEditor;
+
+/// <summary>
+/// The custom editor for the <see cref="NetworkManagerBootstrapper"/> component.
+/// </summary>
+[CustomEditor(typeof(NetworkManagerBootstrapper), true)]
+[CanEditMultipleObjects]
+public class NetworkManagerBootstrapperEditor : NetworkManagerEditor
+{
+    private SerializedProperty m_TargetFrameRate;
+    private SerializedProperty m_EnableVSync;
+
+    public override void OnEnable()
+    {
+        m_TargetFrameRate = serializedObject.FindProperty(nameof(NetworkManagerBootstrapper.TargetFrameRate));
+        m_EnableVSync = serializedObject.FindProperty(nameof(NetworkManagerBootstrapper.EnableVSync));
+        base.OnEnable();
+    }
+
+    private void DisplayNetworkManagerBootstrapperProperties()
+    {
+        EditorGUILayout.PropertyField(m_TargetFrameRate);
+        EditorGUILayout.PropertyField(m_EnableVSync);
+    }
+
+    public override void OnInspectorGUI()
+    {
+        var extendedNetworkManager = target as NetworkManagerBootstrapper;
+        void SetExpanded(bool expanded) { extendedNetworkManager.NetworkManagerBootstrapperExpanded = expanded; };
+        DrawFoldOutGroup<NetworkManagerBootstrapper>(extendedNetworkManager.GetType(), DisplayNetworkManagerBootstrapperProperties, extendedNetworkManager.NetworkManagerBootstrapperExpanded, SetExpanded);
+        base.OnInspectorGUI();
+    }
+}
+#endif
+#endregion
+
+/// <summary>
+/// An extended NetworkManager to handle the bootstrap loading process specific to a client-server
+/// topology where one might want to have local server-side scenes, local client-side scenes, and shared (synchronized) scenes.
+/// <see cref="SceneBootstrapLoader"/>
+/// </summary>
+public class NetworkManagerBootstrapper : NetworkManager
+{
+    #region Validation
+#if UNITY_EDITOR
+    // Inspector view expand/collapse settings for this derived child class
+    [HideInInspector]
+    public bool NetworkManagerBootstrapperExpanded;
+    protected override void OnValidateComponent()
+    {
+        m_OriginalVSyncCount = QualitySettings.vSyncCount;
+        m_ServicesRegistered = CloudProjectSettings.organizationName != string.Empty && CloudProjectSettings.organizationId != string.Empty;
+        base.OnValidateComponent();
+    }
+#endif
+#endregion
+
+    #region Properties
+    public static NetworkManagerBootstrapper Instance;
+
+    public int TargetFrameRate = 100;
+    public bool EnableVSync = false;
+
+    [HideInInspector]
+    [SerializeField]
+    private int m_OriginalVSyncCount;
+
+    /// <summary>
+    /// Example of how to control scene loading server local, client local, or shared.
+    /// Server local: nothing is synchronized with clients.
+    /// Client local: nothing is synchronized with the server.
+    /// Shared: Is synchronized with clients.
+    /// </summary>
+    private SceneBootstrapLoader m_SceneBootstrapLoader;
+
+    private enum ConnectionStates
+    {
+        None,
+        Connecting,
+        Connected,
+    }
+
+    private ConnectionStates m_ConnectionState;
+
+    [SerializeField]
+    private bool m_ServicesRegistered;
+#if !DEDICATED_SERVER
+    private ISession m_CurrentSession;
+    private string m_SessionName;
+    private string m_ProfileName;
+    private Task m_SessionTask;
+#endif
+#endregion
+
+    #region Initialization and Destroy
+    public static string GetRandomString(int length)
+    {
+        var r = new System.Random();
+        return new string(Enumerable.Range(0, length).Select(_ => (char)r.Next('a', 'z')).ToArray());
+    }
+
+    public void SetFrameRate(int targetFrameRate, bool enableVsync)
+    {
+        Application.targetFrameRate = targetFrameRate;
+        QualitySettings.vSyncCount = enableVsync ? m_OriginalVSyncCount : 0;
+    }
+
+    private void Awake()
+    {
+#if !DEDICATED_SERVER
+        Screen.SetResolution((int)(Screen.currentResolution.width * 0.40f), (int)(Screen.currentResolution.height * 0.40f), FullScreenMode.Windowed);
+        SetFrameRate(TargetFrameRate, EnableVSync);
+#endif
+        SetSingleton();
+        m_SceneBootstrapLoader = GetComponent<SceneBootstrapLoader>();
+    }
+
+#if DEDICATED_SERVER
+    private void Start()
+    {
+        m_SceneBootstrapLoader.OnMainMenuLoaded += OnMainMenuLoaded;
+        m_SceneBootstrapLoader.LoadMainMenu();
+    }
+
+    private void OnMainMenuLoaded()
+    {
+        m_SceneBootstrapLoader.OnMainMenuLoaded -= OnMainMenuLoaded;
+        StartDedicatedServer();
+    }
+#else
+    private async void Start()
+    {
+        OnClientConnectedCallback += OnClientConnected;
+        OnClientDisconnectCallback += OnClientDisconnect;
+        OnConnectionEvent += OnClientConnectionEvent;
+
+        // Check to see if the project has been registered with an organization before trying to sign in
+        if (m_ServicesRegistered)
+        {
+            if (UnityServices.Instance != null && UnityServices.Instance.State != ServicesInitializationState.Initialized)
+            {
+                await UnityServices.InitializeAsync();
+            }
+            if (!AuthenticationService.Instance.IsSignedIn)
+            {
+                AuthenticationService.Instance.SignInFailed += SignInFailed;
+                AuthenticationService.Instance.SignedIn += SignedIn;
+                if (string.IsNullOrEmpty(m_ProfileName))
+                {
+                    m_ProfileName = GetRandomString(5);
+                }
+                AuthenticationService.Instance.SwitchProfile(m_ProfileName);
+                await AuthenticationService.Instance.SignInAnonymouslyAsync();
+            }
+        }
+        m_SceneBootstrapLoader.LoadMainMenu();
+
+    }
+    private void OnDestroy()
+    {
+        OnClientConnectedCallback -= OnClientConnected;
+        OnClientDisconnectCallback -= OnClientDisconnect;
+        OnConnectionEvent -= OnClientConnectionEvent;
+    }
+#endif
+#endregion
+
+    #region Session and Connection Event Handling
+
+#if !DEDICATED_SERVER
+    private void OnClientConnectionEvent(NetworkManager networkManager, ConnectionEventData eventData)
+    {
+        LogMessage($"[{Time.realtimeSinceStartup}] Connection event {eventData.EventType} for Client-{eventData.ClientId}.");
+    }
+
+    private void OnClientConnected(ulong clientId)
+    {
+        LogMessage($"[{Time.realtimeSinceStartup}] Connected event invoked for Client-{clientId}.");
+    }
+
+    private void OnClientDisconnect(ulong clientId)
+    {
+        LogMessage($"[{Time.realtimeSinceStartup}] Disconnected event invoked for Client-{clientId}.");
+    }
+
+    private void SignedIn()
+    {
+        AuthenticationService.Instance.SignedIn -= SignedIn;
+        Debug.Log($"Signed in anonymously with profile {m_ProfileName}");
+    }
+
+    private void SignInFailed(RequestFailedException error)
+    {
+        AuthenticationService.Instance.SignInFailed -= SignInFailed;
+        Debug.LogError($"Failed to sign in {m_ProfileName} anonymously: {error}");
+    }
+
+    private void SessionStarted()
+    {
+        OnClientStarted -= SessionStarted;
+        m_ConnectionState = ConnectionStates.Connected;
+        if (IsServer)
+        {
+            LogMessage($"Server started session.");
+        }
+        else
+        {
+            LogMessage($"Client connecting to session.");
+        }
+    }
+
+    private void SessionStopped(bool isHost)
+    {
+        LogMessage($"NetworkManager has stopped.");
+        OnClientStopped -= SessionStopped;
+        m_ConnectionState = ConnectionStates.None;
+        if (IsServer)
+        {
+            ResetMainCamera();
+        }
+    }
+
+    private async Task<ISession> ConnectThroughLiveService()
+    {
+        try
+        {
+            var options = new SessionOptions()
+            {
+                Name = m_SessionName,
+                MaxPlayers = 32
+            }.WithDistributedAuthorityNetwork();
+
+            m_CurrentSession = await MultiplayerService.Instance.CreateOrJoinSessionAsync(m_SessionName, options);
+            return m_CurrentSession;
+        }
+        catch (Exception e)
+        {
+            LogMessage($"{e.Message}");
+            Debug.LogException(e);
+        }
+        return null;
+    }
+#endif
+#endregion
+
+    #region GUI Menu
+#if !DEDICATED_SERVER
+    public void StartOrConnectToDistributedAuthoritySession()
+    {
+        m_SessionTask = ConnectThroughLiveService();
+        m_ConnectionState = ConnectionStates.Connecting;
+        LogMessage($"Connecting to session {m_SessionName}...");
+    }
+
+    private void OnUpdateGUIDisconnected()
+    {
+        var width = !m_ServicesRegistered ? 600 : 300;
+        GUILayout.BeginArea(new Rect(10, 10, width, 800));
+
+        if (NetworkConfig.NetworkTopology == NetworkTopologyTypes.DistributedAuthority)
+        {
+            if (!m_ServicesRegistered)
+            {
+                GUILayout.Label("Project-Settings:Services-General-Settings is not configured.");
+                GUILayout.Label("Distributed authority requires project to be registered with your organization's services account for authentication purposes.");
+            }
+            else
+            {
+                m_SessionName = GUILayout.TextField(m_SessionName);
+
+                if (GUILayout.Button("Create or Connect To Session"))
+                {
+                    NetworkConfig.UseCMBService = true;
+                    OnClientStopped += SessionStopped;
+                    OnClientStarted += SessionStarted;
+                    m_SceneBootstrapLoader.StartSession(SceneBootstrapLoader.StartAsTypes.Client);
+                }
+            }
+        }
+        else
+        {
+            if (GUILayout.Button("Start Server"))
+            {
+                OnServerStopped += SessionStopped;
+                OnServerStarted += SessionStarted;
+                m_SceneBootstrapLoader.StartSession(SceneBootstrapLoader.StartAsTypes.Server);
+            }
+
+            if (GUILayout.Button("Start Host"))
+            {
+                OnServerStopped += SessionStopped;
+                OnServerStarted += SessionStarted;
+                m_SceneBootstrapLoader.StartSession(SceneBootstrapLoader.StartAsTypes.Host);
+            }
+
+            if (GUILayout.Button("Start Client"))
+            {
+                OnClientStopped += SessionStopped;
+                OnClientStarted += SessionStarted;
+                m_SceneBootstrapLoader.StartSession(SceneBootstrapLoader.StartAsTypes.Client);
+            }
+        }
+        GUILayout.EndArea();
+    }
+
+    private int OnUpdateGUIConnected(int yAxisOffset)
+    {
+        GUILayout.BeginArea(new Rect(10, 10, 800, 800));
+        if (CMBServiceConnection)
+        {
+            GUILayout.Label($"Distributed Authority Session: {m_SessionName}");
+            if (LocalClient.IsSessionOwner)
+            {
+                GUILayout.Label("[Session Owner]");
+                yAxisOffset += 20;
+            }
+        }
+        else
+        {
+            GUILayout.Label($"Client-Server Session");
+        }
+        GUILayout.EndArea();
+
+        GUILayout.BeginArea(new Rect(Display.main.renderingWidth - 160, 10, 150, 80));
+        var endSessionText = IsServer && !DistributedAuthorityMode ? "Shutdown" : "Disconnect";
+        if (GUILayout.Button(endSessionText))
+        {
+            if (m_CurrentSession != null && m_CurrentSession.State == SessionState.Connected)
+            {
+                m_CurrentSession.LeaveAsync();
+                m_CurrentSession = null;
+            }
+            else
+            {
+                Shutdown();
+            }
+        }
+        GUILayout.EndArea();
+
+        return yAxisOffset;
+    }
+
+    private void OnGUI()
+    {
+        var yAxisOffset = 10;
+        switch (m_ConnectionState)
+        {
+            case ConnectionStates.None:
+                {
+                    yAxisOffset = 80;
+                    OnUpdateGUIDisconnected();
+                    break;
+                }
+            case ConnectionStates.Connected:
+                {
+                    yAxisOffset = OnUpdateGUIConnected(40);
+                    break;
+                }
+        }
+
+        GUILayout.BeginArea(new Rect(10, yAxisOffset, 600, 800));
+        if (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();
+    }
+#endif
+#endregion
+
+    #region Server Camera Handling
+#if !DEDICATED_SERVER
+    private Vector3 m_CameraOriginalPosition;
+    private Quaternion m_CameraOriginalRotation;
+    private int m_CurrentFollowPlayerIndex = -1;
+    private MoverScriptNoRigidbody m_CurrentPlayerFollowed;
+
+    private void ResetMainCamera()
+    {
+        m_CurrentFollowPlayerIndex = -1;
+        SetCameraDefaults();
+    }
+    private void SetCameraDefaults()
+    {
+        if (Camera.main != null && Camera.main.transform.parent != null)
+        {
+            Camera.main.transform.SetParent(null, false);
+            Camera.main.transform.position = m_CameraOriginalPosition;
+            Camera.main.transform.rotation = m_CameraOriginalRotation;
+        }
+    }
+
+    /// <summary>
+    /// Server only (i.e. not host), follow players as they move around
+    /// </summary>
+    private void ServerFollowPlayerCheck()
+    {
+        bool leftBracket = Input.GetKeyDown(KeyCode.LeftBracket);
+        bool rightBracket = Input.GetKeyDown(KeyCode.RightBracket);
+
+        if ((leftBracket || rightBracket) && ConnectedClientsIds.Count > 0)
+        {
+            // Capture the main camera's original position and rotation the first time the server-side
+            // follows a player.
+            if (m_CurrentFollowPlayerIndex == -1)
+            {
+                m_CameraOriginalPosition = Camera.main.transform.position;
+                m_CameraOriginalRotation = Camera.main.transform.rotation;
+            }
+
+            if (leftBracket)
+            {
+                m_CurrentFollowPlayerIndex--;
+                if (m_CurrentFollowPlayerIndex < 0)
+                {
+                    m_CurrentFollowPlayerIndex = ConnectedClientsIds.Count - 1;
+                }
+            }
+            else
+            {
+                m_CurrentFollowPlayerIndex++;
+            }
+
+            m_CurrentFollowPlayerIndex %= ConnectedClientsIds.Count;
+
+            var playerId = ConnectedClientsIds[m_CurrentFollowPlayerIndex];
+            var playerNetworkClient = ConnectedClients[playerId];
+            m_CurrentPlayerFollowed = playerNetworkClient.PlayerObject.GetComponent<MoverScriptNoRigidbody>();
+            Camera.main.transform.SetParent(playerNetworkClient.PlayerObject.transform, false);
+        }
+        else if (Input.GetKeyDown(KeyCode.Backspace))
+        {
+            ClearFollowPlayer();
+        }
+    }
+    public void ClearFollowPlayer()
+    {
+        if (m_CurrentPlayerFollowed != null)
+        {
+            m_CurrentPlayerFollowed = null;
+            SetCameraDefaults();
+        }
+    }
+#endif
+#endregion
+
+    #region Update Methods and Properties
+#if DEDICATED_SERVER
+    private UnityTransport m_UnityTransport;
+    /// <summary>
+    /// All of the dedicated server specific script logic is contained and only compiled when DEDICATED_SERVER is defined
+    /// </summary>
+
+    private void StartDedicatedServer()
+    {
+        m_UnityTransport = NetworkConfig.NetworkTransport as UnityTransport;
+        if (m_UnityTransport != null)
+        {
+            // Always good to know what scenes are currently loaded since you might have
+            // different scenes to load for a DGS vs client
+            var scenesPreloaded = new System.Text.StringBuilder();
+            scenesPreloaded.Append("Scenes Preloaded: ");
+            for (int i = 0; i < UnityEngine.SceneManagement.SceneManager.sceneCount; i++)
+            {
+                var scene = UnityEngine.SceneManagement.SceneManager.GetSceneAt(i);
+                scenesPreloaded.Append($"[{scene.name}]");
+            }
+            Debug.Log(scenesPreloaded.ToString());
+
+            // Set the application frame rate to like 30 to reduce frame processing overhead
+            Application.targetFrameRate = 30;
+
+            Debug.Log($"[Pre-Init] Server Address Endpoint: {m_UnityTransport.ConnectionData.ServerEndPoint}");
+            Debug.Log($"[Pre-Init] Server Listen Endpoint: {m_UnityTransport.ConnectionData.ListenEndPoint}");
+            // Setup your IP and port sepcific to your DGS
+            //unityTransport.SetConnectionData(ListenAddress, ListenPort, ListenAddress);
+
+            //Debug.Log($"[Post-Init] Server Address Endpoint: {unityTransport.ConnectionData.ServerEndPoint}");
+            //Debug.Log($"[Post-Init] Server Listen Endpoint: {unityTransport.ConnectionData.ListenEndPoint}");
+
+            // Get the server started notification
+            OnServerStarted += ServerStarted;
+
+            // Start the server listening
+            m_SceneBootstrapLoader.StartSession(SceneBootstrapLoader.StartAsTypes.Server);
+        }
+        else
+        {
+            Debug.LogError("Failed to get the UnityTransport!");
+        }
+    }
+
+    /// <summary>
+    /// Register callbacks when the OnServerStarted callback is invoked.
+    /// This makes it easier to know you are registering for events only 
+    /// when the server successfully has started.
+    /// </summary>
+    private void ServerStarted()
+    {
+        Debug.Log("Dedicated Server Started!");
+        Debug.Log($"[Started] Server Address Endpoint: {m_UnityTransport.ConnectionData.ServerEndPoint}");
+        Debug.Log($"[Started] Server Listen Endpoint: {m_UnityTransport.ConnectionData.ListenEndPoint}");
+        Debug.Log("===============================================================");
+        Debug.Log("[X] Exits session (Shutdown) | [ESC] Exits application instance");
+        Debug.Log("===============================================================");
+        OnServerStarted -= ServerStarted;
+        OnClientConnectedCallback += ClientConnectedCallback;
+        OnClientDisconnectCallback += ClientDisconnectCallback;
+        // Register for OnServerStopped
+        OnServerStopped += ServerStopped;
+    }
+
+    private void ServerStopped(bool obj)
+    {
+        OnClientConnectedCallback -= ClientConnectedCallback;
+        OnClientDisconnectCallback -= ClientDisconnectCallback;
+        OnServerStopped -= ServerStopped;
+        Debug.Log("Dedicated Server Stopped!");
+        Debug.Log("===============================================================");
+        Debug.Log("[S] Starts new session (StartServer) | [ESC] Exits application");
+        Debug.Log("===============================================================");
+    }
+
+    private void ClientConnectedCallback(ulong clientId)
+    {
+        Debug.Log($"Client-{clientId} connected and approved.");
+    }
+
+    private void ClientDisconnectCallback(ulong clientId)
+    {
+        Debug.Log($"Client-{clientId} disconnected.");
+    }
+
+#if UNITY_EDITOR
+    private void HandleEditorKeyCommands()
+    {
+        // Shutdown/Stop the server
+        if (Input.GetKeyDown(KeyCode.X) && IsListening && !ShutdownInProgress)
+        {
+            Shutdown();
+        }
+        else // Start the server (this example makes it automatically start when the application first starts)
+        if (Input.GetKeyDown(KeyCode.S) && !IsListening)
+        {
+            StartDedicatedServer();
+        }
+    }
+#else
+    private void HandleConsoleKeyCommands()
+    {
+        if (Console.KeyAvailable) 
+        {
+            var networkManager = NetworkManager.Singleton;
+            var keyPressed = Console.ReadKey(true);
+            switch(keyPressed.Key) 
+            {
+                case ConsoleKey.X:
+                    {
+                        if(networkManager.IsListening && !networkManager.ShutdownInProgress)
+                        {
+                            networkManager.Shutdown();
+                        }
+                        break;
+                    }
+                case ConsoleKey.S:
+                    {
+                        if (!networkManager.IsListening && !networkManager.ShutdownInProgress)
+                        {
+                            StartDedicatedServer();
+                        }
+                        break;
+                    }
+                case ConsoleKey.Escape:
+                    {
+                        Application.Quit();
+                        break;
+                    }
+            }
+        }
+    }
+#endif
+
+    /// <summary>
+    /// Update that is only included in the build and invoked when running as a dedicated server
+    /// </summary>
+    private void DedicatedServerUpdate()
+    {
+#if UNITY_EDITOR
+        HandleEditorKeyCommands();
+#else
+        HandleConsoleKeyCommands();
+#endif
+    }
+
+#else // End of DEDICATED_SERVER defined region
+
+    /// <summary>
+    /// General update for server-side
+    /// </summary>
+    private void ServerSideUpdate()
+    {
+        if (!IsHost)
+        {
+            ServerFollowPlayerCheck();
+        }
+    }
+
+    /// <summary>
+    /// General update for client-side
+    /// </summary>
+    private void ClientSideUpdate()
+    {
+
+    }
+#endif
+
+    private void Update()
+    {
+#if DEDICATED_SERVER
+        DedicatedServerUpdate();
+#else
+        if (IsListening)
+        {
+            if (IsServer)
+            {
+                ServerSideUpdate();
+            }
+            else
+            {
+                ClientSideUpdate();
+            }
+        }
+#endif
+
+        if (m_MessageLogs.Count == 0)
+        {
+            return;
+        }
+
+        for (int i = m_MessageLogs.Count - 1; i >= 0; i--)
+        {
+            if (m_MessageLogs[i].ExpirationTime < Time.realtimeSinceStartup)
+            {
+                m_MessageLogs.RemoveAt(i);
+            }
+        }
+    }
+
+    #endregion
+
+    #region Message Logging
+
+    private List<MessageLog> m_MessageLogs = new List<MessageLog>();
+
+    private class MessageLog
+    {
+        public string Message { get; private set; }
+        public float ExpirationTime { get; private set; }
+
+        public MessageLog(string msg, float timeToLive)
+        {
+            Message = msg;
+            ExpirationTime = Time.realtimeSinceStartup + timeToLive;
+        }
+    }
+
+    public void LogMessage(string msg, float timeToLive = 10.0f)
+    {
+        if (m_MessageLogs.Count > 0)
+        {
+            m_MessageLogs.Insert(0, new MessageLog(msg, timeToLive));
+        }
+        else
+        {
+            m_MessageLogs.Add(new MessageLog(msg, timeToLive));
+        }
+
+        Debug.Log(msg);
+    }
+    #endregion
+
+    public NetworkManagerBootstrapper()
+    {
+        Instance = this;
+    }
+}
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scripts/NetworkManagerBootstrapper.cs.meta b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/NetworkManagerBootstrapper.cs.meta
new file mode 100644
index 0000000000..29e94329b2
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/NetworkManagerBootstrapper.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7db19e0e150e50d4ab23c69a086b8b6e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scripts/NetworkPrefabOverrideHandler.cs b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/NetworkPrefabOverrideHandler.cs
new file mode 100644
index 0000000000..9bba90b13a
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/NetworkPrefabOverrideHandler.cs
@@ -0,0 +1,67 @@
+using Unity.Netcode;
+using UnityEngine;
+
+/// <summary>
+/// Handles spawning different prefab versions based on whether it is a server or client.
+/// !!! CAUTION !!!
+/// Both network prefabs **MUST** have the same <see cref="NetworkBehaviour"/> components
+/// and any server or client specific components that are not netcode related but are
+/// dependencies of a <see cref="NetworkBehaviour"/> component on only the server or client
+/// needs to have code within the <see cref="NetworkBehaviour"/> component to account for
+/// any missing dependencies.
+/// </summary>
+[RequireComponent(typeof(NetworkManager))]
+[RequireComponent(typeof(NetworkPrefabOverrideHandler))]
+public class NetworkPrefabOverrideHandler : MonoBehaviour, INetworkPrefabInstanceHandler
+{
+    public GameObject NetworkPrefab;
+    public GameObject NetworkPrefabOverride;
+
+    private NetworkManagerBootstrapper m_NetworkManager;
+
+    private void Start()
+    {
+        m_NetworkManager = GetComponent<NetworkManagerBootstrapper>();
+        m_NetworkManager.PrefabHandler.AddHandler(NetworkPrefab, this);
+        NetworkManager.OnDestroying += NetworkManager_OnDestroying;
+    }
+
+    private void NetworkManager_OnDestroying(NetworkManager obj)
+    {
+        m_NetworkManager.PrefabHandler.RemoveHandler(NetworkPrefab);
+    }
+
+    /// <summary>
+    /// Invoked on both server and clients when the prefab is spawned.
+    /// Server-side will spawn the default network prefab.
+    /// Client-side will spawn the network prefab override version.
+    /// </summary>
+    /// <param name="ownerClientId">the client identifier that will own this network prefab instance</param>
+    /// <param name="position">optional to use the position passed in</param>
+    /// <param name="rotation">optional to use the rotation passed in</param>
+    /// <returns></returns>
+    public NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaternion rotation)
+    {
+        var gameObject = m_NetworkManager.IsClient ? Instantiate(NetworkPrefabOverride) : Instantiate(NetworkPrefab);
+        // You could integrate spawn locations here and on the server side apply the spawn position at
+        // this stage of the spawn process.
+        gameObject.transform.position = position;
+        gameObject.transform.rotation = rotation;
+        return gameObject.GetComponent<NetworkObject>();
+    }
+
+    public void Destroy(NetworkObject networkObject)
+    {
+#if !DEDICATED_SERVER
+        // Another useful thing about handling this instantiation and destruction of a NetworkObject is that you can do house cleaning
+        // prior to the object being destroyed. This handles the scenario where the server is following a player and the player disconnects.
+        // Before destroying the player object, we want to unparent the camera and reset the player being followed.
+        if (m_NetworkManager.IsServer && !m_NetworkManager.IsHost && Camera.main != null && Camera.main.transform.parent == networkObject.transform)
+        {
+            m_NetworkManager.ClearFollowPlayer();
+        }
+#endif
+        Destroy(networkObject.gameObject);
+    }
+}
+
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scripts/NetworkPrefabOverrideHandler.cs.meta b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/NetworkPrefabOverrideHandler.cs.meta
new file mode 100644
index 0000000000..df7dd96d8e
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/NetworkPrefabOverrideHandler.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 5c472ff64b067344893ed2e632d0f9f1
\ No newline at end of file
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scripts/PlayerBallMotion.cs b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/PlayerBallMotion.cs
new file mode 100644
index 0000000000..7e525d6c33
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/PlayerBallMotion.cs
@@ -0,0 +1,126 @@
+using System.Collections.Generic;
+using Unity.Netcode.Components;
+using UnityEngine;
+using System.Linq;
+
+
+#if UNITY_EDITOR
+using Unity.Netcode.Editor;
+using UnityEditor;
+
+/// <summary>
+/// The custom editor for the <see cref="MoverScriptNoRigidbody"/> component.
+/// </summary>
+[CustomEditor(typeof(PlayerBallMotion), true)]
+[CanEditMultipleObjects]
+public class PlayerBallMotionEditor : NetworkTransformEditor
+{
+    private SerializedProperty m_RotationAxis;
+    private SerializedProperty m_RotationSpeed;
+    
+
+    public override void OnEnable()
+    {
+        m_RotationAxis = serializedObject.FindProperty(nameof(PlayerBallMotion.RotationAxis));
+        m_RotationSpeed = serializedObject.FindProperty(nameof(PlayerBallMotion.RotationSpeed));
+        base.OnEnable();
+    }
+
+    private void DrawPlayerBallMotionProperties()
+    {
+        EditorGUILayout.PropertyField(m_RotationAxis);
+        EditorGUILayout.PropertyField(m_RotationSpeed);
+    }
+
+    public override void OnInspectorGUI()
+    {
+        var playerBallMotion = target as PlayerBallMotion;
+        void SetExpanded(bool expanded) { playerBallMotion.ExpandPlayerBallMotion = expanded; };
+        DrawFoldOutGroup< PlayerBallMotion>(playerBallMotion.GetType(), DrawPlayerBallMotionProperties, playerBallMotion.ExpandPlayerBallMotion, SetExpanded);
+        base.OnInspectorGUI();
+    }
+}
+#endif
+
+public class PlayerBallMotion : NetworkTransform
+{
+#if UNITY_EDITOR
+    public bool ExpandPlayerBallMotion;
+    public bool ExpandNetworkTransform;
+#endif
+    public enum RotateAroundAxis
+    {
+        Up,
+        Right,
+        Forward
+    }
+
+    public RotateAroundAxis RotationAxis;
+    public float RotationSpeed = 1.5f;
+
+    private Vector3 m_AxisRotation = Vector3.zero;
+    private List<PlayerBallMotion> m_Children;
+
+    private bool m_ContinualMotion;
+    private float m_CurrentRotionMotion = 1.0f;
+    public void SetContinualMotion(bool continualMotion)
+    {
+        m_ContinualMotion = continualMotion;
+        foreach (var child in m_Children)
+        {
+            child.SetContinualMotion(continualMotion);
+        }
+    }
+
+    protected override void Awake()
+    {
+        m_Children = GetComponentsInChildren<PlayerBallMotion>().Where((c)=> c != this).ToList();
+        base.Awake();
+    }
+
+    private void SetRotationAixs()
+    {
+        switch (RotationAxis)
+        {
+            case RotateAroundAxis.Up:
+                {
+                    m_AxisRotation = transform.parent.up;
+                    break;
+                }
+            case RotateAroundAxis.Right:
+                {
+                    m_AxisRotation = transform.parent.right;
+                    break;
+                }
+            case RotateAroundAxis.Forward:
+                {
+                    m_AxisRotation = transform.parent.forward;
+                    break;
+                }
+        }
+    }
+
+    public void HasMotion(float direction)
+    {
+        if (direction == 0.0f)
+        {
+            if(!m_ContinualMotion)
+            {
+                return;
+            }
+        }
+        else
+        {
+            m_CurrentRotionMotion = RotationSpeed * direction;
+        }
+
+
+        transform.LookAt(transform.parent);
+        SetRotationAixs();
+        transform.RotateAround(transform.parent.position, m_AxisRotation, m_CurrentRotionMotion);
+        foreach(var child in m_Children)
+        {
+            child.HasMotion(direction);
+        }
+    }
+}
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scripts/PlayerBallMotion.cs.meta b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/PlayerBallMotion.cs.meta
new file mode 100644
index 0000000000..407e0adf7b
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/PlayerBallMotion.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 792d7ce524eb358469373fe12babef88
\ No newline at end of file
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scripts/PlayerColor.cs b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/PlayerColor.cs
new file mode 100644
index 0000000000..aa3dc8c4ba
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/PlayerColor.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using Unity.Netcode;
+using UnityEngine;
+
+
+public class PlayerColor : NetworkBehaviour
+{
+    private static Color[] s_Colors = { Color.red, Color.green, Color.blue, Color.cyan, Color.magenta, Color.yellow };
+    public bool ApplyColorToChildren;
+    public Color Color { get; private set; }
+    public List<GameObject> IgnoreChildren;
+
+    public override void OnNetworkSpawn()
+    {
+        MeshRenderer meshRenderer = GetComponent<MeshRenderer>();
+        ulong myId = GetComponent<NetworkObject>().OwnerClientId - (ulong)(NetworkManager.DistributedAuthorityMode && NetworkManager.CMBServiceConnection ? 1 : 0);
+        Color = s_Colors[myId % Convert.ToUInt64(s_Colors.Length)];
+        if (meshRenderer)
+        {
+            meshRenderer.material.color = Color;
+            if (ApplyColorToChildren)
+            {
+                var meshRenderers = GetComponentsInChildren<MeshRenderer>();
+                foreach (var childMeshRenderer in meshRenderers)
+                {
+                    if (IgnoreChildren != null && IgnoreChildren.Contains(childMeshRenderer.gameObject))
+                    {
+                        continue;
+                    }
+                    childMeshRenderer.material.color = Color;
+                }
+            }
+        }
+
+        if (IsLocalPlayer)
+        {
+            var gameObject = FindAnyObjectByType<ServerHostClientText>();
+            if (gameObject != null)
+            {
+                var serverHost = gameObject.GetComponent<ServerHostClientText>();
+                serverHost?.SetColor(Color);
+            }
+        }
+        base.OnNetworkSpawn();
+    }
+}
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scripts/PlayerColor.cs.meta b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/PlayerColor.cs.meta
new file mode 100644
index 0000000000..90b6ca4628
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/PlayerColor.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8e5128237997be649af0cc87dd0eb563
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scripts/RotatingBodyLogic.cs b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/RotatingBodyLogic.cs
new file mode 100644
index 0000000000..eaa32a77d6
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/RotatingBodyLogic.cs
@@ -0,0 +1,201 @@
+using System.Collections.Generic;
+using Unity.Netcode;
+using Unity.Netcode.Components;
+using UnityEngine;
+#if UNITY_EDITOR
+using Unity.Netcode.Editor;
+using UnityEditor;
+
+/// <summary>
+/// The custom editor for the <see cref="RotatingBodyLogic"/> component.
+/// </summary>
+[CustomEditor(typeof(RotatingBodyLogic), true)]
+[CanEditMultipleObjects]
+public class RotatingBodyLogicEditor : NetworkTransformEditor
+{
+    private SerializedProperty m_RotationSpeed;
+    private SerializedProperty m_RotateDirection;
+    private SerializedProperty m_OnExitTransferParentOnStay;
+    private SerializedProperty m_PathMotion;
+
+
+    public override void OnEnable()
+    {
+        m_RotationSpeed = serializedObject.FindProperty(nameof(RotatingBodyLogic.RotationSpeed));
+        m_RotateDirection = serializedObject.FindProperty(nameof(RotatingBodyLogic.RotateDirection));
+        m_OnExitTransferParentOnStay = serializedObject.FindProperty(nameof(RotatingBodyLogic.OnExitTransferParentOnStay));
+        m_PathMotion = serializedObject.FindProperty(nameof(RotatingBodyLogic.PathMovement));
+        base.OnEnable();
+    }
+
+    private void DisplayRotatingBodyLogicProperties()
+    {
+        EditorGUILayout.PropertyField(m_RotationSpeed);
+        EditorGUILayout.PropertyField(m_RotateDirection);
+        EditorGUILayout.PropertyField(m_OnExitTransferParentOnStay);
+        EditorGUILayout.PropertyField(m_PathMotion);
+    }
+
+    public override void OnInspectorGUI()
+    {
+        var rotatingBodyLogic = target as RotatingBodyLogic;
+        void SetExpanded(bool expanded) { rotatingBodyLogic.RotatingBodyLogicExpanded = expanded; };
+        DrawFoldOutGroup<RotatingBodyLogic>(rotatingBodyLogic.GetType(), DisplayRotatingBodyLogicProperties, rotatingBodyLogic.RotatingBodyLogicExpanded, SetExpanded);
+        base.OnInspectorGUI();
+    }
+}
+#endif
+
+/// <summary>
+/// Handles rotating the large in-scene placed platform/tunnels and parenting/deparenting players
+/// </summary>
+public class RotatingBodyLogic : NetworkTransform
+{
+#if UNITY_EDITOR
+    // Inspector view expand/collapse settings for this derived child class
+    [HideInInspector]
+    public bool RotatingBodyLogicExpanded;
+#endif
+
+    public enum RotationDirections
+    {
+        Clockwise,
+        CounterClockwise
+    }
+
+    [Range(0.0f, 2.0f)]
+    public float RotationSpeed = 1.0f;
+    public RotationDirections RotateDirection;
+    public RotatingBodyLogic OnExitTransferParentOnStay;
+    public List<GameObject> PathMovement;
+
+    private TagHandle m_TagHandle;
+    private float m_RotationDirection;
+
+    private int m_CurrentPathObject = -1;
+    private GameObject m_CurrentNavPoint;
+
+    protected override void OnNetworkPreSpawn(ref NetworkManager networkManager)
+    {
+        m_TagHandle = TagHandle.GetExistingTag("Player");
+        m_RotationDirection = RotateDirection == RotationDirections.Clockwise ? 1.0f : -1.0f;
+        SetNextPoint();
+        base.OnNetworkPreSpawn(ref networkManager);
+    }
+
+    private void SetNextPoint()
+    {
+        if (PathMovement == null || PathMovement.Count == 0)
+        {
+            return;
+        }
+        m_CurrentPathObject++;
+        m_CurrentPathObject %= PathMovement.Count;
+        m_CurrentNavPoint = PathMovement[m_CurrentPathObject];
+    }
+
+
+    /// <summary>
+    /// When triggered, the player is parented under the rotating body.
+    /// </summary>
+    /// <remarks>
+    /// This is only triggered on the owner side since we disable the CharacterController
+    /// on all non-owner instances.
+    /// </remarks>
+    private void OnTriggerEnter(Collider other)
+    {
+        if (!IsSpawned || !other.CompareTag(m_TagHandle))
+        {
+            return;
+        }
+        var nonRigidPlayerMover = other.GetComponent<MoverScriptNoRigidbody>();
+        if (nonRigidPlayerMover != null)
+        {
+            nonRigidPlayerMover.SetParent(NetworkObject);
+        }
+    }
+
+    // This is used to handle NetworkObject to NetworkObject parenting detection
+    private List<MoverScriptNoRigidbody> m_TriggerStayBodies = new List<MoverScriptNoRigidbody>();
+
+    private void OnTriggerStay(Collider other)
+    {
+        if (!IsSpawned || !other.CompareTag(m_TagHandle))
+        {
+            return;
+        }
+        var nonRigidPlayerMover = other.GetComponent<MoverScriptNoRigidbody>();
+        if (nonRigidPlayerMover != null)
+        {
+            if (!m_TriggerStayBodies.Contains(nonRigidPlayerMover))
+            {
+                m_TriggerStayBodies.Add(nonRigidPlayerMover);
+            }
+        }
+    }
+
+    internal bool HandleParentingForTriggerStayBodies(MoverScriptNoRigidbody moverScriptNoRigidbody)
+    {
+        if (m_TriggerStayBodies.Contains(moverScriptNoRigidbody))
+        {
+            moverScriptNoRigidbody.SetParent(NetworkObject);
+            return true;
+        }
+        return false;
+    }
+
+    /// <summary>
+    /// When triggered, the player is deparented from the rotating body.
+    /// </summary>
+    /// <remarks>
+    /// This is only triggered on the owner side since we disable the CharacterController
+    /// on all non-owner instances.
+    /// </remarks>
+    private void OnTriggerExit(Collider other)
+    {
+        if (!IsSpawned || !other.CompareTag(m_TagHandle))
+        {
+            return;
+        }
+
+        var nonRigidPlayerMover = other.GetComponent<MoverScriptNoRigidbody>();
+        if (nonRigidPlayerMover != null)
+        {
+            m_TriggerStayBodies.Remove(nonRigidPlayerMover);
+            if (OnExitTransferParentOnStay && OnExitTransferParentOnStay.HandleParentingForTriggerStayBodies(nonRigidPlayerMover))
+            {
+                return;
+            }
+            // Otherwise, set parent back to root
+            nonRigidPlayerMover.SetParent(null);
+        }
+    }
+
+    /// <summary>
+    /// We rotate the body during late update to avoid fighting between the host/owner (depending upon network topology)
+    /// motion and the body's motion/rotation.
+    /// </summary>
+    private void LateUpdate()
+    {
+        if (!IsSpawned || !CanCommitToTransform)
+        {
+            return;
+        }
+
+        if (m_CurrentNavPoint != null)
+        {
+            if (Vector3.Distance(m_CurrentNavPoint.transform.position, transform.position) <= 0.05f)
+            {
+                SetNextPoint();
+            }
+
+            var direction = (m_CurrentNavPoint.transform.position - transform.position).normalized;
+            transform.position = Vector3.Lerp(transform.position, transform.position + direction * 10, Time.deltaTime);
+        }
+
+        if (RotationSpeed > 0.0f)
+        {
+            transform.right = Vector3.Lerp(transform.right, transform.forward * m_RotationDirection, Time.deltaTime * RotationSpeed);
+        }
+    }
+}
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scripts/RotatingBodyLogic.cs.meta b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/RotatingBodyLogic.cs.meta
new file mode 100644
index 0000000000..ce0ea09165
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/RotatingBodyLogic.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 374ac199eb18f0f468bc018a722775c2
\ No newline at end of file
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scripts/SceneBootstrapLoader.cs b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/SceneBootstrapLoader.cs
new file mode 100644
index 0000000000..256122618e
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/SceneBootstrapLoader.cs
@@ -0,0 +1,420 @@
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Unity.Netcode;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+#if UNITY_EDITOR
+using Unity.Netcode.Editor;
+using UnityEditor;
+
+/// <summary>
+/// The custom editor for the <see cref="SceneBootstrapLoaderEditor"/> component.
+/// </summary>
+[CustomEditor(typeof(SceneBootstrapLoader), true)]
+[CanEditMultipleObjects]
+public class SceneBootstrapLoaderEditor : NetcodeEditorBase<SceneBootstrapLoader>
+{
+    private SerializedProperty m_ServerSceneDefines;
+    private SerializedProperty m_ClientSceneDefines;
+
+    public override void OnEnable()
+    {
+        m_ServerSceneDefines = serializedObject.FindProperty(nameof(SceneBootstrapLoader.ServerSceneDefines));
+        m_ClientSceneDefines = serializedObject.FindProperty(nameof(SceneBootstrapLoader.ClientSceneDefines));
+        base.OnEnable();
+    }
+
+    private void DisplaySceneBootstrapLoaderProperties()
+    {
+        var sceneBootstrapLoader = target as SceneBootstrapLoader;
+        var networkManager = sceneBootstrapLoader.GetComponent<NetworkManager>();
+        if (networkManager.NetworkConfig.NetworkTopology == NetworkTopologyTypes.ClientServer)
+        {
+            EditorGUILayout.PropertyField(m_ServerSceneDefines);
+        }
+        EditorGUILayout.PropertyField(m_ClientSceneDefines);
+    }
+
+    public override void OnInspectorGUI()
+    {
+        var sceneBootstrapLoader = target as SceneBootstrapLoader;
+        void SetExpanded(bool expanded) { sceneBootstrapLoader.SceneBootstrapLoaderExpanded = expanded; };
+        DrawFoldOutGroup<NetworkManagerBootstrapper>(sceneBootstrapLoader.GetType(), DisplaySceneBootstrapLoaderProperties, sceneBootstrapLoader.SceneBootstrapLoaderExpanded, SetExpanded);
+        base.OnInspectorGUI();
+    }
+}
+
+#endif
+
+/// <summary>
+/// Example of how to control scene loading using a <see cref="NetworkSceneManager"/> additive client
+/// synchronization mode and server-side scene validation approach.
+/// </summary>
+/// <remarks>
+/// This component should be added to the same GameObject that the <see cref="NetworkManager"/> component
+/// is attached to (for this example we extended <see cref="NetworkManager"/> to <see cref="NetworkManagerBootstrapper"/>).
+/// </remarks>
+[RequireComponent(typeof(NetworkManager))]
+[RequireComponent(typeof(SceneBootstrapLoader))]
+public class SceneBootstrapLoader : MonoBehaviour
+{
+#if UNITY_EDITOR
+    // Inspector view expand/collapse settings for this derived child class
+    [HideInInspector]
+    public bool SceneBootstrapLoaderExpanded;
+
+    [Tooltip("The main menu or out of session scene to load.")]
+    public SceneAsset MainMenuSceneAsset;
+
+    /// <summary>
+    /// Converts SceneAssets to scene names
+    /// </summary>
+    private void OnValidate()
+    {
+        if (MainMenuSceneAsset != null)
+        {
+            m_MainMenuScene = MainMenuSceneAsset.name;
+        }
+        var networkManager = GetComponent<NetworkManager>();
+        if (networkManager.NetworkConfig.NetworkTopology == NetworkTopologyTypes.ClientServer)
+        {
+            ServerSceneDefines.Validate();
+        }
+        ClientSceneDefines.Validate();
+    }
+#endif
+
+    [Tooltip("Defines how to handle scenes for the server instance.")]
+    public ServerSceneDefine ServerSceneDefines;
+    [Tooltip("Defines how to handle scenes for the client instance.")]
+    public SceneDefine ClientSceneDefines;
+
+    private NetworkManagerBootstrapper m_NetworkManager;
+    private string m_SceneCurrentlyLoading;
+    private string m_SceneJustLoaded;
+
+    [HideInInspector]
+    [SerializeField]
+    private string m_MainMenuScene;
+
+    private void Awake()
+    {
+        m_NetworkManager = GetComponent<NetworkManagerBootstrapper>();
+    }
+
+    public event Action OnMainMenuLoaded;
+
+    /// <summary>
+    /// Should be invoked by bootstrap when first starting the applicaiton and should be loaded upon exiting
+    /// a session and shutting down the <see cref="NetworkManagerBootstrapper"/>.
+    /// </summary>
+    public void LoadMainMenu()
+    {
+        if (!m_NetworkManager.IsListening)
+        {
+            SceneManager.LoadScene(m_MainMenuScene, LoadSceneMode.Single);
+            OnMainMenuLoaded?.Invoke();
+        }
+        else
+        {
+            Debug.LogWarning($"Trying to load main scene {m_MainMenuScene} while {nameof(NetworkManagerBootstrapper)} is still running!");
+        }
+    }
+
+    public enum StartAsTypes
+    {
+        Server,
+        Host,
+        Client
+    }
+
+    /// <summary>
+    /// Invoked by the <see cref="NetworkManagerBootstrapper"/> when
+    /// starting a client or server.
+    /// </summary>
+    /// <param name="startAsServer"></param>
+    public void StartSession(StartAsTypes startAsType)
+    {
+        StartCoroutine(PreSceneLoading(startAsType));
+    }
+
+    /// <summary>
+    /// Both clients and the server invoke this when they shutdown.
+    /// </summary>
+    private void OnNetworkManagerShutdown(bool wasHost)
+    {
+        LoadMainMenu();
+    }
+
+    #region SCENE PRE & POST START LOADING METHODS
+    private IEnumerator PreSceneLoading(StartAsTypes startAsType)
+    {
+        var sceneDefines = startAsType == StartAsTypes.Client ? ClientSceneDefines : ServerSceneDefines;
+        SceneManager.sceneLoaded += SceneLoaded;
+
+        // Unloads any currently loaded scenes and becomes the default active scene.
+        // The default active scene ** has to be shared ** because it is where GameObjects are
+        // instantiated (which includes where network prefabs are instantiated when spawned dynamically)
+        yield return HandleSceneLoading(sceneDefines.DefaultActiveScene, LoadSceneMode.Single);
+
+        // Now load our local server or clien scenes additively
+        foreach (var sceneName in sceneDefines.LocalScenes)
+        {
+            yield return HandleSceneLoading(sceneName, LoadSceneMode.Additive);
+        }
+
+        // When running as a host, we load the client scenes too
+        if (startAsType == StartAsTypes.Host)
+        {
+            foreach (var sceneName in ClientSceneDefines.LocalScenes)
+            {
+                yield return HandleSceneLoading(sceneName, LoadSceneMode.Additive);
+            }
+        }
+
+        SceneManager.sceneLoaded -= SceneLoaded;
+
+        // Now start the NetworkManager (server or client)
+        if (startAsType != StartAsTypes.Client && m_NetworkManager.NetworkConfig.NetworkTopology == NetworkTopologyTypes.ClientServer)
+        {
+            // Server needs to do some additional congiruations to ignore the local scene loaded and
+            // will load any additional shared and synchronized scenes via the NetworkSceneManager.
+            m_NetworkManager.OnServerStarted += OnServerStarted;
+            m_NetworkManager.OnServerStopped += OnNetworkManagerShutdown;
+            if (startAsType == StartAsTypes.Server)
+            {
+                m_NetworkManager.StartServer();
+            }
+#if !DEDICATED_SERVER
+            else
+            {
+                m_NetworkManager.StartHost();
+            }
+#endif
+        }
+#if !DEDICATED_SERVER
+        else
+        {
+            m_NetworkManager.OnClientStopped += OnNetworkManagerShutdown;
+
+            // Distributed authority needs to start using the service and needs to know when the client becomes
+            // the session owner.
+            if (m_NetworkManager.NetworkConfig.NetworkTopology == NetworkTopologyTypes.DistributedAuthority)
+            {
+                m_NetworkManager.OnSessionOwnerPromoted += OnSessionOwnerPromoted;
+                m_NetworkManager.StartOrConnectToDistributedAuthoritySession();
+            }
+            else
+            {
+                m_NetworkManager.StartClient();
+            }
+        }
+#endif
+    }
+
+    /// <summary>
+    /// When the session owner is promoted, it needs to configure itself for the additive client synchronization
+    /// and handle scene validations.
+    /// </summary>
+    /// <param name="sessionOwnerPromoted"></param>
+    private void OnSessionOwnerPromoted(ulong sessionOwnerPromoted)
+    {
+        if (sessionOwnerPromoted == m_NetworkManager.LocalClientId)
+        {
+            // When we set the client synchronization mode to additive, the session owner will include this setting
+            // setting when synchronizing a newly joining client and the client will use any already loaded scenes 
+            // that the session owner determines should be synchronized. If a scene that is being synchronized is not
+            // yet loaded, then the client will load that scene.
+            m_NetworkManager.SceneManager.SetClientSynchronizationMode(LoadSceneMode.Additive);
+
+            // Add a callback to control which scene the session owner synchronizes with clients
+            m_NetworkManager.SceneManager.VerifySceneBeforeLoading = SessionOwnerVerifySceneShouldBeSynchronized;
+        }
+    }
+
+    /// <summary>
+    /// Handles scene loading via <see cref="SceneManager"/> or <see cref="NetworkSceneManager"/> depending upon
+    /// whether the <see cref="NetworkManager"/> is started or not.
+    /// </summary>
+    private IEnumerator HandleSceneLoading(string sceneName, LoadSceneMode loadSceneMode)
+    {
+        m_SceneJustLoaded = string.Empty;
+        m_SceneCurrentlyLoading = sceneName;
+
+        // Server will be the only NetworkManager instance where this is true
+        if (m_NetworkManager.IsListening)
+        {
+
+            var loadingStatus = m_NetworkManager.SceneManager.LoadScene(sceneName, loadSceneMode);
+            if (loadingStatus != SceneEventProgressStatus.Started)
+            {
+                Debug.LogError($"{nameof(NetworkSceneManager)} attempted to load scene {sceneName} but returned a status of {loadingStatus}!");
+                yield break;
+            }
+        }
+        else // Client and Server will both use this to preload their local scenes
+        {
+            SceneManager.LoadScene(m_SceneCurrentlyLoading, loadSceneMode);
+        }
+        while (m_SceneJustLoaded != m_SceneCurrentlyLoading)
+        {
+            yield return null;
+        }
+    }
+
+    private void SceneLoaded(Scene scene, LoadSceneMode loadSceneMode)
+    {
+        m_SceneJustLoaded = scene.name;
+    }
+#endregion
+
+    #region SERVER POST START CONFIGURATION AND ADDITIONAL SHARED SCENE LOADING
+    /// <summary>
+    /// Starts the <see cref="NetworkManagerBootstrapper"/> as a server.
+    /// </summary>
+    private void OnServerStarted()
+    {
+        m_NetworkManager.OnServerStarted -= OnServerStarted;
+
+        // When we set the client synchronization mode to additive, the server will include this setting
+        // when synchronizing a client and the client will use any already loaded scenes that the server
+        // wants to synchronize. If a scene that is being synchronized is not yet loaded, then the client
+        // will load that scene.
+        m_NetworkManager.SceneManager.SetClientSynchronizationMode(LoadSceneMode.Additive);
+
+        // Add a callback to control which scene the server synchronizes with clients
+        m_NetworkManager.SceneManager.VerifySceneBeforeLoading = ServerVerifySceneShouldBeSynchronized;
+
+        // If we have any additional shared scenes we want to load, then load them via NetworkSceneManager
+        if (ServerSceneDefines.SharedScenes.Count > 0)
+        {
+            StartCoroutine(ServerLoadAdditionalSharedScenes());
+        }
+    }
+
+    /// <summary>
+    /// When a client is first synchronized, the server will determine what scenes it should synchronize with the
+    /// client. This callback is invoked for every scene currently loaded and if it returns false then it will not
+    /// attempt to synchronize the scene with the client being synchronized.
+    /// </summary>
+    private bool ServerVerifySceneShouldBeSynchronized(int sceneIndex, string sceneName, LoadSceneMode loadSceneMode)
+    {
+        return !ServerSceneDefines.LocalScenes.Contains(sceneName);
+    }
+
+    /// <summary>
+    /// When a client is first synchronized, the session owner will determine what scenes it should synchronize with the
+    /// client. This callback is invoked for every scene currently loaded and if it returns false then it will not
+    /// attempt to synchronize the scene with the client being synchronized.
+    /// </summary>
+    /// <remarks>
+    /// We use the <see cref="ClientSceneDefines"/> for distributed authority to just exclude scenes that are already preloaded.
+    /// This is optional and semi-redundant since in a distributed network topology state is mirrored across all clients and
+    /// having locally loaded scenes not synchronized just limits where spawned objects can be migrated.
+    /// This is just for example purposes in the event you might need platform specific scenes loaded on a per client basis and/or
+    /// have some other project specific need to have locally loaded scenes that are not synchronized between all connected clients.
+    /// The recommended design for a distributed authority network topology is to just synchronize all scenes if possible.
+    /// </remarks>
+    private bool SessionOwnerVerifySceneShouldBeSynchronized(int sceneIndex, string sceneName, LoadSceneMode loadSceneMode)
+    {
+        return !ClientSceneDefines.LocalScenes.Contains(sceneName);
+    }
+
+
+    private IEnumerator ServerLoadAdditionalSharedScenes()
+    {
+        m_NetworkManager.SceneManager.OnLoadEventCompleted += Server_OnLoadEventCompleted;
+
+        foreach (var sharedScene in ServerSceneDefines.SharedScenes)
+        {
+            yield return HandleSceneLoading(sharedScene, LoadSceneMode.Additive);
+        }
+    }
+
+    private void Server_OnLoadEventCompleted(string sceneName, LoadSceneMode loadSceneMode, List<ulong> clientsCompleted, List<ulong> clientsTimedOut)
+    {
+        m_SceneJustLoaded = sceneName;
+    }
+    #endregion
+}
+
+/// <summary>
+/// The server scene defines included in (i.e. <see cref="SceneDefine"/>) and this provides
+/// you with the ability to have additional additively loaded scenes that the server will
+/// synchronize with clients.
+/// </summary>
+[Serializable]
+public class ServerSceneDefine : SceneDefine
+{
+    [HideInInspector]
+    public List<string> SharedScenes;
+
+#if UNITY_EDITOR
+    [Tooltip("These scenes will be loaded additively upon starting a session and will be synchronized.")]
+    public List<SceneAsset> SharedSceneAssets;
+    protected override void OnValidate()
+    {
+        SharedScenes = new List<string>();
+        foreach (var sharedSceneAsset in SharedSceneAssets)
+        {
+            if (sharedSceneAsset != null)
+            {
+                SharedScenes.Add(sharedSceneAsset.name);
+            }
+        }
+        base.OnValidate();
+    }
+#endif
+}
+
+/// <summary>
+/// The base client and server scenes loaded prior to starting:
+/// <see cref="DefaultActiveScene"/>: Must be synchonized/shared and is the default active scene.
+/// <see cref="LocalScenes"/>: Any client or server specific scenes you don't want synchronized, but
+/// want either the clients or server to load prior to starting a session.
+/// </summary>
+[Serializable]
+public class SceneDefine
+{
+    [HideInInspector]
+    public string DefaultActiveScene;
+    [HideInInspector]
+    public List<string> LocalScenes;
+
+#if UNITY_EDITOR
+    [Tooltip("This scene is synchronized and the default active scene loaded as LoadSceneMode.Single")]
+    public SceneAsset DefaultActiveSceneAsset;
+    [Tooltip("These scenes will be loaded additively and will not be synchronized.")]
+    public List<SceneAsset> LocalSceneAssets;
+
+    /// <summary>
+    /// Invoked by <see cref="SceneBootstrapLoader"/>.
+    /// </summary>
+    /// <remarks>
+    /// This is not the same as the Unity MonoBehaviour's OnValidate
+    /// </remarks>
+    protected virtual void OnValidate()
+    {
+        DefaultActiveScene = string.Empty;
+        if (DefaultActiveSceneAsset)
+        {
+            DefaultActiveScene = DefaultActiveSceneAsset.name;
+        }
+        LocalScenes = new List<string>();
+        foreach (var localSceneAsset in LocalSceneAssets)
+        {
+            if (localSceneAsset != null)
+            {
+                LocalScenes.Add(localSceneAsset.name);
+            }
+        }
+    }
+
+    public void Validate()
+    {
+        OnValidate();
+    }
+#endif
+}
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scripts/SceneBootstrapLoader.cs.meta b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/SceneBootstrapLoader.cs.meta
new file mode 100644
index 0000000000..adfb1bb99a
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/SceneBootstrapLoader.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: c4251d3d650053a419a5c503babb13a6
\ No newline at end of file
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scripts/ServerHostClientText.cs b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/ServerHostClientText.cs
new file mode 100644
index 0000000000..1319e54b85
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/ServerHostClientText.cs
@@ -0,0 +1,88 @@
+using Unity.Netcode;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class ServerHostClientText : NetworkBehaviour
+{
+    private Text m_DisplayText;
+
+    private Color m_Color;
+    private Color m_ColorAlpha;
+    private Vector3 m_AnchoredPosition;
+
+    public void SetColor(Color color)
+    {
+        m_Color = color;
+        m_ColorAlpha = color;
+        m_ColorAlpha.a = 0.35f;
+    }
+
+    private void Awake()
+    {
+        m_AnchoredPosition = (transform as RectTransform).anchoredPosition3D;
+        m_DisplayText = GetComponent<Text>();
+    }
+
+    private void Start()
+    {
+        if (m_DisplayText != null)
+        {
+            m_DisplayText.text = string.Empty;
+            SetColor(m_DisplayText.color);
+        }
+    }
+
+    public override void OnNetworkSpawn()
+    {
+        if (m_DisplayText != null)
+        {
+            if (NetworkManager.IsServer)
+            {
+                m_DisplayText.text = NetworkManager.IsHost ? "Host" : "Server";
+                if (!NetworkManager.IsHost)
+                {
+                    SetColor(Color.white);
+                    m_ColorAlpha.a = 0.65f;
+                }
+            }
+            else if (NetworkManager.IsClient)
+            {
+                m_DisplayText.text = $"Client-{NetworkManager.LocalClientId}";
+            }
+        }
+        (transform as RectTransform).anchoredPosition3D = m_AnchoredPosition;
+        base.OnNetworkSpawn();
+    }
+
+    public override void OnNetworkDespawn()
+    {
+        if (m_DisplayText != null)
+        {
+            m_DisplayText.text = string.Empty;
+        }
+        base.OnNetworkDespawn();
+    }
+
+#if !DEDICATED_SERVER
+    private bool m_LastFocusedValue;
+
+    private void OnGUI()
+    {
+        if (!IsSpawned || m_LastFocusedValue == Application.isFocused)
+        {
+            return;
+        }
+
+        m_LastFocusedValue = Application.isFocused;
+
+        if (m_LastFocusedValue)
+        {
+            m_DisplayText.color = m_Color;
+        }
+        else
+        {
+            m_DisplayText.color = m_ColorAlpha;
+        }
+    }
+#endif
+}
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scripts/ServerHostClientText.cs.meta b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/ServerHostClientText.cs.meta
new file mode 100644
index 0000000000..081f5a96a8
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/ServerHostClientText.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6637cd674efb56a48a3d4d545d23a8d3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scripts/ServerInfoDisplay.cs b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/ServerInfoDisplay.cs
new file mode 100644
index 0000000000..c4025fefc4
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/ServerInfoDisplay.cs
@@ -0,0 +1,30 @@
+#if !DEDICATED_SERVER
+using Unity.Netcode;
+#endif
+using UnityEngine;
+using UnityEngine.UI;
+
+public class ServerInfoDisplay : MonoBehaviour
+{
+    public Text ServerTime;
+    public Text PlayerCount;
+#if !DEDICATED_SERVER
+    private void OnGUI()
+    {
+        if (!NetworkManager.Singleton || !NetworkManager.Singleton.IsListening)
+        {
+            return;
+        }
+
+        if (ServerTime)
+        {
+            ServerTime.text = $"NetworkTick: {NetworkManager.Singleton.ServerTime.Tick}";
+        }
+
+        if (PlayerCount)
+        {
+            PlayerCount.text = $"Player Count: {NetworkManager.Singleton.ConnectedClients.Count}";
+        }
+    }
+#endif
+}
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scripts/ServerInfoDisplay.cs.meta b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/ServerInfoDisplay.cs.meta
new file mode 100644
index 0000000000..8fcedfa9ff
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/ServerInfoDisplay.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: d370147e4c421014cb5dd4eee3b6a373
\ No newline at end of file
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scripts/TriggerPush.cs b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/TriggerPush.cs
new file mode 100644
index 0000000000..ade22f3ed6
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/TriggerPush.cs
@@ -0,0 +1,63 @@
+using UnityEngine;
+
+/// <summary>
+/// This helper class is used to push a player away from a rotating body.
+/// <see cref="CharacterController"/>s without a <see cref="Rigidbody"/> don't
+/// handle collision with rotating bodies. This simulates a "collision".
+/// </summary>
+public class TriggerPush : MonoBehaviour
+{    
+    public enum RightOrLeft
+    {
+        Right,
+        Left
+    }
+
+    [Tooltip("Determines if this trigger will push the player to the left or right of the root transform")]
+    public RightOrLeft PushDirection;
+
+    private TagHandle m_TagHandle;
+
+    private void Awake()
+    {
+        m_TagHandle = TagHandle.GetExistingTag("Player");
+    }
+
+    private void PushObject(Collider other, bool isInside = false)
+    {
+        var nonRigidPlayerMover = other.GetComponent<MoverScriptNoRigidbody>();
+        if (nonRigidPlayerMover != null && nonRigidPlayerMover.CanCommitToTransform)
+        {
+            // We determine the direction to push and if within a trigger we push a little more to prevent from
+            // completely clipping through the object.
+            var direction = (PushDirection == RightOrLeft.Right ? 1.0f : -1.0f) * (isInside ? 1.75f : 1.0f);
+            nonRigidPlayerMover.PushAwayFrom(transform.parent.right * direction);
+        }
+    }
+
+    /// <summary>
+    /// Pushes the player away from the object
+    /// </summary>
+    private void OnTriggerEnter(Collider other)
+    {
+        if (!other.CompareTag(m_TagHandle))
+        {
+            return;
+        }
+        PushObject(other);
+    }
+
+    /// <summary>
+    /// When the trigger is in a "stay" state, we need to signal that
+    /// the amount to "push away" should be increased.
+    /// </summary>
+    /// <param name="other"></param>
+    private void OnTriggerStay(Collider other)
+    {
+        if (!other.CompareTag(m_TagHandle))
+        {
+            return;
+        }
+        PushObject(other, true);
+    }
+}
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Scripts/TriggerPush.cs.meta b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/TriggerPush.cs.meta
new file mode 100644
index 0000000000..7c07b1ebfc
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Scripts/TriggerPush.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 2c40721ca0fd31645a742e5ad0e0cdc5
\ No newline at end of file
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Settings.meta b/Examples/OverridingScenesAndPrefabs/Assets/Settings.meta
new file mode 100644
index 0000000000..bf54907342
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Settings.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f07d39c4f18773945af7943acf04dff7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Settings/Build Profiles.meta b/Examples/OverridingScenesAndPrefabs/Assets/Settings/Build Profiles.meta
new file mode 100644
index 0000000000..c47c89da39
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Settings/Build Profiles.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 38b8655f79da8bd4ea13982ac8833b71
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Settings/Build Profiles/New Windows Server Profile.asset b/Examples/OverridingScenesAndPrefabs/Assets/Settings/Build Profiles/New Windows Server Profile.asset
new file mode 100644
index 0000000000..b5b4979d3e
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Settings/Build Profiles/New Windows Server Profile.asset	
@@ -0,0 +1,49 @@
+%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: 15003, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: New Windows Server Profile
+  m_EditorClassIdentifier: 
+  m_AssetVersion: 1
+  m_BuildTarget: 19
+  m_Subtarget: 1
+  m_PlatformId: 8d1e1bca926649cba89d37a4c66e8b3d
+  m_PlatformBuildProfile:
+    rid: 4481205133896843345
+  m_OverrideGlobalSceneList: 0
+  m_Scenes: []
+  m_ScriptingDefines:
+  - DEDICATED_SERVER
+  m_PlayerSettingsYaml:
+    m_Settings: []
+  references:
+    version: 2
+    RefIds:
+    - rid: 4481205133896843345
+      type: {class: WindowsPlatformSettings, ns: UnityEditor.WindowsStandalone, asm: UnityEditor.WindowsStandalone.Extensions}
+      data:
+        m_Development: 0
+        m_ConnectProfiler: 0
+        m_BuildWithDeepProfilingSupport: 0
+        m_AllowDebugging: 0
+        m_WaitForManagedDebugger: 0
+        m_ManagedDebuggerFixedPort: 0
+        m_ExplicitNullChecks: 0
+        m_ExplicitDivideByZeroChecks: 0
+        m_ExplicitArrayBoundsChecks: 0
+        m_CompressionType: 0
+        m_InstallInBuildFolder: 0
+        m_WindowsBuildAndRunDeployTarget: 0
+        m_Architecture: 0
+        m_CreateSolution: 0
+        m_CopyPDBFiles: 0
+        m_WindowsDevicePortalAddress: 
+        m_WindowsDevicePortalUsername: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Settings/Build Profiles/New Windows Server Profile.asset.meta b/Examples/OverridingScenesAndPrefabs/Assets/Settings/Build Profiles/New Windows Server Profile.asset.meta
new file mode 100644
index 0000000000..6543ae07a8
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Settings/Build Profiles/New Windows Server Profile.asset.meta	
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ceabbe1f96a84864d8cecdc70db0a1f8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Textures.meta b/Examples/OverridingScenesAndPrefabs/Assets/Textures.meta
new file mode 100644
index 0000000000..84caff0700
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Textures.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 22c34a08d52a0644fae5e90dbcc0ba52
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Textures/GridPattern.png b/Examples/OverridingScenesAndPrefabs/Assets/Textures/GridPattern.png
new file mode 100644
index 0000000000..e2f648aacc
Binary files /dev/null and b/Examples/OverridingScenesAndPrefabs/Assets/Textures/GridPattern.png differ
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Textures/GridPattern.png.meta b/Examples/OverridingScenesAndPrefabs/Assets/Textures/GridPattern.png.meta
new file mode 100644
index 0000000000..305bd2392c
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Textures/GridPattern.png.meta
@@ -0,0 +1,153 @@
+fileFormatVersion: 2
+guid: a092c5fa8c60ed04aa1d72555f1740bc
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Textures/Grid_01_BaseMap.png b/Examples/OverridingScenesAndPrefabs/Assets/Textures/Grid_01_BaseMap.png
new file mode 100644
index 0000000000..3f311d2225
Binary files /dev/null and b/Examples/OverridingScenesAndPrefabs/Assets/Textures/Grid_01_BaseMap.png differ
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Textures/Grid_01_BaseMap.png.meta b/Examples/OverridingScenesAndPrefabs/Assets/Textures/Grid_01_BaseMap.png.meta
new file mode 100644
index 0000000000..3a05497054
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Textures/Grid_01_BaseMap.png.meta
@@ -0,0 +1,130 @@
+fileFormatVersion: 2
+guid: e71f43865e91e6b418bd0d67be2445dc
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: WindowsStoreApps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Textures/Grid_01_Emissive.png b/Examples/OverridingScenesAndPrefabs/Assets/Textures/Grid_01_Emissive.png
new file mode 100644
index 0000000000..df81ac1268
Binary files /dev/null and b/Examples/OverridingScenesAndPrefabs/Assets/Textures/Grid_01_Emissive.png differ
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Textures/Grid_01_Emissive.png.meta b/Examples/OverridingScenesAndPrefabs/Assets/Textures/Grid_01_Emissive.png.meta
new file mode 100644
index 0000000000..bcfe13d8d7
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Textures/Grid_01_Emissive.png.meta
@@ -0,0 +1,130 @@
+fileFormatVersion: 2
+guid: 8bf2cf149563066489e749ea032dbca7
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: WindowsStoreApps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Textures/Grid_01_Normal.png b/Examples/OverridingScenesAndPrefabs/Assets/Textures/Grid_01_Normal.png
new file mode 100644
index 0000000000..1d060fba61
Binary files /dev/null and b/Examples/OverridingScenesAndPrefabs/Assets/Textures/Grid_01_Normal.png differ
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Textures/Grid_01_Normal.png.meta b/Examples/OverridingScenesAndPrefabs/Assets/Textures/Grid_01_Normal.png.meta
new file mode 100644
index 0000000000..4a5b2ad61c
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Textures/Grid_01_Normal.png.meta
@@ -0,0 +1,130 @@
+fileFormatVersion: 2
+guid: b94463ba36040ec4082132c54dd1bbad
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 0
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 1
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: WindowsStoreApps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Textures/Grid_02_BaseMap.png b/Examples/OverridingScenesAndPrefabs/Assets/Textures/Grid_02_BaseMap.png
new file mode 100644
index 0000000000..b3069b03d1
Binary files /dev/null and b/Examples/OverridingScenesAndPrefabs/Assets/Textures/Grid_02_BaseMap.png differ
diff --git a/Examples/OverridingScenesAndPrefabs/Assets/Textures/Grid_02_BaseMap.png.meta b/Examples/OverridingScenesAndPrefabs/Assets/Textures/Grid_02_BaseMap.png.meta
new file mode 100644
index 0000000000..7fbedef673
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Assets/Textures/Grid_02_BaseMap.png.meta
@@ -0,0 +1,130 @@
+fileFormatVersion: 2
+guid: 844faea9c35b2464c8ecb09f66e2e2f8
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: WindowsStoreApps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/OverridingScenesAndPrefabs/Images/EndResultView.png b/Examples/OverridingScenesAndPrefabs/Images/EndResultView.png
new file mode 100644
index 0000000000..b98d38ee98
Binary files /dev/null and b/Examples/OverridingScenesAndPrefabs/Images/EndResultView.png differ
diff --git a/Examples/OverridingScenesAndPrefabs/Images/NetworkManagerBootstrapper.png b/Examples/OverridingScenesAndPrefabs/Images/NetworkManagerBootstrapper.png
new file mode 100644
index 0000000000..21a39012e9
Binary files /dev/null and b/Examples/OverridingScenesAndPrefabs/Images/NetworkManagerBootstrapper.png differ
diff --git a/Examples/OverridingScenesAndPrefabs/Images/NetworkManagerBootstrapperProperties.png b/Examples/OverridingScenesAndPrefabs/Images/NetworkManagerBootstrapperProperties.png
new file mode 100644
index 0000000000..8bf0db7fd8
Binary files /dev/null and b/Examples/OverridingScenesAndPrefabs/Images/NetworkManagerBootstrapperProperties.png differ
diff --git a/Examples/OverridingScenesAndPrefabs/Images/NetworkPrefabOverrideHandler.png b/Examples/OverridingScenesAndPrefabs/Images/NetworkPrefabOverrideHandler.png
new file mode 100644
index 0000000000..e5ce6e6835
Binary files /dev/null and b/Examples/OverridingScenesAndPrefabs/Images/NetworkPrefabOverrideHandler.png differ
diff --git a/Examples/OverridingScenesAndPrefabs/Images/SceneBootstrapLoader.png b/Examples/OverridingScenesAndPrefabs/Images/SceneBootstrapLoader.png
new file mode 100644
index 0000000000..d69118f4f6
Binary files /dev/null and b/Examples/OverridingScenesAndPrefabs/Images/SceneBootstrapLoader.png differ
diff --git a/Examples/OverridingScenesAndPrefabs/Images/ScenesView.png b/Examples/OverridingScenesAndPrefabs/Images/ScenesView.png
new file mode 100644
index 0000000000..49dcc587b6
Binary files /dev/null and b/Examples/OverridingScenesAndPrefabs/Images/ScenesView.png differ
diff --git a/Examples/OverridingScenesAndPrefabs/Images/ServiceSettings.png b/Examples/OverridingScenesAndPrefabs/Images/ServiceSettings.png
new file mode 100644
index 0000000000..ea7d2729d2
Binary files /dev/null and b/Examples/OverridingScenesAndPrefabs/Images/ServiceSettings.png differ
diff --git a/Examples/OverridingScenesAndPrefabs/Packages/manifest.json b/Examples/OverridingScenesAndPrefabs/Packages/manifest.json
new file mode 100644
index 0000000000..2ffae44925
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Packages/manifest.json
@@ -0,0 +1,56 @@
+{
+  "dependencies": {
+    "com.unity.2d.sprite": "1.0.0",
+    "com.unity.2d.tilemap": "1.0.0",
+    "com.unity.ads": "4.4.2",
+    "com.unity.ai.navigation": "2.0.4",
+    "com.unity.analytics": "3.8.1",
+    "com.unity.collab-proxy": "2.5.2",
+    "com.unity.feature.development": "1.0.2",
+    "com.unity.ide.rider": "3.0.31",
+    "com.unity.ide.visualstudio": "2.0.22",
+    "com.unity.multiplayer.center": "1.0.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.purchasing": "4.12.2",
+    "com.unity.services.multiplayer": "1.0.0",
+    "com.unity.test-framework": "1.4.5",
+    "com.unity.timeline": "1.8.7",
+    "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.9",
+    "com.unity.transport": "2.3.0",
+    "com.unity.ugui": "2.0.0",
+    "com.unity.visualscripting": "1.9.4",
+    "com.unity.xr.legacyinputhelpers": "2.1.11",
+    "com.unity.modules.accessibility": "1.0.0",
+    "com.unity.modules.ai": "1.0.0",
+    "com.unity.modules.androidjni": "1.0.0",
+    "com.unity.modules.animation": "1.0.0",
+    "com.unity.modules.assetbundle": "1.0.0",
+    "com.unity.modules.audio": "1.0.0",
+    "com.unity.modules.cloth": "1.0.0",
+    "com.unity.modules.director": "1.0.0",
+    "com.unity.modules.imageconversion": "1.0.0",
+    "com.unity.modules.imgui": "1.0.0",
+    "com.unity.modules.jsonserialize": "1.0.0",
+    "com.unity.modules.particlesystem": "1.0.0",
+    "com.unity.modules.physics": "1.0.0",
+    "com.unity.modules.physics2d": "1.0.0",
+    "com.unity.modules.screencapture": "1.0.0",
+    "com.unity.modules.terrain": "1.0.0",
+    "com.unity.modules.terrainphysics": "1.0.0",
+    "com.unity.modules.tilemap": "1.0.0",
+    "com.unity.modules.ui": "1.0.0",
+    "com.unity.modules.uielements": "1.0.0",
+    "com.unity.modules.umbra": "1.0.0",
+    "com.unity.modules.unityanalytics": "1.0.0",
+    "com.unity.modules.unitywebrequest": "1.0.0",
+    "com.unity.modules.unitywebrequestassetbundle": "1.0.0",
+    "com.unity.modules.unitywebrequestaudio": "1.0.0",
+    "com.unity.modules.unitywebrequesttexture": "1.0.0",
+    "com.unity.modules.unitywebrequestwww": "1.0.0",
+    "com.unity.modules.vehicles": "1.0.0",
+    "com.unity.modules.video": "1.0.0",
+    "com.unity.modules.vr": "1.0.0",
+    "com.unity.modules.wind": "1.0.0",
+    "com.unity.modules.xr": "1.0.0"
+  }
+}
diff --git a/Examples/OverridingScenesAndPrefabs/ProjectSettings/ClusterInputManager.asset b/Examples/OverridingScenesAndPrefabs/ProjectSettings/ClusterInputManager.asset
new file mode 100644
index 0000000000..e7886b266a
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/ProjectSettings/ClusterInputManager.asset
@@ -0,0 +1,6 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!236 &1
+ClusterInputManager:
+  m_ObjectHideFlags: 0
+  m_Inputs: []
diff --git a/Examples/OverridingScenesAndPrefabs/ProjectSettings/DynamicsManager.asset b/Examples/OverridingScenesAndPrefabs/ProjectSettings/DynamicsManager.asset
new file mode 100644
index 0000000000..735596aed0
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/ProjectSettings/DynamicsManager.asset
@@ -0,0 +1,37 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!55 &1
+PhysicsManager:
+  m_ObjectHideFlags: 0
+  serializedVersion: 17
+  m_Gravity: {x: 0, y: -9.81, z: 0}
+  m_DefaultMaterial: {fileID: 0}
+  m_BounceThreshold: 2
+  m_DefaultMaxDepenetrationVelocity: 10
+  m_SleepThreshold: 0.005
+  m_DefaultContactOffset: 0.01
+  m_DefaultSolverIterations: 6
+  m_DefaultSolverVelocityIterations: 1
+  m_QueriesHitBackfaces: 0
+  m_QueriesHitTriggers: 1
+  m_EnableAdaptiveForce: 0
+  m_ClothInterCollisionDistance: 0.1
+  m_ClothInterCollisionStiffness: 0.2
+  m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+  m_SimulationMode: 0
+  m_AutoSyncTransforms: 0
+  m_ReuseCollisionCallbacks: 0
+  m_InvokeCollisionCallbacks: 1
+  m_ClothInterCollisionSettingsToggle: 0
+  m_ClothGravity: {x: 0, y: -9.81, z: 0}
+  m_ContactPairsMode: 0
+  m_BroadphaseType: 0
+  m_FrictionType: 0
+  m_EnableEnhancedDeterminism: 0
+  m_EnableUnifiedHeightmaps: 1
+  m_ImprovedPatchFriction: 0
+  m_SolverType: 0
+  m_DefaultMaxAngularSpeed: 50
+  m_ScratchBufferChunkCount: 4
+  m_CurrentBackendId: 4072204805
+  m_FastMotionThreshold: 3.4028235e+38
diff --git a/Examples/OverridingScenesAndPrefabs/ProjectSettings/EditorBuildSettings.asset b/Examples/OverridingScenesAndPrefabs/ProjectSettings/EditorBuildSettings.asset
new file mode 100644
index 0000000000..5494efdd30
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/ProjectSettings/EditorBuildSettings.asset
@@ -0,0 +1,24 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1045 &1
+EditorBuildSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Scenes:
+  - enabled: 1
+    path: Assets/Scenes/BootstrapScene.unity
+    guid: 8077653236d44fd4b92cd4a96193e8b6
+  - enabled: 1
+    path: Assets/Scenes/MainMenu.unity
+    guid: 1ec6afcedd7df124e91af7bfbcea59b2
+  - enabled: 1
+    path: Assets/Scenes/SharedScene.unity
+    guid: 9fc0d4010bbf28b4594072e72b8655ab
+  - enabled: 1
+    path: Assets/Scenes/ServerScene.unity
+    guid: ee7bfa213000a594bb8011364915602e
+  - enabled: 1
+    path: Assets/Scenes/ClientScene.unity
+    guid: d8ac305138d51a84dbbb734b81c4054e
+  m_configObjects: {}
+  m_UseUCBPForAssetBundles: 0
diff --git a/Examples/OverridingScenesAndPrefabs/ProjectSettings/EditorSettings.asset b/Examples/OverridingScenesAndPrefabs/ProjectSettings/EditorSettings.asset
new file mode 100644
index 0000000000..75d7ca8478
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/ProjectSettings/EditorSettings.asset
@@ -0,0 +1,48 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!159 &1
+EditorSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 13
+  m_SerializationMode: 2
+  m_LineEndingsForNewScripts: 2
+  m_DefaultBehaviorMode: 0
+  m_PrefabRegularEnvironment: {fileID: 0}
+  m_PrefabUIEnvironment: {fileID: 0}
+  m_SpritePackerMode: 0
+  m_SpritePackerCacheSize: 10
+  m_SpritePackerPaddingPower: 1
+  m_Bc7TextureCompressor: 0
+  m_EtcTextureCompressorBehavior: 1
+  m_EtcTextureFastCompressor: 1
+  m_EtcTextureNormalCompressor: 2
+  m_EtcTextureBestCompressor: 4
+  m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;asmref;rsp;java;cpp;c;mm;m;h
+  m_ProjectGenerationRootNamespace: 
+  m_EnableTextureStreamingInEditMode: 1
+  m_EnableTextureStreamingInPlayMode: 1
+  m_EnableEditorAsyncCPUTextureLoading: 0
+  m_AsyncShaderCompilation: 1
+  m_PrefabModeAllowAutoSave: 1
+  m_EnterPlayModeOptionsEnabled: 1
+  m_EnterPlayModeOptions: 0
+  m_GameObjectNamingDigits: 1
+  m_GameObjectNamingScheme: 0
+  m_AssetNamingUsesSpace: 1
+  m_InspectorUseIMGUIDefaultInspector: 0
+  m_UseLegacyProbeSampleCount: 0
+  m_SerializeInlineMappingsOnOneLine: 1
+  m_DisableCookiesInLightmapper: 0
+  m_AssetPipelineMode: 1
+  m_RefreshImportMode: 0
+  m_CacheServerMode: 0
+  m_CacheServerEndpoint: 
+  m_CacheServerNamespacePrefix: default
+  m_CacheServerEnableDownload: 1
+  m_CacheServerEnableUpload: 1
+  m_CacheServerEnableAuth: 0
+  m_CacheServerEnableTls: 0
+  m_CacheServerValidationMode: 2
+  m_CacheServerDownloadBatchSize: 128
+  m_EnableEnlightenBakedGI: 0
+  m_ReferencedClipsExactNaming: 1
diff --git a/Examples/OverridingScenesAndPrefabs/ProjectSettings/GraphicsSettings.asset b/Examples/OverridingScenesAndPrefabs/ProjectSettings/GraphicsSettings.asset
new file mode 100644
index 0000000000..7c0ea0b5c3
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/ProjectSettings/GraphicsSettings.asset
@@ -0,0 +1,66 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!30 &1
+GraphicsSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 16
+  m_Deferred:
+    m_Mode: 1
+    m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
+  m_DeferredReflections:
+    m_Mode: 1
+    m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0}
+  m_ScreenSpaceShadows:
+    m_Mode: 1
+    m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0}
+  m_DepthNormals:
+    m_Mode: 1
+    m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0}
+  m_MotionVectors:
+    m_Mode: 1
+    m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0}
+  m_LightHalo:
+    m_Mode: 1
+    m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0}
+  m_LensFlare:
+    m_Mode: 1
+    m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0}
+  m_VideoShadersIncludeMode: 2
+  m_AlwaysIncludedShaders:
+  - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0}
+  m_PreloadedShaders: []
+  m_PreloadShadersBatchTimeLimit: -1
+  m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_CustomRenderPipeline: {fileID: 0}
+  m_TransparencySortMode: 0
+  m_TransparencySortAxis: {x: 0, y: 0, z: 1}
+  m_DefaultRenderingPath: 1
+  m_DefaultMobileRenderingPath: 1
+  m_TierSettings: []
+  m_LightmapStripping: 0
+  m_FogStripping: 0
+  m_InstancingStripping: 0
+  m_BrgStripping: 0
+  m_LightmapKeepPlain: 1
+  m_LightmapKeepDirCombined: 1
+  m_LightmapKeepDynamicPlain: 1
+  m_LightmapKeepDynamicDirCombined: 1
+  m_LightmapKeepShadowMask: 1
+  m_LightmapKeepSubtractive: 1
+  m_FogKeepLinear: 1
+  m_FogKeepExp: 1
+  m_FogKeepExp2: 1
+  m_AlbedoSwatchInfos: []
+  m_RenderPipelineGlobalSettingsMap: {}
+  m_LightsUseLinearIntensity: 0
+  m_LightsUseColorTemperature: 0
+  m_LogWhenShaderIsCompiled: 0
+  m_LightProbeOutsideHullStrategy: 1
+  m_CameraRelativeLightCulling: 0
+  m_CameraRelativeShadowCulling: 0
diff --git a/Examples/OverridingScenesAndPrefabs/ProjectSettings/InputManager.asset b/Examples/OverridingScenesAndPrefabs/ProjectSettings/InputManager.asset
new file mode 100644
index 0000000000..8068b2058b
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/ProjectSettings/InputManager.asset
@@ -0,0 +1,296 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!13 &1
+InputManager:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Axes:
+  - serializedVersion: 3
+    m_Name: Horizontal
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: left
+    positiveButton: right
+    altNegativeButton: a
+    altPositiveButton: d
+    gravity: 3
+    dead: 0.001
+    sensitivity: 3
+    snap: 1
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Vertical
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: down
+    positiveButton: up
+    altNegativeButton: s
+    altPositiveButton: w
+    gravity: 3
+    dead: 0.001
+    sensitivity: 3
+    snap: 1
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Fire1
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: left ctrl
+    altNegativeButton: 
+    altPositiveButton: mouse 0
+    gravity: 1000
+    dead: 0.001
+    sensitivity: 1000
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Fire2
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: left alt
+    altNegativeButton: 
+    altPositiveButton: mouse 1
+    gravity: 1000
+    dead: 0.001
+    sensitivity: 1000
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Fire3
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: left shift
+    altNegativeButton: 
+    altPositiveButton: mouse 2
+    gravity: 1000
+    dead: 0.001
+    sensitivity: 1000
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Jump
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: space
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 1000
+    dead: 0.001
+    sensitivity: 1000
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Mouse X
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: 
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 0
+    dead: 0
+    sensitivity: 0.1
+    snap: 0
+    invert: 0
+    type: 1
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Mouse Y
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: 
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 0
+    dead: 0
+    sensitivity: 0.1
+    snap: 0
+    invert: 0
+    type: 1
+    axis: 1
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Mouse ScrollWheel
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: 
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 0
+    dead: 0
+    sensitivity: 0.1
+    snap: 0
+    invert: 0
+    type: 1
+    axis: 2
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Horizontal
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: 
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 0
+    dead: 0.19
+    sensitivity: 1
+    snap: 0
+    invert: 0
+    type: 2
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Vertical
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: 
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 0
+    dead: 0.19
+    sensitivity: 1
+    snap: 0
+    invert: 1
+    type: 2
+    axis: 1
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Fire1
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: joystick button 0
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 1000
+    dead: 0.001
+    sensitivity: 1000
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Fire2
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: joystick button 1
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 1000
+    dead: 0.001
+    sensitivity: 1000
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Fire3
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: joystick button 2
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 1000
+    dead: 0.001
+    sensitivity: 1000
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Jump
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: joystick button 3
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 1000
+    dead: 0.001
+    sensitivity: 1000
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Submit
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: return
+    altNegativeButton: 
+    altPositiveButton: joystick button 0
+    gravity: 1000
+    dead: 0.001
+    sensitivity: 1000
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Submit
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: enter
+    altNegativeButton: 
+    altPositiveButton: space
+    gravity: 1000
+    dead: 0.001
+    sensitivity: 1000
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Cancel
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: escape
+    altNegativeButton: 
+    altPositiveButton: joystick button 1
+    gravity: 1000
+    dead: 0.001
+    sensitivity: 1000
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 0
+    joyNum: 0
+  m_UsePhysicalKeys: 1
diff --git a/Examples/OverridingScenesAndPrefabs/ProjectSettings/MemorySettings.asset b/Examples/OverridingScenesAndPrefabs/ProjectSettings/MemorySettings.asset
new file mode 100644
index 0000000000..5b5facecac
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/ProjectSettings/MemorySettings.asset
@@ -0,0 +1,35 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!387306366 &1
+MemorySettings:
+  m_ObjectHideFlags: 0
+  m_EditorMemorySettings:
+    m_MainAllocatorBlockSize: -1
+    m_ThreadAllocatorBlockSize: -1
+    m_MainGfxBlockSize: -1
+    m_ThreadGfxBlockSize: -1
+    m_CacheBlockSize: -1
+    m_TypetreeBlockSize: -1
+    m_ProfilerBlockSize: -1
+    m_ProfilerEditorBlockSize: -1
+    m_BucketAllocatorGranularity: -1
+    m_BucketAllocatorBucketsCount: -1
+    m_BucketAllocatorBlockSize: -1
+    m_BucketAllocatorBlockCount: -1
+    m_ProfilerBucketAllocatorGranularity: -1
+    m_ProfilerBucketAllocatorBucketsCount: -1
+    m_ProfilerBucketAllocatorBlockSize: -1
+    m_ProfilerBucketAllocatorBlockCount: -1
+    m_TempAllocatorSizeMain: -1
+    m_JobTempAllocatorBlockSize: -1
+    m_BackgroundJobTempAllocatorBlockSize: -1
+    m_JobTempAllocatorReducedBlockSize: -1
+    m_TempAllocatorSizeGIBakingWorker: -1
+    m_TempAllocatorSizeNavMeshWorker: -1
+    m_TempAllocatorSizeAudioWorker: -1
+    m_TempAllocatorSizeCloudWorker: -1
+    m_TempAllocatorSizeGfx: -1
+    m_TempAllocatorSizeJobWorker: -1
+    m_TempAllocatorSizeBackgroundWorker: -1
+    m_TempAllocatorSizePreloadManager: -1
+  m_PlatformMemorySettings: {}
diff --git a/Examples/OverridingScenesAndPrefabs/ProjectSettings/MultiplayerManager.asset b/Examples/OverridingScenesAndPrefabs/ProjectSettings/MultiplayerManager.asset
new file mode 100644
index 0000000000..2a936644e0
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/ProjectSettings/MultiplayerManager.asset
@@ -0,0 +1,7 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!655991488 &1
+MultiplayerManager:
+  m_ObjectHideFlags: 0
+  m_EnableMultiplayerRoles: 0
+  m_StrippingTypes: {}
diff --git a/Examples/OverridingScenesAndPrefabs/ProjectSettings/NavMeshAreas.asset b/Examples/OverridingScenesAndPrefabs/ProjectSettings/NavMeshAreas.asset
new file mode 100644
index 0000000000..2e2e36968e
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/ProjectSettings/NavMeshAreas.asset
@@ -0,0 +1,93 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!126 &1
+NavMeshProjectSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  areas:
+  - name: Walkable
+    cost: 1
+  - name: Not Walkable
+    cost: 1
+  - name: Jump
+    cost: 2
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  - name: 
+    cost: 1
+  m_LastAgentTypeID: -887442657
+  m_Settings:
+  - serializedVersion: 3
+    agentTypeID: 0
+    agentRadius: 0.5
+    agentHeight: 2
+    agentSlope: 45
+    agentClimb: 0.75
+    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_SettingNames:
+  - Humanoid
diff --git a/Examples/OverridingScenesAndPrefabs/ProjectSettings/Physics2DSettings.asset b/Examples/OverridingScenesAndPrefabs/ProjectSettings/Physics2DSettings.asset
new file mode 100644
index 0000000000..c00eeb46fd
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/ProjectSettings/Physics2DSettings.asset
@@ -0,0 +1,56 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!19 &1
+Physics2DSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 6
+  m_Gravity: {x: 0, y: -9.81}
+  m_DefaultMaterial: {fileID: 0}
+  m_VelocityIterations: 8
+  m_PositionIterations: 3
+  m_BounceThreshold: 1
+  m_MaxLinearCorrection: 0.2
+  m_MaxAngularCorrection: 8
+  m_MaxTranslationSpeed: 100
+  m_MaxRotationSpeed: 360
+  m_BaumgarteScale: 0.2
+  m_BaumgarteTimeOfImpactScale: 0.75
+  m_TimeToSleep: 0.5
+  m_LinearSleepTolerance: 0.01
+  m_AngularSleepTolerance: 2
+  m_DefaultContactOffset: 0.01
+  m_ContactThreshold: 0
+  m_JobOptions:
+    serializedVersion: 2
+    useMultithreading: 0
+    useConsistencySorting: 0
+    m_InterpolationPosesPerJob: 100
+    m_NewContactsPerJob: 30
+    m_CollideContactsPerJob: 100
+    m_ClearFlagsPerJob: 200
+    m_ClearBodyForcesPerJob: 200
+    m_SyncDiscreteFixturesPerJob: 50
+    m_SyncContinuousFixturesPerJob: 50
+    m_FindNearestContactsPerJob: 100
+    m_UpdateTriggerContactsPerJob: 100
+    m_IslandSolverCostThreshold: 100
+    m_IslandSolverBodyCostScale: 1
+    m_IslandSolverContactCostScale: 10
+    m_IslandSolverJointCostScale: 10
+    m_IslandSolverBodiesPerJob: 50
+    m_IslandSolverContactsPerJob: 50
+  m_SimulationMode: 0
+  m_SimulationLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_MaxSubStepCount: 4
+  m_MinSubStepFPS: 30
+  m_UseSubStepping: 0
+  m_UseSubStepContacts: 0
+  m_QueriesHitTriggers: 1
+  m_QueriesStartInColliders: 1
+  m_CallbacksOnDisable: 1
+  m_ReuseCollisionCallbacks: 1
+  m_AutoSyncTransforms: 0
+  m_GizmoOptions: 10
+  m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
diff --git a/Examples/OverridingScenesAndPrefabs/ProjectSettings/PresetManager.asset b/Examples/OverridingScenesAndPrefabs/ProjectSettings/PresetManager.asset
new file mode 100644
index 0000000000..67a94daefe
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/ProjectSettings/PresetManager.asset
@@ -0,0 +1,7 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1386491679 &1
+PresetManager:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_DefaultPresets: {}
diff --git a/Examples/OverridingScenesAndPrefabs/ProjectSettings/ProjectSettings.asset b/Examples/OverridingScenesAndPrefabs/ProjectSettings/ProjectSettings.asset
new file mode 100644
index 0000000000..7894df05ea
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/ProjectSettings/ProjectSettings.asset
@@ -0,0 +1,782 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!129 &1
+PlayerSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 28
+  productGUID: 6859c206e4885eb4d9a885722be3daa1
+  AndroidProfiler: 0
+  AndroidFilterTouchesWhenObscured: 0
+  AndroidEnableSustainedPerformanceMode: 0
+  defaultScreenOrientation: 4
+  targetDevice: 2
+  useOnDemandResources: 0
+  accelerometerFrequency: 60
+  companyName: Unity Software
+  productName: OverridingScenesAndPrefabs
+  defaultCursor: {fileID: 0}
+  cursorHotspot: {x: 0, y: 0}
+  m_SplashScreenBackgroundColor: {r: 0.12156863, g: 0.12156863, b: 0.1254902, a: 1}
+  m_ShowUnitySplashScreen: 1
+  m_ShowUnitySplashLogo: 1
+  m_SplashScreenOverlayOpacity: 1
+  m_SplashScreenAnimation: 1
+  m_SplashScreenLogoStyle: 1
+  m_SplashScreenDrawMode: 0
+  m_SplashScreenBackgroundAnimationZoom: 1
+  m_SplashScreenLogoAnimationZoom: 1
+  m_SplashScreenBackgroundLandscapeAspect: 1
+  m_SplashScreenBackgroundPortraitAspect: 1
+  m_SplashScreenBackgroundLandscapeUvs:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  m_SplashScreenBackgroundPortraitUvs:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  m_SplashScreenLogos: []
+  m_VirtualRealitySplashScreen: {fileID: 0}
+  m_HolographicTrackingLossScreen: {fileID: 0}
+  defaultScreenWidth: 1920
+  defaultScreenHeight: 1080
+  defaultScreenWidthWeb: 960
+  defaultScreenHeightWeb: 600
+  m_StereoRenderingPath: 0
+  m_ActiveColorSpace: 0
+  unsupportedMSAAFallback: 0
+  m_SpriteBatchMaxVertexCount: 65535
+  m_SpriteBatchVertexThreshold: 300
+  m_MTRendering: 1
+  mipStripping: 0
+  numberOfMipsStripped: 0
+  numberOfMipsStrippedPerMipmapLimitGroup: {}
+  m_StackTraceTypes: 010000000100000001000000010000000100000001000000
+  iosShowActivityIndicatorOnLoading: -1
+  androidShowActivityIndicatorOnLoading: -1
+  iosUseCustomAppBackgroundBehavior: 0
+  allowedAutorotateToPortrait: 1
+  allowedAutorotateToPortraitUpsideDown: 1
+  allowedAutorotateToLandscapeRight: 1
+  allowedAutorotateToLandscapeLeft: 1
+  useOSAutorotation: 1
+  use32BitDisplayBuffer: 1
+  preserveFramebufferAlpha: 0
+  disableDepthAndStencilBuffers: 0
+  androidStartInFullscreen: 1
+  androidRenderOutsideSafeArea: 1
+  androidUseSwappy: 1
+  androidBlitType: 0
+  androidResizeableActivity: 1
+  androidDefaultWindowWidth: 1920
+  androidDefaultWindowHeight: 1080
+  androidMinimumWindowWidth: 400
+  androidMinimumWindowHeight: 300
+  androidFullscreenMode: 1
+  androidAutoRotationBehavior: 1
+  androidPredictiveBackSupport: 0
+  androidApplicationEntry: 2
+  defaultIsNativeResolution: 1
+  macRetinaSupport: 1
+  runInBackground: 1
+  muteOtherAudioSources: 0
+  Prepare IOS For Recording: 0
+  Force IOS Speakers When Recording: 0
+  deferSystemGesturesMode: 0
+  hideHomeButton: 0
+  submitAnalytics: 1
+  usePlayerLog: 1
+  dedicatedServerOptimizations: 1
+  bakeCollisionMeshes: 0
+  forceSingleInstance: 0
+  useFlipModelSwapchain: 1
+  resizableWindow: 1
+  useMacAppStoreValidation: 0
+  macAppStoreCategory: public.app-category.games
+  gpuSkinning: 1
+  meshDeformation: 1
+  xboxPIXTextureCapture: 0
+  xboxEnableAvatar: 0
+  xboxEnableKinect: 0
+  xboxEnableKinectAutoTracking: 0
+  xboxEnableFitness: 0
+  visibleInBackground: 1
+  allowFullscreenSwitch: 1
+  fullscreenMode: 3
+  xboxSpeechDB: 0
+  xboxEnableHeadOrientation: 0
+  xboxEnableGuest: 0
+  xboxEnablePIXSampling: 0
+  metalFramebufferOnly: 0
+  xboxOneResolution: 0
+  xboxOneSResolution: 0
+  xboxOneXResolution: 3
+  xboxOneMonoLoggingLevel: 0
+  xboxOneLoggingLevel: 1
+  xboxOneDisableEsram: 0
+  xboxOneEnableTypeOptimization: 0
+  xboxOnePresentImmediateThreshold: 0
+  switchQueueCommandMemory: 1048576
+  switchQueueControlMemory: 16384
+  switchQueueComputeMemory: 262144
+  switchNVNShaderPoolsGranularity: 33554432
+  switchNVNDefaultPoolsGranularity: 16777216
+  switchNVNOtherPoolsGranularity: 16777216
+  switchGpuScratchPoolGranularity: 2097152
+  switchAllowGpuScratchShrinking: 0
+  switchNVNMaxPublicTextureIDCount: 0
+  switchNVNMaxPublicSamplerIDCount: 0
+  switchMaxWorkerMultiple: 8
+  switchNVNGraphicsFirmwareMemory: 32
+  vulkanNumSwapchainBuffers: 3
+  vulkanEnableSetSRGBWrite: 0
+  vulkanEnablePreTransform: 0
+  vulkanEnableLateAcquireNextImage: 0
+  vulkanEnableCommandBufferRecycling: 1
+  loadStoreDebugModeEnabled: 0
+  visionOSBundleVersion: 1.0
+  tvOSBundleVersion: 1.0
+  bundleVersion: 1.0
+  preloadedAssets: []
+  metroInputSource: 0
+  wsaTransparentSwapchain: 0
+  m_HolographicPauseOnTrackingLoss: 1
+  xboxOneDisableKinectGpuReservation: 1
+  xboxOneEnable7thCore: 1
+  vrSettings:
+    enable360StereoCapture: 0
+  isWsaHolographicRemotingEnabled: 0
+  enableFrameTimingStats: 0
+  enableOpenGLProfilerGPURecorders: 1
+  allowHDRDisplaySupport: 0
+  useHDRDisplay: 0
+  hdrBitDepth: 0
+  m_ColorGamuts: 00000000
+  targetPixelDensity: 30
+  resolutionScalingMode: 0
+  resetResolutionOnWindowResize: 0
+  androidSupportedAspectRatio: 1
+  androidMaxAspectRatio: 2.1
+  androidMinAspectRatio: 1
+  applicationIdentifier:
+    Standalone: com.DefaultCompany.CharacterControllerMovingBodies
+  buildNumber:
+    Standalone: 0
+    VisionOS: 0
+    iPhone: 0
+    tvOS: 0
+  overrideDefaultApplicationIdentifier: 0
+  AndroidBundleVersionCode: 1
+  AndroidMinSdkVersion: 23
+  AndroidTargetSdkVersion: 0
+  AndroidPreferredInstallLocation: 1
+  aotOptions: 
+  stripEngineCode: 1
+  iPhoneStrippingLevel: 0
+  iPhoneScriptCallOptimization: 0
+  ForceInternetPermission: 0
+  ForceSDCardPermission: 0
+  CreateWallpaper: 0
+  androidSplitApplicationBinary: 0
+  keepLoadedShadersAlive: 0
+  StripUnusedMeshComponents: 0
+  strictShaderVariantMatching: 0
+  VertexChannelCompressionMask: 4054
+  iPhoneSdkVersion: 988
+  iOSSimulatorArchitecture: 0
+  iOSTargetOSVersionString: 13.0
+  tvOSSdkVersion: 0
+  tvOSSimulatorArchitecture: 0
+  tvOSRequireExtendedGameController: 0
+  tvOSTargetOSVersionString: 13.0
+  VisionOSSdkVersion: 0
+  VisionOSTargetOSVersionString: 1.0
+  uIPrerenderedIcon: 0
+  uIRequiresPersistentWiFi: 0
+  uIRequiresFullScreen: 1
+  uIStatusBarHidden: 1
+  uIExitOnSuspend: 0
+  uIStatusBarStyle: 0
+  appleTVSplashScreen: {fileID: 0}
+  appleTVSplashScreen2x: {fileID: 0}
+  tvOSSmallIconLayers: []
+  tvOSSmallIconLayers2x: []
+  tvOSLargeIconLayers: []
+  tvOSLargeIconLayers2x: []
+  tvOSTopShelfImageLayers: []
+  tvOSTopShelfImageLayers2x: []
+  tvOSTopShelfImageWideLayers: []
+  tvOSTopShelfImageWideLayers2x: []
+  iOSLaunchScreenType: 0
+  iOSLaunchScreenPortrait: {fileID: 0}
+  iOSLaunchScreenLandscape: {fileID: 0}
+  iOSLaunchScreenBackgroundColor:
+    serializedVersion: 2
+    rgba: 0
+  iOSLaunchScreenFillPct: 100
+  iOSLaunchScreenSize: 100
+  iOSLaunchScreeniPadType: 0
+  iOSLaunchScreeniPadImage: {fileID: 0}
+  iOSLaunchScreeniPadBackgroundColor:
+    serializedVersion: 2
+    rgba: 0
+  iOSLaunchScreeniPadFillPct: 100
+  iOSLaunchScreeniPadSize: 100
+  iOSLaunchScreenCustomStoryboardPath: 
+  iOSLaunchScreeniPadCustomStoryboardPath: 
+  iOSDeviceRequirements: []
+  iOSURLSchemes: []
+  macOSURLSchemes: []
+  iOSBackgroundModes: 0
+  iOSMetalForceHardShadows: 0
+  metalEditorSupport: 1
+  metalAPIValidation: 1
+  metalCompileShaderBinary: 0
+  iOSRenderExtraFrameOnPause: 0
+  iosCopyPluginsCodeInsteadOfSymlink: 0
+  appleDeveloperTeamID: 
+  iOSManualSigningProvisioningProfileID: 
+  tvOSManualSigningProvisioningProfileID: 
+  VisionOSManualSigningProvisioningProfileID: 
+  iOSManualSigningProvisioningProfileType: 0
+  tvOSManualSigningProvisioningProfileType: 0
+  VisionOSManualSigningProvisioningProfileType: 0
+  appleEnableAutomaticSigning: 0
+  iOSRequireARKit: 0
+  iOSAutomaticallyDetectAndAddCapabilities: 1
+  appleEnableProMotion: 0
+  shaderPrecisionModel: 0
+  clonedFromGUID: 00000000000000000000000000000000
+  templatePackageId: 
+  templateDefaultScene: 
+  useCustomMainManifest: 0
+  useCustomLauncherManifest: 0
+  useCustomMainGradleTemplate: 0
+  useCustomLauncherGradleManifest: 0
+  useCustomBaseGradleTemplate: 0
+  useCustomGradlePropertiesTemplate: 0
+  useCustomGradleSettingsTemplate: 0
+  useCustomProguardFile: 0
+  AndroidTargetArchitectures: 2
+  AndroidSplashScreenScale: 0
+  androidSplashScreen: {fileID: 0}
+  AndroidKeystoreName: 
+  AndroidKeyaliasName: 
+  AndroidEnableArmv9SecurityFeatures: 0
+  AndroidEnableArm64MTE: 0
+  AndroidBuildApkPerCpuArchitecture: 0
+  AndroidTVCompatibility: 0
+  AndroidIsGame: 1
+  AndroidEnableTango: 0
+  androidEnableBanner: 1
+  androidUseLowAccuracyLocation: 0
+  androidUseCustomKeystore: 0
+  m_AndroidBanners:
+  - width: 320
+    height: 180
+    banner: {fileID: 0}
+  androidGamepadSupportLevel: 0
+  AndroidMinifyRelease: 0
+  AndroidMinifyDebug: 0
+  AndroidValidateAppBundleSize: 1
+  AndroidAppBundleSizeToValidate: 200
+  AndroidReportGooglePlayAppDependencies: 1
+  androidSymbolsSizeThreshold: 800
+  m_BuildTargetIcons: []
+  m_BuildTargetPlatformIcons:
+  - m_BuildTarget: Android
+    m_Icons:
+    - m_Textures: []
+      m_Width: 432
+      m_Height: 432
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 324
+      m_Height: 324
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 216
+      m_Height: 216
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 162
+      m_Height: 162
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 108
+      m_Height: 108
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 81
+      m_Height: 81
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 0
+      m_SubKind: 
+  m_BuildTargetBatching: []
+  m_BuildTargetShaderSettings: []
+  m_BuildTargetGraphicsJobs: []
+  m_BuildTargetGraphicsJobMode: []
+  m_BuildTargetGraphicsAPIs: []
+  m_BuildTargetVRSettings: []
+  m_DefaultShaderChunkSizeInMB: 16
+  m_DefaultShaderChunkCount: 0
+  openGLRequireES31: 0
+  openGLRequireES31AEP: 0
+  openGLRequireES32: 0
+  m_TemplateCustomTags: {}
+  mobileMTRendering:
+    Android: 1
+    VisionOS: 1
+    iPhone: 1
+    tvOS: 1
+  m_BuildTargetGroupLightmapEncodingQuality: []
+  m_BuildTargetGroupLightmapSettings: []
+  m_BuildTargetGroupLoadStoreDebugModeSettings: []
+  m_BuildTargetNormalMapEncoding: []
+  m_BuildTargetDefaultTextureCompressionFormat: []
+  playModeTestRunnerEnabled: 0
+  runPlayModeTestAsEditModeTest: 0
+  actionOnDotNetUnhandledException: 1
+  editorGfxJobOverride: 1
+  enableInternalProfiler: 0
+  logObjCUncaughtExceptions: 1
+  enableCrashReportAPI: 0
+  cameraUsageDescription: 
+  locationUsageDescription: 
+  microphoneUsageDescription: 
+  bluetoothUsageDescription: 
+  macOSTargetOSVersion: 11.0
+  switchNMETAOverride: 
+  switchNetLibKey: 
+  switchSocketMemoryPoolSize: 6144
+  switchSocketAllocatorPoolSize: 128
+  switchSocketConcurrencyLimit: 14
+  switchScreenResolutionBehavior: 2
+  switchUseCPUProfiler: 0
+  switchEnableFileSystemTrace: 0
+  switchLTOSetting: 0
+  switchApplicationID: 0x01004b9000490000
+  switchNSODependencies: 
+  switchCompilerFlags: 
+  switchTitleNames_0: 
+  switchTitleNames_1: 
+  switchTitleNames_2: 
+  switchTitleNames_3: 
+  switchTitleNames_4: 
+  switchTitleNames_5: 
+  switchTitleNames_6: 
+  switchTitleNames_7: 
+  switchTitleNames_8: 
+  switchTitleNames_9: 
+  switchTitleNames_10: 
+  switchTitleNames_11: 
+  switchTitleNames_12: 
+  switchTitleNames_13: 
+  switchTitleNames_14: 
+  switchTitleNames_15: 
+  switchPublisherNames_0: 
+  switchPublisherNames_1: 
+  switchPublisherNames_2: 
+  switchPublisherNames_3: 
+  switchPublisherNames_4: 
+  switchPublisherNames_5: 
+  switchPublisherNames_6: 
+  switchPublisherNames_7: 
+  switchPublisherNames_8: 
+  switchPublisherNames_9: 
+  switchPublisherNames_10: 
+  switchPublisherNames_11: 
+  switchPublisherNames_12: 
+  switchPublisherNames_13: 
+  switchPublisherNames_14: 
+  switchPublisherNames_15: 
+  switchIcons_0: {fileID: 0}
+  switchIcons_1: {fileID: 0}
+  switchIcons_2: {fileID: 0}
+  switchIcons_3: {fileID: 0}
+  switchIcons_4: {fileID: 0}
+  switchIcons_5: {fileID: 0}
+  switchIcons_6: {fileID: 0}
+  switchIcons_7: {fileID: 0}
+  switchIcons_8: {fileID: 0}
+  switchIcons_9: {fileID: 0}
+  switchIcons_10: {fileID: 0}
+  switchIcons_11: {fileID: 0}
+  switchIcons_12: {fileID: 0}
+  switchIcons_13: {fileID: 0}
+  switchIcons_14: {fileID: 0}
+  switchIcons_15: {fileID: 0}
+  switchSmallIcons_0: {fileID: 0}
+  switchSmallIcons_1: {fileID: 0}
+  switchSmallIcons_2: {fileID: 0}
+  switchSmallIcons_3: {fileID: 0}
+  switchSmallIcons_4: {fileID: 0}
+  switchSmallIcons_5: {fileID: 0}
+  switchSmallIcons_6: {fileID: 0}
+  switchSmallIcons_7: {fileID: 0}
+  switchSmallIcons_8: {fileID: 0}
+  switchSmallIcons_9: {fileID: 0}
+  switchSmallIcons_10: {fileID: 0}
+  switchSmallIcons_11: {fileID: 0}
+  switchSmallIcons_12: {fileID: 0}
+  switchSmallIcons_13: {fileID: 0}
+  switchSmallIcons_14: {fileID: 0}
+  switchSmallIcons_15: {fileID: 0}
+  switchManualHTML: 
+  switchAccessibleURLs: 
+  switchLegalInformation: 
+  switchMainThreadStackSize: 1048576
+  switchPresenceGroupId: 
+  switchLogoHandling: 0
+  switchReleaseVersion: 0
+  switchDisplayVersion: 1.0.0
+  switchStartupUserAccount: 0
+  switchSupportedLanguagesMask: 0
+  switchLogoType: 0
+  switchApplicationErrorCodeCategory: 
+  switchUserAccountSaveDataSize: 0
+  switchUserAccountSaveDataJournalSize: 0
+  switchApplicationAttribute: 0
+  switchCardSpecSize: -1
+  switchCardSpecClock: -1
+  switchRatingsMask: 0
+  switchRatingsInt_0: 0
+  switchRatingsInt_1: 0
+  switchRatingsInt_2: 0
+  switchRatingsInt_3: 0
+  switchRatingsInt_4: 0
+  switchRatingsInt_5: 0
+  switchRatingsInt_6: 0
+  switchRatingsInt_7: 0
+  switchRatingsInt_8: 0
+  switchRatingsInt_9: 0
+  switchRatingsInt_10: 0
+  switchRatingsInt_11: 0
+  switchRatingsInt_12: 0
+  switchLocalCommunicationIds_0: 
+  switchLocalCommunicationIds_1: 
+  switchLocalCommunicationIds_2: 
+  switchLocalCommunicationIds_3: 
+  switchLocalCommunicationIds_4: 
+  switchLocalCommunicationIds_5: 
+  switchLocalCommunicationIds_6: 
+  switchLocalCommunicationIds_7: 
+  switchParentalControl: 0
+  switchAllowsScreenshot: 1
+  switchAllowsVideoCapturing: 1
+  switchAllowsRuntimeAddOnContentInstall: 0
+  switchDataLossConfirmation: 0
+  switchUserAccountLockEnabled: 0
+  switchSystemResourceMemory: 16777216
+  switchSupportedNpadStyles: 22
+  switchNativeFsCacheSize: 32
+  switchIsHoldTypeHorizontal: 1
+  switchSupportedNpadCount: 8
+  switchEnableTouchScreen: 1
+  switchSocketConfigEnabled: 0
+  switchTcpInitialSendBufferSize: 32
+  switchTcpInitialReceiveBufferSize: 64
+  switchTcpAutoSendBufferSizeMax: 256
+  switchTcpAutoReceiveBufferSizeMax: 256
+  switchUdpSendBufferSize: 9
+  switchUdpReceiveBufferSize: 42
+  switchSocketBufferEfficiency: 4
+  switchSocketInitializeEnabled: 1
+  switchNetworkInterfaceManagerInitializeEnabled: 1
+  switchDisableHTCSPlayerConnection: 0
+  switchUseNewStyleFilepaths: 1
+  switchUseLegacyFmodPriorities: 0
+  switchUseMicroSleepForYield: 1
+  switchEnableRamDiskSupport: 0
+  switchMicroSleepForYieldTime: 25
+  switchRamDiskSpaceSize: 12
+  switchUpgradedPlayerSettingsToNMETA: 0
+  ps4NPAgeRating: 12
+  ps4NPTitleSecret: 
+  ps4NPTrophyPackPath: 
+  ps4ParentalLevel: 11
+  ps4ContentID: ED1633-NPXX51362_00-0000000000000000
+  ps4Category: 0
+  ps4MasterVersion: 01.00
+  ps4AppVersion: 01.00
+  ps4AppType: 0
+  ps4ParamSfxPath: 
+  ps4VideoOutPixelFormat: 0
+  ps4VideoOutInitialWidth: 1920
+  ps4VideoOutBaseModeInitialWidth: 1920
+  ps4VideoOutReprojectionRate: 60
+  ps4PronunciationXMLPath: 
+  ps4PronunciationSIGPath: 
+  ps4BackgroundImagePath: 
+  ps4StartupImagePath: 
+  ps4StartupImagesFolder: 
+  ps4IconImagesFolder: 
+  ps4SaveDataImagePath: 
+  ps4SdkOverride: 
+  ps4BGMPath: 
+  ps4ShareFilePath: 
+  ps4ShareOverlayImagePath: 
+  ps4PrivacyGuardImagePath: 
+  ps4ExtraSceSysFile: 
+  ps4NPtitleDatPath: 
+  ps4RemotePlayKeyAssignment: -1
+  ps4RemotePlayKeyMappingDir: 
+  ps4PlayTogetherPlayerCount: 0
+  ps4EnterButtonAssignment: 2
+  ps4ApplicationParam1: 0
+  ps4ApplicationParam2: 0
+  ps4ApplicationParam3: 0
+  ps4ApplicationParam4: 0
+  ps4DownloadDataSize: 0
+  ps4GarlicHeapSize: 2048
+  ps4ProGarlicHeapSize: 2560
+  playerPrefsMaxSize: 32768
+  ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
+  ps4pnSessions: 1
+  ps4pnPresence: 1
+  ps4pnFriends: 1
+  ps4pnGameCustomData: 1
+  playerPrefsSupport: 0
+  enableApplicationExit: 0
+  resetTempFolder: 1
+  restrictedAudioUsageRights: 0
+  ps4UseResolutionFallback: 0
+  ps4ReprojectionSupport: 0
+  ps4UseAudio3dBackend: 0
+  ps4UseLowGarlicFragmentationMode: 1
+  ps4SocialScreenEnabled: 0
+  ps4ScriptOptimizationLevel: 2
+  ps4Audio3dVirtualSpeakerCount: 14
+  ps4attribCpuUsage: 0
+  ps4PatchPkgPath: 
+  ps4PatchLatestPkgPath: 
+  ps4PatchChangeinfoPath: 
+  ps4PatchDayOne: 0
+  ps4attribUserManagement: 0
+  ps4attribMoveSupport: 0
+  ps4attrib3DSupport: 0
+  ps4attribShareSupport: 0
+  ps4attribExclusiveVR: 0
+  ps4disableAutoHideSplash: 0
+  ps4videoRecordingFeaturesUsed: 0
+  ps4contentSearchFeaturesUsed: 0
+  ps4CompatibilityPS5: 0
+  ps4AllowPS5Detection: 0
+  ps4GPU800MHz: 1
+  ps4attribEyeToEyeDistanceSettingVR: 0
+  ps4IncludedModules: []
+  ps4attribVROutputEnabled: 0
+  monoEnv: 
+  splashScreenBackgroundSourceLandscape: {fileID: 0}
+  splashScreenBackgroundSourcePortrait: {fileID: 0}
+  blurSplashScreenBackground: 1
+  spritePackerPolicy: 
+  webGLMemorySize: 32
+  webGLExceptionSupport: 1
+  webGLNameFilesAsHashes: 0
+  webGLShowDiagnostics: 0
+  webGLDataCaching: 1
+  webGLDebugSymbols: 0
+  webGLEmscriptenArgs: 
+  webGLModulesDirectory: 
+  webGLTemplate: APPLICATION:Default
+  webGLAnalyzeBuildSize: 0
+  webGLUseEmbeddedResources: 0
+  webGLCompressionFormat: 1
+  webGLWasmArithmeticExceptions: 0
+  webGLLinkerTarget: 1
+  webGLThreadsSupport: 0
+  webGLDecompressionFallback: 0
+  webGLInitialMemorySize: 32
+  webGLMaximumMemorySize: 2048
+  webGLMemoryGrowthMode: 2
+  webGLMemoryLinearGrowthStep: 16
+  webGLMemoryGeometricGrowthStep: 0.2
+  webGLMemoryGeometricGrowthCap: 96
+  webGLEnableWebGPU: 0
+  webGLPowerPreference: 2
+  webGLWebAssemblyTable: 0
+  webGLWebAssemblyBigInt: 0
+  webGLCloseOnQuit: 0
+  webWasm2023: 0
+  scriptingDefineSymbols: {}
+  additionalCompilerArguments: {}
+  platformArchitecture: {}
+  scriptingBackend: {}
+  il2cppCompilerConfiguration: {}
+  il2cppCodeGeneration: {}
+  il2cppStacktraceInformation: {}
+  managedStrippingLevel: {}
+  incrementalIl2cppBuild: {}
+  suppressCommonWarnings: 1
+  allowUnsafeCode: 0
+  useDeterministicCompilation: 1
+  additionalIl2CppArgs: 
+  scriptingRuntimeVersion: 1
+  gcIncremental: 1
+  gcWBarrierValidation: 0
+  apiCompatibilityLevelPerPlatform: {}
+  editorAssembliesCompatibilityLevel: 1
+  m_RenderingPath: 1
+  m_MobileRenderingPath: 1
+  metroPackageName: CharacterControllerMovingBodies
+  metroPackageVersion: 1.0.0.0
+  metroCertificatePath: 
+  metroCertificatePassword: 
+  metroCertificateSubject: 
+  metroCertificateIssuer: 
+  metroCertificateNotAfter: 0000000000000000
+  metroApplicationDescription: CharacterControllerMovingBodies
+  wsaImages: {}
+  metroTileShortName: CharacterControllerMovingBodies
+  metroTileShowName: 0
+  metroMediumTileShowName: 0
+  metroLargeTileShowName: 0
+  metroWideTileShowName: 0
+  metroSupportStreamingInstall: 0
+  metroLastRequiredScene: 0
+  metroDefaultTileSize: 1
+  metroTileForegroundText: 2
+  metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0}
+  metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1}
+  metroSplashScreenUseBackgroundColor: 0
+  syncCapabilities: 0
+  platformCapabilities: {}
+  metroTargetDeviceFamilies: {}
+  metroFTAName: 
+  metroFTAFileTypes: []
+  metroProtocolName: 
+  vcxProjDefaultLanguage: 
+  XboxOneProductId: 
+  XboxOneUpdateKey: 
+  XboxOneSandboxId: 
+  XboxOneContentId: 
+  XboxOneTitleId: 
+  XboxOneSCId: 
+  XboxOneGameOsOverridePath: 
+  XboxOnePackagingOverridePath: 
+  XboxOneAppManifestOverridePath: 
+  XboxOneVersion: 1.0.0.0
+  XboxOnePackageEncryption: 0
+  XboxOnePackageUpdateGranularity: 2
+  XboxOneDescription: 
+  XboxOneLanguage:
+  - enus
+  XboxOneCapability: []
+  XboxOneGameRating: {}
+  XboxOneIsContentPackage: 0
+  XboxOneEnhancedXboxCompatibilityMode: 0
+  XboxOneEnableGPUVariability: 1
+  XboxOneSockets: {}
+  XboxOneSplashScreen: {fileID: 0}
+  XboxOneAllowedProductIds: []
+  XboxOnePersistentLocalStorageSize: 0
+  XboxOneXTitleMemory: 8
+  XboxOneOverrideIdentityName: 
+  XboxOneOverrideIdentityPublisher: 
+  vrEditorSettings: {}
+  cloudServicesEnabled:
+    Purchasing: 0
+    Unity Ads: 0
+  luminIcon:
+    m_Name: 
+    m_ModelFolderPath: 
+    m_PortalFolderPath: 
+  luminCert:
+    m_CertPath: 
+    m_SignPackage: 1
+  luminIsChannelApp: 0
+  luminVersion:
+    m_VersionCode: 1
+    m_VersionName: 
+  hmiPlayerDataPath: 
+  hmiForceSRGBBlit: 0
+  embeddedLinuxEnableGamepadInput: 0
+  hmiCpuConfiguration: 
+  hmiLogStartupTiming: 0
+  qnxGraphicConfPath: 
+  apiCompatibilityLevel: 6
+  captureStartupLogs: {}
+  activeInputHandler: 0
+  windowsGamepadBackendHint: 0
+  cloudProjectId: 
+  framebufferDepthMemorylessMode: 0
+  qualitySettingsNames: []
+  projectName: 
+  organizationId: 
+  cloudEnabled: 0
+  legacyClampBlendShapeWeights: 0
+  hmiLoadingImage: {fileID: 0}
+  platformRequiresReadableAssets: 0
+  virtualTexturingSupportEnabled: 0
+  insecureHttpOption: 0
+  androidVulkanDenyFilterList: []
+  androidVulkanAllowFilterList: []
diff --git a/Examples/OverridingScenesAndPrefabs/ProjectSettings/QualitySettings.asset b/Examples/OverridingScenesAndPrefabs/ProjectSettings/QualitySettings.asset
new file mode 100644
index 0000000000..8e158d62c6
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/ProjectSettings/QualitySettings.asset
@@ -0,0 +1,340 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!47 &1
+QualitySettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 5
+  m_CurrentQuality: 5
+  m_QualitySettings:
+  - serializedVersion: 4
+    name: Very Low
+    pixelLightCount: 0
+    shadows: 0
+    shadowResolution: 0
+    shadowProjection: 1
+    shadowCascades: 1
+    shadowDistance: 15
+    shadowNearPlaneOffset: 3
+    shadowCascade2Split: 0.33333334
+    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
+    shadowmaskMode: 0
+    skinWeights: 1
+    globalTextureMipmapLimit: 1
+    textureMipmapLimitSettings: []
+    anisotropicTextures: 0
+    antiAliasing: 0
+    softParticles: 0
+    softVegetation: 0
+    realtimeReflectionProbes: 0
+    billboardsFaceCameraPosition: 0
+    useLegacyDetailDistribution: 0
+    adaptiveVsync: 0
+    vSyncCount: 0
+    realtimeGICPUUsage: 25
+    adaptiveVsyncExtraA: 0
+    adaptiveVsyncExtraB: 0
+    lodBias: 0.3
+    maximumLODLevel: 0
+    enableLODCrossFade: 1
+    streamingMipmapsActive: 0
+    streamingMipmapsAddAllCameras: 1
+    streamingMipmapsMemoryBudget: 512
+    streamingMipmapsRenderersPerFrame: 512
+    streamingMipmapsMaxLevelReduction: 2
+    streamingMipmapsMaxFileIORequests: 1024
+    particleRaycastBudget: 4
+    asyncUploadTimeSlice: 2
+    asyncUploadBufferSize: 16
+    asyncUploadPersistentBuffer: 1
+    resolutionScalingFixedDPIFactor: 1
+    customRenderPipeline: {fileID: 0}
+    terrainQualityOverrides: 0
+    terrainPixelError: 1
+    terrainDetailDensityScale: 1
+    terrainBasemapDistance: 1000
+    terrainDetailDistance: 80
+    terrainTreeDistance: 5000
+    terrainBillboardStart: 50
+    terrainFadeLength: 5
+    terrainMaxTrees: 50
+    excludedTargetPlatforms: []
+  - serializedVersion: 4
+    name: Low
+    pixelLightCount: 0
+    shadows: 0
+    shadowResolution: 0
+    shadowProjection: 1
+    shadowCascades: 1
+    shadowDistance: 20
+    shadowNearPlaneOffset: 3
+    shadowCascade2Split: 0.33333334
+    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
+    shadowmaskMode: 0
+    skinWeights: 2
+    globalTextureMipmapLimit: 0
+    textureMipmapLimitSettings: []
+    anisotropicTextures: 0
+    antiAliasing: 0
+    softParticles: 0
+    softVegetation: 0
+    realtimeReflectionProbes: 0
+    billboardsFaceCameraPosition: 0
+    useLegacyDetailDistribution: 0
+    adaptiveVsync: 0
+    vSyncCount: 0
+    realtimeGICPUUsage: 25
+    adaptiveVsyncExtraA: 0
+    adaptiveVsyncExtraB: 0
+    lodBias: 0.4
+    maximumLODLevel: 0
+    enableLODCrossFade: 1
+    streamingMipmapsActive: 0
+    streamingMipmapsAddAllCameras: 1
+    streamingMipmapsMemoryBudget: 512
+    streamingMipmapsRenderersPerFrame: 512
+    streamingMipmapsMaxLevelReduction: 2
+    streamingMipmapsMaxFileIORequests: 1024
+    particleRaycastBudget: 16
+    asyncUploadTimeSlice: 2
+    asyncUploadBufferSize: 16
+    asyncUploadPersistentBuffer: 1
+    resolutionScalingFixedDPIFactor: 1
+    customRenderPipeline: {fileID: 0}
+    terrainQualityOverrides: 0
+    terrainPixelError: 1
+    terrainDetailDensityScale: 1
+    terrainBasemapDistance: 1000
+    terrainDetailDistance: 80
+    terrainTreeDistance: 5000
+    terrainBillboardStart: 50
+    terrainFadeLength: 5
+    terrainMaxTrees: 50
+    excludedTargetPlatforms: []
+  - serializedVersion: 4
+    name: Medium
+    pixelLightCount: 1
+    shadows: 1
+    shadowResolution: 0
+    shadowProjection: 1
+    shadowCascades: 1
+    shadowDistance: 20
+    shadowNearPlaneOffset: 3
+    shadowCascade2Split: 0.33333334
+    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
+    shadowmaskMode: 0
+    skinWeights: 2
+    globalTextureMipmapLimit: 0
+    textureMipmapLimitSettings: []
+    anisotropicTextures: 1
+    antiAliasing: 0
+    softParticles: 0
+    softVegetation: 0
+    realtimeReflectionProbes: 0
+    billboardsFaceCameraPosition: 0
+    useLegacyDetailDistribution: 0
+    adaptiveVsync: 0
+    vSyncCount: 1
+    realtimeGICPUUsage: 25
+    adaptiveVsyncExtraA: 0
+    adaptiveVsyncExtraB: 0
+    lodBias: 0.7
+    maximumLODLevel: 0
+    enableLODCrossFade: 1
+    streamingMipmapsActive: 0
+    streamingMipmapsAddAllCameras: 1
+    streamingMipmapsMemoryBudget: 512
+    streamingMipmapsRenderersPerFrame: 512
+    streamingMipmapsMaxLevelReduction: 2
+    streamingMipmapsMaxFileIORequests: 1024
+    particleRaycastBudget: 64
+    asyncUploadTimeSlice: 2
+    asyncUploadBufferSize: 16
+    asyncUploadPersistentBuffer: 1
+    resolutionScalingFixedDPIFactor: 1
+    customRenderPipeline: {fileID: 0}
+    terrainQualityOverrides: 0
+    terrainPixelError: 1
+    terrainDetailDensityScale: 1
+    terrainBasemapDistance: 1000
+    terrainDetailDistance: 80
+    terrainTreeDistance: 5000
+    terrainBillboardStart: 50
+    terrainFadeLength: 5
+    terrainMaxTrees: 50
+    excludedTargetPlatforms: []
+  - serializedVersion: 4
+    name: High
+    pixelLightCount: 2
+    shadows: 2
+    shadowResolution: 1
+    shadowProjection: 1
+    shadowCascades: 2
+    shadowDistance: 40
+    shadowNearPlaneOffset: 3
+    shadowCascade2Split: 0.33333334
+    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
+    shadowmaskMode: 1
+    skinWeights: 2
+    globalTextureMipmapLimit: 0
+    textureMipmapLimitSettings: []
+    anisotropicTextures: 1
+    antiAliasing: 0
+    softParticles: 0
+    softVegetation: 1
+    realtimeReflectionProbes: 1
+    billboardsFaceCameraPosition: 1
+    useLegacyDetailDistribution: 0
+    adaptiveVsync: 0
+    vSyncCount: 1
+    realtimeGICPUUsage: 50
+    adaptiveVsyncExtraA: 0
+    adaptiveVsyncExtraB: 0
+    lodBias: 1
+    maximumLODLevel: 0
+    enableLODCrossFade: 1
+    streamingMipmapsActive: 0
+    streamingMipmapsAddAllCameras: 1
+    streamingMipmapsMemoryBudget: 512
+    streamingMipmapsRenderersPerFrame: 512
+    streamingMipmapsMaxLevelReduction: 2
+    streamingMipmapsMaxFileIORequests: 1024
+    particleRaycastBudget: 256
+    asyncUploadTimeSlice: 2
+    asyncUploadBufferSize: 16
+    asyncUploadPersistentBuffer: 1
+    resolutionScalingFixedDPIFactor: 1
+    customRenderPipeline: {fileID: 0}
+    terrainQualityOverrides: 0
+    terrainPixelError: 1
+    terrainDetailDensityScale: 1
+    terrainBasemapDistance: 1000
+    terrainDetailDistance: 80
+    terrainTreeDistance: 5000
+    terrainBillboardStart: 50
+    terrainFadeLength: 5
+    terrainMaxTrees: 50
+    excludedTargetPlatforms: []
+  - serializedVersion: 4
+    name: Very High
+    pixelLightCount: 3
+    shadows: 2
+    shadowResolution: 2
+    shadowProjection: 1
+    shadowCascades: 2
+    shadowDistance: 70
+    shadowNearPlaneOffset: 3
+    shadowCascade2Split: 0.33333334
+    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
+    shadowmaskMode: 1
+    skinWeights: 4
+    globalTextureMipmapLimit: 0
+    textureMipmapLimitSettings: []
+    anisotropicTextures: 2
+    antiAliasing: 2
+    softParticles: 1
+    softVegetation: 1
+    realtimeReflectionProbes: 1
+    billboardsFaceCameraPosition: 1
+    useLegacyDetailDistribution: 0
+    adaptiveVsync: 0
+    vSyncCount: 1
+    realtimeGICPUUsage: 50
+    adaptiveVsyncExtraA: 0
+    adaptiveVsyncExtraB: 0
+    lodBias: 1.5
+    maximumLODLevel: 0
+    enableLODCrossFade: 1
+    streamingMipmapsActive: 0
+    streamingMipmapsAddAllCameras: 1
+    streamingMipmapsMemoryBudget: 512
+    streamingMipmapsRenderersPerFrame: 512
+    streamingMipmapsMaxLevelReduction: 2
+    streamingMipmapsMaxFileIORequests: 1024
+    particleRaycastBudget: 1024
+    asyncUploadTimeSlice: 2
+    asyncUploadBufferSize: 16
+    asyncUploadPersistentBuffer: 1
+    resolutionScalingFixedDPIFactor: 1
+    customRenderPipeline: {fileID: 0}
+    terrainQualityOverrides: 0
+    terrainPixelError: 1
+    terrainDetailDensityScale: 1
+    terrainBasemapDistance: 1000
+    terrainDetailDistance: 80
+    terrainTreeDistance: 5000
+    terrainBillboardStart: 50
+    terrainFadeLength: 5
+    terrainMaxTrees: 50
+    excludedTargetPlatforms: []
+  - serializedVersion: 4
+    name: Ultra
+    pixelLightCount: 4
+    shadows: 2
+    shadowResolution: 2
+    shadowProjection: 1
+    shadowCascades: 4
+    shadowDistance: 150
+    shadowNearPlaneOffset: 3
+    shadowCascade2Split: 0.33333334
+    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
+    shadowmaskMode: 1
+    skinWeights: 255
+    globalTextureMipmapLimit: 0
+    textureMipmapLimitSettings: []
+    anisotropicTextures: 2
+    antiAliasing: 2
+    softParticles: 1
+    softVegetation: 1
+    realtimeReflectionProbes: 1
+    billboardsFaceCameraPosition: 1
+    useLegacyDetailDistribution: 0
+    adaptiveVsync: 0
+    vSyncCount: 1
+    realtimeGICPUUsage: 100
+    adaptiveVsyncExtraA: 0
+    adaptiveVsyncExtraB: 0
+    lodBias: 2
+    maximumLODLevel: 0
+    enableLODCrossFade: 1
+    streamingMipmapsActive: 0
+    streamingMipmapsAddAllCameras: 1
+    streamingMipmapsMemoryBudget: 512
+    streamingMipmapsRenderersPerFrame: 512
+    streamingMipmapsMaxLevelReduction: 2
+    streamingMipmapsMaxFileIORequests: 1024
+    particleRaycastBudget: 4096
+    asyncUploadTimeSlice: 2
+    asyncUploadBufferSize: 16
+    asyncUploadPersistentBuffer: 1
+    resolutionScalingFixedDPIFactor: 1
+    customRenderPipeline: {fileID: 0}
+    terrainQualityOverrides: 0
+    terrainPixelError: 1
+    terrainDetailDensityScale: 1
+    terrainBasemapDistance: 1000
+    terrainDetailDistance: 80
+    terrainTreeDistance: 5000
+    terrainBillboardStart: 50
+    terrainFadeLength: 5
+    terrainMaxTrees: 50
+    excludedTargetPlatforms: []
+  m_TextureMipmapLimitGroupNames: []
+  m_PerPlatformDefaultQuality:
+    Android: 2
+    EmbeddedLinux: 5
+    GameCoreScarlett: 5
+    GameCoreXboxOne: 5
+    LinuxHeadlessSimulation: 5
+    Nintendo Switch: 5
+    PS4: 5
+    PS5: 5
+    QNX: 5
+    ReservedCFE: 5
+    Server: 5
+    Standalone: 5
+    VisionOS: 5
+    WebGL: 3
+    Windows Store Apps: 5
+    XboxOne: 5
+    iPhone: 2
+    tvOS: 2
diff --git a/Examples/OverridingScenesAndPrefabs/ProjectSettings/TagManager.asset b/Examples/OverridingScenesAndPrefabs/ProjectSettings/TagManager.asset
new file mode 100644
index 0000000000..eb5d9aedd6
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/ProjectSettings/TagManager.asset
@@ -0,0 +1,45 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!78 &1
+TagManager:
+  serializedVersion: 3
+  tags: []
+  layers:
+  - Default
+  - TransparentFX
+  - Ignore Raycast
+  - 
+  - Water
+  - UI
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  m_SortingLayers:
+  - name: Default
+    uniqueID: 0
+    locked: 0
+  m_RenderingLayers:
+  - Default
diff --git a/Examples/OverridingScenesAndPrefabs/ProjectSettings/TimeManager.asset b/Examples/OverridingScenesAndPrefabs/ProjectSettings/TimeManager.asset
new file mode 100644
index 0000000000..8f68da289f
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/ProjectSettings/TimeManager.asset
@@ -0,0 +1,13 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!5 &1
+TimeManager:
+  m_ObjectHideFlags: 0
+  Fixed Timestep:
+    m_Count: 2822399
+    m_Rate:
+      m_Denominator: 1
+      m_Numerator: 141120000
+  Maximum Allowed Timestep: 0.33333334
+  m_TimeScale: 1
+  Maximum Particle Timestep: 0.03
diff --git a/Examples/OverridingScenesAndPrefabs/ProjectSettings/UnityConnectSettings.asset b/Examples/OverridingScenesAndPrefabs/ProjectSettings/UnityConnectSettings.asset
new file mode 100644
index 0000000000..2d81664be6
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/ProjectSettings/UnityConnectSettings.asset
@@ -0,0 +1,36 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!310 &1
+UnityConnectSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 1
+  m_Enabled: 1
+  m_TestMode: 0
+  m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
+  m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
+  m_ConfigUrl: https://config.uca.cloud.unity3d.com
+  m_DashboardUrl: https://dashboard.unity3d.com
+  m_TestInitMode: 0
+  CrashReportingSettings:
+    m_EventUrl: https://perf-events.cloud.unity3d.com
+    m_Enabled: 0
+    m_LogBufferSize: 10
+    m_CaptureEditorExceptions: 1
+  UnityPurchasingSettings:
+    m_Enabled: 0
+    m_TestMode: 0
+  UnityAnalyticsSettings:
+    m_Enabled: 0
+    m_TestMode: 0
+    m_InitializeOnStartup: 1
+    m_PackageRequiringCoreStatsPresent: 1
+  UnityAdsSettings:
+    m_Enabled: 0
+    m_InitializeOnStartup: 1
+    m_TestMode: 0
+    m_IosGameId: 
+    m_AndroidGameId: 
+    m_GameIds: {}
+    m_GameId: 
+  PerformanceReportingSettings:
+    m_Enabled: 0
diff --git a/Examples/OverridingScenesAndPrefabs/ProjectSettings/VFXManager.asset b/Examples/OverridingScenesAndPrefabs/ProjectSettings/VFXManager.asset
new file mode 100644
index 0000000000..a2a4a97a2f
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/ProjectSettings/VFXManager.asset
@@ -0,0 +1,19 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!937362698 &1
+VFXManager:
+  m_ObjectHideFlags: 0
+  m_IndirectShader: {fileID: 0}
+  m_CopyBufferShader: {fileID: 0}
+  m_SortShader: {fileID: 0}
+  m_StripUpdateShader: {fileID: 0}
+  m_EmptyShader: {fileID: 0}
+  m_RenderPipeSettingsPath: 
+  m_FixedTimeStep: 0.016666668
+  m_MaxDeltaTime: 0.05
+  m_MaxScrubTime: 30
+  m_MaxCapacity: 100000000
+  m_CompiledVersion: 0
+  m_RuntimeVersion: 0
+  m_RuntimeResources: {fileID: 0}
+  m_BatchEmptyLifetime: 300
diff --git a/Examples/OverridingScenesAndPrefabs/ProjectSettings/VersionControlSettings.asset b/Examples/OverridingScenesAndPrefabs/ProjectSettings/VersionControlSettings.asset
new file mode 100644
index 0000000000..979fd8eca8
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/ProjectSettings/VersionControlSettings.asset
@@ -0,0 +1,7 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!890905787 &1
+VersionControlSettings:
+  m_ObjectHideFlags: 0
+  m_Mode: Visible Meta Files
+  m_TrackPackagesOutsideProject: 0
diff --git a/Examples/OverridingScenesAndPrefabs/Readme.md b/Examples/OverridingScenesAndPrefabs/Readme.md
new file mode 100644
index 0000000000..f411aae755
--- /dev/null
+++ b/Examples/OverridingScenesAndPrefabs/Readme.md
@@ -0,0 +1,112 @@
+# Netcode for GameObjects <br /> Overriding Scenes and NetworkPrefabs
+![image](Images/EndResultView.png)
+_Supports using the client-server and distributed authority network topologies._
+
+
+This example, based on the [Netcode for GameObjects Smooth Transform Space Transitions](https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/tree/example/server-client-unique-scenes-and-prefabs/Examples/CharacterControllerMovingBodies), provides and overview of how to use:
+- [`NetworkPrefabHandler`](https://docs.unity3d.com/Packages/com.unity.netcode.gameobjects@2.0/api/Unity.Netcode.NetworkPrefabHandler.html) as a way to dynamically control overriding network prefabs and how they are instantiated.
+  - For this example, the prefab handler is overriding the player prefab. 
+    - *You will only see the end result of this portion of the example by running a server instance (i.e. not host) as that will create instances of the ServerPlayer network prefab instead of the ClientPlayer network prefab.*
+- [`NetworkSceneManager.SetClientSynchronizationMode`](https://docs.unity3d.com/Packages/com.unity.netcode.gameobjects@2.0/api/Unity.Netcode.NetworkSceneManager.html#Unity_Netcode_NetworkSceneManager_SetClientSynchronizationMode_UnityEngine_SceneManagement_LoadSceneMode_) to change the default client synchronization mode (SingleMode) to an additive client synchronization mode. 
+  - Additive client synchronization mode will prevent already existing preloaded scenes from being unloaded and will use them, as opposed to reloading the same scene, during a client's initial synchronization. 
+    - *This is a server-side only setting that gets sent to the clients during the initial synchronization process.*
+- [`NetworkSceneManager.VerifySceneBeforeLoading`](https://docs.unity3d.com/Packages/com.unity.netcode.gameobjects@2.0/api/Unity.Netcode.NetworkSceneManager.html#Unity_Netcode_NetworkSceneManager_VerifySceneBeforeLoading) in order to control what scenes the server will include when sending the synchronization message to newly connecting clients.
+
+## Building The Project
+This example uses unity services. Upon loading the project for the first time, you will want to set your organization and create a new cloud project. This is the only required setting to create stand alone builds for this project.
+![image](Images/ServiceSettings.png)
+
+## Terminology
+
+### Shared Scenes
+These are scenes that will be synchronized between a server or session owner and used when a client runs through the initial synchronization process. 
+- You can populate these scenes with in-scene placed or dynamically spawned NetworkObjects. 
+- These scenes **must be** within the scenes in build list.
+
+### Local Scenes
+These are scenes that are always only local to the application instances (server or client) and will not be synchronized. 
+- You should not populate these scenes with NetworkObjects. 
+  -However, this example includes one of several ways you can associate a `MonoBehaviour` with a `NetworkBehaviour`. 
+- These scenes can be dynamically created, included in the scenes in build list, or be an addressable loaded at some point prior to connecting or while connected to a session.
+
+## Client Synchronization and Scene Validation
+By combining these two scene management features, you can preload scenes:
+- That should not be synchronized and/or are specific to the server or client side of a network session.
+- That you know will be synchronized in order to reduce the client synchronization process.
+
+This approach can be useful if you:
+- Want to have server-side only content that is loaded only on a server.
+- Want to load local scenes for UI purposes or content that you don't need to synchronize.
+    - *This example separates the colliders of the scene geometry from the mesh filters and renderers. Clients are the only instances that load the graphics related scene assets. Both clients and server load a shared scene that contains in-scene placed NetworkObjects and the colliders for the "floor"*
+
+[Read the documentation for more information about client synchronization mode.](https://docs-multiplayer.unity3d.com/netcode/current/basics/scenemanagement/client-synchronization-mode/)
+
+### Note on Distributed Authority
+Since a distributed authority network topology is designed to keep all clients synchronized enough with the SDK level states in order to allow for rapid session owner promotion, the most common design approach (relative to this example) is to have local client scenes and the scenes to be synchronized between clients. However, there could be edge case scenarios where perhaps you only want there to only ever be a single session owner and upon the session owner disconnecting all clients will disconnect themselves too. Under this type of design, it would be valid to have local "server-side" (i.e. session owner) scenes. This example implements this by default for example purposes only. If you want your project to use session owner promotion, then it is highly recommended to only use the have client-side local and shared scenes approach.
+
+## The Bootstrap Loading Process
+![image](Images/ScenesView.png)
+
+### BootstrapScene
+The first scene loaded. Contains a `NetworkManagerBootstrapper` in-scene placed `GameObject`.
+![image](Images/NetworkManagerBootstrapper.png)
+
+#### NetworkManager Bootstrapper (component)
+![image](Images/NetworkManagerBootstrapperProperties.png)
+
+Handles the pre-network session menu interface along with connect and disconnect events. Since it is derived from `NetworkManager`, it also defines the network session configuration (i.e. `NetworkConfig`). The `NetworkManagerBootstrapper` in-scene placed `GameObject` gets loaded into the DDOL scene automatically and will persist throughout the application life time. This derived class requires the `SceneBootstrapLoader` component.
+
+#### Scene Bootstrap Loader (component)
+![image](Images/SceneBootstrapLoader.png)
+
+This component handles preloading scenes for both the client(s) and server. Upon being started, the `NetworkManagerBootstrapper` component will invoke `SceneBootstrapLoader.LoadMainMenu` method that kicks off the scene preloading process. 
+- **Default Active Scene Asset:** There is always an active scene. For this example, the default active scene is the same on both the client and server relative properties. *The active scene is always (and should always) be a "shared scene".*
+  - This could represent a lobby or network session main menu (i.e. create or join session).
+  - Both the client and the server preload this scene prior to starting a network session.
+- **Local Scene Assets:** There could be times where you want to load scenes specific to the `NetworkManager` instance type (i.e. client, host, or server).
+  - These scenes are not synchronized by a server (client-server) or session owner (distributed authority).
+  - Having different locally loaded scenes is typically more common in a client-server network topology.
+  - In a distributed authority network topology, it is more common to keep all scenes synchronized but you might want to load non-synchronized scenes (i.e. menu interface for settings etc).
+- **Shared Scene Assets:** These scenes are synchronized by the server or session owner (depending upon network topology used).
+  - This example only provides a server specific set of scene assets to load because you can always add those same scenes to the client-side locally loaded scenes.
+    - If the server synchronizes any scenes from the share scene assets with a client that already has those scene loaded, then those locally loaded scenes on the client side will be used during synchronization.
+    - Depending upon how many scenes you want to synchronize and/or how large one or more scenes are, preloading scenes can reduce synchronization time for clients.
+The `NetworkManagerBootstrapper` uses the `SceneBootstrapLoader` component to start the creation or joining of a network session. The logical flow looks like:
+- `NetworkManagerBootstrapper` invokes `SceneBootstrapLoader.StartSession` when you click one of the (very simple) main menu buttons and passes in the mode/type of `NetworkManager` to start.
+- Based on the `NetworkManager` type being started, the `SceneBootstrapLoader` will then:
+ - Load the default active scene using the `UnityEngine.SceneManagement.SceneManager`.
+ - Load the local scenes using the `UnityEngine.SceneManagement.SceneManager`.
+ - Then it will create or join a network session by either starting the `NetworkManager` or connecting to the sesssion via multiplayer services.
+ - _Server or Session Owner only:_
+   - If any, load the shared (i.e. synchronized) scene assets using the `NetworkSceneManager`
+
+#### Network Prefab Override Handler (component)
+![image](Images/NetworkPrefabOverrideHandler.png)
+
+This `MonoBehaviour` component implements the `INetworkPrefabInstanceHandler` interface and registers with the `NetworkManafer.PrefabHandler` when started. It contains two network prefab properties:
+- Network Prefab: This is the network prefab that you want to override. In this example, it is what is used to spawn a server-side player prefab and is what is defined within the `NetworkManagerBootstrapper` component.
+- Network Prefab Override: This is what is used to spawn a player prefab on the client-side.
+
+At runtime the local `NetworkManager` instance is a client/host or server and will spawn either the ClientPlayer or ServerPlayer prefab. The `NetworkPrefabOverrideHandler` does not need to be a `NetworkBehaviour` and sometimes (especially for overriding the player prefab) it is better to register prefab handlers prior to starting the `NetworkManager`.
+
+## Input Controls
+The following is a list of the input controls used in this project:
+### Clients Only
+- `W,A,S,D`: Movement (forward, backward, turn left, turn right)
+  - *Arrow keys can be used as well.*
+- `SPACE`: Jumps
+- `P`: Enable disable player name and information.
+- `C`: Toggles the player child object movement (continuous or only when the player moves).
+
+### Server Only
+- `[,]`: Right and left bracket keys will follow spawned players.
+- `Backspace`: Stop following a player.
+
+## Example Limitations
+This example is primarily to provide a starting point for anyone interested in exploring how to override (customize) the scene loading and/or prefab instantiation. It does not cover all possible use case scenarios. It is recommended to explore this example, modify it, and read the [Netcode for GameObjects documentation](https://docs-multiplayer.unity3d.com/netcode/current/about/) for more details.
+
+
+
+
+
+
diff --git a/Examples/PingTool/.gitignore b/Examples/PingTool/.gitignore
new file mode 100644
index 0000000000..2800399634
--- /dev/null
+++ b/Examples/PingTool/.gitignore
@@ -0,0 +1,83 @@
+# This .gitignore file should be placed at the root of your Unity project directory
+#
+# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
+#
+/[Ll]ibrary/
+/[Tt]emp/
+/[Oo]bj/
+/[Bb]uild/
+/[Bb]uilds/
+/[Ll]ogs/
+/[Uu]ser[Ss]ettings/
+
+# MemoryCaptures can get excessive in size.
+# They also could contain extremely sensitive data
+/[Mm]emoryCaptures/
+
+# Asset meta data should only be ignored when the corresponding asset is also ignored
+!/[Aa]ssets/**/*.meta
+
+# Uncomment this line if you wish to ignore the asset store tools plugin
+# /[Aa]ssets/AssetStoreTools*
+
+# Autogenerated Jetbrains Rider plugin
+/[Aa]ssets/Plugins/Editor/JetBrains*
+
+# Visual Studio cache directory
+.vs/
+
+# Gradle cache directory
+.gradle/
+
+# Autogenerated VS/MD/Consulo solution and project files
+ExportedObj/
+.consulo/
+*.csproj
+*.unityproj
+*.sln
+*.suo
+*.tmp
+*.user
+*.userprefs
+*.pidb
+*.booproj
+*.svd
+*.pdb
+*.mdb
+*.opendb
+*.VC.db
+
+# Unity3D generated meta files
+*.pidb.meta
+*.pdb.meta
+*.mdb.meta
+
+# Unity3D generated file on crash reports
+sysinfo.txt
+
+# Builds
+*.apk
+*.aab
+*.unitypackage
+
+# Crashlytics generated file
+crashlytics-build.properties
+
+# Packed Addressables
+/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
+
+# Temporary auto-generated Android Assets
+/[Aa]ssets/[Ss]treamingAssets/aa.meta
+/[Aa]ssets/[Ss]treamingAssets/aa/*
+/[Aa]ssets/[Ss]treamingAssets/BuildInfo.json
+/[Aa]ssets/[Ss]treamingAssets/BuildInfo.json.meta
+
+# Secrets
+*.pem
+*.pem.meta
+
+InitTestScene*
+
+boot.config
+SceneTemplateSettings.json
+*BurstAotSettings*.json
diff --git a/Examples/PingTool/Assets/DefaultNetworkPrefabs.asset b/Examples/PingTool/Assets/DefaultNetworkPrefabs.asset
new file mode 100644
index 0000000000..72cef84a6d
--- /dev/null
+++ b/Examples/PingTool/Assets/DefaultNetworkPrefabs.asset
@@ -0,0 +1,31 @@
+%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: DefaultNetworkPrefabs
+  m_EditorClassIdentifier: 
+  IsDefault: 1
+  List:
+  - Override: 0
+    Prefab: {fileID: 8921789205124766477, guid: 89b57e576a8d47643b2dbd45b1f8cab1, type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
+  - Override: 0
+    Prefab: {fileID: 4874009706086500699, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
+  - Override: 0
+    Prefab: {fileID: 3439633038736912633, guid: 398aad09d8b2a47eba664a076763cdcc, type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
diff --git a/Examples/PingTool/Assets/DefaultNetworkPrefabs.asset.meta b/Examples/PingTool/Assets/DefaultNetworkPrefabs.asset.meta
new file mode 100644
index 0000000000..fee27b3ade
--- /dev/null
+++ b/Examples/PingTool/Assets/DefaultNetworkPrefabs.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: aa82390bfdde2564f828b8e5be375282
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/Materials.meta b/Examples/PingTool/Assets/Materials.meta
new file mode 100644
index 0000000000..463de70d61
--- /dev/null
+++ b/Examples/PingTool/Assets/Materials.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d5b7ad71451c27e4291295cfffc10328
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/Materials/ChildLocal.mat b/Examples/PingTool/Assets/Materials/ChildLocal.mat
new file mode 100644
index 0000000000..b6fd2dd9a1
--- /dev/null
+++ b/Examples/PingTool/Assets/Materials/ChildLocal.mat
@@ -0,0 +1,86 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ChildLocal
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _ALPHAPREMULTIPLY_ON
+  - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 3
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 1
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0.8980392, g: 0.039215658, b: 0.7682729, a: 0.2509804}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Examples/PingTool/Assets/Materials/ChildLocal.mat.meta b/Examples/PingTool/Assets/Materials/ChildLocal.mat.meta
new file mode 100644
index 0000000000..35e4d565be
--- /dev/null
+++ b/Examples/PingTool/Assets/Materials/ChildLocal.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 45fc555bc05bfee4ab8b0d536799ecee
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/Materials/ChildLocalNoParentSync.mat b/Examples/PingTool/Assets/Materials/ChildLocalNoParentSync.mat
new file mode 100644
index 0000000000..c44172e7a7
--- /dev/null
+++ b/Examples/PingTool/Assets/Materials/ChildLocalNoParentSync.mat
@@ -0,0 +1,86 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ChildLocalNoParentSync
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _ALPHAPREMULTIPLY_ON
+  - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 3
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 1
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0.039215658, g: 0.78592235, b: 0.8980392, a: 0.2509804}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Examples/PingTool/Assets/Materials/ChildLocalNoParentSync.mat.meta b/Examples/PingTool/Assets/Materials/ChildLocalNoParentSync.mat.meta
new file mode 100644
index 0000000000..3a26e43d98
--- /dev/null
+++ b/Examples/PingTool/Assets/Materials/ChildLocalNoParentSync.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: affef70511a06dd46b8f52636020af4a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/Materials/ChildWorld.mat b/Examples/PingTool/Assets/Materials/ChildWorld.mat
new file mode 100644
index 0000000000..0c2bf4b187
--- /dev/null
+++ b/Examples/PingTool/Assets/Materials/ChildWorld.mat
@@ -0,0 +1,86 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ChildWorld
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _ALPHAPREMULTIPLY_ON
+  - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 3
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 1
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0.3783494, g: 0.039215658, b: 0.8980392, a: 0.2509804}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Examples/PingTool/Assets/Materials/ChildWorld.mat.meta b/Examples/PingTool/Assets/Materials/ChildWorld.mat.meta
new file mode 100644
index 0000000000..9a00ded8c6
--- /dev/null
+++ b/Examples/PingTool/Assets/Materials/ChildWorld.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 15d0bda12a233964086aee5c0c357e24
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/Materials/ChildWorldNoParentSync.mat b/Examples/PingTool/Assets/Materials/ChildWorldNoParentSync.mat
new file mode 100644
index 0000000000..86b27eb5c9
--- /dev/null
+++ b/Examples/PingTool/Assets/Materials/ChildWorldNoParentSync.mat
@@ -0,0 +1,86 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ChildWorldNoParentSync
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _ALPHAPREMULTIPLY_ON
+  - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 3
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 1
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 0.039215658, g: 0.8980392, b: 0.09095798, a: 0.2509804}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Examples/PingTool/Assets/Materials/ChildWorldNoParentSync.mat.meta b/Examples/PingTool/Assets/Materials/ChildWorldNoParentSync.mat.meta
new file mode 100644
index 0000000000..5ab7ff2e72
--- /dev/null
+++ b/Examples/PingTool/Assets/Materials/ChildWorldNoParentSync.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a5e199307b2e0894294d9c8bee99a691
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/Materials/Direction.mat b/Examples/PingTool/Assets/Materials/Direction.mat
new file mode 100644
index 0000000000..ed5ed117c3
--- /dev/null
+++ b/Examples/PingTool/Assets/Materials/Direction.mat
@@ -0,0 +1,84 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Direction
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 1
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.8962264, g: 0.52830994, b: 0.038047332, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Examples/PingTool/Assets/Materials/Direction.mat.meta b/Examples/PingTool/Assets/Materials/Direction.mat.meta
new file mode 100644
index 0000000000..c93791fac0
--- /dev/null
+++ b/Examples/PingTool/Assets/Materials/Direction.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5324c76c2bab7344badd5ea27a40bcb5
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/Materials/GridPattern.mat b/Examples/PingTool/Assets/Materials/GridPattern.mat
new file mode 100644
index 0000000000..f44981f387
--- /dev/null
+++ b/Examples/PingTool/Assets/Materials/GridPattern.mat
@@ -0,0 +1,85 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: GridPattern
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords:
+  - _GLOSSYREFLECTIONS_OFF
+  - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 1
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 6, y: 6}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: a092c5fa8c60ed04aa1d72555f1740bc, type: 3}
+        m_Scale: {x: 6, y: 6}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0.785
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 1
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0.254717, g: 0.23188858, b: 0.23188858, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Examples/PingTool/Assets/Materials/GridPattern.mat.meta b/Examples/PingTool/Assets/Materials/GridPattern.mat.meta
new file mode 100644
index 0000000000..cbca0f4485
--- /dev/null
+++ b/Examples/PingTool/Assets/Materials/GridPattern.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 42c4a0ad1f9d67a45b12f68697321aad
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/Materials/Ground.mat b/Examples/PingTool/Assets/Materials/Ground.mat
new file mode 100644
index 0000000000..252ea1a0ed
--- /dev/null
+++ b/Examples/PingTool/Assets/Materials/Ground.mat
@@ -0,0 +1,79 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Ground
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0.14769986, g: 0.1509434, b: 0.1473834, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Examples/PingTool/Assets/Materials/Ground.mat.meta b/Examples/PingTool/Assets/Materials/Ground.mat.meta
new file mode 100644
index 0000000000..6dbcac16d3
--- /dev/null
+++ b/Examples/PingTool/Assets/Materials/Ground.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9c73b921ea39f4344a19c2d1c7d6b314
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/Materials/PlayerMaterial.mat b/Examples/PingTool/Assets/Materials/PlayerMaterial.mat
new file mode 100644
index 0000000000..e7f5729956
--- /dev/null
+++ b/Examples/PingTool/Assets/Materials/PlayerMaterial.mat
@@ -0,0 +1,80 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: PlayerMaterial
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
diff --git a/Examples/PingTool/Assets/Materials/PlayerMaterial.mat.meta b/Examples/PingTool/Assets/Materials/PlayerMaterial.mat.meta
new file mode 100644
index 0000000000..1ceca58536
--- /dev/null
+++ b/Examples/PingTool/Assets/Materials/PlayerMaterial.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 44e292334941fe148b997ca2b01b5789
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/PingTool.meta b/Examples/PingTool/Assets/PingTool.meta
new file mode 100644
index 0000000000..ba9359124c
--- /dev/null
+++ b/Examples/PingTool/Assets/PingTool.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ce8d435e959ea9a41b4c776fc31f9550
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/PingTool/NetStateMonitorConfiguration.asset b/Examples/PingTool/Assets/PingTool/NetStateMonitorConfiguration.asset
new file mode 100644
index 0000000000..8748ea24db
--- /dev/null
+++ b/Examples/PingTool/Assets/PingTool/NetStateMonitorConfiguration.asset
@@ -0,0 +1,188 @@
+%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: f51159758cdc14734b2cb6ec1e40e18e, type: 3}
+  m_Name: NetStateMonitorConfiguration
+  m_EditorClassIdentifier: 
+  <DisplayElements>k__BackingField:
+  - <FieldsInitialized>k__BackingField: 1
+    <Type>k__BackingField: 2
+    <Label>k__BackingField: Bandwidth Consumption
+    <Stats>k__BackingField:
+    - <TypeIndex>k__BackingField: 0
+      <EnumValue>k__BackingField: 6
+    - <TypeIndex>k__BackingField: 0
+      <EnumValue>k__BackingField: 5
+    <CounterConfiguration>k__BackingField:
+      <SmoothingMethod>k__BackingField: 1
+      <AggregationMethod>k__BackingField: 1
+      m_SignificantDigits: 3
+      <HighlightLowerBound>k__BackingField: -3.402823e+38
+      <HighlightUpperBound>k__BackingField: 3.402823e+38
+      <ExponentialMovingAverageParams>k__BackingField:
+        m_HalfLife: 1000000000
+      <SimpleMovingAverageParams>k__BackingField:
+        m_SampleCount: 512
+        <SampleRate>k__BackingField: 0
+    <GraphConfiguration>k__BackingField:
+      m_SampleCount: 30
+      <SampleRate>k__BackingField: 1
+      <VariableColors>k__BackingField: []
+      <XAxisType>k__BackingField: 0
+      <LineGraphConfiguration>k__BackingField:
+        m_LineThickness: 2
+    <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
+    - <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
+  - <FieldsInitialized>k__BackingField: 1
+    <Type>k__BackingField: 0
+    <Label>k__BackingField: Packet Loss
+    <Stats>k__BackingField:
+    - <TypeIndex>k__BackingField: 0
+      <EnumValue>k__BackingField: 65
+    <CounterConfiguration>k__BackingField:
+      <SmoothingMethod>k__BackingField: 1
+      <AggregationMethod>k__BackingField: 1
+      m_SignificantDigits: 3
+      <HighlightLowerBound>k__BackingField: -3.402823e+38
+      <HighlightUpperBound>k__BackingField: 3.402823e+38
+      <ExponentialMovingAverageParams>k__BackingField:
+        m_HalfLife: 1000000000
+      <SimpleMovingAverageParams>k__BackingField:
+        m_SampleCount: 512
+        <SampleRate>k__BackingField: 0
+    <GraphConfiguration>k__BackingField:
+      m_SampleCount: 30
+      <SampleRate>k__BackingField: 1
+      <VariableColors>k__BackingField: []
+      <XAxisType>k__BackingField: 0
+      <LineGraphConfiguration>k__BackingField:
+        m_LineThickness: 2
+    <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: PacketLoss
+  - <FieldsInitialized>k__BackingField: 1
+    <Type>k__BackingField: 0
+    <Label>k__BackingField: Bytes Sent
+    <Stats>k__BackingField:
+    - <TypeIndex>k__BackingField: 0
+      <EnumValue>k__BackingField: 6
+    <CounterConfiguration>k__BackingField:
+      <SmoothingMethod>k__BackingField: 1
+      <AggregationMethod>k__BackingField: 1
+      m_SignificantDigits: 3
+      <HighlightLowerBound>k__BackingField: -3.402823e+38
+      <HighlightUpperBound>k__BackingField: 3.402823e+38
+      <ExponentialMovingAverageParams>k__BackingField:
+        m_HalfLife: 1000000000
+      <SimpleMovingAverageParams>k__BackingField:
+        m_SampleCount: 512
+        <SampleRate>k__BackingField: 0
+    <GraphConfiguration>k__BackingField:
+      m_SampleCount: 30
+      <SampleRate>k__BackingField: 1
+      <VariableColors>k__BackingField: []
+      <XAxisType>k__BackingField: 0
+      <LineGraphConfiguration>k__BackingField:
+        m_LineThickness: 2
+    <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
+  - <FieldsInitialized>k__BackingField: 1
+    <Type>k__BackingField: 0
+    <Label>k__BackingField: Bytes Received
+    <Stats>k__BackingField:
+    - <TypeIndex>k__BackingField: 0
+      <EnumValue>k__BackingField: 5
+    <CounterConfiguration>k__BackingField:
+      <SmoothingMethod>k__BackingField: 1
+      <AggregationMethod>k__BackingField: 1
+      m_SignificantDigits: 3
+      <HighlightLowerBound>k__BackingField: -3.402823e+38
+      <HighlightUpperBound>k__BackingField: 3.402823e+38
+      <ExponentialMovingAverageParams>k__BackingField:
+        m_HalfLife: 1000000000
+      <SimpleMovingAverageParams>k__BackingField:
+        m_SampleCount: 512
+        <SampleRate>k__BackingField: 0
+    <GraphConfiguration>k__BackingField:
+      m_SampleCount: 30
+      <SampleRate>k__BackingField: 1
+      <VariableColors>k__BackingField: []
+      <XAxisType>k__BackingField: 0
+      <LineGraphConfiguration>k__BackingField:
+        m_LineThickness: 2
+    <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: TotalBytesReceived
+  - <FieldsInitialized>k__BackingField: 1
+    <Type>k__BackingField: 0
+    <Label>k__BackingField: Packets Sent
+    <Stats>k__BackingField:
+    - <TypeIndex>k__BackingField: 0
+      <EnumValue>k__BackingField: 50
+    <CounterConfiguration>k__BackingField:
+      <SmoothingMethod>k__BackingField: 1
+      <AggregationMethod>k__BackingField: 1
+      m_SignificantDigits: 3
+      <HighlightLowerBound>k__BackingField: -3.402823e+38
+      <HighlightUpperBound>k__BackingField: 3.402823e+38
+      <ExponentialMovingAverageParams>k__BackingField:
+        m_HalfLife: 1000000000
+      <SimpleMovingAverageParams>k__BackingField:
+        m_SampleCount: 512
+        <SampleRate>k__BackingField: 0
+    <GraphConfiguration>k__BackingField:
+      m_SampleCount: 30
+      <SampleRate>k__BackingField: 1
+      <VariableColors>k__BackingField: []
+      <XAxisType>k__BackingField: 0
+      <LineGraphConfiguration>k__BackingField:
+        m_LineThickness: 2
+    <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: PacketsSent
+  - <FieldsInitialized>k__BackingField: 1
+    <Type>k__BackingField: 0
+    <Label>k__BackingField: Packets Received
+    <Stats>k__BackingField:
+    - <TypeIndex>k__BackingField: 0
+      <EnumValue>k__BackingField: 49
+    <CounterConfiguration>k__BackingField:
+      <SmoothingMethod>k__BackingField: 1
+      <AggregationMethod>k__BackingField: 1
+      m_SignificantDigits: 3
+      <HighlightLowerBound>k__BackingField: -3.402823e+38
+      <HighlightUpperBound>k__BackingField: 3.402823e+38
+      <ExponentialMovingAverageParams>k__BackingField:
+        m_HalfLife: 1000000000
+      <SimpleMovingAverageParams>k__BackingField:
+        m_SampleCount: 512
+        <SampleRate>k__BackingField: 0
+    <GraphConfiguration>k__BackingField:
+      m_SampleCount: 30
+      <SampleRate>k__BackingField: 1
+      <VariableColors>k__BackingField: []
+      <XAxisType>k__BackingField: 0
+      <LineGraphConfiguration>k__BackingField:
+        m_LineThickness: 2
+    <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: PacketsReceived
diff --git a/Examples/PingTool/Assets/PingTool/NetStateMonitorConfiguration.asset.meta b/Examples/PingTool/Assets/PingTool/NetStateMonitorConfiguration.asset.meta
new file mode 100644
index 0000000000..2a68e5668d
--- /dev/null
+++ b/Examples/PingTool/Assets/PingTool/NetStateMonitorConfiguration.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 03031231403f0524aaf3b35382577439
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/PingTool/NetStatsMonitor.prefab b/Examples/PingTool/Assets/PingTool/NetStatsMonitor.prefab
new file mode 100644
index 0000000000..84102aafb5
--- /dev/null
+++ b/Examples/PingTool/Assets/PingTool/NetStatsMonitor.prefab
@@ -0,0 +1,55 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4454842426221127109
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4454842426221127111}
+  - component: {fileID: 4454842426221127108}
+  m_Layer: 0
+  m_Name: NetStatsMonitor
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4454842426221127111
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4454842426221127109}
+  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 &4454842426221127108
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4454842426221127109}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 17737e0516da2445b9b0077ae2bd9b4f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Visible: 1
+  m_MaxRefreshRate: 30
+  <CustomStyleSheet>k__BackingField: {fileID: 7433441132597879392, guid: a56f0c6613129184da3cb2c0c44717d0, type: 3}
+  <PanelSettingsOverride>k__BackingField: {fileID: 11400000, guid: 1c064f75ae3a5264b8b63afe332432bc, type: 2}
+  <Position>k__BackingField:
+    <OverridePosition>k__BackingField: 1
+    m_PositionLeftToRight: 0
+    m_PositionTopToBottom: 1
+  <Configuration>k__BackingField: {fileID: 11400000, guid: 03031231403f0524aaf3b35382577439, type: 2}
diff --git a/Examples/PingTool/Assets/PingTool/NetStatsMonitor.prefab.meta b/Examples/PingTool/Assets/PingTool/NetStatsMonitor.prefab.meta
new file mode 100644
index 0000000000..b50d0b57a0
--- /dev/null
+++ b/Examples/PingTool/Assets/PingTool/NetStatsMonitor.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c66c065828bdfe34bae0d3f7479fc521
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/PingTool/NetStatsMonitorPanelSettings.asset b/Examples/PingTool/Assets/PingTool/NetStatsMonitorPanelSettings.asset
new file mode 100644
index 0000000000..5867392d24
--- /dev/null
+++ b/Examples/PingTool/Assets/PingTool/NetStatsMonitorPanelSettings.asset
@@ -0,0 +1,46 @@
+%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: 19101, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: NetStatsMonitorPanelSettings
+  m_EditorClassIdentifier: 
+  themeUss: {fileID: -4733365628477956816, guid: 4f71e2feb5fe949a0ab042f9aaa1ffca, type: 3}
+  m_DisableNoThemeWarning: 0
+  m_TargetTexture: {fileID: 0}
+  m_RenderMode: 0
+  m_WorldSpaceLayer: 0
+  m_ScaleMode: 2
+  m_ReferenceSpritePixelsPerUnit: 100
+  m_PixelsPerUnit: 100
+  m_Scale: 1
+  m_ReferenceDpi: 72
+  m_FallbackDpi: 96
+  m_ReferenceResolution: {x: 1280, y: 720}
+  m_ScreenMatchMode: 0
+  m_Match: 0.5
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+  m_BindingLogLevel: 0
+  m_ClearDepthStencil: 1
+  m_ClearColor: 0
+  m_ColorClearValue: {r: 0, g: 0, b: 0, a: 0}
+  m_VertexBudget: 0
+  m_DynamicAtlasSettings:
+    m_MinAtlasSize: 128
+    m_MaxAtlasSize: 1024
+    m_MaxSubTextureSize: 128
+    m_ActiveFilters: 0
+  m_AtlasBlitShader: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0}
+  m_RuntimeShader: {fileID: 9100, guid: 0000000000000000f000000000000000, type: 0}
+  m_RuntimeWorldShader: {fileID: 9102, guid: 0000000000000000f000000000000000, type: 0}
+  m_ICUDataAsset: {fileID: 0}
+  forceGammaRendering: 0
+  textSettings: {fileID: 0}
diff --git a/Examples/PingTool/Assets/PingTool/NetStatsMonitorPanelSettings.asset.meta b/Examples/PingTool/Assets/PingTool/NetStatsMonitorPanelSettings.asset.meta
new file mode 100644
index 0000000000..8f14d7901a
--- /dev/null
+++ b/Examples/PingTool/Assets/PingTool/NetStatsMonitorPanelSettings.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1c064f75ae3a5264b8b63afe332432bc
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/PingTool/PingTool.cs b/Examples/PingTool/Assets/PingTool/PingTool.cs
new file mode 100644
index 0000000000..32b0da0fa8
--- /dev/null
+++ b/Examples/PingTool/Assets/PingTool/PingTool.cs
@@ -0,0 +1,709 @@
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+#if MULTIPLAYER_TOOLS
+using Unity.Multiplayer.Tools.NetStats;
+using Unity.Multiplayer.Tools.NetStatsMonitor;
+#endif
+using Unity.Netcode.Transports.UTP;
+using UnityEngine;
+using UnityEngine.Events;
+using UnityEngine.UI;
+
+namespace Unity.Netcode.Examples.PingTool
+{
+    public class PingTool : NetworkBehaviour
+    {
+        #region PUBLIC PROPERTIES
+        /// Note: Sending anything beyond 100 pings per second (100HZ) is only going to congest the 
+        /// reliable pipeline. If the client is locked at a fixed frame rate (i.e.60HZ) then it will
+        /// send 1 ping per frame and will wait for 100 frames to reconcile the values and populate
+        /// each client's <see cref="ClientRtt"/> entry.
+        [Tooltip("The number of pings that will be sent per second.")]
+        [Range(1, 100)]
+        public int PingRate = 30;
+#if MULTIPLAYER_TOOLS
+        public bool StartWithNetStateMonitorHidden = true;
+        public KeyCode NetStatsMonitorToggle = KeyCode.Tab;
+#endif
+        public Text PingRateValue;
+        public Text PingToolHelp;
+        public bool EnableConsoleLogging = true;
+
+        public UnityEvent<ulong, ClientRtt> LogMessage;
+
+        /// <summary>
+        /// Used to hold the averaged values of:
+        /// Ping: This is the average time it takes to receive a PingRpc from the client
+        /// RTT: This is the average UnityTransport round trip time value
+        /// </summary>
+        public struct ClientRtt
+        {
+            public float Ping;
+            public float RTT;
+        }
+        #endregion
+
+        #region PRIVATE PROPERTIES
+        private struct ClientPingEntry
+        {
+            public int ReceivedPongs;
+            public float PingTime;
+            public ulong UTP_RTT;
+
+            public void Reset()
+            {
+                ReceivedPongs = 0;
+                PingTime = 0.0f;
+                UTP_RTT = 0;
+            }
+        }
+        private NetworkVariable<int> m_PingRate = new NetworkVariable<int>();
+        private UnityTransport m_UnityTransport;
+        private Dictionary<ulong, ClientPingEntry> m_ClientPingQueue = new Dictionary<ulong, ClientPingEntry>();
+        private Dictionary<ulong, ClientRtt> m_ClientRtt = new Dictionary<ulong, ClientRtt>();
+        private Dictionary<ulong, float> m_NextClientPingTime = new Dictionary<ulong, float>();
+        private Dictionary<ulong, Coroutine> m_ClientUpdateRoutines = new Dictionary<ulong, Coroutine>();
+        private Slider m_Slider;
+
+        private Canvas m_PingUICanvas;
+        private bool m_PingRateUpdated;
+        private float m_LastUpdatedTime;
+        #endregion
+
+        #region PUBLIC METHODS
+        /// <summary>
+        /// Reutrns the current reconciled client's ping and RTT values.
+        /// </summary>
+        public ClientRtt GetClientRtt(ulong clientID)
+        {
+            if (m_ClientRtt.ContainsKey(clientID))
+            {
+                return m_ClientRtt[clientID];
+            }
+            return new ClientRtt()
+            {
+                Ping = -1.0f,
+                RTT = -1.0f,
+            };
+        }
+        #endregion
+
+        #region NETWORKBEHAVIOUR AND NETCODE EVENTS
+        private void Awake()
+        {
+            m_Slider = GetComponentInChildren<Slider>();
+            m_PingUICanvas = GetComponentInChildren<Canvas>();
+            m_PingUICanvas.gameObject.SetActive(false);
+#if MULTIPLAYER_TOOLS
+            if (m_NetStatsMonitor != null)
+            {
+                m_NetStatsMonitor.Visible = false;
+            }
+#endif
+
+            if (PingToolHelp)
+            {
+                PingToolHelp.text = PingToolHelp.text.Replace("<>", $"<{NetStatsMonitorToggle}>");
+            }
+        }
+
+        protected override void OnNetworkPreSpawn(ref NetworkManager networkManager)
+        {
+            m_UnityTransport = NetworkManager.NetworkConfig.NetworkTransport as UnityTransport;
+            base.OnNetworkPreSpawn(ref networkManager);
+        }
+
+        private void InitializeAllClients()
+        {
+            // Register to get the UTP RTT to the server or service and to get frame times            
+            AddClientStats(NetworkManager.LocalClientId);
+            // Server does not need to update its RTT to itself
+            if (!NetworkManager.IsServer)
+            {
+                InitializePingClientTime(NetworkManager.LocalClientId);
+            }
+
+            foreach (var clientId in NetworkManager.ConnectedClientsIds)
+            {
+                // Clients or the server ignores their entry
+                if (clientId == NetworkManager.LocalClientId)
+                {
+                    continue;
+                }
+                AddClientStats(clientId);
+                InitializePingClientTime(clientId);
+            }
+        }
+
+        public override void OnNetworkSpawn()
+        {
+            m_PingUICanvas.gameObject.SetActive(true);
+            m_Slider.gameObject.SetActive(IsOwner);
+
+            if (IsOwner)
+            {
+                m_PingUICanvas.gameObject.SetActive(true);
+                m_Slider.onValueChanged.AddListener(delegate { OnPingRateChanged(); });
+                m_PingRate.Value = PingRate;
+                m_Slider.value = PingRate;
+
+                InitializeAllClients();
+                NetworkManager.OnConnectionEvent += OnConnectionEvent;
+                // Start the PingRate change monitor that avoids sending a bunch
+                // of updates until the user is finished selecting their value
+                StartCoroutine(OwnerMonitorPingRateChange());
+            }
+            else
+            {
+                m_PingRate.OnValueChanged += OnPingRateChanged;
+                InitializeAllClients();
+                NetworkManager.OnConnectionEvent += OnConnectionEvent;
+            }
+            UpdatePingRateValue(m_PingRate.Value);
+
+            base.OnNetworkSpawn();
+        }
+
+        private void UpdatePingRateValue(int value)
+        {
+            if (PingRateValue)
+            {
+                PingRateValue.text = $"{m_PingRate.Value}";
+            }
+        }
+
+        protected override void OnOwnershipChanged(ulong previous, ulong current)
+        {
+            if (current == NetworkManager.LocalClientId)
+            {
+                m_Slider.gameObject.SetActive(true);
+                m_Slider.onValueChanged.AddListener(delegate { OnPingRateChanged(); });
+                m_Slider.value = m_PingRate.Value;
+                StartCoroutine(OwnerMonitorPingRateChange());
+            }
+            else if (previous == NetworkManager.LocalClientId)
+            {
+                m_Slider.gameObject.SetActive(false);
+                m_Slider.onValueChanged.RemoveAllListeners();
+            }
+
+            base.OnOwnershipChanged(previous, current);
+        }
+
+        private void OnPingRateChanged(int previous, int current)
+        {
+            InitializePingClientTime(OwnerClientId);
+            UpdatePingRateValue(current);
+        }
+
+        public override void OnNetworkDespawn()
+        {
+            m_PingRate.OnValueChanged -= OnPingRateChanged;
+            NetworkManager.OnConnectionEvent -= OnConnectionEvent;
+            m_PingUICanvas.gameObject.SetActive(false);
+            if (HasAuthority)
+            {
+                m_Slider.onValueChanged.RemoveAllListeners();
+            }
+
+            foreach (var clientEntry in m_ClientRtt)
+            {
+                if (m_ClientUpdateRoutines.ContainsKey(clientEntry.Key))
+                {
+                    StopCoroutine(m_ClientUpdateRoutines[clientEntry.Key]);
+                }
+                RemoveClientStats(clientEntry.Key);
+            }
+            RemoveClientStats(NetworkManager.LocalClientId);
+
+            m_ClientUpdateRoutines.Clear();
+            m_ClientPingQueue.Clear();
+            m_ClientRtt.Clear();
+            m_NextClientPingTime.Clear();
+
+#if MULTIPLAYER_TOOLS
+            if (m_NetStatsMonitor)
+            {
+                m_NetStatsMonitor.Visible = false;
+            }
+#endif
+
+            base.OnNetworkDespawn();
+        }
+
+        private void OnConnectionEvent(NetworkManager networkManager, ConnectionEventData eventData)
+        {
+            switch (eventData.EventType)
+            {
+                case ConnectionEvent.ClientDisconnected:
+                    {
+                        if (m_ClientUpdateRoutines.ContainsKey(eventData.ClientId))
+                        {
+                            StopCoroutine(m_ClientUpdateRoutines[eventData.ClientId]);
+                            m_ClientUpdateRoutines.Remove(eventData.ClientId);
+                        }
+                        m_ClientPingQueue.Remove(eventData.ClientId);
+                        m_ClientRtt.Remove(eventData.ClientId);
+                        m_NextClientPingTime.Remove(eventData.ClientId);
+                        RemoveClientStats(eventData.ClientId);
+                        break;
+                    }
+                case ConnectionEvent.ClientConnected:
+                    {
+                        if (eventData.ClientId == NetworkManager.LocalClientId || m_ClientPingQueue.ContainsKey(eventData.ClientId))
+                        {
+                            break;
+                        }
+                        else
+                        {
+                            InitializePingClientTime(eventData.ClientId);
+                            AddClientStats(eventData.ClientId);
+                        }
+                        break;
+                    }
+                case ConnectionEvent.PeerConnected:
+                    {
+                        if (eventData.ClientId == NetworkManager.LocalClientId || m_ClientPingQueue.ContainsKey(eventData.ClientId))
+                        {
+                            break;
+                        }
+                        else
+                        {
+                            InitializePingClientTime(eventData.ClientId);
+                            AddClientStats(eventData.ClientId);
+                        }
+
+                        break;
+                    }
+                case ConnectionEvent.PeerDisconnected:
+                    {
+                        if (m_ClientUpdateRoutines.ContainsKey(eventData.ClientId))
+                        {
+                            StopCoroutine(m_ClientUpdateRoutines[eventData.ClientId]);
+                            m_ClientUpdateRoutines.Remove(eventData.ClientId);
+                        }
+                        m_ClientPingQueue.Remove(eventData.ClientId);
+                        m_ClientRtt.Remove(eventData.ClientId);
+                        m_NextClientPingTime.Remove(eventData.ClientId);
+                        RemoveClientStats(eventData.ClientId);
+                        break;
+                    }
+            }
+        }
+
+        private void OnPingRateChanged()
+        {
+            if (!IsSpawned || !HasAuthority)
+            {
+                return;
+            }
+
+            if (m_Slider.value != PingRate)
+            {
+                PingRate = (int)m_Slider.value;
+                UpdatePingRateValue(PingRate);
+                // Flag the last time this value updated for the OwnerMonitorPingRateChange coroutine
+                m_LastUpdatedTime = Time.realtimeSinceStartup;
+                m_PingRateUpdated = true;
+            }
+        }
+
+        /// <summary>
+        /// Helper coroutine to prevent from sending every micro-adjustment to 
+        /// the ping rate value. Once the user has stopped changing the slider
+        /// then the clients will be notified of the change and the local authority
+        /// will reset its inbound client queues.
+        /// </summary>
+        private IEnumerator OwnerMonitorPingRateChange()
+        {
+            var waitForOneSecond = new WaitForSeconds(1.0f);
+            var changeWaitPeriod = new WaitForSeconds(0.1f);
+            var continueToMonitor = true;
+            var networkManager = NetworkManager;
+
+            while (continueToMonitor)
+            {
+                if (!m_PingRateUpdated)
+                {
+                    yield return waitForOneSecond;
+                }
+                else
+                {
+                    yield return changeWaitPeriod;
+                }
+
+
+                // Terminate if shutting down, the local client is disconnected, or the targeted client is no longer connected
+                continueToMonitor = !networkManager.ShutdownInProgress && networkManager.IsConnectedClient && IsSpawned && IsOwner;
+                if (!continueToMonitor)
+                {
+                    continue;
+                }
+
+                if (!m_PingRateUpdated)
+                {
+                    continue;
+                }
+
+                // Just continue to wait for any slider changes to stop before
+                // triggering an update to non-authority instances and resetting
+                // the inboudn client queue
+                if ((m_LastUpdatedTime + 0.25f) > Time.realtimeSinceStartup)
+                {
+                    continue;
+                }
+
+                // Unset this flag
+                m_PingRateUpdated = false;
+
+                // If the user slide the slider around but landed back to the same
+                // value we were already on, then just ignore this change update
+                if (m_PingRate.Value == PingRate)
+                {
+                    continue;
+                }
+
+                // Update remote clients
+                m_PingRate.Value = PingRate;
+
+                // Reset all of the local inbound client queues
+                foreach (var clientId in NetworkManager.ConnectedClientsIds)
+                {
+                    if (clientId == OwnerClientId)
+                    {
+                        continue;
+                    }
+                    InitializePingClientTime(clientId);
+                }
+            }
+            yield break;
+        }
+
+#if MULTIPLAYER_TOOLS
+        private void Update()
+        {
+            if (IsSpawned)
+            {
+                UpdateStats(PingToolMetrics.FrameRate, Time.deltaTime);
+                if (m_NetStatsMonitor && Input.GetKeyDown(NetStatsMonitorToggle))
+                {
+                    m_NetStatsMonitor.Visible = !m_NetStatsMonitor.Visible;
+                    if (PingToolHelp)
+                    {
+                        PingToolHelp.gameObject.SetActive(!m_NetStatsMonitor.Visible);
+                    }
+                }
+            }
+        }
+#endif
+
+        #endregion
+
+        #region INBOUND CLIENT INITIALIZATION
+        /// <summary>
+        /// Initializes or resets a client's ping and RTT data
+        /// </summary>
+        private void InitializePingClientTime(ulong clientId)
+        {
+            if (m_ClientUpdateRoutines.ContainsKey(clientId))
+            {
+                StopCoroutine(m_ClientUpdateRoutines[clientId]);
+
+                m_ClientUpdateRoutines.Remove(clientId);
+            }
+            if (!m_NextClientPingTime.ContainsKey(clientId))
+            {
+                m_NextClientPingTime.Add(clientId, 0);
+            }
+            m_NextClientPingTime[clientId] = Time.realtimeSinceStartup;
+
+            m_ClientUpdateRoutines.Add(clientId, StartCoroutine(UpdateClientRoutine(clientId)));
+        }
+
+        private void InitializeClient(ulong clientId, bool hasEntry)
+        {
+            if (!hasEntry)
+            {
+                m_ClientPingQueue.Add(clientId, new ClientPingEntry());
+            }
+            else
+            {
+                m_ClientPingQueue[clientId].Reset();
+            }
+        }
+        #endregion
+
+        #region INBOUND PING PROCESSING
+        [Rpc(SendTo.SpecifiedInParams)]
+        private void PingRpc(float timeSent, RpcParams rpcParams)
+        {
+            // Exit early if despawning or shutdown
+            if (!IsSpawned || NetworkManager == null || !NetworkManager.IsListening || NetworkManager.ShutdownInProgress)
+            {
+                return;
+            }
+
+            PongRpc(Mathf.Abs(NetworkManager.ServerTime.TimeAsFloat - timeSent), RpcTarget.Single(rpcParams.Receive.SenderClientId, RpcTargetUse.Temp));
+        }
+
+        [Rpc(SendTo.SpecifiedInParams)]
+        private void PongRpc(float timeDelta, RpcParams rpcParams)
+        {
+            // Exit early if despawning or shutdown
+            if (!IsSpawned || NetworkManager == null || !NetworkManager.IsListening || NetworkManager.ShutdownInProgress)
+            {
+                return;
+            }
+
+            UpdateClientRTT(rpcParams.Receive.SenderClientId, timeDelta);
+        }
+
+        private void UpdateClientRTT(ulong clientId, float timeDelta)
+        {
+            var clientHasEntry = m_ClientPingQueue.ContainsKey(clientId);
+            // Handle creating a new entry or reconfiguring the client's queue size (in the event PingRate has changed)
+            if (!clientHasEntry)
+            {
+                InitializeClient(clientId, clientHasEntry);
+            }
+            var currentRTT = m_UnityTransport.GetCurrentRtt(NetworkManager.CMBServiceConnection || !NetworkManager.IsServer ? NetworkManager.ServerClientId : clientId);
+            var latencyToTimeServer = 0.0f;
+
+            if (!NetworkManager.IsServer && !NetworkManager.CMBServiceConnection)
+            {
+                latencyToTimeServer = m_UnityTransport.GetCurrentRtt(NetworkManager.ServerClientId);
+            }
+
+            var pingEntry = m_ClientPingQueue[clientId];
+            var ping = Mathf.Abs(timeDelta - (latencyToTimeServer * 0.001f));
+            pingEntry.PingTime += ping;
+            pingEntry.UTP_RTT += currentRTT;
+            pingEntry.ReceivedPongs++;
+            m_ClientPingQueue[clientId] = pingEntry;
+#if MULTIPLAYER_TOOLS
+            UpdateStats(PingToolMetrics.RTT, currentRTT * 0.001f);
+            UpdateStats(PingToolMetrics.Ping, ping);
+#endif
+        }
+        #endregion
+
+        #region CLIENT COROUTINE AND RTT PROCESSING
+        /// <summary>
+        /// Reconciles a clients inbound ping queue
+        /// </summary>
+        private void ReconcileClient(ulong clientId, float pingFrequency)
+        {
+            if (!m_ClientPingQueue.ContainsKey(clientId))
+            {
+                return;
+            }
+            if (!m_ClientRtt.ContainsKey(clientId))
+            {
+                m_ClientRtt.Add(clientId, new ClientRtt());
+            }
+            var pingEntry = m_ClientPingQueue[clientId];
+            var clientRTT = m_ClientRtt[clientId];
+            clientRTT.Ping = pingEntry.PingTime / pingEntry.ReceivedPongs;
+            clientRTT.RTT = (float)pingEntry.UTP_RTT / pingEntry.ReceivedPongs;
+            m_ClientRtt[clientId] = clientRTT;
+            pingEntry.Reset();
+            m_ClientPingQueue[clientId] = pingEntry;
+        }
+
+        private IEnumerator UpdateClientRoutine(ulong clientId)
+        {
+            var pingFrequency = 1.0f / m_PingRate.Value;
+            var pingFrequencyWait = new WaitForSeconds(pingFrequency);
+            var clientToReconcile = clientId;
+            var continueToPingAndReconcile = true;
+            var networkManager = NetworkManager;
+            var nextReconcileTime = Time.realtimeSinceStartup + 1.0f;
+            // the queueSize is always 1 larger than the ping rate to account for there always being a tail in the queue.
+            var queueSize = PingRate + 1;
+            var clientHasEntry = m_ClientPingQueue.ContainsKey(clientId);
+            // Handle creating a new entry or reconfiguring the client's queue size (in the event PingRate has changed)
+            if (!clientHasEntry)
+            {
+                InitializeClient(clientId, clientHasEntry);
+            }
+
+            while (continueToPingAndReconcile)
+            {
+                // Clients only need to get the RTT to the server or service
+                if (!networkManager.IsServer && clientId == networkManager.LocalClientId)
+                {
+                    UpdateClientRTT(clientToReconcile, 0.0f);
+                }
+                else
+                {
+                    // Send a ping to this client so it can reconcile on its end
+                    PingRpc(networkManager.ServerTime.TimeAsFloat, RpcTarget.Single(clientId, RpcTargetUse.Temp));
+                }
+                yield return pingFrequencyWait;
+
+                // Only reconcile every second
+                if (nextReconcileTime > Time.realtimeSinceStartup)
+                {
+                    continue;
+                }
+
+                // Terminate if shutting down, the local client is disconnected, or the targeted client is no longer connected
+                continueToPingAndReconcile = !networkManager.ShutdownInProgress && networkManager.IsConnectedClient && networkManager.ConnectedClientsIds.Contains(clientToReconcile);
+                if (!continueToPingAndReconcile)
+                {
+                    continue;
+                }
+
+                nextReconcileTime = Time.realtimeSinceStartup + 1.0f;
+
+                ReconcileClient(clientToReconcile, pingFrequency);
+                if (EnableConsoleLogging)
+                {
+                    var clientRtt = GetClientRtt(clientToReconcile);
+                    LogMessage?.Invoke(clientToReconcile, GetClientRtt(clientToReconcile));
+                }
+            }
+            yield break;
+        }
+        #endregion
+
+        #region RNSM INTEGRATION
+        private void AddClientStats(ulong clientId)
+        {
+#if MULTIPLAYER_TOOLS
+            if (m_ClientDisplayElements.ContainsKey(clientId))
+            {
+                return;
+            }
+            var localClient = NetworkManager.LocalClientId;
+            var clientDisplayElements = new ClientDisplayElements();
+            if (clientId == localClient)
+            {
+                clientDisplayElements.FrameRate = new DisplayElementConfiguration()
+                {
+                    Type = DisplayElementType.Counter,
+                    Label = "Frame Rate",
+                };
+                clientDisplayElements.FrameRate.CounterConfiguration.SmoothingMethod = SmoothingMethod.SimpleMovingAverage;
+                clientDisplayElements.FrameRate.CounterConfiguration.AggregationMethod = AggregationMethod.Average;
+                clientDisplayElements.FrameRate.CounterConfiguration.SignificantDigits = 3;
+                clientDisplayElements.FrameRate.CounterConfiguration.SimpleMovingAverageParams.SampleCount = Application.targetFrameRate;
+                clientDisplayElements.FrameRate.CounterConfiguration.SimpleMovingAverageParams.SampleRate = SampleRate.PerSecond;
+                clientDisplayElements.FrameRate.Stats.Add(MetricId.Create(PingToolMetrics.FrameRate));
+                m_NetStatsMonitor.Configuration.DisplayElements.Add(clientDisplayElements.FrameRate);
+            }
+
+            if ((!NetworkManager.IsServer && clientId == localClient) || (NetworkManager.IsServer && clientId != localClient))
+            {
+                var connectionDescription = $"Client-{clientId} RTT";
+                if (NetworkManager.CMBServiceConnection)
+                {
+                    connectionDescription = $"Service RTT";
+                }
+                else if (!NetworkManager.IsServer)
+                {
+                    connectionDescription = $"Server RTT";
+                }
+                clientDisplayElements.RTT = new DisplayElementConfiguration()
+                {
+                    Type = DisplayElementType.Counter,
+                    Label = connectionDescription,
+                };
+                clientDisplayElements.RTT.CounterConfiguration.SmoothingMethod = SmoothingMethod.SimpleMovingAverage;
+                clientDisplayElements.RTT.CounterConfiguration.AggregationMethod = AggregationMethod.Average;
+                clientDisplayElements.RTT.CounterConfiguration.SignificantDigits = 3;
+                clientDisplayElements.RTT.CounterConfiguration.SimpleMovingAverageParams.SampleCount = PingRate;
+                clientDisplayElements.RTT.CounterConfiguration.SimpleMovingAverageParams.SampleRate = SampleRate.PerSecond;
+                clientDisplayElements.RTT.Stats.Add(MetricId.Create(PingToolMetrics.RTT));
+                m_NetStatsMonitor.Configuration.DisplayElements.Add(clientDisplayElements.RTT);
+            }
+
+            if (clientId != localClient)
+            {
+                clientDisplayElements.Ping = new DisplayElementConfiguration()
+                {
+                    Type = DisplayElementType.Counter,
+                    Label = $"Client-{clientId} Ping",
+                };
+
+                clientDisplayElements.Ping.CounterConfiguration.SmoothingMethod = SmoothingMethod.SimpleMovingAverage;
+                clientDisplayElements.Ping.CounterConfiguration.AggregationMethod = AggregationMethod.Average;
+                clientDisplayElements.Ping.CounterConfiguration.SignificantDigits = 3;
+                clientDisplayElements.Ping.CounterConfiguration.SimpleMovingAverageParams.SampleCount = PingRate;
+                clientDisplayElements.Ping.CounterConfiguration.SimpleMovingAverageParams.SampleRate = SampleRate.PerSecond;
+                clientDisplayElements.Ping.Stats.Add(MetricId.Create(PingToolMetrics.Ping));
+                m_NetStatsMonitor.Configuration.DisplayElements.Add(clientDisplayElements.Ping);
+            }
+
+            m_NetStatsMonitor.ApplyConfiguration();
+            m_ClientDisplayElements.Add(clientId, clientDisplayElements);
+#endif
+        }
+
+        private void RemoveClientStats(ulong clientId)
+        {
+#if MULTIPLAYER_TOOLS
+            if (!m_ClientDisplayElements.ContainsKey(clientId))
+            {
+                return;
+            }
+            if (m_ClientDisplayElements[clientId].FrameRate != null)
+            {
+                m_NetStatsMonitor.Configuration.DisplayElements.Remove(m_ClientDisplayElements[clientId].FrameRate);
+            }
+            if (m_ClientDisplayElements[clientId].Ping != null)
+            {
+                m_NetStatsMonitor.Configuration.DisplayElements.Remove(m_ClientDisplayElements[clientId].Ping);
+            }
+            if (m_ClientDisplayElements[clientId].RTT != null)
+            {
+                m_NetStatsMonitor.Configuration.DisplayElements.Remove(m_ClientDisplayElements[clientId].RTT);
+            }
+            m_ClientDisplayElements.Remove(clientId);
+            m_NetStatsMonitor.ApplyConfiguration();
+#endif
+        }
+
+#if MULTIPLAYER_TOOLS
+        [SerializeField]
+        private RuntimeNetStatsMonitor m_NetStatsMonitor;
+
+        private struct ClientDisplayElements
+        {
+            public DisplayElementConfiguration Ping;
+            public DisplayElementConfiguration RTT;
+            public DisplayElementConfiguration FrameRate;
+        }
+
+        private Dictionary<ulong, ClientDisplayElements> m_ClientDisplayElements = new Dictionary<ulong, ClientDisplayElements>();
+
+        // User-defined metrics can be defined using the MetricTypeEnum attribute
+        [MetricTypeEnum(DisplayName = "PingToolMetrics")]
+        private enum PingToolMetrics
+        {
+            // Metadata for each user-defined metric can be defined using the MetricMetadata Attribute
+            [MetricMetadata(Units = Units.Seconds, MetricKind = MetricKind.Gauge)]
+            FrameRate,
+
+            [MetricMetadata(Units = Units.Seconds, MetricKind = MetricKind.Gauge)]
+            RTT,
+
+            [MetricMetadata(Units = Units.Seconds, MetricKind = MetricKind.Gauge)]
+            Ping,
+        }
+
+        private void UpdateStats(PingToolMetrics metricType, float value)
+        {
+            if (m_NetStatsMonitor == null || !m_NetStatsMonitor.gameObject.activeInHierarchy)
+            {
+                return;
+            }
+            m_NetStatsMonitor.AddCustomValue(MetricId.Create(metricType), value);
+        }
+#endif
+        #endregion
+    }
+}
diff --git a/Examples/PingTool/Assets/PingTool/PingTool.cs.meta b/Examples/PingTool/Assets/PingTool/PingTool.cs.meta
new file mode 100644
index 0000000000..5576cd7d11
--- /dev/null
+++ b/Examples/PingTool/Assets/PingTool/PingTool.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 1466a9d81cf83ff45bca7014cb93c010
\ No newline at end of file
diff --git a/Examples/PingTool/Assets/PingTool/PingTool.prefab b/Examples/PingTool/Assets/PingTool/PingTool.prefab
new file mode 100644
index 0000000000..b36922c89a
--- /dev/null
+++ b/Examples/PingTool/Assets/PingTool/PingTool.prefab
@@ -0,0 +1,899 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &61459498585251617
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8751044705753477979}
+  - component: {fileID: 2972173288477737866}
+  - component: {fileID: 4089164277529487385}
+  - component: {fileID: 7858255331522260270}
+  m_Layer: 5
+  m_Name: PingUICanvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8751044705753477979
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 61459498585251617}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1251000097366145441}
+  - {fileID: 6277513074320060017}
+  - {fileID: 4052611471472719404}
+  - {fileID: 4428071759692496771}
+  m_Father: {fileID: 2569679938784265262}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!223 &2972173288477737866
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 61459498585251617}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &4089164277529487385
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 61459498585251617}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!114 &7858255331522260270
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 61459498585251617}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!1 &1021335138690337840
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6057903054739576449}
+  - component: {fileID: 526932693318939688}
+  - component: {fileID: 9110625980467893981}
+  m_Layer: 5
+  m_Name: Fill
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6057903054739576449
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1021335138690337840}
+  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: 5653153439718720483}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 10}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &526932693318939688
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1021335138690337840}
+  m_CullTransparentMesh: 1
+--- !u!114 &9110625980467893981
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1021335138690337840}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.8867924, g: 0.5861589, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1209164785514491542
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6277513074320060017}
+  - component: {fileID: 997989977250032043}
+  m_Layer: 5
+  m_Name: Slider
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6277513074320060017
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1209164785514491542}
+  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:
+  - {fileID: 4191173795133522563}
+  - {fileID: 5653153439718720483}
+  - {fileID: 4401222439642131516}
+  m_Father: {fileID: 8751044705753477979}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -20, y: 120}
+  m_SizeDelta: {x: 20, y: 160}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &997989977250032043
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1209164785514491542}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 0.7264151, g: 0.37546504, b: 0, a: 1}
+    m_HighlightedColor: {r: 1, g: 0.46648857, b: 0.023584902, a: 1}
+    m_PressedColor: {r: 0.990566, g: 0.59785765, b: 0, a: 1}
+    m_SelectedColor: {r: 0.8584906, g: 0.3851904, b: 0.01214843, a: 1}
+    m_DisabledColor: {r: 0.5283019, g: 0.28247792, b: 0.12709148, a: 0.6039216}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 3093036233426299934}
+  m_FillRect: {fileID: 6057903054739576449}
+  m_HandleRect: {fileID: 5754391144261322890}
+  m_Direction: 2
+  m_MinValue: 0
+  m_MaxValue: 100
+  m_WholeNumbers: 1
+  m_Value: 50
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &1747164378101099109
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4401222439642131516}
+  m_Layer: 5
+  m_Name: Handle Slide Area
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4401222439642131516
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1747164378101099109}
+  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:
+  - {fileID: 5754391144261322890}
+  m_Father: {fileID: 6277513074320060017}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: -20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &2153677013667498382
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5754391144261322890}
+  - component: {fileID: 8219797307110424300}
+  - component: {fileID: 3093036233426299934}
+  m_Layer: 5
+  m_Name: Handle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5754391144261322890
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2153677013667498382}
+  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: 4401222439642131516}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8219797307110424300
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2153677013667498382}
+  m_CullTransparentMesh: 1
+--- !u!114 &3093036233426299934
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2153677013667498382}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2288713204005449346
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4428071759692496771}
+  - component: {fileID: 8253236516847930255}
+  - component: {fileID: 5912429997513659108}
+  m_Layer: 5
+  m_Name: PingRateLabel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4428071759692496771
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2288713204005449346}
+  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: 8751044705753477979}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -85, y: 65}
+  m_SizeDelta: {x: 100, y: 24}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8253236516847930255
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2288713204005449346}
+  m_CullTransparentMesh: 1
+--- !u!114 &5912429997513659108
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2288713204005449346}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.4606132, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 18
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 2
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: PingRate
+--- !u!1 &3505673252728825044
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5653153439718720483}
+  m_Layer: 5
+  m_Name: Fill Area
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5653153439718720483
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3505673252728825044}
+  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:
+  - {fileID: 6057903054739576449}
+  m_Father: {fileID: 6277513074320060017}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.25, y: 0}
+  m_AnchorMax: {x: 0.75, y: 1}
+  m_AnchoredPosition: {x: 0, y: -5}
+  m_SizeDelta: {x: 0, y: -20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &4874009706086500699
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2569679938784265262}
+  - component: {fileID: 9070511216422219346}
+  - component: {fileID: 2592079281344418938}
+  m_Layer: 0
+  m_Name: PingTool
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2569679938784265262
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4874009706086500699}
+  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:
+  - {fileID: 8751044705753477979}
+  - {fileID: 1263430958893551036}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &9070511216422219346
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4874009706086500699}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  GlobalObjectIdHash: 1175888021
+  InScenePlacedSourceGlobalObjectIdHash: 290216032
+  DeferredDespawnTick: 0
+  Ownership: 2
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 1
+  AutoObjectParentSync: 1
+  SyncOwnerTransformWhenParented: 1
+  AllowOwnerToParent: 0
+--- !u!114 &2592079281344418938
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4874009706086500699}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1466a9d81cf83ff45bca7014cb93c010, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ShowTopMostFoldoutHeaderGroup: 1
+  PingRate: 2
+  StartWithNetStateMonitorHidden: 1
+  NetStatsMonitorToggle: 9
+  PingRateValue: {fileID: 3165861447957584369}
+  PingToolHelp: {fileID: 7873216060197180850}
+  EnableConsoleLogging: 0
+  LogMessage:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 0}
+        m_TargetAssemblyTypeName: NetworkManagerHelper, Assembly-CSharp
+        m_MethodName: LogPingToolMessage
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  m_NetStatsMonitor: {fileID: 1263430958893551039}
+--- !u!1 &6370153036591290436
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1251000097366145441}
+  - component: {fileID: 277549501682696586}
+  - component: {fileID: 7873216060197180850}
+  m_Layer: 5
+  m_Name: PingToolHelper
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1251000097366145441
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6370153036591290436}
+  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: 8751044705753477979}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 132.5, y: 25.600006}
+  m_SizeDelta: {x: 260, y: 24}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &277549501682696586
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6370153036591290436}
+  m_CullTransparentMesh: 1
+--- !u!114 &7873216060197180850
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6370153036591290436}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.4606132, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 18
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: Hit <TAB> To Show PingTool
+--- !u!1 &7349017088681708274
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4191173795133522563}
+  - component: {fileID: 6954251507700634014}
+  - component: {fileID: 4731618890350644451}
+  m_Layer: 5
+  m_Name: Background
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4191173795133522563
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7349017088681708274}
+  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: 6277513074320060017}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.25, y: 0}
+  m_AnchorMax: {x: 0.75, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6954251507700634014
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7349017088681708274}
+  m_CullTransparentMesh: 1
+--- !u!114 &4731618890350644451
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7349017088681708274}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.3773585, g: 0.18323456, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &8398529410826658403
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4052611471472719404}
+  - component: {fileID: 8739364301692861879}
+  - component: {fileID: 3165861447957584369}
+  m_Layer: 5
+  m_Name: PingRateValue
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4052611471472719404
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8398529410826658403}
+  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: 8751044705753477979}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -85, y: 47}
+  m_SizeDelta: {x: 100, y: 24}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8739364301692861879
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8398529410826658403}
+  m_CullTransparentMesh: 1
+--- !u!114 &3165861447957584369
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8398529410826658403}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.4606132, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 18
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 40
+    m_Alignment: 2
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 0
+--- !u!1001 &3195968410650093691
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 2569679938784265262}
+    m_Modifications:
+    - target: {fileID: 4454842426221127109, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
+      propertyPath: m_Name
+      value: NetStatsMonitor
+      objectReference: {fileID: 0}
+    - target: {fileID: 4454842426221127111, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4454842426221127111, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4454842426221127111, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4454842426221127111, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4454842426221127111, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4454842426221127111, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4454842426221127111, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4454842426221127111, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4454842426221127111, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4454842426221127111, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
+--- !u!4 &1263430958893551036 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4454842426221127111, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
+  m_PrefabInstance: {fileID: 3195968410650093691}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1263430958893551039 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 4454842426221127108, guid: c66c065828bdfe34bae0d3f7479fc521, type: 3}
+  m_PrefabInstance: {fileID: 3195968410650093691}
+  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: 
diff --git a/Examples/PingTool/Assets/PingTool/PingTool.prefab.meta b/Examples/PingTool/Assets/PingTool/PingTool.prefab.meta
new file mode 100644
index 0000000000..d793fdc835
--- /dev/null
+++ b/Examples/PingTool/Assets/PingTool/PingTool.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3f5e8ae5613c82a4f9f859c11a4f2e09
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/PingTool/UnityMpToolsRnsmDefaultStyleSheet.uss b/Examples/PingTool/Assets/PingTool/UnityMpToolsRnsmDefaultStyleSheet.uss
new file mode 100644
index 0000000000..1506d17620
--- /dev/null
+++ b/Examples/PingTool/Assets/PingTool/UnityMpToolsRnsmDefaultStyleSheet.uss
@@ -0,0 +1,163 @@
+
+:root {
+    --border-width: 1px;
+    --border-color: #585858;
+    --left-padding-width: 6px;
+    --legend-dimension: 6px;
+    --axis-label-spacing: 0px;
+}
+
+.rnsm-monitor {
+    background-color: #000000;
+    opacity: 0.75;
+    max-width: 250px;
+    position: absolute;
+}
+
+.rnsm-monitor * {
+    color: #D2D2D2;
+}
+
+.rnsm-title {
+    -unity-font-style: bold;
+    font-size: 14px;
+    padding-left: var(--left-padding-width);
+}
+
+.rnsm-display-element {
+    border-top-width: var(--border-width);
+    border-top-color: var(--border-color);
+    padding-left: var(--left-padding-width);
+}
+
+.rnsm-display-element-label {
+    -unity-text-align: middle-left;
+    font-size: 12px;
+    padding-top: 0px;
+    padding-bottom: 0px;
+}
+
+.rnsm-counter {
+    flex-direction: row;
+}
+
+.rnsm-counter-value {
+    flex-grow: 1;
+    -unity-text-align: middle-right;
+    font-size: 11px;
+}
+
+/* Highlight anomalous counter values */
+.rnsm-counter-out-of-bounds * {
+    color: red;
+}
+
+.rnsm-graph {
+    flex-direction: column;
+    flex-grow: 1;
+    padding-bottom: 3px;
+    padding-top: 5px;
+}
+
+.rnsm-graph .rnsm-display-element-label-empty {
+    display: none;
+}
+
+.rnsm-graph-and-y-axis {
+    flex-direction: row;
+}
+
+.rnsm-graph-contents {
+    flex-grow: 1;
+    border-color: var(--border-color);
+    border-width: var(--border-width);
+    padding-top: 0px;
+    padding-bottom: 1px;
+    min-height: 64px;
+    /* Setting both the min and the max provides stronger guarantees on the width */
+    /* than just setting `width`. This is important for graphs, as frequent small */
+    /* changes in the size of the graph can result in frequent reallocations of */
+    /* the graphs buffers (the size of which depends on the size of the graph) */
+    min-width: 196px;
+    max-width: 196px;
+}
+
+.rnsm-graph-axis Label {
+    font-size: 10px;
+    padding-top: var(--axis-label-spacing);
+    padding-bottom: var(--axis-label-spacing);
+}
+
+.rnsm-graph-x-axis {
+    flex-direction: row;
+}
+
+.rnsm-graph-x-axis Label {
+    margin: var(--axis-label-spacing);
+    padding: var(--axis-label-spacing);
+}
+
+.rnsm-graph-x-axis .rnsm-graph-axis-min-value {
+    -unity-text-align: upper-left;
+}
+
+.rnsm-graph-x-axis .rnsm-graph-axis-max-value {
+    flex-grow: 1;
+    -unity-text-align: upper-right;
+}
+
+.rnsm-graph-y-axis {
+    flex-direction: column-reverse;
+}
+
+.rnsm-graph-y-axis Label {
+    min-width: 45px;
+    margin-top: var(--axis-label-spacing);
+    margin-bottom: var(--axis-label-spacing);
+    margin-right: var(--axis-label-spacing);
+    padding: var(--axis-label-spacing);
+}
+
+.rnsm-graph-y-axis .rnsm-graph-axis-max-value {
+    -unity-text-align: upper-left;
+}
+
+.rnsm-graph-y-axis .rnsm-graph-axis-min-value {
+    flex-grow: 1;
+    -unity-text-align: lower-left;
+}
+
+.rnsm-no-data-received-label {
+    font-size: 11px;
+}
+
+.rnsm-graph-legend {
+    flex-wrap: wrap;
+    flex-direction: row;
+    padding-top: 1px;
+}
+
+.rnsm-graph-legendkey {
+    flex-direction: row;
+    height: var(--legend-dimension);
+    margin-top: 3px;
+    margin-bottom: 3px;
+    margin-right: 8px;
+}
+
+.rnsm-graph-legendkey-swatch {
+    width: var(--legend-dimension);
+    height: var(--legend-dimension);
+    flex-shrink: 0;
+}
+
+.rnsm-graph-legendkey-label {
+    flex-shrink: 0;
+    margin-left: 1px;
+    -unity-text-align: middle-center;
+    font-size: 11px;
+    padding: 0px;
+    margin: 2px
+}
+
+›
\ No newline at end of file
diff --git a/Examples/PingTool/Assets/PingTool/UnityMpToolsRnsmDefaultStyleSheet.uss.meta b/Examples/PingTool/Assets/PingTool/UnityMpToolsRnsmDefaultStyleSheet.uss.meta
new file mode 100644
index 0000000000..984d42017a
--- /dev/null
+++ b/Examples/PingTool/Assets/PingTool/UnityMpToolsRnsmDefaultStyleSheet.uss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a56f0c6613129184da3cb2c0c44717d0
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
diff --git a/Examples/PingTool/Assets/PingTool/com.unity.netcode.gameobjects.pingtool.asmdef b/Examples/PingTool/Assets/PingTool/com.unity.netcode.gameobjects.pingtool.asmdef
new file mode 100644
index 0000000000..32a7124a2e
--- /dev/null
+++ b/Examples/PingTool/Assets/PingTool/com.unity.netcode.gameobjects.pingtool.asmdef
@@ -0,0 +1,26 @@
+{
+    "name": "com.unity.netcode.gameobjects.pingtool",
+    "rootNamespace": "",
+    "references": [
+        "GUID:1491147abca9d7d4bb7105af628b223e",
+        "GUID:b1cd7326e664a434ab35daa802773c7f",
+        "GUID:2c360f3794ebc41388fc11424ddbfdd0",
+        "GUID:524f3e206aa8d41e7bc8bb9d5696afed",
+        "GUID:a92477ff3d03a41319d732687b2254aa"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [
+        {
+            "name": "com.unity.multiplayer.tools",
+            "expression": "",
+            "define": "MULTIPLAYER_TOOLS"
+        }
+    ],
+    "noEngineReferences": false
+}
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Components/com.unity.netcode.components.asmdef.meta b/Examples/PingTool/Assets/PingTool/com.unity.netcode.gameobjects.pingtool.asmdef.meta
similarity index 76%
rename from com.unity.netcode.gameobjects/Components/com.unity.netcode.components.asmdef.meta
rename to Examples/PingTool/Assets/PingTool/com.unity.netcode.gameobjects.pingtool.asmdef.meta
index 3dcf24db40..88353a8db9 100644
--- a/com.unity.netcode.gameobjects/Components/com.unity.netcode.components.asmdef.meta
+++ b/Examples/PingTool/Assets/PingTool/com.unity.netcode.gameobjects.pingtool.asmdef.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3b8ed52f1b5c64994af4c4e0aa4b6c4b
+guid: a1c5c8796f569ed4dbca5b47f77dc993
 AssemblyDefinitionImporter:
   externalObjects: {}
   userData: 
diff --git a/Examples/PingTool/Assets/Prefabs.meta b/Examples/PingTool/Assets/Prefabs.meta
new file mode 100644
index 0000000000..c867cd3a70
--- /dev/null
+++ b/Examples/PingTool/Assets/Prefabs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4b97118ef11ec3347bc72b8d681e094b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/Prefabs/Player.prefab b/Examples/PingTool/Assets/Prefabs/Player.prefab
new file mode 100644
index 0000000000..91b4a80993
--- /dev/null
+++ b/Examples/PingTool/Assets/Prefabs/Player.prefab
@@ -0,0 +1,231 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8921789205124766477
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8921789205124766473}
+  - component: {fileID: 8921789205124766472}
+  - component: {fileID: 8921789205124766479}
+  - component: {fileID: 8921789205124766478}
+  - component: {fileID: 7090626284373653165}
+  - component: {fileID: 8921789205124766474}
+  - component: {fileID: 871737567343884637}
+  - component: {fileID: 4377583426220269498}
+  - component: {fileID: 7019092494283592047}
+  m_Layer: 0
+  m_Name: Player
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8921789205124766473
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8921789205124766477}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.5, 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!33 &8921789205124766472
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8921789205124766477}
+  m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &8921789205124766479
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8921789205124766477}
+  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: 44e292334941fe148b997ca2b01b5789, 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!136 &8921789205124766478
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8921789205124766477}
+  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.5
+  m_Height: 2
+  m_Direction: 1
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!54 &7090626284373653165
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8921789205124766477}
+  serializedVersion: 4
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 1
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 80
+  m_CollisionDetection: 0
+--- !u!114 &8921789205124766474
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8921789205124766477}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  GlobalObjectIdHash: 2320382337
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 1
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
+--- !u!114 &871737567343884637
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8921789205124766477}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8e5128237997be649af0cc87dd0eb563, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ApplyColorToChildren: 0
+--- !u!114 &4377583426220269498
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8921789205124766477}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3ac7b002fd8506c45afe1f87c8e02f7a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  AuthorityMode: 1
+  UseUnreliableDeltas: 0
+  SyncPositionX: 1
+  SyncPositionY: 1
+  SyncPositionZ: 1
+  SyncRotAngleX: 0
+  SyncRotAngleY: 0
+  SyncRotAngleZ: 0
+  SyncScaleX: 0
+  SyncScaleY: 0
+  SyncScaleZ: 0
+  PositionThreshold: 0.001
+  RotAngleThreshold: 0.01
+  ScaleThreshold: 0.01
+  UseQuaternionSynchronization: 0
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 1
+  InLocalSpace: 0
+  Interpolate: 1
+  SlerpPosition: 0
+  ExpandPlayerMotionProperties: 0
+  ExpandNetworkTranspormProperties: 1
+  Radius: 10
+  Speed: 5
+--- !u!114 &7019092494283592047
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8921789205124766477}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f6c0be61502bb534f922ebb746851216, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  UseRigidBodyForMotion: 1
+  AutoUpdateKinematicState: 1
+  AutoSetKinematicOnDespawn: 1
diff --git a/Examples/PingTool/Assets/Prefabs/Player.prefab.meta b/Examples/PingTool/Assets/Prefabs/Player.prefab.meta
new file mode 100644
index 0000000000..bb7863aa49
--- /dev/null
+++ b/Examples/PingTool/Assets/Prefabs/Player.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 89b57e576a8d47643b2dbd45b1f8cab1
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/Prefabs/SceneLevelGeometry.prefab b/Examples/PingTool/Assets/Prefabs/SceneLevelGeometry.prefab
new file mode 100644
index 0000000000..1e85afca52
--- /dev/null
+++ b/Examples/PingTool/Assets/Prefabs/SceneLevelGeometry.prefab
@@ -0,0 +1,779 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &910007655143077103
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6283120762215196916}
+  - component: {fileID: 3739510624437302406}
+  m_Layer: 0
+  m_Name: CornerBumper (1)
+  m_TagString: Boundary
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6283120762215196916
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 910007655143077103}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0.9244967, z: -0, w: -0.38119}
+  m_LocalPosition: {x: -29.72, y: 0.98, z: 29.82}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: -224.815, z: 0}
+--- !u!65 &3739510624437302406
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 910007655143077103}
+  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_Size: {x: 4, y: 2, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &1854705290947220173
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2290144462706082272}
+  - component: {fileID: 4559046433245738380}
+  m_Layer: 0
+  m_Name: CornerBumper (2)
+  m_TagString: Boundary
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2290144462706082272
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1854705290947220173}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0.3771283, z: -0, w: -0.92616105}
+  m_LocalPosition: {x: -29.53, y: 0.98, z: -29.71}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: -315.688, z: 0}
+--- !u!65 &4559046433245738380
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1854705290947220173}
+  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_Size: {x: 4, y: 2, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &4012615691354089848
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4012615691354089844}
+  - component: {fileID: 4012615691354089845}
+  - component: {fileID: 4012615691354089850}
+  - component: {fileID: 4012615691354089851}
+  m_Layer: 0
+  m_Name: Floor
+  m_TagString: Floor
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4012615691354089844
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691354089848}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.50000006, z: 0}
+  m_LocalScale: {x: 60, y: 1, z: 60}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &4012615691354089845
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691354089848}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &4012615691354089850
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691354089848}
+  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_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 42c4a0ad1f9d67a45b12f68697321aad, 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!65 &4012615691354089851
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691354089848}
+  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_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &4012615691503252843
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4012615691503252839}
+  - component: {fileID: 4012615691503252836}
+  - component: {fileID: 4012615691503252837}
+  - component: {fileID: 4012615691503252842}
+  m_Layer: 0
+  m_Name: Side
+  m_TagString: Boundary
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4012615691503252839
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691503252843}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -30.5, y: 0.49999994, z: 0}
+  m_LocalScale: {x: 1, y: 3, z: 62}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &4012615691503252836
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691503252843}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &4012615691503252837
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691503252843}
+  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_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 9c73b921ea39f4344a19c2d1c7d6b314, 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!65 &4012615691503252842
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691503252843}
+  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_Size: {x: 2, y: 1, z: 1}
+  m_Center: {x: -0.5, y: 0, z: 0}
+--- !u!1 &4012615691965054905
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4012615691965054901}
+  - component: {fileID: 4012615691965054906}
+  - component: {fileID: 4012615691965054907}
+  - component: {fileID: 4012615691965054904}
+  m_Layer: 0
+  m_Name: Side
+  m_TagString: Boundary
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4012615691965054901
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691965054905}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.49999994, z: 30.5}
+  m_LocalScale: {x: 60, y: 3, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &4012615691965054906
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691965054905}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &4012615691965054907
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691965054905}
+  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_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 9c73b921ea39f4344a19c2d1c7d6b314, 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!65 &4012615691965054904
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615691965054905}
+  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_Size: {x: 1, y: 1, z: 2}
+  m_Center: {x: 0, y: 0, z: 0.5}
+--- !u!1 &4012615692269653858
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4012615692269653854}
+  - component: {fileID: 4012615692269653855}
+  - component: {fileID: 4012615692269653852}
+  - component: {fileID: 4012615692269653853}
+  m_Layer: 0
+  m_Name: Side
+  m_TagString: Boundary
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4012615692269653854
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692269653858}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.49999994, z: -30.5}
+  m_LocalScale: {x: 60, y: 3, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &4012615692269653855
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692269653858}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &4012615692269653852
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692269653858}
+  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_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 9c73b921ea39f4344a19c2d1c7d6b314, 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!65 &4012615692269653853
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692269653858}
+  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_Size: {x: 1, y: 1, z: 2}
+  m_Center: {x: 0, y: 0, z: -0.5}
+--- !u!1 &4012615692778511854
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4012615692778511849}
+  m_Layer: 0
+  m_Name: SceneLevelGeometry
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4012615692778511849
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692778511854}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.000000059604645, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4012615691354089844}
+  - {fileID: 4012615691965054901}
+  - {fileID: 4012615692269653854}
+  - {fileID: 4012615691503252839}
+  - {fileID: 4012615692791378778}
+  - {fileID: 3910294717376836327}
+  - {fileID: 6283120762215196916}
+  - {fileID: 2290144462706082272}
+  - {fileID: 6959258897999621209}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &4012615692791378782
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4012615692791378778}
+  - component: {fileID: 4012615692791378779}
+  - component: {fileID: 4012615692791378776}
+  - component: {fileID: 4012615692791378777}
+  m_Layer: 0
+  m_Name: Side
+  m_TagString: Boundary
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4012615692791378778
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692791378782}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 30.5, y: 0.49999994, z: 0}
+  m_LocalScale: {x: 1, y: 3, z: 62}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &4012615692791378779
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692791378782}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &4012615692791378776
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692791378782}
+  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_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 9c73b921ea39f4344a19c2d1c7d6b314, 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!65 &4012615692791378777
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4012615692791378782}
+  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_Size: {x: 2, y: 1, z: 1}
+  m_Center: {x: 0.5, y: 0, z: 0}
+--- !u!1 &4674276234353933548
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3910294717376836327}
+  - component: {fileID: 3136259738973340924}
+  m_Layer: 0
+  m_Name: CornerBumper
+  m_TagString: Boundary
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3910294717376836327
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4674276234353933548}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: -0.38268343, z: 0, w: 0.92387956}
+  m_LocalPosition: {x: 29.7, y: 0.98, z: -29.61}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: -45, z: 0}
+--- !u!65 &3136259738973340924
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4674276234353933548}
+  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_Size: {x: 4, y: 2, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1 &7080625901286762351
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6959258897999621209}
+  - component: {fileID: 7672408768716900064}
+  m_Layer: 0
+  m_Name: CornerBumper (3)
+  m_TagString: Boundary
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6959258897999621209
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7080625901286762351}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: 0.93588465, z: -0, w: -0.35230666}
+  m_LocalPosition: {x: 29.26, y: 0.98, z: 29.45}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4012615692778511849}
+  m_LocalEulerAnglesHint: {x: 0, y: -498.74298, z: 0}
+--- !u!65 &7672408768716900064
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7080625901286762351}
+  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_Size: {x: 4, y: 2, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
diff --git a/Examples/PingTool/Assets/Prefabs/SceneLevelGeometry.prefab.meta b/Examples/PingTool/Assets/Prefabs/SceneLevelGeometry.prefab.meta
new file mode 100644
index 0000000000..154fd718e7
--- /dev/null
+++ b/Examples/PingTool/Assets/Prefabs/SceneLevelGeometry.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3ec484313a7a6754dac871e620df8db2
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/Resources.meta b/Examples/PingTool/Assets/Resources.meta
new file mode 100644
index 0000000000..edebf21a13
--- /dev/null
+++ b/Examples/PingTool/Assets/Resources.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6a51a9fbd254e544eb3e85853865f80d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/Resources/BillingMode.json b/Examples/PingTool/Assets/Resources/BillingMode.json
new file mode 100644
index 0000000000..6f4bfb7103
--- /dev/null
+++ b/Examples/PingTool/Assets/Resources/BillingMode.json
@@ -0,0 +1 @@
+{"androidStore":"GooglePlay"}
\ No newline at end of file
diff --git a/Examples/PingTool/Assets/Resources/BillingMode.json.meta b/Examples/PingTool/Assets/Resources/BillingMode.json.meta
new file mode 100644
index 0000000000..557e7d707c
--- /dev/null
+++ b/Examples/PingTool/Assets/Resources/BillingMode.json.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a1890189503409a4bb24dd4f0eab1f0a
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/Scenes.meta b/Examples/PingTool/Assets/Scenes.meta
new file mode 100644
index 0000000000..b398c5b4ab
--- /dev/null
+++ b/Examples/PingTool/Assets/Scenes.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9bb955f9d9ef9c34d897f353c8643a1d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/Scenes/Camera.preset b/Examples/PingTool/Assets/Scenes/Camera.preset
new file mode 100644
index 0000000000..b8bbae0a72
--- /dev/null
+++ b/Examples/PingTool/Assets/Scenes/Camera.preset
@@ -0,0 +1,195 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!181963792 &2655988077585873504
+Preset:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Camera
+  m_TargetType:
+    m_NativeTypeID: 20
+    m_ManagedTypePPtr: {fileID: 0}
+    m_ManagedTypeFallback: 
+  m_Properties:
+  - target: {fileID: 0}
+    propertyPath: m_Enabled
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_ClearFlags
+    value: 2
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_BackGroundColor.r
+    value: 0.066037714
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_BackGroundColor.g
+    value: 0.066037714
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_BackGroundColor.b
+    value: 0.066037714
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_BackGroundColor.a
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_projectionMatrixMode
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_GateFitMode
+    value: 2
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_FOVAxisMode
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_Iso
+    value: 200
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_ShutterSpeed
+    value: 0.005
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_Aperture
+    value: 16
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_FocusDistance
+    value: 10
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_FocalLength
+    value: 50
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_BladeCount
+    value: 5
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_Curvature.x
+    value: 2
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_Curvature.y
+    value: 11
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_BarrelClipping
+    value: 0.25
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_Anamorphism
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SensorSize.x
+    value: 36
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_SensorSize.y
+    value: 24
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_LensShift.x
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_LensShift.y
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_NormalizedViewPortRect.x
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_NormalizedViewPortRect.y
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_NormalizedViewPortRect.width
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_NormalizedViewPortRect.height
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: near clip plane
+    value: 0.3
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: far clip plane
+    value: 1000
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: field of view
+    value: 60
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: orthographic
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: orthographic size
+    value: 5
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_Depth
+    value: -1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_CullingMask.m_Bits
+    value: 4294967295
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_RenderingPath
+    value: -1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_TargetTexture
+    value: 
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_TargetDisplay
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_TargetEye
+    value: 3
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_HDR
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_AllowMSAA
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_AllowDynamicResolution
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_ForceIntoRT
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_OcclusionCulling
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_StereoConvergence
+    value: 10
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_StereoSeparation
+    value: 0.022
+    objectReference: {fileID: 0}
+  m_ExcludedProperties: []
diff --git a/Examples/PingTool/Assets/Scenes/Camera.preset.meta b/Examples/PingTool/Assets/Scenes/Camera.preset.meta
new file mode 100644
index 0000000000..3e327ecf36
--- /dev/null
+++ b/Examples/PingTool/Assets/Scenes/Camera.preset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1807b530602915743868e6c3bdc1a93c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2655988077585873504
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/Scenes/SampleScene.unity b/Examples/PingTool/Assets/Scenes/SampleScene.unity
new file mode 100644
index 0000000000..b880ffe45e
--- /dev/null
+++ b/Examples/PingTool/Assets/Scenes/SampleScene.unity
@@ -0,0 +1,902 @@
+%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: 705507994}
+  m_UseRadianceAmbientProbe: 0
+--- !u!157 &3
+LightmapSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 13
+  m_BakeOnSceneLoad: 0
+  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: 500
+    m_PVRBounces: 2
+    m_PVREnvironmentSampleCount: 500
+    m_PVREnvironmentReferencePointCount: 2048
+    m_PVRFilteringMode: 2
+    m_PVRDenoiserTypeDirect: 0
+    m_PVRDenoiserTypeIndirect: 0
+    m_PVRDenoiserTypeAO: 0
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVREnvironmentMIS: 0
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
+  m_LightingDataAsset: {fileID: 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 &28232985
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 28232986}
+  - component: {fileID: 28232988}
+  - component: {fileID: 28232987}
+  - component: {fileID: 28232989}
+  - component: {fileID: 28232990}
+  m_Layer: 5
+  m_Name: ServerHostClientDisplay
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &28232986
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 28232985}
+  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: 479361665}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 25}
+  m_SizeDelta: {x: 180, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &28232987
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 28232985}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 23
+    m_FontStyle: 1
+    m_BestFit: 1
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 
+--- !u!222 &28232988
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 28232985}
+  m_CullTransparentMesh: 1
+--- !u!114 &28232989
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 28232985}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  GlobalObjectIdHash: 536662705
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 1
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
+  SyncOwnerTransformWhenParented: 1
+  AllowOwnerToParent: 0
+--- !u!114 &28232990
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 28232985}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6637cd674efb56a48a3d4d545d23a8d3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ShowTopMostFoldoutHeaderGroup: 1
+--- !u!1 &455857869
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 455857870}
+  - component: {fileID: 455857872}
+  - component: {fileID: 455857871}
+  m_Layer: 0
+  m_Name: ExtNetworkManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &455857870
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 455857869}
+  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 &455857871
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 455857869}
+  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: 128
+  m_MaxPayloadSize: 6144
+  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 &455857872
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 455857869}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9639343147b80384d98dd77ff33767d4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  NetworkManagerExpanded: 1
+  NetworkConfig:
+    ProtocolVersion: 0
+    NetworkTransport: {fileID: 455857871}
+    PlayerPrefab: {fileID: 8921789205124766477, guid: 89b57e576a8d47643b2dbd45b1f8cab1, type: 3}
+    Prefabs:
+      NetworkPrefabsLists:
+      - {fileID: 11400000, guid: aa82390bfdde2564f828b8e5be375282, 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: 0
+    UseCMBService: 0
+    AutoSpawnPlayerPrefabClientSide: 1
+    NetworkMessageMetrics: 1
+    NetworkProfilingMetrics: 1
+    OldPrefabList: []
+  RunInBackground: 1
+  LogLevel: 1
+  ExtendedNetworkManagerExpanded: 1
+  ConnectionType: 1
+  TargetFrameRate: 100
+  EnableVSync: 0
+  m_OriginalVSyncCount: 1
+--- !u!1 &479361661
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 479361665}
+  - component: {fileID: 479361664}
+  - component: {fileID: 479361663}
+  - component: {fileID: 479361662}
+  m_Layer: 5
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &479361662
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 479361661}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &479361663
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 479361661}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 1
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 1280, y: 720}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0.5
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!223 &479361664
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 479361661}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!224 &479361665
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 479361661}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 28232986}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!1 &705507993
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 705507995}
+  - component: {fileID: 705507994}
+  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 &705507994
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 705507993}
+  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: 1
+  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 &705507995
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 705507993}
+  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!1001 &726227292
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1251000097366145441, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 134.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 2569679938784265262, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2569679938784265262, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2569679938784265262, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2569679938784265262, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2569679938784265262, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2569679938784265262, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2569679938784265262, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2569679938784265262, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2569679938784265262, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2569679938784265262, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2592079281344418938, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: LogMessage.m_PersistentCalls.m_Calls.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2592079281344418938, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: LogMessage.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 2592079281344418938, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: LogMessage.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: LogPingToolMessage
+      objectReference: {fileID: 0}
+    - target: {fileID: 2592079281344418938, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: LogMessage.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+      value: NetworkManagerHelper, Assembly-CSharp
+      objectReference: {fileID: 0}
+    - target: {fileID: 2592079281344418938, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: LogMessage.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+      value: UnityEngine.Object, UnityEngine
+      objectReference: {fileID: 0}
+    - target: {fileID: 4874009706086500699, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: m_Name
+      value: PingTool
+      objectReference: {fileID: 0}
+    - target: {fileID: 5754391144261322890, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5754391144261322890, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5754391144261322890, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6057903054739576449, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6057903054739576449, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7873216060197180850, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: m_Text
+      value: <> Toggles PingTool
+      objectReference: {fileID: 0}
+    - target: {fileID: 7873216060197180850, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: m_FontData.m_Alignment
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 9070511216422219346, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: GlobalObjectIdHash
+      value: 1592695806
+      objectReference: {fileID: 0}
+    - target: {fileID: 9070511216422219346, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+      propertyPath: InScenePlacedSourceGlobalObjectIdHash
+      value: 290216032
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 3f5e8ae5613c82a4f9f859c11a4f2e09, type: 3}
+--- !u!1001 &748186899
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.75
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.75
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.25
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511849, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4012615692778511854, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+      propertyPath: m_Name
+      value: SceneLevelGeometry
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 3ec484313a7a6754dac871e620df8db2, type: 3}
+--- !u!1 &963194225
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 963194228}
+  - component: {fileID: 963194227}
+  - component: {fileID: 963194226}
+  m_Layer: 0
+  m_Name: Main Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!81 &963194226
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 963194225}
+  m_Enabled: 1
+--- !u!20 &963194227
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 963194225}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 0.066037714, g: 0.066037714, b: 0.066037714, 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: -1
+  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 &963194228
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 963194225}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.53729963, y: 0, z: 0, w: 0.8433915}
+  m_LocalPosition: {x: 0, y: 10, z: -5}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 65, y: 0, z: 0}
+--- !u!1 &1184702125
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1184702128}
+  - component: {fileID: 1184702127}
+  - component: {fileID: 1184702126}
+  m_Layer: 0
+  m_Name: EventSystem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1184702126
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1184702125}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_SendPointerHoverToParent: 1
+  m_HorizontalAxis: Horizontal
+  m_VerticalAxis: Vertical
+  m_SubmitButton: Submit
+  m_CancelButton: Cancel
+  m_InputActionsPerSecond: 10
+  m_RepeatDelay: 0.5
+  m_ForceModuleActive: 0
+--- !u!114 &1184702127
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1184702125}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_FirstSelected: {fileID: 0}
+  m_sendNavigationEvents: 1
+  m_DragThreshold: 10
+--- !u!4 &1184702128
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1184702125}
+  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: 963194228}
+  - {fileID: 705507995}
+  - {fileID: 455857870}
+  - {fileID: 479361665}
+  - {fileID: 1184702128}
+  - {fileID: 748186899}
+  - {fileID: 726227292}
diff --git a/Examples/PingTool/Assets/Scenes/SampleScene.unity.meta b/Examples/PingTool/Assets/Scenes/SampleScene.unity.meta
new file mode 100644
index 0000000000..952bd1e9e1
--- /dev/null
+++ b/Examples/PingTool/Assets/Scenes/SampleScene.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9fc0d4010bbf28b4594072e72b8655ab
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/Scenes/SampleScenePrefabs.asset b/Examples/PingTool/Assets/Scenes/SampleScenePrefabs.asset
new file mode 100644
index 0000000000..26e47a6487
--- /dev/null
+++ b/Examples/PingTool/Assets/Scenes/SampleScenePrefabs.asset
@@ -0,0 +1,16 @@
+%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: SampleScenePrefabs
+  m_EditorClassIdentifier: 
+  IsDefault: 0
+  List: []
diff --git a/Examples/PingTool/Assets/Scenes/SampleScenePrefabs.asset.meta b/Examples/PingTool/Assets/Scenes/SampleScenePrefabs.asset.meta
new file mode 100644
index 0000000000..402e4425d7
--- /dev/null
+++ b/Examples/PingTool/Assets/Scenes/SampleScenePrefabs.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3d25a2b1f6c12ee47bf7601c2edd7e70
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/Scripts.meta b/Examples/PingTool/Assets/Scripts.meta
new file mode 100644
index 0000000000..528b6db2ae
--- /dev/null
+++ b/Examples/PingTool/Assets/Scripts.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8f0135d923712c4438b2facb3ce21fb6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/Scripts/ExtendedNetworkManager.cs b/Examples/PingTool/Assets/Scripts/ExtendedNetworkManager.cs
new file mode 100644
index 0000000000..2c291bbe89
--- /dev/null
+++ b/Examples/PingTool/Assets/Scripts/ExtendedNetworkManager.cs
@@ -0,0 +1,427 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Unity.Netcode;
+using Unity.Services.Authentication;
+using Unity.Services.Core;
+using Unity.Services.Multiplayer;
+using UnityEngine;
+using SessionState = Unity.Services.Multiplayer.SessionState;
+
+#if UNITY_EDITOR
+using Unity.Netcode.Editor;
+using UnityEditor;
+
+/// <summary>
+/// The custom editor for the <see cref="ExtendedNetworkManager"/> component.
+/// </summary>
+[CustomEditor(typeof(ExtendedNetworkManager), true)]
+[CanEditMultipleObjects]
+public class ExtendedNetworkManagerEditor : NetworkManagerEditor
+{
+    private SerializedProperty m_ConnectionType;
+    private SerializedProperty m_TargetFrameRate;
+    private SerializedProperty m_EnableVSync;
+
+    public override void OnEnable()
+    {
+        m_ConnectionType = serializedObject.FindProperty(nameof(ExtendedNetworkManager.ConnectionType));
+        m_TargetFrameRate = serializedObject.FindProperty(nameof(ExtendedNetworkManager.TargetFrameRate));
+        m_EnableVSync = serializedObject.FindProperty(nameof(ExtendedNetworkManager.EnableVSync));
+        base.OnEnable();
+    }
+
+    private void DisplayExtendedNetworkManagerProperties()
+    {
+        EditorGUILayout.PropertyField(m_ConnectionType);
+        EditorGUILayout.PropertyField(m_TargetFrameRate);
+        EditorGUILayout.PropertyField(m_EnableVSync);
+    }
+
+    public override void OnInspectorGUI()
+    {
+        var extendedNetworkManager = target as ExtendedNetworkManager;
+        // Handle switching the appropriate connection type based on the network topology
+        // Host connectio type can be set for client-server and distributed authority
+        // Live Service can only be used with distributed authority
+        // Client-server can only be used with a host connection type
+        var connectionTypes = Enum.GetValues(typeof(ExtendedNetworkManager.ConnectionTypes));
+        var connectionType = ExtendedNetworkManager.ConnectionTypes.LiveService;
+        if (m_ConnectionType.enumValueIndex > 0 && m_ConnectionType.enumValueIndex < connectionTypes.Length)
+        {
+            connectionType = (ExtendedNetworkManager.ConnectionTypes)connectionTypes.GetValue(m_ConnectionType.enumValueIndex);
+        }
+        void SetExpanded(bool expanded) { extendedNetworkManager.ExtendedNetworkManagerExpanded = expanded; };
+        DrawFoldOutGroup<ExtendedNetworkManager>(extendedNetworkManager.GetType(), DisplayExtendedNetworkManagerProperties, extendedNetworkManager.ExtendedNetworkManagerExpanded, SetExpanded);
+
+        var updatedConnectedType = (ExtendedNetworkManager.ConnectionTypes)connectionTypes.GetValue(m_ConnectionType.enumValueIndex);
+        if (connectionType == updatedConnectedType && updatedConnectedType == ExtendedNetworkManager.ConnectionTypes.LiveService && extendedNetworkManager.NetworkConfig.NetworkTopology == NetworkTopologyTypes.ClientServer)
+        {
+            extendedNetworkManager.ConnectionType = ExtendedNetworkManager.ConnectionTypes.Host;
+        }
+        else if (connectionType == ExtendedNetworkManager.ConnectionTypes.Host && updatedConnectedType == ExtendedNetworkManager.ConnectionTypes.LiveService && extendedNetworkManager.NetworkConfig.NetworkTopology == NetworkTopologyTypes.ClientServer)
+        {
+            extendedNetworkManager.NetworkConfig.NetworkTopology = NetworkTopologyTypes.DistributedAuthority;
+        }
+        base.OnInspectorGUI();
+    }
+}
+#endif
+
+
+
+public class ExtendedNetworkManager : NetworkManager
+{
+#if UNITY_EDITOR
+    // Inspector view expand/collapse settings for this derived child class
+    [HideInInspector]
+    public bool ExtendedNetworkManagerExpanded;
+#endif
+
+    public static ExtendedNetworkManager Instance;
+
+    public enum ConnectionTypes
+    {
+        LiveService,
+        Host,
+    }
+    public ConnectionTypes ConnectionType;
+
+    public int TargetFrameRate = 100;
+    public bool EnableVSync = false;
+
+    [HideInInspector]
+    [SerializeField]
+    private int m_OriginalVSyncCount;
+
+#if UNITY_EDITOR
+
+    protected override void OnValidateComponent()
+    {
+        m_OriginalVSyncCount = QualitySettings.vSyncCount;
+        base.OnValidateComponent();
+    }
+#endif
+
+    private ISession m_CurrentSession;
+
+    private string m_SessionName;
+    private string m_ProfileName;
+    private Task m_SessionTask;
+
+    private enum ConnectionStates
+    {
+        None,
+        Connecting,
+        Connected,
+    }
+
+    private ConnectionStates m_ConnectionState;
+
+    public static string GetRandomString(int length)
+    {
+        var r = new System.Random();
+        return new string(Enumerable.Range(0, length).Select(_ => (char)r.Next('a', 'z')).ToArray());
+    }
+
+    public void SetFrameRate(int targetFrameRate, bool enableVsync)
+    {
+        Application.targetFrameRate = targetFrameRate;
+        QualitySettings.vSyncCount = enableVsync ? m_OriginalVSyncCount : 0;
+    }
+
+    private void Awake()
+    {
+        Screen.SetResolution((int)(Screen.currentResolution.width * 0.40f), (int)(Screen.currentResolution.height * 0.40f), FullScreenMode.Windowed);
+        SetFrameRate(TargetFrameRate, EnableVSync);
+        SetSingleton();
+    }
+
+    private async void Start()
+    {
+        OnClientConnectedCallback += OnClientConnected;
+        OnClientDisconnectCallback += OnClientDisconnect;
+        OnConnectionEvent += OnClientConnectionEvent;
+        if (UnityServices.Instance != null && UnityServices.Instance.State != ServicesInitializationState.Initialized)
+        {
+            await UnityServices.InitializeAsync();
+        }
+        if (!AuthenticationService.Instance.IsSignedIn)
+        {
+            AuthenticationService.Instance.SignInFailed += SignInFailed;
+            AuthenticationService.Instance.SignedIn += SignedIn;
+            if (string.IsNullOrEmpty(m_ProfileName))
+            {
+                m_ProfileName = GetRandomString(5);
+            }
+            AuthenticationService.Instance.SwitchProfile(m_ProfileName);
+            await AuthenticationService.Instance.SignInAnonymouslyAsync();
+        }
+    }
+
+    private void OnDestroy()
+    {
+        OnClientConnectedCallback -= OnClientConnected;
+        OnClientDisconnectCallback -= OnClientDisconnect;
+        OnConnectionEvent -= OnClientConnectionEvent;
+    }
+
+    private void SignedIn()
+    {
+        AuthenticationService.Instance.SignedIn -= SignedIn;
+        Debug.Log($"Signed in anonymously with profile {m_ProfileName}");
+    }
+
+    private void SignInFailed(RequestFailedException error)
+    {
+        AuthenticationService.Instance.SignInFailed -= SignInFailed;
+        Debug.LogError($"Failed to sign in {m_ProfileName} anonymously: {error}");
+    }
+
+    private void OnDrawLiveServiceGUI()
+    {
+        m_SessionName = GUILayout.TextField(m_SessionName);
+
+        if (GUILayout.Button("Create or Connect To Session"))
+        {
+            NetworkConfig.UseCMBService = true;
+            OnClientStopped += ClientStopped;
+            OnClientStarted += ClientStarted;
+            m_SessionTask = ConnectThroughLiveService();
+            m_ConnectionState = ConnectionStates.Connecting;
+            LogMessage($"Connecting to session {m_SessionName}...");
+        }
+    }
+
+    private void OnDrawDAHostGUI()
+    {
+        if (GUILayout.Button("Start Host"))
+        {
+            OnClientStopped += ClientStopped;
+            OnClientStarted += ClientStarted;
+            StartHost();
+        }
+
+        if (GUILayout.Button("Start Client"))
+        {
+            OnClientStopped += ClientStopped;
+            OnClientStarted += ClientStarted;
+            StartClient();
+        }
+    }
+
+    private void OnUpdateGUIDisconnected()
+    {
+        GUILayout.BeginArea(new Rect(10, 10, 300, 800));
+
+        GUILayout.Label("Session Name", GUILayout.Width(100));
+
+        var connectionType = ConnectionType;
+        if (NetworkConfig.NetworkTopology == NetworkTopologyTypes.ClientServer && connectionType != ConnectionTypes.Host)
+        {
+            connectionType = ConnectionTypes.Host;
+        }
+
+        switch (connectionType)
+        {
+            case ConnectionTypes.LiveService:
+                {
+                    OnDrawLiveServiceGUI();
+                    break;
+                }
+            case ConnectionTypes.Host:
+                {
+                    OnDrawDAHostGUI();
+                    break;
+                }
+        }
+
+        GUILayout.EndArea();
+
+        GUILayout.BeginArea(new Rect(10, Display.main.renderingHeight - 40, Display.main.renderingWidth - 10, 30));
+        var scenesPreloaded = new System.Text.StringBuilder();
+        scenesPreloaded.Append("Scenes Preloaded: ");
+        for (int i = 0; i < UnityEngine.SceneManagement.SceneManager.sceneCount; i++)
+        {
+            var scene = UnityEngine.SceneManagement.SceneManager.GetSceneAt(i);
+            scenesPreloaded.Append($"[{scene.name}]");
+        }
+        GUILayout.Label(scenesPreloaded.ToString());
+        GUILayout.EndArea();
+    }
+
+    private void OnUpdateGUIConnected()
+    {
+        if (CMBServiceConnection)
+        {
+            GUILayout.BeginArea(new Rect(10, 10, 800, 800));
+            GUILayout.Label($"Session: {m_SessionName}");
+            GUILayout.EndArea();
+        }
+        else
+        {
+            GUILayout.BeginArea(new Rect(10, 10, 800, 800));
+            if (DistributedAuthorityMode)
+            {
+                GUILayout.Label($"DAHosted Session");
+            }
+            else
+            {
+                GUILayout.Label($"Client-Server Session");
+            }
+
+            GUILayout.EndArea();
+        }
+
+        GUILayout.BeginArea(new Rect(Display.main.renderingWidth - 160, 10, 150, 80));
+
+        if (GUILayout.Button("Disconnect"))
+        {
+            if (m_CurrentSession != null && m_CurrentSession.State == SessionState.Connected)
+            {
+                m_CurrentSession.LeaveAsync();
+                m_CurrentSession = null;
+            }
+            else
+            {
+                Shutdown();
+            }
+        }
+
+        GUILayout.EndArea();
+    }
+
+    private void OnGUI()
+    {
+        var yAxisOffset = 10;
+        switch (m_ConnectionState)
+        {
+            case ConnectionStates.None:
+                {
+                    yAxisOffset = 80;
+                    OnUpdateGUIDisconnected();
+                    break;
+                }
+            case ConnectionStates.Connected:
+                {
+                    yAxisOffset = 40;
+                    OnUpdateGUIConnected();
+                    break;
+                }
+        }
+
+        GUILayout.BeginArea(new Rect(10, yAxisOffset, 600, 800));
+        if (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();
+    }
+
+    private void ClientStarted()
+    {
+        OnClientStarted -= ClientStarted;
+        m_ConnectionState = ConnectionStates.Connected;
+        LogMessage($"Connected to session {m_SessionName}.");
+    }
+
+    private void ClientStopped(bool isHost)
+    {
+        OnClientStopped -= ClientStopped;
+        m_ConnectionState = ConnectionStates.None;
+        m_SessionTask = null;
+        m_CurrentSession = null;
+    }
+
+    private async Task<ISession> ConnectThroughLiveService()
+    {
+        try
+        {
+            var options = new SessionOptions()
+            {
+                Name = m_SessionName,
+                MaxPlayers = 32
+            }.WithDistributedAuthorityNetwork();
+
+            m_CurrentSession = await MultiplayerService.Instance.CreateOrJoinSessionAsync(m_SessionName, options);
+            return m_CurrentSession;
+        }
+        catch (Exception e)
+        {
+            LogMessage($"{e.Message}");
+            Debug.LogException(e);
+        }
+        return null;
+    }
+
+    private void Update()
+    {
+        if (m_MessageLogs.Count == 0)
+        {
+            return;
+        }
+
+        for (int i = m_MessageLogs.Count - 1; i >= 0; i--)
+        {
+            if (m_MessageLogs[i].ExpirationTime < Time.realtimeSinceStartup)
+            {
+                m_MessageLogs.RemoveAt(i);
+            }
+        }
+    }
+
+    private void OnClientConnectionEvent(NetworkManager networkManager, ConnectionEventData eventData)
+    {
+        LogMessage($"[{Time.realtimeSinceStartup}] Connection event {eventData.EventType} for Client-{eventData.ClientId}.");
+    }
+
+    private void OnClientConnected(ulong clientId)
+    {
+        LogMessage($"[{Time.realtimeSinceStartup}] Connected event invoked for Client-{clientId}.");
+    }
+
+    private void OnClientDisconnect(ulong clientId)
+    {
+        LogMessage($"[{Time.realtimeSinceStartup}] Disconnected event invoked for Client-{clientId}.");
+    }
+
+    private List<MessageLog> m_MessageLogs = new List<MessageLog>();
+
+    private class MessageLog
+    {
+        public string Message { get; private set; }
+        public float ExpirationTime { get; private set; }
+
+        public MessageLog(string msg, float timeToLive)
+        {
+            Message = msg;
+            ExpirationTime = Time.realtimeSinceStartup + timeToLive;
+        }
+    }
+
+    public void LogMessage(string msg, float timeToLive = 10.0f)
+    {
+        if (m_MessageLogs.Count > 0)
+        {
+            m_MessageLogs.Insert(0, new MessageLog(msg, timeToLive));
+        }
+        else
+        {
+            m_MessageLogs.Add(new MessageLog(msg, timeToLive));
+        }
+
+        Debug.Log(msg);
+    }
+
+    public ExtendedNetworkManager()
+    {
+        Instance = this;
+    }
+}
diff --git a/Examples/PingTool/Assets/Scripts/ExtendedNetworkManager.cs.meta b/Examples/PingTool/Assets/Scripts/ExtendedNetworkManager.cs.meta
new file mode 100644
index 0000000000..80b3f767c1
--- /dev/null
+++ b/Examples/PingTool/Assets/Scripts/ExtendedNetworkManager.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 9639343147b80384d98dd77ff33767d4
\ No newline at end of file
diff --git a/Examples/PingTool/Assets/Scripts/PlayerColor.cs b/Examples/PingTool/Assets/Scripts/PlayerColor.cs
new file mode 100644
index 0000000000..e73efe815d
--- /dev/null
+++ b/Examples/PingTool/Assets/Scripts/PlayerColor.cs
@@ -0,0 +1,37 @@
+using System;
+using Unity.Netcode;
+using UnityEngine;
+
+
+public class PlayerColor : NetworkBehaviour
+{
+    private static Color[] s_Colors = { Color.yellow, Color.green, Color.blue, Color.cyan, Color.magenta};
+    public bool ApplyColorToChildren;
+
+    public override void OnNetworkSpawn()
+    {
+        MeshRenderer meshRenderer = GetComponent<MeshRenderer>();
+        ulong myId = GetComponent<NetworkObject>().OwnerClientId;
+        var color = myId == NetworkManager.ServerClientId ? Color.red : s_Colors[myId % Convert.ToUInt64(s_Colors.Length)];
+        meshRenderer.material.color = color;
+        if (ApplyColorToChildren)
+        {
+            var meshRenderers = GetComponentsInChildren<MeshRenderer>();
+            foreach (var childMeshRenderer in meshRenderers)
+            {
+                childMeshRenderer.material.color = color;
+            }
+        }
+
+        if (IsLocalPlayer)
+        {
+            var gameObject = GameObject.Find("ServerHostClientDisplay");
+            if (gameObject != null)
+            {
+                var serverHost = gameObject.GetComponent<ServerHostClientText>();
+                serverHost?.SetColor(color);
+            }
+        }
+        base.OnNetworkSpawn();
+    }
+}
diff --git a/Examples/PingTool/Assets/Scripts/PlayerColor.cs.meta b/Examples/PingTool/Assets/Scripts/PlayerColor.cs.meta
new file mode 100644
index 0000000000..90b6ca4628
--- /dev/null
+++ b/Examples/PingTool/Assets/Scripts/PlayerColor.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8e5128237997be649af0cc87dd0eb563
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/Scripts/PlayerMotion.cs b/Examples/PingTool/Assets/Scripts/PlayerMotion.cs
new file mode 100644
index 0000000000..f746521c15
--- /dev/null
+++ b/Examples/PingTool/Assets/Scripts/PlayerMotion.cs
@@ -0,0 +1,100 @@
+using Unity.Netcode.Components;
+using UnityEngine;
+
+#if UNITY_EDITOR
+using Unity.Netcode.Editor;
+using UnityEditor;
+/// <summary>
+/// The custom editor for the <see cref="MoverScript"/> component.
+/// </summary>
+[CustomEditor(typeof(PlayerMotion), true)]
+public class PlayerMotionEditor : NetworkTransformEditor
+{
+    private SerializedProperty m_Radius;
+    private SerializedProperty m_Speed;
+
+    public override void OnEnable()
+    {
+        m_Radius = serializedObject.FindProperty(nameof(PlayerMotion.Radius));
+        m_Speed = serializedObject.FindProperty(nameof(PlayerMotion.Speed));
+
+        base.OnEnable();
+    }
+
+    public override void OnInspectorGUI()
+    {
+        var playerMotion = target as PlayerMotion;
+        playerMotion.ExpandPlayerMotionProperties = EditorGUILayout.BeginFoldoutHeaderGroup(playerMotion.ExpandPlayerMotionProperties, $"{nameof(PlayerMotion)} Properties");
+        if (playerMotion.ExpandPlayerMotionProperties)
+        {
+            EditorGUILayout.EndFoldoutHeaderGroup();
+            EditorGUILayout.PropertyField(m_Radius);
+            EditorGUILayout.PropertyField(m_Speed);
+        }
+        else
+        {
+            EditorGUILayout.EndFoldoutHeaderGroup();
+        }
+
+        EditorGUILayout.Space();
+
+        playerMotion.ExpandNetworkTranspormProperties = EditorGUILayout.BeginFoldoutHeaderGroup(playerMotion.ExpandNetworkTranspormProperties, $"{nameof(NetworkTransform)} Properties");
+        if (playerMotion.ExpandNetworkTranspormProperties)
+        {
+            base.OnInspectorGUI();
+        }
+        else
+        {
+            serializedObject.ApplyModifiedProperties();
+        }
+    }
+}
+#endif
+
+public class PlayerMotion : NetworkTransform
+{
+
+#if UNITY_EDITOR
+    public bool ExpandPlayerMotionProperties;
+    public bool ExpandNetworkTranspormProperties;
+
+#endif
+
+    [Range(1.0f, 20.0f)]
+    public float Radius = 10.0f;
+
+    [Range(1.0f, 30.0f)]
+    public float Speed = 5.0f;
+
+    private float m_CurrentPi;
+    private float m_Increment = 0.25f;
+    private float m_ClockWise = 1.0f;
+    private Rigidbody m_RigidBody;
+
+    public override void OnNetworkSpawn()
+    {
+        // Always invoked base when deriving from NetworkTransform
+        base.OnNetworkSpawn();
+        m_RigidBody = GetComponent<Rigidbody>();
+        if (CanCommitToTransform)
+        {
+            m_CurrentPi = Random.Range(-Mathf.PI, Mathf.PI);
+            m_ClockWise = Random.Range(-1.0f, 1.0f);
+            m_ClockWise = m_ClockWise / Mathf.Abs(m_ClockWise);
+            if (!IsOwner)
+            {
+                Radius += Random.Range(-2.0f, 2.0f);
+            }
+        }
+    }
+
+    private void FixedUpdate()
+    {
+        if (IsSpawned && CanCommitToTransform)
+        {
+            m_CurrentPi += m_ClockWise * (Speed * m_Increment * Time.fixedDeltaTime);
+            var offset = new Vector3(Radius * Mathf.Cos(m_CurrentPi), transform.position.y, Radius * Mathf.Sin(m_CurrentPi));
+            m_RigidBody.MovePosition(Vector3.Lerp(transform.position, offset, Speed * 0.1f * Time.fixedDeltaTime));
+        }
+    }
+}
diff --git a/Examples/PingTool/Assets/Scripts/PlayerMotion.cs.meta b/Examples/PingTool/Assets/Scripts/PlayerMotion.cs.meta
new file mode 100644
index 0000000000..562ed49405
--- /dev/null
+++ b/Examples/PingTool/Assets/Scripts/PlayerMotion.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3ac7b002fd8506c45afe1f87c8e02f7a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/Scripts/ServerHostClientText.cs b/Examples/PingTool/Assets/Scripts/ServerHostClientText.cs
new file mode 100644
index 0000000000..74dfdd7ada
--- /dev/null
+++ b/Examples/PingTool/Assets/Scripts/ServerHostClientText.cs
@@ -0,0 +1,81 @@
+using Unity.Netcode;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class ServerHostClientText : NetworkBehaviour
+{
+    private Text m_DisplayText;
+
+    private Color m_Color;
+    private Color m_ColorAlpha;
+    private Vector3 m_AnchoredPosition3D;
+
+    public void SetColor(Color color)
+    {
+        m_Color = color;
+        m_ColorAlpha = color;
+        m_ColorAlpha.a = 0.35f;
+    }
+
+    private void Awake()
+    {
+        // Get the anchored 3D position
+        m_AnchoredPosition3D = (transform as RectTransform).anchoredPosition3D;
+        m_DisplayText = GetComponent<Text>();
+    }
+
+    private void Start()
+    {
+        if (m_DisplayText != null)
+        {
+            m_DisplayText.text = string.Empty;
+            SetColor(m_DisplayText.color);
+        }
+    }
+
+    public override void OnNetworkSpawn()
+    {
+        if (m_DisplayText != null)
+        {
+            if (NetworkManager.IsServer)
+            {
+                m_DisplayText.text = NetworkManager.IsHost ? "Host" : "Server";
+            }
+            else if (NetworkManager.IsClient)
+            {
+                m_DisplayText.text = $"Client-{NetworkManager.LocalClientId}";
+            }
+        }
+        // Apply the AnchoredPosition3D to account for any adjustments in resolution/size
+        (transform as RectTransform).anchoredPosition3D = m_AnchoredPosition3D;
+    }
+
+    public override void OnNetworkDespawn()
+    {
+        if (m_DisplayText != null)
+        {
+            m_DisplayText.text = string.Empty;
+        }
+        base.OnNetworkDespawn();
+    }
+
+    private bool m_LastFocusedValue;
+    private void OnGUI()
+    {
+        if (!IsSpawned || m_LastFocusedValue == Application.isFocused)
+        {
+            return;
+        }
+
+        m_LastFocusedValue = Application.isFocused;
+
+        if (m_LastFocusedValue)
+        {
+            m_DisplayText.color = m_Color;
+        }
+        else
+        {
+            m_DisplayText.color = m_ColorAlpha;
+        }
+    }
+}
diff --git a/Examples/PingTool/Assets/Scripts/ServerHostClientText.cs.meta b/Examples/PingTool/Assets/Scripts/ServerHostClientText.cs.meta
new file mode 100644
index 0000000000..081f5a96a8
--- /dev/null
+++ b/Examples/PingTool/Assets/Scripts/ServerHostClientText.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6637cd674efb56a48a3d4d545d23a8d3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/Textures.meta b/Examples/PingTool/Assets/Textures.meta
new file mode 100644
index 0000000000..84caff0700
--- /dev/null
+++ b/Examples/PingTool/Assets/Textures.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 22c34a08d52a0644fae5e90dbcc0ba52
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Assets/Textures/GridPattern.png b/Examples/PingTool/Assets/Textures/GridPattern.png
new file mode 100644
index 0000000000..e2f648aacc
Binary files /dev/null and b/Examples/PingTool/Assets/Textures/GridPattern.png differ
diff --git a/Examples/PingTool/Assets/Textures/GridPattern.png.meta b/Examples/PingTool/Assets/Textures/GridPattern.png.meta
new file mode 100644
index 0000000000..305bd2392c
--- /dev/null
+++ b/Examples/PingTool/Assets/Textures/GridPattern.png.meta
@@ -0,0 +1,153 @@
+fileFormatVersion: 2
+guid: a092c5fa8c60ed04aa1d72555f1740bc
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Examples/PingTool/Packages/manifest.json b/Examples/PingTool/Packages/manifest.json
new file mode 100644
index 0000000000..45f1b14b65
--- /dev/null
+++ b/Examples/PingTool/Packages/manifest.json
@@ -0,0 +1,56 @@
+{
+  "dependencies": {
+    "com.unity.2d.sprite": "1.0.0",
+    "com.unity.2d.tilemap": "1.0.0",
+    "com.unity.ads": "4.4.2",
+    "com.unity.ai.navigation": "2.0.4",
+    "com.unity.analytics": "3.8.1",
+    "com.unity.collab-proxy": "2.5.2",
+    "com.unity.feature.development": "1.0.2",
+    "com.unity.ide.visualstudio": "2.0.22",
+    "com.unity.multiplayer.center": "1.0.0",
+    "com.unity.multiplayer.playmode": "1.3.0",
+    "com.unity.multiplayer.tools": "2.2.1",
+    "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.services.multiplayer": "1.0.0",
+    "com.unity.test-framework": "1.4.5",
+    "com.unity.timeline": "1.8.7",
+    "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.9",
+    "com.unity.transport": "2.3.0",
+    "com.unity.ugui": "2.0.0",
+    "com.unity.visualscripting": "1.9.4",
+    "com.unity.xr.legacyinputhelpers": "2.1.11",
+    "com.unity.modules.accessibility": "1.0.0",
+    "com.unity.modules.ai": "1.0.0",
+    "com.unity.modules.androidjni": "1.0.0",
+    "com.unity.modules.animation": "1.0.0",
+    "com.unity.modules.assetbundle": "1.0.0",
+    "com.unity.modules.audio": "1.0.0",
+    "com.unity.modules.cloth": "1.0.0",
+    "com.unity.modules.director": "1.0.0",
+    "com.unity.modules.imageconversion": "1.0.0",
+    "com.unity.modules.imgui": "1.0.0",
+    "com.unity.modules.jsonserialize": "1.0.0",
+    "com.unity.modules.particlesystem": "1.0.0",
+    "com.unity.modules.physics": "1.0.0",
+    "com.unity.modules.physics2d": "1.0.0",
+    "com.unity.modules.screencapture": "1.0.0",
+    "com.unity.modules.terrain": "1.0.0",
+    "com.unity.modules.terrainphysics": "1.0.0",
+    "com.unity.modules.tilemap": "1.0.0",
+    "com.unity.modules.ui": "1.0.0",
+    "com.unity.modules.uielements": "1.0.0",
+    "com.unity.modules.umbra": "1.0.0",
+    "com.unity.modules.unityanalytics": "1.0.0",
+    "com.unity.modules.unitywebrequest": "1.0.0",
+    "com.unity.modules.unitywebrequestassetbundle": "1.0.0",
+    "com.unity.modules.unitywebrequestaudio": "1.0.0",
+    "com.unity.modules.unitywebrequesttexture": "1.0.0",
+    "com.unity.modules.unitywebrequestwww": "1.0.0",
+    "com.unity.modules.vehicles": "1.0.0",
+    "com.unity.modules.video": "1.0.0",
+    "com.unity.modules.vr": "1.0.0",
+    "com.unity.modules.wind": "1.0.0",
+    "com.unity.modules.xr": "1.0.0"
+  }
+}
diff --git a/Examples/PingTool/ProjectSettings/EditorBuildSettings.asset b/Examples/PingTool/ProjectSettings/EditorBuildSettings.asset
new file mode 100644
index 0000000000..40917b058d
--- /dev/null
+++ b/Examples/PingTool/ProjectSettings/EditorBuildSettings.asset
@@ -0,0 +1,11 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1045 &1
+EditorBuildSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Scenes:
+  - enabled: 1
+    path: Assets/Scenes/SampleScene.unity
+    guid: 9fc0d4010bbf28b4594072e72b8655ab
+  m_configObjects: {}
diff --git a/Examples/PingTool/ProjectSettings/ProjectSettings.asset b/Examples/PingTool/ProjectSettings/ProjectSettings.asset
new file mode 100644
index 0000000000..b9c336c7c7
--- /dev/null
+++ b/Examples/PingTool/ProjectSettings/ProjectSettings.asset
@@ -0,0 +1,690 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!129 &1
+PlayerSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 28
+  productGUID: e6cab765567b920448a2fb603cb43bb8
+  AndroidProfiler: 0
+  AndroidFilterTouchesWhenObscured: 0
+  AndroidEnableSustainedPerformanceMode: 0
+  defaultScreenOrientation: 4
+  targetDevice: 2
+  useOnDemandResources: 0
+  accelerometerFrequency: 60
+  companyName: Unity Software
+  productName: Netcode for GameObjects PingTool
+  defaultCursor: {fileID: 0}
+  cursorHotspot: {x: 0, y: 0}
+  m_SplashScreenBackgroundColor: {r: 0.12156863, g: 0.12156863, b: 0.1254902, a: 1}
+  m_ShowUnitySplashScreen: 1
+  m_ShowUnitySplashLogo: 1
+  m_SplashScreenOverlayOpacity: 1
+  m_SplashScreenAnimation: 1
+  m_SplashScreenLogoStyle: 1
+  m_SplashScreenDrawMode: 0
+  m_SplashScreenBackgroundAnimationZoom: 1
+  m_SplashScreenLogoAnimationZoom: 1
+  m_SplashScreenBackgroundLandscapeAspect: 1
+  m_SplashScreenBackgroundPortraitAspect: 1
+  m_SplashScreenBackgroundLandscapeUvs:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  m_SplashScreenBackgroundPortraitUvs:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  m_SplashScreenLogos: []
+  m_VirtualRealitySplashScreen: {fileID: 0}
+  m_HolographicTrackingLossScreen: {fileID: 0}
+  defaultScreenWidth: 1280
+  defaultScreenHeight: 720
+  defaultScreenWidthWeb: 960
+  defaultScreenHeightWeb: 600
+  m_StereoRenderingPath: 0
+  m_ActiveColorSpace: 0
+  unsupportedMSAAFallback: 0
+  m_SpriteBatchVertexThreshold: 300
+  m_MTRendering: 1
+  mipStripping: 0
+  numberOfMipsStripped: 0
+  numberOfMipsStrippedPerMipmapLimitGroup: {}
+  m_StackTraceTypes: 020000000100000001000000010000000200000001000000
+  iosShowActivityIndicatorOnLoading: -1
+  androidShowActivityIndicatorOnLoading: -1
+  iosUseCustomAppBackgroundBehavior: 0
+  allowedAutorotateToPortrait: 1
+  allowedAutorotateToPortraitUpsideDown: 1
+  allowedAutorotateToLandscapeRight: 1
+  allowedAutorotateToLandscapeLeft: 1
+  useOSAutorotation: 1
+  use32BitDisplayBuffer: 1
+  preserveFramebufferAlpha: 0
+  disableDepthAndStencilBuffers: 0
+  androidStartInFullscreen: 1
+  androidRenderOutsideSafeArea: 1
+  androidUseSwappy: 1
+  androidBlitType: 0
+  androidResizeableActivity: 0
+  androidDefaultWindowWidth: 1920
+  androidDefaultWindowHeight: 1080
+  androidMinimumWindowWidth: 400
+  androidMinimumWindowHeight: 300
+  androidFullscreenMode: 1
+  androidAutoRotationBehavior: 1
+  androidPredictiveBackSupport: 0
+  androidApplicationEntry: 1
+  defaultIsNativeResolution: 1
+  macRetinaSupport: 1
+  runInBackground: 1
+  captureSingleScreen: 0
+  muteOtherAudioSources: 0
+  Prepare IOS For Recording: 0
+  Force IOS Speakers When Recording: 0
+  deferSystemGesturesMode: 0
+  hideHomeButton: 0
+  submitAnalytics: 1
+  usePlayerLog: 1
+  dedicatedServerOptimizations: 0
+  bakeCollisionMeshes: 0
+  forceSingleInstance: 0
+  useFlipModelSwapchain: 1
+  resizableWindow: 1
+  useMacAppStoreValidation: 0
+  macAppStoreCategory: public.app-category.games
+  gpuSkinning: 0
+  meshDeformation: 0
+  xboxPIXTextureCapture: 0
+  xboxEnableAvatar: 0
+  xboxEnableKinect: 0
+  xboxEnableKinectAutoTracking: 0
+  xboxEnableFitness: 0
+  visibleInBackground: 1
+  allowFullscreenSwitch: 1
+  fullscreenMode: 3
+  xboxSpeechDB: 0
+  xboxEnableHeadOrientation: 0
+  xboxEnableGuest: 0
+  xboxEnablePIXSampling: 0
+  metalFramebufferOnly: 0
+  xboxOneResolution: 0
+  xboxOneSResolution: 0
+  xboxOneXResolution: 3
+  xboxOneMonoLoggingLevel: 0
+  xboxOneLoggingLevel: 1
+  xboxOneDisableEsram: 0
+  xboxOneEnableTypeOptimization: 0
+  xboxOnePresentImmediateThreshold: 0
+  switchQueueCommandMemory: 1048576
+  switchQueueControlMemory: 16384
+  switchQueueComputeMemory: 262144
+  switchNVNShaderPoolsGranularity: 33554432
+  switchNVNDefaultPoolsGranularity: 16777216
+  switchNVNOtherPoolsGranularity: 16777216
+  switchGpuScratchPoolGranularity: 2097152
+  switchAllowGpuScratchShrinking: 0
+  switchNVNMaxPublicTextureIDCount: 0
+  switchNVNMaxPublicSamplerIDCount: 0
+  switchMaxWorkerMultiple: 8
+  switchNVNGraphicsFirmwareMemory: 32
+  vulkanNumSwapchainBuffers: 3
+  vulkanEnableSetSRGBWrite: 0
+  vulkanEnablePreTransform: 0
+  vulkanEnableLateAcquireNextImage: 0
+  vulkanEnableCommandBufferRecycling: 1
+  loadStoreDebugModeEnabled: 0
+  visionOSBundleVersion: 1.0
+  tvOSBundleVersion: 1.0
+  bundleVersion: 1.0
+  preloadedAssets: []
+  metroInputSource: 0
+  wsaTransparentSwapchain: 0
+  m_HolographicPauseOnTrackingLoss: 1
+  xboxOneDisableKinectGpuReservation: 1
+  xboxOneEnable7thCore: 1
+  vrSettings:
+    enable360StereoCapture: 0
+  isWsaHolographicRemotingEnabled: 0
+  enableFrameTimingStats: 0
+  enableOpenGLProfilerGPURecorders: 1
+  allowHDRDisplaySupport: 0
+  useHDRDisplay: 0
+  hdrBitDepth: 0
+  m_ColorGamuts: 00000000
+  targetPixelDensity: 30
+  resolutionScalingMode: 0
+  resetResolutionOnWindowResize: 0
+  androidSupportedAspectRatio: 1
+  androidMaxAspectRatio: 2.1
+  androidMinAspectRatio: 1
+  applicationIdentifier:
+    Standalone: com.Unity-Software.Netcode-for-GameObjects-PingTool
+  buildNumber:
+    Standalone: 0
+    VisionOS: 0
+    iPhone: 0
+    tvOS: 0
+  overrideDefaultApplicationIdentifier: 0
+  AndroidBundleVersionCode: 1
+  AndroidMinSdkVersion: 23
+  AndroidTargetSdkVersion: 0
+  AndroidPreferredInstallLocation: 1
+  aotOptions: 
+  stripEngineCode: 1
+  iPhoneStrippingLevel: 0
+  iPhoneScriptCallOptimization: 0
+  ForceInternetPermission: 0
+  ForceSDCardPermission: 0
+  CreateWallpaper: 0
+  androidSplitApplicationBinary: 0
+  keepLoadedShadersAlive: 0
+  StripUnusedMeshComponents: 0
+  strictShaderVariantMatching: 0
+  VertexChannelCompressionMask: 4054
+  iPhoneSdkVersion: 988
+  iOSSimulatorArchitecture: 0
+  iOSTargetOSVersionString: 13.0
+  tvOSSdkVersion: 0
+  tvOSSimulatorArchitecture: 0
+  tvOSRequireExtendedGameController: 0
+  tvOSTargetOSVersionString: 13.0
+  VisionOSSdkVersion: 0
+  VisionOSTargetOSVersionString: 1.0
+  uIPrerenderedIcon: 0
+  uIRequiresPersistentWiFi: 0
+  uIRequiresFullScreen: 1
+  uIStatusBarHidden: 1
+  uIExitOnSuspend: 0
+  uIStatusBarStyle: 0
+  appleTVSplashScreen: {fileID: 0}
+  appleTVSplashScreen2x: {fileID: 0}
+  tvOSSmallIconLayers: []
+  tvOSSmallIconLayers2x: []
+  tvOSLargeIconLayers: []
+  tvOSLargeIconLayers2x: []
+  tvOSTopShelfImageLayers: []
+  tvOSTopShelfImageLayers2x: []
+  tvOSTopShelfImageWideLayers: []
+  tvOSTopShelfImageWideLayers2x: []
+  iOSLaunchScreenType: 0
+  iOSLaunchScreenPortrait: {fileID: 0}
+  iOSLaunchScreenLandscape: {fileID: 0}
+  iOSLaunchScreenBackgroundColor:
+    serializedVersion: 2
+    rgba: 0
+  iOSLaunchScreenFillPct: 100
+  iOSLaunchScreenSize: 100
+  iOSLaunchScreeniPadType: 0
+  iOSLaunchScreeniPadImage: {fileID: 0}
+  iOSLaunchScreeniPadBackgroundColor:
+    serializedVersion: 2
+    rgba: 0
+  iOSLaunchScreeniPadFillPct: 100
+  iOSLaunchScreeniPadSize: 100
+  iOSLaunchScreenCustomStoryboardPath: 
+  iOSLaunchScreeniPadCustomStoryboardPath: 
+  iOSDeviceRequirements: []
+  iOSURLSchemes: []
+  macOSURLSchemes: []
+  iOSBackgroundModes: 0
+  iOSMetalForceHardShadows: 0
+  metalEditorSupport: 1
+  metalAPIValidation: 1
+  metalCompileShaderBinary: 0
+  iOSRenderExtraFrameOnPause: 0
+  iosCopyPluginsCodeInsteadOfSymlink: 0
+  appleDeveloperTeamID: 
+  iOSManualSigningProvisioningProfileID: 
+  tvOSManualSigningProvisioningProfileID: 
+  VisionOSManualSigningProvisioningProfileID: 
+  iOSManualSigningProvisioningProfileType: 0
+  tvOSManualSigningProvisioningProfileType: 0
+  VisionOSManualSigningProvisioningProfileType: 0
+  appleEnableAutomaticSigning: 0
+  iOSRequireARKit: 0
+  iOSAutomaticallyDetectAndAddCapabilities: 1
+  appleEnableProMotion: 0
+  shaderPrecisionModel: 0
+  clonedFromGUID: 00000000000000000000000000000000
+  templatePackageId: 
+  templateDefaultScene: 
+  useCustomMainManifest: 0
+  useCustomLauncherManifest: 0
+  useCustomMainGradleTemplate: 0
+  useCustomLauncherGradleManifest: 0
+  useCustomBaseGradleTemplate: 0
+  useCustomGradlePropertiesTemplate: 0
+  useCustomGradleSettingsTemplate: 0
+  useCustomProguardFile: 0
+  AndroidTargetArchitectures: 1
+  AndroidSplashScreenScale: 0
+  androidSplashScreen: {fileID: 0}
+  AndroidKeystoreName: 
+  AndroidKeyaliasName: 
+  AndroidEnableArmv9SecurityFeatures: 0
+  AndroidEnableArm64MTE: 0
+  AndroidBuildApkPerCpuArchitecture: 0
+  AndroidTVCompatibility: 0
+  AndroidIsGame: 1
+  AndroidEnableTango: 0
+  androidEnableBanner: 1
+  androidUseLowAccuracyLocation: 0
+  androidUseCustomKeystore: 0
+  m_AndroidBanners:
+  - width: 320
+    height: 180
+    banner: {fileID: 0}
+  androidGamepadSupportLevel: 0
+  AndroidMinifyRelease: 0
+  AndroidMinifyDebug: 0
+  AndroidValidateAppBundleSize: 1
+  AndroidAppBundleSizeToValidate: 200
+  AndroidReportGooglePlayAppDependencies: 1
+  androidSymbolsSizeThreshold: 800
+  m_BuildTargetIcons: []
+  m_BuildTargetPlatformIcons: []
+  m_BuildTargetBatching: []
+  m_BuildTargetShaderSettings: []
+  m_BuildTargetGraphicsJobs: []
+  m_BuildTargetGraphicsJobMode: []
+  m_BuildTargetGraphicsAPIs: []
+  m_BuildTargetVRSettings: []
+  m_DefaultShaderChunkSizeInMB: 16
+  m_DefaultShaderChunkCount: 0
+  openGLRequireES31: 0
+  openGLRequireES31AEP: 0
+  openGLRequireES32: 0
+  m_TemplateCustomTags: {}
+  mobileMTRendering:
+    Android: 1
+    VisionOS: 1
+    iPhone: 1
+    tvOS: 1
+  m_BuildTargetGroupLightmapEncodingQuality: []
+  m_BuildTargetGroupLightmapSettings: []
+  m_BuildTargetGroupLoadStoreDebugModeSettings: []
+  m_BuildTargetNormalMapEncoding: []
+  m_BuildTargetDefaultTextureCompressionFormat: []
+  playModeTestRunnerEnabled: 0
+  runPlayModeTestAsEditModeTest: 0
+  actionOnDotNetUnhandledException: 1
+  enableInternalProfiler: 0
+  logObjCUncaughtExceptions: 1
+  enableCrashReportAPI: 0
+  cameraUsageDescription: 
+  locationUsageDescription: 
+  microphoneUsageDescription: 
+  bluetoothUsageDescription: 
+  macOSTargetOSVersion: 11.0
+  switchNMETAOverride: 
+  switchNetLibKey: 
+  switchSocketMemoryPoolSize: 6144
+  switchSocketAllocatorPoolSize: 128
+  switchSocketConcurrencyLimit: 14
+  switchScreenResolutionBehavior: 2
+  switchUseCPUProfiler: 0
+  switchEnableFileSystemTrace: 0
+  switchLTOSetting: 0
+  switchApplicationID: 0x01004b9000490000
+  switchNSODependencies: 
+  switchCompilerFlags: 
+  switchTitleNames_0: 
+  switchTitleNames_1: 
+  switchTitleNames_2: 
+  switchTitleNames_3: 
+  switchTitleNames_4: 
+  switchTitleNames_5: 
+  switchTitleNames_6: 
+  switchTitleNames_7: 
+  switchTitleNames_8: 
+  switchTitleNames_9: 
+  switchTitleNames_10: 
+  switchTitleNames_11: 
+  switchTitleNames_12: 
+  switchTitleNames_13: 
+  switchTitleNames_14: 
+  switchTitleNames_15: 
+  switchPublisherNames_0: 
+  switchPublisherNames_1: 
+  switchPublisherNames_2: 
+  switchPublisherNames_3: 
+  switchPublisherNames_4: 
+  switchPublisherNames_5: 
+  switchPublisherNames_6: 
+  switchPublisherNames_7: 
+  switchPublisherNames_8: 
+  switchPublisherNames_9: 
+  switchPublisherNames_10: 
+  switchPublisherNames_11: 
+  switchPublisherNames_12: 
+  switchPublisherNames_13: 
+  switchPublisherNames_14: 
+  switchPublisherNames_15: 
+  switchIcons_0: {fileID: 0}
+  switchIcons_1: {fileID: 0}
+  switchIcons_2: {fileID: 0}
+  switchIcons_3: {fileID: 0}
+  switchIcons_4: {fileID: 0}
+  switchIcons_5: {fileID: 0}
+  switchIcons_6: {fileID: 0}
+  switchIcons_7: {fileID: 0}
+  switchIcons_8: {fileID: 0}
+  switchIcons_9: {fileID: 0}
+  switchIcons_10: {fileID: 0}
+  switchIcons_11: {fileID: 0}
+  switchIcons_12: {fileID: 0}
+  switchIcons_13: {fileID: 0}
+  switchIcons_14: {fileID: 0}
+  switchIcons_15: {fileID: 0}
+  switchSmallIcons_0: {fileID: 0}
+  switchSmallIcons_1: {fileID: 0}
+  switchSmallIcons_2: {fileID: 0}
+  switchSmallIcons_3: {fileID: 0}
+  switchSmallIcons_4: {fileID: 0}
+  switchSmallIcons_5: {fileID: 0}
+  switchSmallIcons_6: {fileID: 0}
+  switchSmallIcons_7: {fileID: 0}
+  switchSmallIcons_8: {fileID: 0}
+  switchSmallIcons_9: {fileID: 0}
+  switchSmallIcons_10: {fileID: 0}
+  switchSmallIcons_11: {fileID: 0}
+  switchSmallIcons_12: {fileID: 0}
+  switchSmallIcons_13: {fileID: 0}
+  switchSmallIcons_14: {fileID: 0}
+  switchSmallIcons_15: {fileID: 0}
+  switchManualHTML: 
+  switchAccessibleURLs: 
+  switchLegalInformation: 
+  switchMainThreadStackSize: 1048576
+  switchPresenceGroupId: 
+  switchLogoHandling: 0
+  switchReleaseVersion: 0
+  switchDisplayVersion: 1.0.0
+  switchStartupUserAccount: 0
+  switchSupportedLanguagesMask: 0
+  switchLogoType: 0
+  switchApplicationErrorCodeCategory: 
+  switchUserAccountSaveDataSize: 0
+  switchUserAccountSaveDataJournalSize: 0
+  switchApplicationAttribute: 0
+  switchCardSpecSize: -1
+  switchCardSpecClock: -1
+  switchRatingsMask: 0
+  switchRatingsInt_0: 0
+  switchRatingsInt_1: 0
+  switchRatingsInt_2: 0
+  switchRatingsInt_3: 0
+  switchRatingsInt_4: 0
+  switchRatingsInt_5: 0
+  switchRatingsInt_6: 0
+  switchRatingsInt_7: 0
+  switchRatingsInt_8: 0
+  switchRatingsInt_9: 0
+  switchRatingsInt_10: 0
+  switchRatingsInt_11: 0
+  switchRatingsInt_12: 0
+  switchLocalCommunicationIds_0: 
+  switchLocalCommunicationIds_1: 
+  switchLocalCommunicationIds_2: 
+  switchLocalCommunicationIds_3: 
+  switchLocalCommunicationIds_4: 
+  switchLocalCommunicationIds_5: 
+  switchLocalCommunicationIds_6: 
+  switchLocalCommunicationIds_7: 
+  switchParentalControl: 0
+  switchAllowsScreenshot: 1
+  switchAllowsVideoCapturing: 1
+  switchAllowsRuntimeAddOnContentInstall: 0
+  switchDataLossConfirmation: 0
+  switchUserAccountLockEnabled: 0
+  switchSystemResourceMemory: 16777216
+  switchSupportedNpadStyles: 22
+  switchNativeFsCacheSize: 32
+  switchIsHoldTypeHorizontal: 1
+  switchSupportedNpadCount: 8
+  switchEnableTouchScreen: 1
+  switchSocketConfigEnabled: 0
+  switchTcpInitialSendBufferSize: 32
+  switchTcpInitialReceiveBufferSize: 64
+  switchTcpAutoSendBufferSizeMax: 256
+  switchTcpAutoReceiveBufferSizeMax: 256
+  switchUdpSendBufferSize: 9
+  switchUdpReceiveBufferSize: 42
+  switchSocketBufferEfficiency: 4
+  switchSocketInitializeEnabled: 1
+  switchNetworkInterfaceManagerInitializeEnabled: 1
+  switchDisableHTCSPlayerConnection: 0
+  switchUseNewStyleFilepaths: 1
+  switchUseLegacyFmodPriorities: 0
+  switchUseMicroSleepForYield: 1
+  switchEnableRamDiskSupport: 0
+  switchMicroSleepForYieldTime: 25
+  switchRamDiskSpaceSize: 12
+  switchUpgradedPlayerSettingsToNMETA: 0
+  ps4NPAgeRating: 12
+  ps4NPTitleSecret: 
+  ps4NPTrophyPackPath: 
+  ps4ParentalLevel: 11
+  ps4ContentID: ED1633-NPXX51362_00-0000000000000000
+  ps4Category: 0
+  ps4MasterVersion: 01.00
+  ps4AppVersion: 01.00
+  ps4AppType: 0
+  ps4ParamSfxPath: 
+  ps4VideoOutPixelFormat: 0
+  ps4VideoOutInitialWidth: 1920
+  ps4VideoOutBaseModeInitialWidth: 1920
+  ps4VideoOutReprojectionRate: 60
+  ps4PronunciationXMLPath: 
+  ps4PronunciationSIGPath: 
+  ps4BackgroundImagePath: 
+  ps4StartupImagePath: 
+  ps4StartupImagesFolder: 
+  ps4IconImagesFolder: 
+  ps4SaveDataImagePath: 
+  ps4SdkOverride: 
+  ps4BGMPath: 
+  ps4ShareFilePath: 
+  ps4ShareOverlayImagePath: 
+  ps4PrivacyGuardImagePath: 
+  ps4ExtraSceSysFile: 
+  ps4NPtitleDatPath: 
+  ps4RemotePlayKeyAssignment: -1
+  ps4RemotePlayKeyMappingDir: 
+  ps4PlayTogetherPlayerCount: 0
+  ps4EnterButtonAssignment: 2
+  ps4ApplicationParam1: 0
+  ps4ApplicationParam2: 0
+  ps4ApplicationParam3: 0
+  ps4ApplicationParam4: 0
+  ps4DownloadDataSize: 0
+  ps4GarlicHeapSize: 2048
+  ps4ProGarlicHeapSize: 2560
+  playerPrefsMaxSize: 32768
+  ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
+  ps4pnSessions: 1
+  ps4pnPresence: 1
+  ps4pnFriends: 1
+  ps4pnGameCustomData: 1
+  playerPrefsSupport: 0
+  enableApplicationExit: 0
+  resetTempFolder: 1
+  restrictedAudioUsageRights: 0
+  ps4UseResolutionFallback: 0
+  ps4ReprojectionSupport: 0
+  ps4UseAudio3dBackend: 0
+  ps4UseLowGarlicFragmentationMode: 1
+  ps4SocialScreenEnabled: 0
+  ps4ScriptOptimizationLevel: 2
+  ps4Audio3dVirtualSpeakerCount: 14
+  ps4attribCpuUsage: 0
+  ps4PatchPkgPath: 
+  ps4PatchLatestPkgPath: 
+  ps4PatchChangeinfoPath: 
+  ps4PatchDayOne: 0
+  ps4attribUserManagement: 0
+  ps4attribMoveSupport: 0
+  ps4attrib3DSupport: 0
+  ps4attribShareSupport: 0
+  ps4attribExclusiveVR: 0
+  ps4disableAutoHideSplash: 0
+  ps4videoRecordingFeaturesUsed: 0
+  ps4contentSearchFeaturesUsed: 0
+  ps4CompatibilityPS5: 0
+  ps4AllowPS5Detection: 0
+  ps4GPU800MHz: 1
+  ps4attribEyeToEyeDistanceSettingVR: 0
+  ps4IncludedModules: []
+  ps4attribVROutputEnabled: 0
+  monoEnv: 
+  splashScreenBackgroundSourceLandscape: {fileID: 0}
+  splashScreenBackgroundSourcePortrait: {fileID: 0}
+  blurSplashScreenBackground: 1
+  spritePackerPolicy: 
+  webGLMemorySize: 32
+  webGLExceptionSupport: 1
+  webGLNameFilesAsHashes: 0
+  webGLShowDiagnostics: 0
+  webGLDataCaching: 1
+  webGLDebugSymbols: 0
+  webGLEmscriptenArgs: 
+  webGLModulesDirectory: 
+  webGLTemplate: APPLICATION:Default
+  webGLAnalyzeBuildSize: 0
+  webGLUseEmbeddedResources: 0
+  webGLCompressionFormat: 1
+  webGLWasmArithmeticExceptions: 0
+  webGLLinkerTarget: 1
+  webGLThreadsSupport: 0
+  webGLDecompressionFallback: 0
+  webGLInitialMemorySize: 32
+  webGLMaximumMemorySize: 2048
+  webGLMemoryGrowthMode: 2
+  webGLMemoryLinearGrowthStep: 16
+  webGLMemoryGeometricGrowthStep: 0.2
+  webGLMemoryGeometricGrowthCap: 96
+  webGLEnableWebGPU: 0
+  webGLPowerPreference: 2
+  webGLWebAssemblyTable: 0
+  webGLWebAssemblyBigInt: 0
+  webGLCloseOnQuit: 0
+  webWasm2023: 0
+  scriptingDefineSymbols:
+    Standalone: UNITY_MP_TOOLS_NET_STATS_MONITOR_ENABLED_IN_RELEASE
+  additionalCompilerArguments: {}
+  platformArchitecture: {}
+  scriptingBackend:
+    Standalone: 0
+  il2cppCompilerConfiguration: {}
+  il2cppCodeGeneration: {}
+  il2cppStacktraceInformation: {}
+  managedStrippingLevel: {}
+  incrementalIl2cppBuild: {}
+  suppressCommonWarnings: 1
+  allowUnsafeCode: 0
+  useDeterministicCompilation: 1
+  additionalIl2CppArgs: 
+  scriptingRuntimeVersion: 1
+  gcIncremental: 1
+  gcWBarrierValidation: 0
+  apiCompatibilityLevelPerPlatform: {}
+  editorAssembliesCompatibilityLevel: 1
+  m_RenderingPath: 1
+  m_MobileRenderingPath: 1
+  metroPackageName: ByteSerializer
+  metroPackageVersion: 1.0.0.0
+  metroCertificatePath: 
+  metroCertificatePassword: 
+  metroCertificateSubject: 
+  metroCertificateIssuer: 
+  metroCertificateNotAfter: 0000000000000000
+  metroApplicationDescription: ByteSerializer
+  wsaImages: {}
+  metroTileShortName: ByteSerializer
+  metroTileShowName: 0
+  metroMediumTileShowName: 0
+  metroLargeTileShowName: 0
+  metroWideTileShowName: 0
+  metroSupportStreamingInstall: 0
+  metroLastRequiredScene: 0
+  metroDefaultTileSize: 1
+  metroTileForegroundText: 2
+  metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0}
+  metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1}
+  metroSplashScreenUseBackgroundColor: 0
+  syncCapabilities: 0
+  platformCapabilities: {}
+  metroTargetDeviceFamilies: {}
+  metroFTAName: 
+  metroFTAFileTypes: []
+  metroProtocolName: 
+  vcxProjDefaultLanguage: 
+  XboxOneProductId: 
+  XboxOneUpdateKey: 
+  XboxOneSandboxId: 
+  XboxOneContentId: 
+  XboxOneTitleId: 
+  XboxOneSCId: 
+  XboxOneGameOsOverridePath: 
+  XboxOnePackagingOverridePath: 
+  XboxOneAppManifestOverridePath: 
+  XboxOneVersion: 1.0.0.0
+  XboxOnePackageEncryption: 0
+  XboxOnePackageUpdateGranularity: 2
+  XboxOneDescription: 
+  XboxOneLanguage:
+  - enus
+  XboxOneCapability: []
+  XboxOneGameRating: {}
+  XboxOneIsContentPackage: 0
+  XboxOneEnhancedXboxCompatibilityMode: 0
+  XboxOneEnableGPUVariability: 1
+  XboxOneSockets: {}
+  XboxOneSplashScreen: {fileID: 0}
+  XboxOneAllowedProductIds: []
+  XboxOnePersistentLocalStorageSize: 0
+  XboxOneXTitleMemory: 8
+  XboxOneOverrideIdentityName: 
+  XboxOneOverrideIdentityPublisher: 
+  vrEditorSettings: {}
+  cloudServicesEnabled:
+    Unity Ads: 0
+  luminIcon:
+    m_Name: 
+    m_ModelFolderPath: 
+    m_PortalFolderPath: 
+  luminCert:
+    m_CertPath: 
+    m_SignPackage: 1
+  luminIsChannelApp: 0
+  luminVersion:
+    m_VersionCode: 1
+    m_VersionName: 
+  hmiPlayerDataPath: 
+  hmiForceSRGBBlit: 1
+  embeddedLinuxEnableGamepadInput: 1
+  hmiCpuConfiguration: 
+  hmiLogStartupTiming: 0
+  qnxGraphicConfPath: 
+  apiCompatibilityLevel: 6
+  captureStartupLogs: {}
+  activeInputHandler: 0
+  windowsGamepadBackendHint: 0
+  cloudProjectId: 
+  framebufferDepthMemorylessMode: 0
+  qualitySettingsNames: []
+  projectName: 
+  organizationId: 
+  cloudEnabled: 0
+  legacyClampBlendShapeWeights: 0
+  hmiLoadingImage: {fileID: 0}
+  platformRequiresReadableAssets: 0
+  virtualTexturingSupportEnabled: 0
+  insecureHttpOption: 0
+  androidVulkanDenyFilterList: []
+  androidVulkanAllowFilterList: []
diff --git a/Examples/PingTool/ProjectSettings/TagManager.asset b/Examples/PingTool/ProjectSettings/TagManager.asset
new file mode 100644
index 0000000000..eb5d9aedd6
--- /dev/null
+++ b/Examples/PingTool/ProjectSettings/TagManager.asset
@@ -0,0 +1,45 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!78 &1
+TagManager:
+  serializedVersion: 3
+  tags: []
+  layers:
+  - Default
+  - TransparentFX
+  - Ignore Raycast
+  - 
+  - Water
+  - UI
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  m_SortingLayers:
+  - name: Default
+    uniqueID: 0
+    locked: 0
+  m_RenderingLayers:
+  - Default
diff --git a/Examples/PingTool/ProjectSettings/TimeManager.asset b/Examples/PingTool/ProjectSettings/TimeManager.asset
new file mode 100644
index 0000000000..8f68da289f
--- /dev/null
+++ b/Examples/PingTool/ProjectSettings/TimeManager.asset
@@ -0,0 +1,13 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!5 &1
+TimeManager:
+  m_ObjectHideFlags: 0
+  Fixed Timestep:
+    m_Count: 2822399
+    m_Rate:
+      m_Denominator: 1
+      m_Numerator: 141120000
+  Maximum Allowed Timestep: 0.33333334
+  m_TimeScale: 1
+  Maximum Particle Timestep: 0.03
diff --git a/Examples/PingTool/ProjectSettings/UnityConnectSettings.asset b/Examples/PingTool/ProjectSettings/UnityConnectSettings.asset
new file mode 100644
index 0000000000..2d81664be6
--- /dev/null
+++ b/Examples/PingTool/ProjectSettings/UnityConnectSettings.asset
@@ -0,0 +1,36 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!310 &1
+UnityConnectSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 1
+  m_Enabled: 1
+  m_TestMode: 0
+  m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
+  m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
+  m_ConfigUrl: https://config.uca.cloud.unity3d.com
+  m_DashboardUrl: https://dashboard.unity3d.com
+  m_TestInitMode: 0
+  CrashReportingSettings:
+    m_EventUrl: https://perf-events.cloud.unity3d.com
+    m_Enabled: 0
+    m_LogBufferSize: 10
+    m_CaptureEditorExceptions: 1
+  UnityPurchasingSettings:
+    m_Enabled: 0
+    m_TestMode: 0
+  UnityAnalyticsSettings:
+    m_Enabled: 0
+    m_TestMode: 0
+    m_InitializeOnStartup: 1
+    m_PackageRequiringCoreStatsPresent: 1
+  UnityAdsSettings:
+    m_Enabled: 0
+    m_InitializeOnStartup: 1
+    m_TestMode: 0
+    m_IosGameId: 
+    m_AndroidGameId: 
+    m_GameIds: {}
+    m_GameId: 
+  PerformanceReportingSettings:
+    m_Enabled: 0
diff --git a/Examples/PingTool/ProjectSettings/VersionControlSettings.asset b/Examples/PingTool/ProjectSettings/VersionControlSettings.asset
new file mode 100644
index 0000000000..979fd8eca8
--- /dev/null
+++ b/Examples/PingTool/ProjectSettings/VersionControlSettings.asset
@@ -0,0 +1,7 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!890905787 &1
+VersionControlSettings:
+  m_ObjectHideFlags: 0
+  m_Mode: Visible Meta Files
+  m_TrackPackagesOutsideProject: 0
diff --git a/Examples/PingTool/README.md b/Examples/PingTool/README.md
new file mode 100644
index 0000000000..f529f5bf3f
--- /dev/null
+++ b/Examples/PingTool/README.md
@@ -0,0 +1,57 @@
+# Netcode for GameObjects Ping Tool
+This project is only for example purposes and provides one example of how to one can acquire ping times between clients during a network session. It also includes integration with the Realtime Network Stats Monitor tool that provides additional relative (and useful) network stats.
+
+## Ping Tool
+The ping tool lives in its own assembly for convenience purposes:
+
+![image](https://github.com/user-attachments/assets/d2fdecda-e8ec-4d1a-ae6e-4590c6fcce40)
+
+The **Sample** scene includes an in-scene placed instance of the **PingTool**:
+
+![image](https://github.com/user-attachments/assets/4e7c8af1-bc15-4b93-95f1-86367abea5ab)
+
+The **Net Stats Monitor Toggle** property allows you to select the key to press to toggle the RNSM visibility (the **tab** key is the default).
+
+The ping tool includes a runtime "Ping Rate" slider that provides you with the ability to adjust the number of pings to send per second. This is only to demonstrate you really don't need to send more than 1 or 2 pings per second to get reasonable results.
+
+
+## Ping Tool RNSM Integration
+Depending upon the network topology selected in the **NetworkManager** depends upon how information is displayed.
+The RTT values represnt the UnitTransport's Round Trip Time calculated values.
+The Ping values represent the time it takes to send a message from client-a to client-b which includes the time it takes to be serialized, added to the outbound queue, sent via UTP, received by UTP, deserialized and processed on the client-b side. The delta time is based off of the delta network server time on client-a and client-b.
+
+### Client-Server Network Topology
+When using a client-server network topology, upon first starting a host with no other connected clients you should see no stats other than the frame frate:
+**(Host View)**
+
+![image](https://github.com/user-attachments/assets/9c5c16f7-bb41-4c6b-945d-b3dfcb3a3fea)
+
+When you connect one or more clients:
+- From the host side, you will begin to see the RTT and ping times to each connected client:
+**(Host View)**
+  
+![image](https://github.com/user-attachments/assets/b130f453-6acf-4e1e-b264-d69c7ae7be23)
+
+- From a client side, you will see the RTT to the server and a ping time for each connected client:
+**(Client-2 View)**
+  
+![image](https://github.com/user-attachments/assets/73e7d93a-5f6c-4c0f-b044-ef35315f33a0)
+
+### Distributed Authority Network Topology
+When using a distributed authority network topology, upon creating a session you will immediately see the RTT to the service displayed:
+
+![image](https://github.com/user-attachments/assets/c1f36a49-9986-4b26-b78d-feadc8f00d2a)
+
+As more clients join the session you will start to see the ping times to each client:
+
+![image](https://github.com/user-attachments/assets/06abcaac-693f-4b7f-bf13-03c63dd684bf)
+
+## About This Example
+While we will make efforts to update this project, it is for example purposes only and could have bugs or even areas where it could be improved. If you plan on using this example or the PingTool assembly for your project, we recommend you cusotmize it depending upon your project's needs and goals.
+
+
+
+
+
+
+
diff --git a/LICENSE.md b/LICENSE.md
index a5eb171398..031978c204 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,9 +1,7 @@
-MIT License
+Unity Companion License (UCL License)
 
-Copyright (c) 2021 Unity Technologies
+com.unity.netcode.gameobjects copyright ©  2021-2024 Unity Technologies
+Licensed under the Unity Companion License for Unity-dependent projects (see https://unity3d.com/legal/licenses/unity_companion_license).
+Unless expressly provided otherwise, the Software under this license is made available strictly on an “AS IS” BASIS WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED. Please review the license for details on these and other terms and conditions.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
index 4cb6984e3b..a45f6909a0 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ For general questions, networking advice or discussions about Netcode for GameOb
 ### Compatibility
 
 Netcode for GameObjects targets the following Unity versions:
-- Unity 2021.3(LTS), and 2022.3(LTS)
+- Unity 6 (LTS)
 
 On the following runtime platforms:
 - Windows, MacOS, and Linux
diff --git a/Tools/CI/NGO-recipes.sln b/Tools/CI/NGO-recipes.sln
new file mode 100644
index 0000000000..f4e6215128
--- /dev/null
+++ b/Tools/CI/NGO-recipes.sln
@@ -0,0 +1,16 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NGO.Cookbook", "NGO.Cookbook.csproj", "{A5A71435-C891-4C78-989C-2713DAA7B3B8}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A5A71435-C891-4C78-989C-2713DAA7B3B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5A71435-C891-4C78-989C-2713DAA7B3B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5A71435-C891-4C78-989C-2713DAA7B3B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A5A71435-C891-4C78-989C-2713DAA7B3B8}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal
diff --git a/Tools/CI/NGO.Cookbook.csproj b/Tools/CI/NGO.Cookbook.csproj
new file mode 100644
index 0000000000..968e57e6a2
--- /dev/null
+++ b/Tools/CI/NGO.Cookbook.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="RecipeEngine.Modules.Wrench" Version="0.10.45" />
+    </ItemGroup>
+
+</Project>
diff --git a/Tools/CI/Program.cs b/Tools/CI/Program.cs
new file mode 100644
index 0000000000..176215bdff
--- /dev/null
+++ b/Tools/CI/Program.cs
@@ -0,0 +1,21 @@
+using NGO.Cookbook.Settings;
+using RecipeEngine;
+using RecipeEngine.Modules.Wrench.Helpers;
+
+
+// ReSharper disable once CheckNamespace
+public static class Program
+{
+    public static int Main(string[] args)
+    {
+        var settings = new NGOSettings();
+
+        // ReSharper disable once UnusedVariable
+        var engine = EngineFactory
+            .Create()
+            .ScanAll()
+            .WithWrenchModule(settings.Wrench)
+            .GenerateAsync().Result;
+        return engine;
+    }
+}
diff --git a/Tools/CI/Settings/NGOSettings.cs b/Tools/CI/Settings/NGOSettings.cs
new file mode 100644
index 0000000000..ebd24769c0
--- /dev/null
+++ b/Tools/CI/Settings/NGOSettings.cs
@@ -0,0 +1,34 @@
+using RecipeEngine.Api.Settings;
+using RecipeEngine.Modules.Wrench.Models;
+using RecipeEngine.Modules.Wrench.Settings;
+
+namespace NGO.Cookbook.Settings;
+
+public class NGOSettings : AnnotatedSettingsBase
+{
+    // Path from the root of the repository where packages are located.
+    readonly string[] packagesRootPaths = {"."};
+
+    // update this to list all packages in this repo that you want to release.
+    Dictionary<string, PackageOptions> PackageOptions = new()
+    {
+        {
+            "com.unity.netcode.gameobjects",
+            new PackageOptions() { ReleaseOptions = new ReleaseOptions() { IsReleasing = true } }
+        }
+    };
+
+    public NGOSettings()
+    {
+        Wrench = new WrenchSettings(
+            packagesRootPaths,
+            PackageOptions,
+            false,
+            false,
+            @"Tools\CI\NGO.Cookbook.csproj"); // There should be fix soon and there should be no need of specifying the path
+
+        Wrench.PvpProfilesToCheck = new HashSet<string>() { "supported" };
+    }
+
+    public WrenchSettings Wrench { get; private set; }
+}
diff --git a/Tools/CI/nuget.config b/Tools/CI/nuget.config
new file mode 100644
index 0000000000..de6af57e8d
--- /dev/null
+++ b/Tools/CI/nuget.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <packageSources>
+        <add key="Artifactory Prd" value="https://artifactory.prd.it.unity3d.com/artifactory/api/nuget/v3/nuget"/>
+    </packageSources>
+</configuration>
diff --git a/Tools/CI/regenerate.bat b/Tools/CI/regenerate.bat
new file mode 100644
index 0000000000..33c9c9fb12
--- /dev/null
+++ b/Tools/CI/regenerate.bat
@@ -0,0 +1,2 @@
+cd %~dp0../../
+dotnet run --project Tools\CI\NGO.Cookbook.csproj
\ No newline at end of file
diff --git a/Tools/CI/regenerate.sh b/Tools/CI/regenerate.sh
new file mode 100644
index 0000000000..ef2be6b8d8
--- /dev/null
+++ b/Tools/CI/regenerate.sh
@@ -0,0 +1,2 @@
+cd $(dirname "$0")/../../
+dotnet run --project Tools\CI\NGO.Cookbook.csproj
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/CHANGELOG.md b/com.unity.netcode.gameobjects/CHANGELOG.md
index 67d29d47d5..982f6bac83 100644
--- a/com.unity.netcode.gameobjects/CHANGELOG.md
+++ b/com.unity.netcode.gameobjects/CHANGELOG.md
@@ -6,82 +6,351 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 Additional documentation and release notes are available at [Multiplayer Documentation](https://docs-multiplayer.unity3d.com).
 
-[Unreleased]
+## [2.3.1] - 2025-04-14
+
+### Fixed
+
+- Fixed issue where during a `NetworkObject`'s spawn if you instantiated, spawned, and parented another network prefab under the currently spawning `NetworkObject` the parenting message would not properly defer until the parent `NetworkObject` was spawned. (#3401)
+
+
+## [2.3.0] - 2025-04-09
+
+### Added
+
+- Added `NetworkManager.OnPreShutdown` which is called before the NetworkManager cleans up and shuts down. (#3366)
+- Added `Lerp` interpolation type that still uses a lerp approach but uses the new buffer consumption logic. (#3355)
+- Added property to enable or disable lerp smoothing for position, rotation, and scale interpolators. (#3355)
+- Added `NetworkTransform.InterpolationBufferTickOffset` static property to provide users with a way to increase or decrease the time marker where interpolators will pull state update from the queue. (#3355)
+- Added interpolator types as an inspector view selection for position, rotation, and scale. (#3337)
+- Added a new smooth dampening interpolator type that provides a nice balance between precision and smoothing results. (#3337)
+- Added `NetworkTimeSystem.TickLatency` property that provides the average latency of a client. (#3337)
+- Added `FastBufferReader(ArraySegment<byte> buffer, Allocator copyAllocator)` constructor that uses the `ArraySegment.Offset` as the `FastBufferReader` offset and the `ArraySegment.Count` as the `FastBufferReader` length. (#3321)
+- Added `FastBufferReader(ArraySegment<byte> buffer, Allocator copyAllocator, int length = -1)` constructor that uses the `ArraySegment.Offset` as the `FastBufferReader` offset. (#3321)
+
+### Fixed
+
+- Fixed issue where in-scene placed `NetworkObjects` could fail to synchronize its transform properly (especially without a `NetworkTransform`) if their parenting changes from the default when the scene is loaded and if the same scene remains loaded between network sessions while the parenting is completely different from the original hierarchy. (#3387)
+- Fixed an issue in `UnityTransport` where the transport would accept sends on invalid connections, leading to a useless memory allocation and confusing error message. (#3382)
+- Fixed issue where the time delta that interpolators used would not be properly updated during multiple fixed update invocations within the same player loop frame. (#3355)
+- Fixed issue when using a distributed authority network topology and many clients attempt to connect simultaneously the session owner could max-out the maximum in-flight reliable messages allowed, start dropping packets, and some of the connecting clients would fail to fully synchronize. (#3350)
+- Fixed issue when using a distributed authority network topology and scene management was disabled clients would not be able to spawn any new network prefab instances until synchronization was complete. (#3350)
+- Fixed issue where an owner that changes ownership, when using a distributed authority network topology, could yield identical previous and current owner identifiers. This could also cause `NetworkTransform` to fail to change ownership which would leave the previous owner still subscribed to network tick events. (#3347)
+- Fixed issue where the `MaximumInterpolationTime` could not be modified from within the inspector view or runtime. (#3337)
+- Fixed `ChangeOwnership` changing ownership to clients that are not observers. This also happened with automated object distribution. (#3323)
+- Fixed issue where `AnticipatedNetworkVariable` previous value returned by `AnticipatedNetworkVariable.OnAuthoritativeValueChanged` is updated correctly on the non-authoritative side. (#3306)
+- Fixed `OnClientConnectedCallback` passing incorrect `clientId` when scene management is disabled. (#3312)
+- Fixed issue where the `NetworkObject.Ownership` custom editor did not take the default "Everything" flag into consideration. (#3305)
+- Fixed DestroyObject flow on non-authority game clients. (#3291)
+- Fixed exception being thrown when a `GameObject` with an associated `NetworkTransform` is disabled. (#3243)
+- Fixed issue where the scene migration synchronization table was not cleaned up if the `GameObject` of a `NetworkObject` is destroyed before it should have been. (#3230)
+- Fixed issue where the scene migration synchronization table was not cleaned up upon `NetworkManager` shutting down. (#3230)
+- Fixed `NetworkObject.DeferDespawn` to respect the `DestroyGameObject` parameter. (#3219)
+- Fixed issue where a `NetworkObject` with nested `NetworkTransform` components of varying authority modes was not being taken into consideration and would break both the initial `NetworkTransform` synchronization and fail to properly handle synchronized state updates of the nested `NetworkTransform` components. (#3209)
+- Fixed issue with distributing parented children that have the distributable and/or transferrable permissions set and have the same owner as the root parent, that has the distributable permission set, were not being distributed to the same client upon the owning client disconnecting when using a distributed authority network topology. (#3203)
+- Fixed issue where a spawned `NetworkObject` that was registered with a prefab handler and owned by a client would invoke destroy more than once on the host-server side if the client disconnected while the `NetworkObject` was still spawned. (#3200)
+- Fixed issue where `NetworkVariableBase` derived classes were not being re-initialized if the associated `NetworkObject` instance was not destroyed and re-spawned. (#3181)
+
+### Changed
+
+- Changed the scene loading event serialization order for in-scene placed `NetworkObject`s to be based on their parent-child hierarchy. (#3387)
+- Changed the original `Lerp` interpolation type to `LegacyLerp`. (#3355)
+- Changed `BufferedLinearInterpolator<T>.Update(float deltaTime, NetworkTime serverTime)` as being deprecated since this method is only used for internal testing purposes. (#3337)
+- Changed error thrown when attempting to build a dedicated server with Unity Transport that uses websockets to provide more useful information to the user. (#3336)
+- Changed root in-scene placed `NetworkObject` instances now will always have either the `Distributable` permission set unless the `SessionOwner` permission is set. (#3305)
+- Changed the `DestroyObject` message to reduce the serialized message size and remove the unnecessary message field. (#3304)
+- Changed the `NetworkTimeSystem.Sync` method to use half RTT to calculate the desired local time offset as opposed to the full RTT. (#3212)
+
+## [2.2.0] - 2024-12-12
+
+### Added
+
+- Added `NetworkObject.OwnershipStatus.SessionOwner` to allow Network Objects to be distributable and only owned by the Session Owner. This flag will override all other `OwnershipStatus` flags. (#3175)
+- Added `UnityTransport.GetEndpoint` method to provide a way to obtain `NetworkEndpoint` information of a connection via client identifier. (#3130)
+- Added `NetworkTransport.OnEarlyUpdate` and `NetworkTransport.OnPostLateUpdate` methods to provide more control over handling transport related events at the start and end of each frame. (#3113)
+
+### Fixed
+
+- Fixed issue where the server, host, or session owner would not populate the in-scene place `NetworkObject` table if the scene was loaded prior to starting the `NetworkManager`. (#3177)
+- Fixed issue where the `NetworkObjectIdHash` value could be incorrect when entering play mode while still in prefab edit mode with pending changes and using MPPM. (#3162)
+- Fixed issue where a sever only `NetworkManager` instance would spawn the actual `NetworkPrefab`'s `GameObject` as opposed to creating an instance of it. (#3160)
+- Fixed issue where only the session owner (as opposed to all clients) would handle spawning prefab overrides properly when using a distributed authority network topology. (#3160)
+- Fixed issue where an exception was thrown when calling `NetworkManager.Shutdown` after calling `UnityTransport.Shutdown`. (#3118)
+- Fixed issue where `NetworkList` properties on in-scene placed `NetworkObject`s could cause small memory leaks when entering playmode. (#3147)
+- Fixed in-scene `NertworkObject` synchronization issue when loading a scene with currently connected clients connected to a session created by a `NetworkManager` started as a server (i.e. not as a host). (#3133)
+- Fixed issue where a `NetworkManager` started as a server would not add itself as an observer to in-scene placed `NetworkObject`s instantiated and spawned by a scene loading event. (#3133)
+- Fixed issue where spawning a player using `NetworkObject.InstantiateAndSpawn` or `NetworkSpawnManager.InstantiateAndSpawn` would not update the `NetworkSpawnManager.PlayerObjects` or assign the newly spawned player to the `NetworkClient.PlayerObject`. (#3122)
+- Fixed issue where queued UnitTransport (NetworkTransport) message batches were being sent on the next frame. They are now sent at the end of the frame during `PostLateUpdate`.  (#3113)
+- Fixed issue where `NotOwnerRpcTarget` or `OwnerRpcTarget` were not using their replacements `NotAuthorityRpcTarget` and `AuthorityRpcTarget` which would invoke a warning. (#3111)
+- Fixed issue where client is removed as an observer from spawned objects when their player instance is despawned. (#3110)
+- Fixed issue where `NetworkAnimator` would statically allocate write buffer space for `Animator` parameters that could cause a write error if the number of parameters exceeded the space allocated. (#3108)
+
+### Changed
+
+- In-scene placed `NetworkObject`s have been made distributable when balancing object distribution after a connection event. (#3175)
+- Optimised `NetworkVariable` and `NetworkTransform` related packets when in Distributed Authority mode.
+- The Debug Simulator section of the Unity Transport component was removed. This section was not functional anymore and users are now recommended to use the more featureful [Network Simulator](https://docs-multiplayer.unity3d.com/tools/current/tools-network-simulator/) tool from the Multiplayer Tools package instead. (#3121)
+
+## [2.1.1] - 2024-10-18
+
+### Added
+
+- Added ability to edit the `NetworkConfig.AutoSpawnPlayerPrefabClientSide` within the inspector view. (#3097)
+- Added `IContactEventHandlerWithInfo` that derives from `IContactEventHandler` that can be updated per frame to provide `ContactEventHandlerInfo` information to the `RigidbodyContactEventManager` when processing collisions. (#3094)
+  - `ContactEventHandlerInfo.ProvideNonRigidBodyContactEvents`: When set to true, non-`Rigidbody` collisions with the registered `Rigidbody` will generate contact event notifications. (#3094)
+  - `ContactEventHandlerInfo.HasContactEventPriority`: When set to true, the `Rigidbody` will be prioritized as the instance that generates the event if the `Rigidbody` colliding does not have priority. (#3094)
+- Added a static `NetworkManager.OnInstantiated` event notification to be able to track when a new `NetworkManager` instance has been instantiated. (#3088)
+- Added a static `NetworkManager.OnDestroying` event notification to be able to track when an existing `NetworkManager` instance is being destroyed. (#3088)
+
+### Fixed
+
+- Fixed issue where `NetworkPrefabProcessor` would not mark the prefab list as dirty and prevent saving the `DefaultNetworkPrefabs` asset when only imports or only deletes were detected.(#3103)
+- Fixed an issue where nested `NetworkTransform` components in owner authoritative mode cleared their initial settings on the server, causing improper synchronization. (#3099)
+- Fixed issue with service not getting synchronized with in-scene placed `NetworkObject` instances when a session owner starts a `SceneEventType.Load` event. (#3096)
+- Fixed issue with the in-scene network prefab instance update menu tool where it was not properly updating scenes when invoked on the root prefab instance. (#3092)
+- Fixed an issue where newly synchronizing clients would always receive current `NetworkVariable` values, potentially causing issues with collections if there were pending updates. Now, pending state updates serialize previous values to avoid duplicates on new clients. (#3081)
+- Fixed issue where changing ownership would mark every `NetworkVariable` dirty. Now, it will only mark any `NetworkVariable` with owner read permissions as dirty and will send/flush any pending updates to all clients prior to sending the change in ownership message. (#3081)
+- Fixed an issue where transferring ownership of `NetworkVariable` collections didn't update the new owner’s previous value, causing the last added value to be detected as a change during additions or removals. (#3081)
+- Fixed issue where a client (or server) with no write permissions for a `NetworkVariable` using a standard .NET collection type could still modify the collection which could cause various issues depending upon the modification and collection type. (#3081)
+- Fixed issue where applying the position and/or rotation to the `NetworkManager.ConnectionApprovalResponse` when connection approval and auto-spawn player prefab were enabled would not apply the position and/or rotation when the player prefab was instantiated. (#3078)
+- Fixed issue where `NetworkObject.SpawnWithObservers` was not being honored when spawning the player prefab. (#3077)
+- Fixed issue with the client count not being correct on the host or server side when a client disconnects itself from a session. (#3075)
+
+### Changed
+
+- Changed `NetworkConfig.AutoSpawnPlayerPrefabClientSide` is no longer automatically set when starting `NetworkManager`. (#3097)
+- Updated `NetworkVariableDeltaMessage` so the server now forwards delta state updates from clients immediately, instead of waiting until the end of the frame or the next network tick. (#3081)
+
+## [2.0.0] - 2024-09-12
+
+### Added
+
+- Added tooltips for all of the `NetworkObject` component's properties. (#3052)
+- Added message size validation to named and unnamed message sending functions for better error messages. (#3049)
+- Added "Check for NetworkObject Component" property to the Multiplayer->Netcode for GameObjects project settings. When disabled, this will bypass the in-editor `NetworkObject` check on `NetworkBehaviour` components. (#3031)
+- Added `NetworkTransform.SwitchTransformSpaceWhenParented` property that, when enabled, will handle the world to local, local to world, and local to local transform space transitions when interpolation is enabled. (#3013)
+- Added `NetworkTransform.TickSyncChildren` that, when enabled, will tick synchronize nested and/or child `NetworkTransform` components to eliminate any potential visual jittering that could occur if the `NetworkTransform` instances get into a state where their state updates are landing on different network ticks. (#3013)
+- Added `NetworkObject.AllowOwnerToParent` property to provide the ability to allow clients to parent owned objects when running in a client-server network topology. (#3013)
+- Added `NetworkObject.SyncOwnerTransformWhenParented` property to provide a way to disable applying the server's transform information in the parenting message on the client owner instance which can be useful for owner authoritative motion models. (#3013)
+- Added `NetcodeEditorBase` editor helper class to provide easier modification and extension of the SDK's components. (#3013)
+
+### Fixed
+
+- Fixed issue where `NetworkAnimator` would send updates to non-observer clients. (#3057)
+- Fixed issue where an exception could occur when receiving a universal RPC for a `NetworkObject` that has been despawned. (#3052)
+- Fixed issue where a NetworkObject hidden from a client that is then promoted to be session owner was not being synchronized with newly joining clients.(#3051)
+- Fixed issue where clients could have a wrong time delta on `NetworkVariableBase` which could prevent from sending delta state updates. (#3045)
+- Fixed issue where setting a prefab hash value during connection approval but not having a player prefab assigned could cause an exception when spawning a player. (#3042)
+- Fixed issue where the `NetworkSpawnManager.HandleNetworkObjectShow` could throw an exception if one of the `NetworkObject` components to show was destroyed during the same frame. (#3030)
+- Fixed issue where the `NetworkManagerHelper` was continuing to check for hierarchy changes when in play mode. (#3026)
+- Fixed issue with newly/late joined clients and `NetworkTransform` synchronization of parented `NetworkObject` instances. (#3013)
+- Fixed issue with smooth transitions between transform spaces when interpolation is enabled (requires `NetworkTransform.SwitchTransformSpaceWhenParented` to be enabled). (#3013)
+
+### Changed
+
+- Changed `NetworkTransformEditor` now uses `NetworkTransform` as the base type class to assure it doesn't display a foldout group when using the base `NetworkTransform` component class. (#3052)
+- Changed `NetworkAnimator.Awake` is now a protected virtual method. (#3052)
+- Changed  when invoking `NetworkManager.ConnectionManager.DisconnectClient` during a distributed authority session a more appropriate message is logged. (#3052)
+- Changed `NetworkTransformEditor` so it now derives from `NetcodeEditorBase`. (#3013)
+- Changed `NetworkRigidbodyBaseEditor` so it now derives from `NetcodeEditorBase`. (#3013)
+- Changed `NetworkManagerEditor` so it now derives from `NetcodeEditorBase`. (#3013)
+
+
+## [2.0.0-pre.4] - 2024-08-21
 
 ### Added
 
-- Added a static `NetworkManager.OnInstantiated` event notification to be able to track when a new `NetworkManager` instance has been instantiated. (#3089)
-- Added a static `NetworkManager.OnDestroying` event notification to be able to track when an existing `NetworkManager` instance is being destroyed. (#3089)
-- Added message size validation to named and unnamed message sending functions for better error messages. (#3043)
-- Added "Check for NetworkObject Component" property to the Multiplayer->Netcode for GameObjects project settings. When disabled, this will bypass the in-editor `NetworkObject` check on `NetworkBehaviour` components. (#3034)
+- Added `NetworkVariable.CheckDirtyState` that is to be used in tandem with collections in order to detect whether the collection or an item within the collection has changed. (#3004)
 
 ### Fixed
 
-- Fixed issue with the in-scene network prefab instance update menu tool where it was not properly updating scenes when invoked on the root prefab instance. (#3084)
-- Fixed issue where `NetworkAnimator` would send updates to non-observer clients. (#3058)
-- Fixed issue where an exception could occur when receiving a universal RPC for a `NetworkObject` that has been despawned. (#3055)
-- Fixed issue where setting a prefab hash value during connection approval but not having a player prefab assigned could cause an exception when spawning a player. (#3046)
-- Fixed issue where collections v2.2.x was not supported when using UTP v2.2.x within Unity v2022.3. (#3033)
-- Fixed issue where the `NetworkSpawnManager.HandleNetworkObjectShow` could throw an exception if one of the `NetworkObject` components to show was destroyed during the same frame. (#3029)
-- Fixed issue where the `NetworkManagerHelper` was continuing to check for hierarchy changes when in play mode. (#3027)
+- Fixed issue where nested `NetworkTransform` components were not getting updated. (#3016)
+- Fixed issue by adding null checks in `NetworkVariableBase.CanClientRead` and `NetworkVariableBase.CanClientWrite` methods to ensure safe access to `NetworkBehaviour`. (#3012)
+- Fixed issue where `FixedStringSerializer<T>` was using `NetworkVariableSerialization<byte>.AreEqual` to determine if two bytes were equal causes an exception to be thrown due to no byte serializer having been defined. (#3009)
+- Fixed Issue where a state with dual triggers, inbound and outbound, could cause a false layer to layer state transition message to be sent to non-authority `NetworkAnimator` instances and cause a warning message to be logged. (#3008)
+- Fixed issue using collections within `NetworkVariable` where the collection would not detect changes to items or nested items. (#3004)
+- Fixed issue where `List`, `Dictionary`, and `HashSet` collections would not uniquely duplicate nested collections. (#3004)
+- Fixed issue where `NotAuthorityTarget` would include the service observer in the list of targets to send the RPC to as opposed to excluding the service observer as it should. (#3000)
+- Fixed issue where `ProxyRpcTargetGroup` could attempt to send a message if there were no targets to send to. (#3000)
 
 ### Changed
 
+- Changed `NetworkAnimator` to automatically switch to owner authoritative mode when using a distributed authority network topology. (#3021)
+- Changed permissions exception thrown in `NetworkList` to exiting early with a logged error that is now a unified permissions message within `NetworkVariableBase`. (#3004)
+- Changed permissions exception thrown in `NetworkVariable.Value` to exiting early with a logged error that is now a unified permissions message within `NetworkVariableBase`. (#3004)
+
 
-## [1.11.0] - 2024-08-20
+## [2.0.0-pre.3] - 2024-07-23
 
 ### Added
+- Added: `UnityTransport.GetNetworkDriver` and `UnityTransport.GetLocalEndpoint` methods to expose the driver and local endpoint being used. (#2978)
+
+### Fixed
+
+- Fixed issue where deferred despawn was causing GC allocations when converting an `IEnumerable` to a list. (#2983)
+- Fixed issue where the realtime network stats monitor was not able to display RPC traffic in release builds due to those stats being only available in development builds or the editor. (#2979)
+- Fixed issue where `NetworkManager.ScenesLoaded` was not being updated if `PostSynchronizationSceneUnloading` was set and any loaded scenes not used during synchronization were unloaded. (#2971)
+- Fixed issue where `Rigidbody2d` under Unity 6000.0.11f1 has breaking changes where `velocity` is now `linearVelocity` and `isKinematic` is replaced by `bodyType`. (#2971)
+- Fixed issue where `NetworkSpawnManager.InstantiateAndSpawn` and `NetworkObject.InstantiateAndSpawn` were not honoring the ownerClientId parameter when using a client-server network topology. (#2968)
+- Fixed issue where internal delta serialization could not have a byte serializer defined when serializing deltas for other types. Added `[GenerateSerializationForType(typeof(byte))]` to both the `NetworkVariable` and `AnticipatedNetworkVariable` classes to assure a byte serializer is defined.(#2962)
+- Fixed issue when scene management was disabled and the session owner would still try to synchronize a late joining client. (#2962)
+- Fixed issue when using a distributed authority network topology where it would allow a session owner to spawn a `NetworkObject` prior to being approved. Now, an error message is logged and the `NetworkObject` will not be spawned prior to the client being approved.  (#2962)
+- Fixed issue where attempting to spawn during `NetworkBehaviour.OnInSceneObjectsSpawned` and `NetworkBehaviour.OnNetworkSessionSynchronized` notifications would throw a collection modified exception.  (#2962)
+
+### Changed
+
+- Changed logic where clients can now set the `NetworkSceneManager` client synchronization mode when using a distributed authority network topology. (#2985)
 
-- Added `NetworkVariable.CheckDirtyState` that is to be used in tandem with collections in order to detect whether the collection or an item within the collection has changed. (#3005)
+
+## [2.0.0-pre.2] - 2024-06-17
+
+### Added
+
+- Added `AnticipatedNetworkVariable<T>`, which adds support for client anticipation of `NetworkVariable` values, allowing for more responsive gameplay. (#2957)
+- Added `AnticipatedNetworkTransform`, which adds support for client anticipation of NetworkTransforms. (#2957)
+- Added `NetworkVariableBase.ExceedsDirtinessThreshold` to allow network variables to throttle updates by only sending updates when the difference between the current and previous values exceeds a threshold. (This is exposed in `NetworkVariable<T>` with the callback `NetworkVariable<T>.CheckExceedsDirtinessThreshold`). (#2957)
+- Added `NetworkVariableUpdateTraits`, which add additional throttling support: `MinSecondsBetweenUpdates` will prevent the `NetworkVariable` from sending updates more often than the specified time period (even if it exceeds the dirtiness threshold), while `MaxSecondsBetweenUpdates` will force a dirty `NetworkVariable` to send an update after the specified time period even if it has not yet exceeded the dirtiness threshold. (#2957)
+- Added virtual method `NetworkVariableBase.OnInitialize` which can be used by `NetworkVariable` subclasses to add initialization code. (#2957)
+- Added `NetworkTime.TickWithPartial`, which represents the current tick as a double that includes the fractional/partial tick value. (#2957)
+- Added `NetworkTickSystem.AnticipationTick`, which can be helpful with implementation of client anticipation. This value represents the tick the current local client was at at the beginning of the most recent network round trip, which enables it to correlate server update ticks with the client tick that may have triggered them. (#2957)
+- Added event `NetworkManager.OnSessionOwnerPromoted` that is invoked when a new session owner promotion occurs. (#2948)
+- Added `NetworkRigidBodyBase.GetLinearVelocity` and `NetworkRigidBodyBase.SetLinearVelocity` convenience/helper methods. (#2948)
+- Added `NetworkRigidBodyBase.GetAngularVelocity` and `NetworkRigidBodyBase.SetAngularVelocity` convenience/helper methods. (#2948)
 
 ### Fixed
 
-- Fixed issue by adding null checks in `NetworkVariableBase.CanClientRead` and `NetworkVariableBase.CanClientWrite` methods to ensure safe access to `NetworkBehaviour`. (#3011)
-- Fixed issue using collections within `NetworkVariable` where the collection would not detect changes to items or nested items. (#3005)
-- Fixed issue where `List`, `Dictionary`, and `HashSet` collections would not uniquely duplicate nested collections. (#3005)
-- Fixed Issue where a state with dual triggers, inbound and outbound, could cause a false layer to layer state transition message to be sent to non-authority `NetworkAnimator` instances and cause a warning message to be logged. (#2999)
-- Fixed issue where `FixedStringSerializer<T>` was using `NetworkVariableSerialization<byte>.AreEqual` to determine if two bytes were equal causes an exception to be thrown due to no byte serializer having been defined. (#2992)
+- Fixed issue when `NetworkTransform` half float precision is enabled and ownership changes the current base position was not being synchronized. (#2948)
+- Fixed issue where `OnClientConnected` not being invoked on the session owner when connecting to a new distributed authority session. (#2948)
+- Fixed issue where Rigidbody micro-motion (i.e. relatively small velocities) would result in non-authority instances slightly stuttering as the body would come to a rest (i.e. no motion). Now, the threshold value can increase at higher velocities and can decrease slightly below the provided threshold to account for this. (#2948)
 
 ### Changed
 
-- Changed permissions exception thrown in `NetworkList` to exiting early with a logged error that is now a unified permissions message within `NetworkVariableBase`. (#3005)
-- Changed permissions exception thrown in `NetworkVariable.Value` to exiting early with a logged error that is now a unified permissions message within `NetworkVariableBase`. (#3005)
+- Changed `NetworkAnimator` no longer requires the `Animator` component to exist on the same `GameObject`. (#2957)
+- Changed `NetworkObjectReference` and `NetworkBehaviourReference` to allow null references when constructing and serializing. (#2957)
+- Changed the client's owned objects is now returned (`NetworkClient` and `NetworkSpawnManager`) as an array as opposed to a list for performance purposes. (#2948)
+- Changed `NetworkTransfrom.TryCommitTransformToServer` to be internal as it will be removed by the final 2.0.0 release. (#2948)
+- Changed `NetworkTransformEditor.OnEnable` to a virtual method to be able to customize a `NetworkTransform` derived class by creating a derived editor control from `NetworkTransformEditor`. (#2948)
+
+
+## [2.0.0-exp.5] - 2024-06-03
+
+### Added
+
+
+### Fixed
+
+- Fixed issue where SessionOwner message was being treated as a new entry for the new message indexing when it should have been ordinally sorted with the legacy message indices. (#2942)
+
+### Changed
+- Changed `FastBufferReader` and `FastBufferWriter` so that they always ensure the length of items serialized is always serialized as an `uint` and added a check before casting for safe reading and writing.(#2946)
 
 
-## [1.10.0] - 2024-07-22
+## [2.0.0-exp.4] - 2024-05-31
 
 ### Added
 
-- Added `NetworkBehaviour.OnNetworkPreSpawn` and `NetworkBehaviour.OnNetworkPostSpawn` methods that provide the ability to handle pre and post spawning actions during the `NetworkObject` spawn sequence. (#2906)
-- Added a client-side only `NetworkBehaviour.OnNetworkSessionSynchronized` convenience method that is invoked on all `NetworkBehaviour`s after a newly joined client has finished synchronizing with the network session in progress. (#2906)
-- Added `NetworkBehaviour.OnInSceneObjectsSpawned` convenience method that is invoked when all in-scene `NetworkObject`s have been spawned after a scene has been loaded or upon a host or server starting. (#2906)
+- Added `NetworkRigidbodyBase.AttachToFixedJoint` and `NetworkRigidbodyBase.DetachFromFixedJoint` to replace parenting for rigid bodies that have `NetworkRigidbodyBase.UseRigidBodyForMotion` enabled. (#2933)
+- Added `NetworkBehaviour.OnNetworkPreSpawn` and `NetworkBehaviour.OnNetworkPostSpawn` methods that provide the ability to handle pre and post spawning actions during the `NetworkObject` spawn sequence. (#2912)
+- Added a client-side only `NetworkBehaviour.OnNetworkSessionSynchronized` convenience method that is invoked on all `NetworkBehaviour`s after a newly joined client has finished synchronizing with the network session in progress. (#2912)
+- Added `NetworkBehaviour.OnInSceneObjectsSpawned` convenience method that is invoked when all in-scene `NetworkObject`s have been spawned after a scene has been loaded or upon a host or server starting. (#2912)
 
 ### Fixed
 
-- Fixed issue where the realtime network stats monitor was not able to display RPC traffic in release builds due to those stats being only available in development builds or the editor. (#2980)
-- Fixed issue where `NetworkManager.ScenesLoaded` was not being updated if `PostSynchronizationSceneUnloading` was set and any loaded scenes not used during synchronization were unloaded.(#2977)
-- Fixed issue where internal delta serialization could not have a byte serializer defined when serializing deltas for other types. Added `[GenerateSerializationForType(typeof(byte))]` to both the `NetworkVariable` and `AnticipatedNetworkVariable` classes to assure a byte serializer is defined. (#2953)
-- Fixed issue with the client count not being correct on the host or server side when a client disconnects itself from a session. (#2941)
-- Fixed issue with the host trying to send itself a message that it has connected when first starting up. (#2941)
-- Fixed issue where in-scene placed NetworkObjects could be destroyed if a client disconnects early and/or before approval. (#2923)
-- Fixed issue where `NetworkDeltaPosition` would "jitter" periodically if both unreliable delta state updates and half-floats were used together. (#2922)
-- Fixed issue where `NetworkRigidbody2D` would not properly change body type based on the instance's authority when spawned. (#2916)
-- Fixed issue where a `NetworkObject` component's associated `NetworkBehaviour` components would not be detected if scene loading is disabled in the editor and the currently loaded scene has in-scene placed `NetworkObject`s. (#2906)
-- Fixed issue where an in-scene placed `NetworkObject` with `NetworkTransform` that is also parented under a `GameObject` would not properly synchronize when the parent `GameObject` had a world space position other than 0,0,0. (#2895)
+- Fixed issue where non-authoritative rigid bodies with `NetworkRigidbodyBase.UseRigidBodyForMotion` enabled would constantly log errors about the renderTime being before `StartTimeConsumed`. (#2933)
+- Fixed issue where in-scene placed NetworkObjects could be destroyed if a client disconnects early and/or before approval. (#2924)
+- Fixed issue where a `NetworkObject` component's associated `NetworkBehaviour` components would not be detected if scene loading is disabled in the editor and the currently loaded scene has in-scene placed `NetworkObject`s. (#2912)
+- Fixed issue where an in-scene placed `NetworkObject` with `NetworkTransform` that is also parented under a `GameObject` would not properly synchronize when the parent `GameObject` had a world space position other than 0,0,0. (#2898)
 
 ### Changed
 
+- Change all the access modifiers of test class from Public to Internal (#2930)
+- Changed messages are now sorted by enum values as opposed to ordinally sorting the messages by their type name. (#2929)
+- Changed `NetworkClient.SessionModeTypes` to `NetworkClient.NetworkTopologyTypes`. (#2875)
+- Changed `NetworkClient.SessionModeType` to `NetworkClient.NetworkTopologyType`. (#2875)
+- Changed `NetworkConfig.SessionMode` to `NeworkConfig.NetworkTopology`. (#2875)
+
+## [2.0.0-exp.2] - 2024-04-02
+
+### Added
+- Added updates to all internal messages to account for a distributed authority network session connection. (#2863)
+- Added `NetworkRigidbodyBase` that provides users with a more customizable network rigidbody, handles both `Rigidbody` and `Rigidbody2D`, and provides an option to make `NetworkTransform` use the rigid body for motion. (#2863)
+  - For a customized `NetworkRigidbodyBase` class:
+    - `NetworkRigidbodyBase.AutoUpdateKinematicState` provides control on whether the kinematic setting will be automatically set or not when ownership changes.
+    - `NetworkRigidbodyBase.AutoSetKinematicOnDespawn` provides control on whether isKinematic will automatically be set to true when the associated `NetworkObject` is despawned.
+    - `NetworkRigidbodyBase.Initialize` is a protected method that, when invoked, will initialize the instance. This includes options to:
+      - Set whether using a `RigidbodyTypes.Rigidbody` or `RigidbodyTypes.Rigidbody2D`.
+      - Includes additional optional parameters to set the `NetworkTransform`, `Rigidbody`, and `Rigidbody2d` to use.
+  - Provides additional public methods:
+    - `NetworkRigidbodyBase.GetPosition` to return the position of the `Rigidbody` or `Rigidbody2d` (depending upon its initialized setting).
+    - `NetworkRigidbodyBase.GetRotation` to return the rotation of the `Rigidbody` or `Rigidbody2d` (depending upon its initialized setting).
+    - `NetworkRigidbodyBase.MovePosition` to move to the position of the `Rigidbody` or `Rigidbody2d` (depending upon its initialized setting).
+    - `NetworkRigidbodyBase.MoveRotation` to move to the rotation of the `Rigidbody` or `Rigidbody2d` (depending upon its initialized setting).
+    - `NetworkRigidbodyBase.Move` to move to the position and rotation of the `Rigidbody` or `Rigidbody2d` (depending upon its initialized setting).
+    - `NetworkRigidbodyBase.Move` to move to the position and rotation of the `Rigidbody` or `Rigidbody2d` (depending upon its initialized setting).
+    - `NetworkRigidbodyBase.SetPosition` to set the position of the `Rigidbody` or `Rigidbody2d` (depending upon its initialized setting).
+    - `NetworkRigidbodyBase.SetRotation` to set the rotation of the `Rigidbody` or `Rigidbody2d` (depending upon its initialized setting).
+    - `NetworkRigidbodyBase.ApplyCurrentTransform` to set the position and rotation of the `Rigidbody` or `Rigidbody2d` based on the associated `GameObject` transform (depending upon its initialized setting).
+    - `NetworkRigidbodyBase.WakeIfSleeping` to wake up the rigid body if sleeping.
+    - `NetworkRigidbodyBase.SleepRigidbody` to put the rigid body to sleep.
+    - `NetworkRigidbodyBase.IsKinematic` to determine if the `Rigidbody` or `Rigidbody2d` (depending upon its initialized setting) is currently kinematic.
+    - `NetworkRigidbodyBase.SetIsKinematic` to set the `Rigidbody` or `Rigidbody2d` (depending upon its initialized setting) current kinematic state.
+    - `NetworkRigidbodyBase.ResetInterpolation` to reset the `Rigidbody` or `Rigidbody2d` (depending upon its initialized setting) back to its original interpolation value when initialized.
+  - Now includes a `MonoBehaviour.FixedUpdate` implementation that will update the assigned `NetworkTransform` when `NetworkRigidbodyBase.UseRigidBodyForMotion` is true. (#2863)
+- Added `RigidbodyContactEventManager` that provides a more optimized way to process collision enter and collision stay events as opposed to the `Monobehaviour` approach. (#2863)
+  - Can be used in client-server and distributed authority modes, but is particularly useful in distributed authority.
+- Added rigid body motion updates to `NetworkTransform` which allows users to set interolation on rigid bodies. (#2863)
+  - Extrapolation is only allowed on authoritative instances, but custom class derived from `NetworkRigidbodyBase` or `NetworkRigidbody` or `NetworkRigidbody2D` automatically switches non-authoritative instances to interpolation if set to extrapolation.
+- Added distributed authority mode support to `NetworkAnimator`. (#2863)
+- Added session mode selection to `NetworkManager` inspector view. (#2863)
+- Added distributed authority permissions feature. (#2863)
+- Added distributed authority mode specific `NetworkObject` permissions flags (Distributable, Transferable, and RequestRequired). (#2863)
+- Added distributed authority mode specific `NetworkObject.SetOwnershipStatus` method that applies one or more `NetworkObject` instance's ownership flags. If updated when spawned, the ownership permission changes are synchronized with the other connected clients. (#2863)
+- Added distributed authority mode specific `NetworkObject.RemoveOwnershipStatus` method that removes one or more `NetworkObject` instance's ownership flags. If updated when spawned, the ownership permission changes are synchronized with the other connected clients. (#2863)
+- Added distributed authority mode specific `NetworkObject.HasOwnershipStatus` method that will return (true or false) whether one or more ownership flags is set. (#2863)
+- Added distributed authority mode specific `NetworkObject.SetOwnershipLock` method that locks ownership of a `NetworkObject` to prevent ownership from changing until the current owner releases the lock. (#2863)
+- Added distributed authority mode specific `NetworkObject.RequestOwnership` method that sends an ownership request to the current owner of a spawned `NetworkObject` instance. (#2863)
+- Added distributed authority mode specific `NetworkObject.OnOwnershipRequested` callback handler that is invoked on the owner/authoritative side when a non-owner requests ownership. Depending upon the boolean returned value depends upon whether the request is approved or denied. (#2863)
+- Added distributed authority mode specific `NetworkObject.OnOwnershipRequestResponse` callback handler that is invoked when a non-owner's request has been processed. This callback includes a `NetworkObjet.OwnershipRequestResponseStatus` response parameter that describes whether the request was approved or the reason why it was not approved. (#2863)
+- Added distributed authority mode specific `NetworkObject.DeferDespawn` method that defers the despawning of `NetworkObject` instances on non-authoritative clients based on the tick offset parameter. (#2863)
+- Added distributed authority mode specific `NetworkObject.OnDeferredDespawnComplete` callback handler that can be used to further control when deferring the despawning of a `NetworkObject` on non-authoritative instances. (#2863)
+- Added `NetworkClient.SessionModeType` as one way to determine the current session mode of the network session a client is connected to. (#2863)
+- Added distributed authority mode specific `NetworkClient.IsSessionOwner` property to determine if the current local client is the current session owner of a distributed authority session. (#2863)
+- Added distributed authority mode specific client side spawning capabilities. When running in distributed authority mode, clients can instantiate and spawn `NetworkObject` instances (the local client is automatically the owner of the spawned object). (#2863)
+  - This is useful to better visually synchronize owner authoritative motion models and newly spawned `NetworkObject` instances (i.e. projectiles for example).
+- Added distributed authority mode specific client side player spawning capabilities. Clients will automatically spawn their associated player object locally. (#2863)
+- Added distributed authority mode specific `NetworkConfig.AutoSpawnPlayerPrefabClientSide` property (default is true) to provide control over the automatic spawning of player prefabs on the local client side. (#2863)
+- Added distributed authority mode specific `NetworkManager.OnFetchLocalPlayerPrefabToSpawn` callback that, when assigned, will allow the local client to provide the player prefab to be spawned for the local client. (#2863)
+  - This is only invoked if the `NetworkConfig.AutoSpawnPlayerPrefabClientSide` property is set to true.
+- Added distributed authority mode specific `NetworkBehaviour.HasAuthority` property that determines if the local client has authority over the associated `NetworkObject` instance (typical use case is within a `NetworkBehaviour` script much like that of `IsServer` or `IsClient`). (#2863)
+- Added distributed authority mode specific `NetworkBehaviour.IsSessionOwner` property that determines if the local client is the session owner (typical use case would be to determine if the local client can has scene management authority within a `NetworkBehaviour` script). (#2863)
+- Added support for distributed authority mode scene management where the currently assigned session owner can start scene events (i.e. scene loading and scene unloading). (#2863)
+
+### Fixed
+
+- Fixed issue where the host was not invoking `OnClientDisconnectCallback` for its own local client when internally shutting down. (#2822)
+- Fixed issue where NetworkTransform could potentially attempt to "unregister" a named message prior to it being registered. (#2807)
+- Fixed issue where in-scene placed `NetworkObject`s with complex nested children `NetworkObject`s (more than one child in depth) would not synchronize properly if WorldPositionStays was set to true. (#2796)
+
+### Changed
+- Changed client side awareness of other clients is now the same as a server or host. (#2863)
+- Changed `NetworkManager.ConnectedClients` can now be accessed by both server and clients. (#2863)
+- Changed `NetworkManager.ConnectedClientsList` can now be accessed by both server and clients. (#2863)
+- Changed `NetworkTransform` defaults to owner authoritative when connected to a distributed authority session. (#2863)
+- Changed `NetworkVariable` defaults to owner write and everyone read permissions when connected to a distributed authority session (even if declared with server read or write permissions).  (#2863)
+- Changed `NetworkObject` no longer implements the `MonoBehaviour.Update` method in order to determine whether a `NetworkObject` instance has been migrated to a different scene. Instead, only `NetworkObjects` with the `SceneMigrationSynchronization` property set will be updated internally during the `NetworkUpdateStage.PostLateUpdate` by `NetworkManager`. (#2863)
+- Changed `NetworkManager` inspector view layout where properties are now organized by category. (#2863)
+- Changed `NetworkTransform` to now use `NetworkTransformMessage` as opposed to named messages for NetworkTransformState updates. (#2810)
+- Changed `CustomMessageManager` so it no longer attempts to register or "unregister" a null or empty string and will log an error if this condition occurs. (#2807)
 
 ## [1.9.1] - 2024-04-18
 
 ### Added
-- Added AnticipatedNetworkVariable<T>, which adds support for client anticipation of NetworkVariable values, allowing for more responsive gameplay (#2820)
-- Added AnticipatedNetworkTransform, which adds support for client anticipation of NetworkTransforms (#2820)
-- Added NetworkVariableBase.ExceedsDirtinessThreshold to allow network variables to throttle updates by only sending updates when the difference between the current and previous values exceeds a threshold. (This is exposed in NetworkVariable<T> with the callback NetworkVariable<T>.CheckExceedsDirtinessThreshold) (#2820)
-- Added NetworkVariableUpdateTraits, which add additional throttling support: MinSecondsBetweenUpdates will prevent the NetworkVariable from sending updates more often than the specified time period (even if it exceeds the dirtiness threshold), while MaxSecondsBetweenUpdates will force a dirty NetworkVariable to send an update after the specified time period even if it has not yet exceeded the dirtiness threshold. (#2820)
-- Added virtual method NetworkVariableBase.OnInitialize() which can be used by NetworkVariable subclasses to add initialization code (#2820)
-- Added virtual method NetworkVariableBase.Update(), which is called once per frame to support behaviors such as interpolation between an anticipated value and an authoritative one. (#2820)
-- Added NetworkTime.TickWithPartial, which represents the current tick as a double that includes the fractional/partial tick value. (#2820)
+- Added `AnticipatedNetworkVariable<T>`, which adds support for client anticipation of NetworkVariable values, allowing for more responsive game play (#2820)
+- Added `AnticipatedNetworkTransform`, which adds support for client anticipation of `NetworkTransform`s (#2820)
+- Added `NetworkVariableBase.ExceedsDirtinessThreshold` to allow network variables to throttle updates by only sending updates when the difference between the current and previous values exceeds a threshold. (This is exposed in NetworkVariable<T> with the callback NetworkVariable<T>.CheckExceedsDirtinessThreshold) (#2820)
+- Added `NetworkVariableUpdateTraits`, which add additional throttling support: `MinSecondsBetweenUpdates` will prevent the `NetworkVariable` from sending updates more often than the specified time period (even if it exceeds the dirtiness threshold), while `MaxSecondsBetweenUpdates` will force a dirty `NetworkVariable` to send an update after the specified time period even if it has not yet exceeded the dirtiness threshold. (#2820)
+- Added virtual method `NetworkVariableBase.OnInitialize()` which can be used by `NetworkVariable` subclasses to add initialization code (#2820)
+- Added virtual method `NetworkVariableBase.Update()`, which is called once per frame to support behaviors such as interpolation between an anticipated value and an authoritative one. (#2820)
+- Added `NetworkTime.TickWithPartial`, which represents the current tick as a double that includes the fractional/partial tick value. (#2820)
 - `NetworkVariable` now includes built-in support for `NativeHashSet`, `NativeHashMap`, `List`, `HashSet`, and `Dictionary` (#2813)
 - `NetworkVariable` now includes delta compression for collection values (`NativeList`, `NativeArray`, `NativeHashSet`, `NativeHashMap`, `List`, `HashSet`, `Dictionary`, and `FixedString` types) to save bandwidth by only sending the values that changed. (Note: For `NativeList`, `NativeArray`, and `List`, this algorithm works differently than that used in `NetworkList`. This algorithm will use less bandwidth for "set" and "add" operations, but `NetworkList` is more bandwidth-efficient if you are performing frequent "insert" operations.) (#2813)
 - `UserNetworkVariableSerialization` now has optional callbacks for `WriteDelta` and `ReadDelta`. If both are provided, they will be used for all serialization operations on NetworkVariables of that type except for the first one for each client. If either is missing, the existing `Write` and `Read` will always be used. (#2813)
@@ -89,7 +358,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
 
 ### Fixed
 
-- Fixed issue where NetworkTransformEditor would throw and exception if you excluded the physics package. (#2871)
+- Fixed issue where `NetworkTransformEditor` would throw and exception if you excluded the physics package. (#2871)
 - Fixed issue where `NetworkTransform` could not properly synchronize its base position when using half float precision. (#2845)
 - Fixed issue where the host was not invoking `OnClientDisconnectCallback` for its own local client when internally shutting down. (#2822)
 - Fixed issue where NetworkTransform could potentially attempt to "unregister" a named message prior to it being registered. (#2807)
@@ -139,6 +408,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
 - Fixed issue where  you could not have multiple source network prefab overrides targeting the same network prefab as their override. (#2710)
 
 ### Changed
+
 - Changed the server or host shutdown so it will now perform a "soft shutdown" when `NetworkManager.Shutdown` is invoked. This will send a disconnect notification to all connected clients and the server-host will wait for all connected clients to disconnect or timeout after a 5 second period before completing the shutdown process. (#2789)
 - Changed `OnClientDisconnectedCallback` will now return the assigned client identifier on the local client side if the client was approved and assigned one prior to being disconnected. (#2789)
 - Changed `NetworkTransform.SetState` (and related methods) now are cumulative during a fractional tick period and sent on the next pending tick. (#2777)
@@ -151,6 +421,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
 - Changed in-scene placed `NetworkObject`s now set their `IsSceneObject` value when generating their `GlobalObjectIdHash` value. (#2710)
 - Changed the default `NetworkConfig.SpawnTimeout` value from 1.0s to 10.0s. (#2710)
 
+
 ## [1.7.1] - 2023-11-15
 
 ### Added
@@ -200,7 +471,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
 ### Added
 
 - Added a protected virtual method `NetworkTransform.OnInitialize(ref NetworkTransformState replicatedState)` that just returns the replicated state reference.
-  
+
 ### Fixed
 
 - Fixed issue where invoking `NetworkManager.Shutdown` within `NetworkManager.OnClientStopped` or `NetworkManager.OnServerStopped` would force `NetworkManager.ShutdownInProgress` to remain true after completing the shutdown process. (#2661)
@@ -258,7 +529,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
 - Fixed issue where invalid endpoint addresses were not being detected and returning false from NGO UnityTransport. (#2496)
 - Fixed some errors that could occur if a connection is lost and the loss is detected when attempting to write to the socket. (#2495)
 
-## Changed
+### Changed
 
 - Adding network prefabs before NetworkManager initialization is now supported. (#2565)
 - Connecting clients being synchronized now switch to the server's active scene before spawning and synchronizing NetworkObjects. (#2532)
diff --git a/com.unity.netcode.gameobjects/Components/AnticipatedNetworkTransform.cs.meta b/com.unity.netcode.gameobjects/Components/AnticipatedNetworkTransform.cs.meta
deleted file mode 100644
index 1adaf3380e..0000000000
--- a/com.unity.netcode.gameobjects/Components/AnticipatedNetworkTransform.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 97616b67982a4be48d957d421e422433
-timeCreated: 1705597211
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Components/AssemblyInfo.cs b/com.unity.netcode.gameobjects/Components/AssemblyInfo.cs
deleted file mode 100644
index dca734793c..0000000000
--- a/com.unity.netcode.gameobjects/Components/AssemblyInfo.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System.Runtime.CompilerServices;
-
-#if UNITY_EDITOR
-[assembly: InternalsVisibleTo("Unity.Netcode.Editor")]
-[assembly: InternalsVisibleTo("Unity.Netcode.Editor.CodeGen")]
-#endif // UNITY_EDITOR
-
-#if UNITY_INCLUDE_TESTS
-[assembly: InternalsVisibleTo("Unity.Netcode.RuntimeTests")]
-[assembly: InternalsVisibleTo("TestProject.RuntimeTests")]
-#if UNITY_EDITOR
-[assembly: InternalsVisibleTo("Unity.Netcode.EditorTests")]
-[assembly: InternalsVisibleTo("TestProject.EditorTests")]
-#endif // UNITY_EDITOR
-#endif // UNITY_INCLUDE_TESTS
diff --git a/com.unity.netcode.gameobjects/Components/Interpolator/BufferedLinearInterpolator.cs b/com.unity.netcode.gameobjects/Components/Interpolator/BufferedLinearInterpolator.cs
deleted file mode 100644
index a9389424cc..0000000000
--- a/com.unity.netcode.gameobjects/Components/Interpolator/BufferedLinearInterpolator.cs
+++ /dev/null
@@ -1,390 +0,0 @@
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace Unity.Netcode
-{
-    /// <summary>
-    /// Solves for incoming values that are jittered
-    /// Partially solves for message loss. Unclamped lerping helps hide this, but not completely
-    /// </summary>
-    /// <typeparam name="T">The type of interpolated value</typeparam>
-    public abstract class BufferedLinearInterpolator<T> where T : struct
-    {
-        internal float MaxInterpolationBound = 3.0f;
-        private struct BufferedItem
-        {
-            public T Item;
-            public double TimeSent;
-
-            public BufferedItem(T item, double timeSent)
-            {
-                Item = item;
-                TimeSent = timeSent;
-            }
-        }
-
-        /// <summary>
-        /// There's two factors affecting interpolation: buffering (set in NetworkManager's NetworkTimeSystem) and interpolation time, which is the amount of time it'll take to reach the target. This is to affect the second one.
-        /// </summary>
-        public float MaximumInterpolationTime = 0.1f;
-
-        private const double k_SmallValue = 9.999999439624929E-11; // copied from Vector3's equal operator
-
-        private T m_InterpStartValue;
-        private T m_CurrentInterpValue;
-        private T m_InterpEndValue;
-
-        private double m_EndTimeConsumed;
-        private double m_StartTimeConsumed;
-
-        private readonly List<BufferedItem> m_Buffer = new List<BufferedItem>(k_BufferCountLimit);
-
-        // Buffer consumption scenarios
-        // Perfect case consumption
-        // | 1 | 2 | 3 |
-        // | 2 | 3 | 4 | consume 1
-        // | 3 | 4 | 5 | consume 2
-        // | 4 | 5 | 6 | consume 3
-        // | 5 | 6 | 7 | consume 4
-        // jittered case
-        // | 1 | 2 | 3 |
-        // | 2 | 3 |   | consume 1
-        // | 3 |   |   | consume 2
-        // | 4 | 5 | 6 | consume 3
-        // | 5 | 6 | 7 | consume 4
-        // bursted case (assuming max count is 5)
-        // | 1 | 2 | 3 |
-        // | 2 | 3 |   | consume 1
-        // | 3 |   |   | consume 2
-        // |   |   |   | consume 3
-        // |   |   |   |
-        // | 4 | 5 | 6 | 7 | 8 | --> consume all and teleport to last value <8> --> this is the nuclear option, ideally this example would consume 4 and 5
-        // instead of jumping to 8, but since in OnValueChange we don't yet have an updated server time (updated in pre-update) to know which value
-        // we should keep and which we should drop, we don't have enough information to do this. Another thing would be to not have the burst in the first place.
-
-        // Constant absolute value for max buffer count instead of dynamic time based value. This is in case we have very low tick rates, so
-        // that we don't have a very small buffer because of this.
-        private const int k_BufferCountLimit = 100;
-        private BufferedItem m_LastBufferedItemReceived;
-        private int m_NbItemsReceivedThisFrame;
-
-        private int m_LifetimeConsumedCount;
-
-        private bool InvalidState => m_Buffer.Count == 0 && m_LifetimeConsumedCount == 0;
-
-        /// <summary>
-        /// Resets interpolator to initial state
-        /// </summary>
-        public void Clear()
-        {
-            m_Buffer.Clear();
-            m_EndTimeConsumed = 0.0d;
-            m_StartTimeConsumed = 0.0d;
-        }
-
-        /// <summary>
-        /// Teleports current interpolation value to targetValue.
-        /// </summary>
-        /// <param name="targetValue">The target value to teleport instantly</param>
-        /// <param name="serverTime">The current server time</param>
-        public void ResetTo(T targetValue, double serverTime)
-        {
-            m_LifetimeConsumedCount = 1;
-            m_InterpStartValue = targetValue;
-            m_InterpEndValue = targetValue;
-            m_CurrentInterpValue = targetValue;
-            m_Buffer.Clear();
-            m_EndTimeConsumed = 0.0d;
-            m_StartTimeConsumed = 0.0d;
-
-            Update(0, serverTime, serverTime);
-        }
-
-        // todo if I have value 1, 2, 3 and I'm treating 1 to 3, I shouldn't interpolate between 1 and 3, I should interpolate from 1 to 2, then from 2 to 3 to get the best path
-        private void TryConsumeFromBuffer(double renderTime, double serverTime)
-        {
-            int consumedCount = 0;
-            // only consume if we're ready
-
-            //  this operation was measured as one of our most expensive, and we should put some thought into this.
-            //   NetworkTransform has (currently) 7 buffered linear interpolators (3 position, 3 scale, 1 rot), and
-            //   each has its own independent buffer and 'm_endTimeConsume'.  That means every frame I have to do 7x
-            //   these checks vs. if we tracked these values in a unified way
-            if (renderTime >= m_EndTimeConsumed)
-            {
-                BufferedItem? itemToInterpolateTo = null;
-                // assumes we're using sequenced messages for netvar syncing
-                // buffer contains oldest values first, iterating from end to start to remove elements from list while iterating
-
-                // calling m_Buffer.Count shows up hot in the profiler.
-                for (int i = m_Buffer.Count - 1; i >= 0; i--) // todo stretch: consume ahead if we see we're missing values due to packet loss
-                {
-                    var bufferedValue = m_Buffer[i];
-                    // Consume when ready and interpolate to last value we can consume. This can consume multiple values from the buffer
-                    if (bufferedValue.TimeSent <= serverTime)
-                    {
-                        if (!itemToInterpolateTo.HasValue || bufferedValue.TimeSent > itemToInterpolateTo.Value.TimeSent)
-                        {
-                            if (m_LifetimeConsumedCount == 0)
-                            {
-                                // if interpolator not initialized, teleport to first value when available
-                                m_StartTimeConsumed = bufferedValue.TimeSent;
-                                m_InterpStartValue = bufferedValue.Item;
-                            }
-                            else if (consumedCount == 0)
-                            {
-                                // Interpolating to new value, end becomes start. We then look in our buffer for a new end.
-                                m_StartTimeConsumed = m_EndTimeConsumed;
-                                m_InterpStartValue = m_InterpEndValue;
-                            }
-
-                            if (bufferedValue.TimeSent > m_EndTimeConsumed)
-                            {
-                                itemToInterpolateTo = bufferedValue;
-                                m_EndTimeConsumed = bufferedValue.TimeSent;
-                                m_InterpEndValue = bufferedValue.Item;
-                            }
-                        }
-
-                        m_Buffer.RemoveAt(i);
-                        consumedCount++;
-                        m_LifetimeConsumedCount++;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Convenience version of 'Update' mainly for testing
-        ///  the reason we don't want to always call this version is so that on the calling side we can compute
-        ///  the renderTime once for the many things being interpolated (and the many interpolators per object)
-        /// </summary>
-        /// <param name="deltaTime">time since call</param>
-        /// <param name="serverTime">current server time</param>
-        /// <returns>The newly interpolated value of type 'T'</returns>
-        public T Update(float deltaTime, NetworkTime serverTime)
-        {
-            return Update(deltaTime, serverTime.TimeTicksAgo(1).Time, serverTime.Time);
-        }
-
-        /// <summary>
-        /// Call to update the state of the interpolators before reading out
-        /// </summary>
-        /// <param name="deltaTime">time since last call</param>
-        /// <param name="renderTime">our current time</param>
-        /// <param name="serverTime">current server time</param>
-        /// <returns>The newly interpolated value of type 'T'</returns>
-        public T Update(float deltaTime, double renderTime, double serverTime)
-        {
-            TryConsumeFromBuffer(renderTime, serverTime);
-
-            if (InvalidState)
-            {
-                throw new InvalidOperationException("trying to update interpolator when no data has been added to it yet");
-            }
-
-            // Interpolation example to understand the math below
-            // 4   4.5      6   6.5
-            // |   |        |   |
-            // A   render   B   Server
-
-            if (m_LifetimeConsumedCount >= 1) // shouldn't interpolate between default values, let's wait to receive data first, should only interpolate between real measurements
-            {
-                float t = 1.0f;
-                double range = m_EndTimeConsumed - m_StartTimeConsumed;
-                if (range > k_SmallValue)
-                {
-                    t = (float)((renderTime - m_StartTimeConsumed) / range);
-
-                    if (t < 0.0f)
-                    {
-                        // There is no mechanism to guarantee renderTime to not be before m_StartTimeConsumed
-                        // This clamps t to a minimum of 0 and fixes issues with longer frames and pauses
-
-                        if (NetworkLog.CurrentLogLevel <= LogLevel.Developer)
-                        {
-                            NetworkLog.LogError($"renderTime was before m_StartTimeConsumed. This should never happen. {nameof(renderTime)} is {renderTime}, {nameof(m_StartTimeConsumed)} is {m_StartTimeConsumed}");
-                        }
-                        t = 0.0f;
-                    }
-
-                    if (t > MaxInterpolationBound) // max extrapolation
-                    {
-                        // TODO this causes issues with teleport, investigate
-                        t = 1.0f;
-                    }
-                }
-
-                var target = InterpolateUnclamped(m_InterpStartValue, m_InterpEndValue, t);
-                m_CurrentInterpValue = Interpolate(m_CurrentInterpValue, target, deltaTime / MaximumInterpolationTime); // second interpolate to smooth out extrapolation jumps
-            }
-
-            m_NbItemsReceivedThisFrame = 0;
-            return m_CurrentInterpValue;
-        }
-
-        /// <summary>
-        /// Add measurements to be used during interpolation. These will be buffered before being made available to be displayed as "latest value".
-        /// </summary>
-        /// <param name="newMeasurement">The new measurement value to use</param>
-        /// <param name="sentTime">The time to record for measurement</param>
-        public void AddMeasurement(T newMeasurement, double sentTime)
-        {
-            m_NbItemsReceivedThisFrame++;
-
-            // This situation can happen after a game is paused. When starting to receive again, the server will have sent a bunch of messages in the meantime
-            // instead of going through thousands of value updates just to get a big teleport, we're giving up on interpolation and teleporting to the latest value
-            if (m_NbItemsReceivedThisFrame > k_BufferCountLimit)
-            {
-                if (m_LastBufferedItemReceived.TimeSent < sentTime)
-                {
-                    m_LastBufferedItemReceived = new BufferedItem(newMeasurement, sentTime);
-                    ResetTo(newMeasurement, sentTime);
-                    // Next line keeps renderTime above m_StartTimeConsumed. Fixes pause/unpause issues
-                    m_Buffer.Add(m_LastBufferedItemReceived);
-                }
-
-                return;
-            }
-
-            // Part the of reason for disabling extrapolation is how we add and use measurements over time.
-            // TODO: Add detailed description of this area in Jira ticket
-            if (sentTime > m_EndTimeConsumed || m_LifetimeConsumedCount == 0) // treat only if value is newer than the one being interpolated to right now
-            {
-                m_LastBufferedItemReceived = new BufferedItem(newMeasurement, sentTime);
-                m_Buffer.Add(m_LastBufferedItemReceived);
-            }
-        }
-
-        /// <summary>
-        /// Gets latest value from the interpolator. This is updated every update as time goes by.
-        /// </summary>
-        /// <returns>The current interpolated value of type 'T'</returns>
-        public T GetInterpolatedValue()
-        {
-            return m_CurrentInterpValue;
-        }
-
-        /// <summary>
-        /// Method to override and adapted to the generic type. This assumes interpolation for that value will be clamped.
-        /// </summary>
-        /// <param name="start">The start value (min)</param>
-        /// <param name="end">The end value (max)</param>
-        /// <param name="time">The time value used to interpolate between start and end values (pos)</param>
-        /// <returns>The interpolated value</returns>
-        protected abstract T Interpolate(T start, T end, float time);
-
-        /// <summary>
-        /// Method to override and adapted to the generic type. This assumes interpolation for that value will not be clamped.
-        /// </summary>
-        /// <param name="start">The start value (min)</param>
-        /// <param name="end">The end value (max)</param>
-        /// <param name="time">The time value used to interpolate between start and end values (pos)</param>
-        /// <returns>The interpolated value</returns>
-        protected abstract T InterpolateUnclamped(T start, T end, float time);
-    }
-
-    /// <inheritdoc />
-    /// <remarks>
-    /// This is a buffered linear interpolator for a <see cref="float"/> type value
-    /// </remarks>
-    public class BufferedLinearInterpolatorFloat : BufferedLinearInterpolator<float>
-    {
-        /// <inheritdoc />
-        protected override float InterpolateUnclamped(float start, float end, float time)
-        {
-            // Disabling Extrapolation:
-            // TODO: Add Jira Ticket
-            return Mathf.Lerp(start, end, time);
-        }
-
-        /// <inheritdoc />
-        protected override float Interpolate(float start, float end, float time)
-        {
-            return Mathf.Lerp(start, end, time);
-        }
-    }
-
-    /// <inheritdoc />
-    /// <remarks>
-    /// This is a buffered linear interpolator for a <see cref="Quaternion"/> type value
-    /// </remarks>
-    public class BufferedLinearInterpolatorQuaternion : BufferedLinearInterpolator<Quaternion>
-    {
-        /// <summary>
-        /// Use <see cref="Quaternion.Slerp"/> when <see cref="true"/>.
-        /// Use <see cref="Quaternion.Lerp"/> when <see cref="false"/>
-        /// </summary>
-        /// <remarks>
-        /// When using half precision (due to the imprecision) using <see cref="Quaternion.Lerp"/> is
-        /// less processor intensive (i.e. precision is already "imprecise").
-        /// When using full precision (to maintain precision) using <see cref="Quaternion.Slerp"/> is
-        /// more processor intensive yet yields more precise results.
-        /// </remarks>
-        public bool IsSlerp;
-
-        /// <inheritdoc />
-        protected override Quaternion InterpolateUnclamped(Quaternion start, Quaternion end, float time)
-        {
-            if (IsSlerp)
-            {
-                return Quaternion.Slerp(start, end, time);
-            }
-            else
-            {
-                return Quaternion.Lerp(start, end, time);
-            }
-        }
-
-        /// <inheritdoc />
-        protected override Quaternion Interpolate(Quaternion start, Quaternion end, float time)
-        {
-            if (IsSlerp)
-            {
-                return Quaternion.Slerp(start, end, time);
-            }
-            else
-            {
-                return Quaternion.Lerp(start, end, time);
-            }
-        }
-    }
-
-    /// <summary>
-    /// A <see cref="BufferedLinearInterpolator<T>"/> <see cref="Vector3"/> implementation.
-    /// </summary>
-    public class BufferedLinearInterpolatorVector3 : BufferedLinearInterpolator<Vector3>
-    {
-        /// <summary>
-        /// Use <see cref="Vector3.Slerp"/> when <see cref="true"/>.
-        /// Use <see cref="Vector3.Lerp"/> when <see cref="false"/>
-        /// </summary>
-        public bool IsSlerp;
-        /// <inheritdoc />
-        protected override Vector3 InterpolateUnclamped(Vector3 start, Vector3 end, float time)
-        {
-            if (IsSlerp)
-            {
-                return Vector3.Slerp(start, end, time);
-            }
-            else
-            {
-                return Vector3.Lerp(start, end, time);
-            }
-        }
-
-        /// <inheritdoc />
-        protected override Vector3 Interpolate(Vector3 start, Vector3 end, float time)
-        {
-            if (IsSlerp)
-            {
-                return Vector3.Slerp(start, end, time);
-            }
-            else
-            {
-                return Vector3.Lerp(start, end, time);
-            }
-        }
-    }
-}
diff --git a/com.unity.netcode.gameobjects/Components/Messages/NetworkTransformMessage.cs b/com.unity.netcode.gameobjects/Components/Messages/NetworkTransformMessage.cs
deleted file mode 100644
index 1cdd9fa613..0000000000
--- a/com.unity.netcode.gameobjects/Components/Messages/NetworkTransformMessage.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-using Unity.Netcode.Components;
-using UnityEngine;
-
-namespace Unity.Netcode
-{
-    /// <summary>
-    /// NetworkTransform State Update Message
-    /// </summary>
-    internal struct NetworkTransformMessage : INetworkMessage
-    {
-        public int Version => 0;
-        public ulong NetworkObjectId;
-        public int NetworkBehaviourId;
-        public NetworkTransform.NetworkTransformState State;
-
-        private NetworkTransform m_ReceiverNetworkTransform;
-        private FastBufferReader m_CurrentReader;
-
-        private unsafe void CopyPayload(ref FastBufferWriter writer)
-        {
-            writer.WriteBytesSafe(m_CurrentReader.GetUnsafePtrAtCurrentPosition(), m_CurrentReader.Length - m_CurrentReader.Position);
-        }
-
-        public void Serialize(FastBufferWriter writer, int targetVersion)
-        {
-            if (m_CurrentReader.IsInitialized)
-            {
-                CopyPayload(ref writer);
-            }
-            else
-            {
-                BytePacker.WriteValueBitPacked(writer, NetworkObjectId);
-                BytePacker.WriteValueBitPacked(writer, NetworkBehaviourId);
-                writer.WriteNetworkSerializable(State);
-            }
-        }
-
-        public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int receivedMessageVersion)
-        {
-            var networkManager = context.SystemOwner as NetworkManager;
-            if (networkManager == null)
-            {
-                Debug.LogError($"[{nameof(NetworkTransformMessage)}] System owner context was not of type {nameof(NetworkManager)}!");
-                return false;
-            }
-            var currentPosition = reader.Position;
-            ByteUnpacker.ReadValueBitPacked(reader, out NetworkObjectId);
-            if (!networkManager.SpawnManager.SpawnedObjects.ContainsKey(NetworkObjectId))
-            {
-                networkManager.DeferredMessageManager.DeferMessage(IDeferredNetworkMessageManager.TriggerType.OnSpawn, NetworkObjectId, reader, ref context);
-                return false;
-            }
-            // Get the behaviour index
-            ByteUnpacker.ReadValueBitPacked(reader, out NetworkBehaviourId);
-
-            // Deserialize the state
-            reader.ReadNetworkSerializable(out State);
-
-            var networkObject = networkManager.SpawnManager.SpawnedObjects[NetworkObjectId];
-
-            // Get the target NetworkTransform
-            m_ReceiverNetworkTransform = networkObject.ChildNetworkBehaviours[NetworkBehaviourId] as NetworkTransform;
-
-            var isServerAuthoritative = m_ReceiverNetworkTransform.IsServerAuthoritative();
-            var ownerAuthoritativeServerSide = !isServerAuthoritative && networkManager.IsServer;
-            if (ownerAuthoritativeServerSide)
-            {
-                var ownerClientId = networkObject.OwnerClientId;
-                if (ownerClientId == NetworkManager.ServerClientId)
-                {
-                    // Ownership must have changed, ignore any additional pending messages that might have
-                    // come from a previous owner client.
-                    return true;
-                }
-
-                var networkDelivery = State.IsReliableStateUpdate() ? NetworkDelivery.ReliableSequenced : NetworkDelivery.UnreliableSequenced;
-
-                // Forward the state update if there are any remote clients to foward it to
-                if (networkManager.ConnectionManager.ConnectedClientsList.Count > (networkManager.IsHost ? 2 : 1))
-                {
-                    // This is only to copy the existing and already serialized struct for forwarding purposes only.
-                    // This will not include any changes made to this struct at this particular stage of processing the message.
-                    var currentMessage = this;
-                    // Create a new reader that replicates this message
-                    currentMessage.m_CurrentReader = new FastBufferReader(reader, Collections.Allocator.None);
-                    // Rewind the new reader to the beginning of the message's payload
-                    currentMessage.m_CurrentReader.Seek(currentPosition);
-                    // Forward the message to all connected clients that are observers of the associated NetworkObject
-                    var clientCount = networkManager.ConnectionManager.ConnectedClientsList.Count;
-                    for (int i = 0; i < clientCount; i++)
-                    {
-                        var clientId = networkManager.ConnectionManager.ConnectedClientsList[i].ClientId;
-                        if (NetworkManager.ServerClientId == clientId || (!isServerAuthoritative && clientId == ownerClientId) || !networkObject.Observers.Contains(clientId))
-                        {
-                            continue;
-                        }
-                        networkManager.MessageManager.SendMessage(ref currentMessage, networkDelivery, clientId);
-                    }
-                    // Dispose of the reader used for forwarding
-                    currentMessage.m_CurrentReader.Dispose();
-                }
-            }
-            return true;
-        }
-
-        public void Handle(ref NetworkContext context)
-        {
-            if (m_ReceiverNetworkTransform == null)
-            {
-                Debug.LogError($"[{nameof(NetworkTransformMessage)}][Dropped] Reciever {nameof(NetworkTransform)} was not set!");
-                return;
-            }
-            m_ReceiverNetworkTransform.TransformStateUpdate(ref State);
-        }
-    }
-}
diff --git a/com.unity.netcode.gameobjects/Components/NetworkRigidbody.cs b/com.unity.netcode.gameobjects/Components/NetworkRigidbody.cs
deleted file mode 100644
index bebaf79751..0000000000
--- a/com.unity.netcode.gameobjects/Components/NetworkRigidbody.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-#if COM_UNITY_MODULES_PHYSICS
-using UnityEngine;
-
-namespace Unity.Netcode.Components
-{
-    /// <summary>
-    /// NetworkRigidbody allows for the use of <see cref="Rigidbody"/> on network objects. By controlling the kinematic
-    /// mode of the <see cref="Rigidbody"/> and disabling it on all peers but the authoritative one.
-    /// </summary>
-    [RequireComponent(typeof(Rigidbody))]
-    [RequireComponent(typeof(NetworkTransform))]
-    [AddComponentMenu("Netcode/Network Rigidbody")]
-    public class NetworkRigidbody : NetworkBehaviour
-    {
-        /// <summary>
-        /// Determines if we are server (true) or owner (false) authoritative
-        /// </summary>
-        private bool m_IsServerAuthoritative;
-
-        private Rigidbody m_Rigidbody;
-        private NetworkTransform m_NetworkTransform;
-        private RigidbodyInterpolation m_OriginalInterpolation;
-
-        // Used to cache the authority state of this Rigidbody during the last frame
-        private bool m_IsAuthority;
-
-        private void Awake()
-        {
-            m_NetworkTransform = GetComponent<NetworkTransform>();
-            m_IsServerAuthoritative = m_NetworkTransform.IsServerAuthoritative();
-
-            SetupRigidBody();
-        }
-
-        /// <summary>
-        /// If the current <see cref="NetworkTransform"/> has authority,
-        /// then use the <see cref="RigidBody"/> interpolation strategy,
-        /// if the <see cref="NetworkTransform"/> is handling interpolation,
-        /// set interpolation to none on the <see cref="RigidBody"/>
-        /// <br/>
-        /// Turn off physics for the rigid body until spawned, otherwise
-        /// clients can run fixed update before the first
-        /// full <see cref="NetworkTransform"/> update
-        /// </summary>
-        private void SetupRigidBody()
-        {
-            m_Rigidbody = GetComponent<Rigidbody>();
-            m_OriginalInterpolation = m_Rigidbody.interpolation;
-
-            m_Rigidbody.interpolation = m_IsAuthority ? m_OriginalInterpolation : (m_NetworkTransform.Interpolate ? RigidbodyInterpolation.None : m_OriginalInterpolation);
-            m_Rigidbody.isKinematic = true;
-        }
-
-        /// <summary>
-        /// For owner authoritative (i.e. ClientNetworkTransform)
-        /// we adjust our authority when we gain ownership
-        /// </summary>
-        public override void OnGainedOwnership()
-        {
-            UpdateOwnershipAuthority();
-        }
-
-        /// <summary>
-        /// For owner authoritative(i.e. ClientNetworkTransform)
-        /// we adjust our authority when we have lost ownership
-        /// </summary>
-        public override void OnLostOwnership()
-        {
-            UpdateOwnershipAuthority();
-        }
-
-        /// <summary>
-        /// Sets the authority differently depending upon
-        /// whether it is server or owner authoritative
-        /// </summary>
-        private void UpdateOwnershipAuthority()
-        {
-            if (m_IsServerAuthoritative)
-            {
-                m_IsAuthority = NetworkManager.IsServer;
-            }
-            else
-            {
-                m_IsAuthority = IsOwner;
-            }
-
-            // If you have authority then you are not kinematic
-            m_Rigidbody.isKinematic = !m_IsAuthority;
-
-            // Set interpolation of the Rigidbody based on authority
-            // With authority: let local transform handle interpolation
-            // Without authority: let the NetworkTransform handle interpolation
-            m_Rigidbody.interpolation = m_IsAuthority ? m_OriginalInterpolation : RigidbodyInterpolation.None;
-        }
-
-        /// <inheritdoc />
-        public override void OnNetworkSpawn()
-        {
-            UpdateOwnershipAuthority();
-        }
-
-        /// <inheritdoc />
-        public override void OnNetworkDespawn()
-        {
-            m_Rigidbody.interpolation = m_OriginalInterpolation;
-            // Turn off physics for the rigid body until spawned, otherwise
-            // non-owners can run fixed updates before the first full
-            // NetworkTransform update and physics will be applied (i.e. gravity, etc)
-            m_Rigidbody.isKinematic = true;
-        }
-    }
-}
-#endif // COM_UNITY_MODULES_PHYSICS
diff --git a/com.unity.netcode.gameobjects/Components/NetworkRigidbody2D.cs b/com.unity.netcode.gameobjects/Components/NetworkRigidbody2D.cs
deleted file mode 100644
index 4d7d4b153c..0000000000
--- a/com.unity.netcode.gameobjects/Components/NetworkRigidbody2D.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-#if COM_UNITY_MODULES_PHYSICS2D
-using UnityEngine;
-
-namespace Unity.Netcode.Components
-{
-    /// <summary>
-    /// NetworkRigidbody allows for the use of <see cref="Rigidbody2D"/> on network objects. By controlling the kinematic
-    /// mode of the rigidbody and disabling it on all peers but the authoritative one.
-    /// </summary>
-    [RequireComponent(typeof(Rigidbody2D))]
-    [RequireComponent(typeof(NetworkTransform))]
-    [AddComponentMenu("Netcode/Network Rigidbody 2D")]
-    public class NetworkRigidbody2D : NetworkBehaviour
-    {
-        /// <summary>
-        /// Determines if we are server (true) or owner (false) authoritative
-        /// </summary>
-        private bool m_IsServerAuthoritative;
-
-        private Rigidbody2D m_Rigidbody;
-        private NetworkTransform m_NetworkTransform;
-
-        private RigidbodyInterpolation2D m_OriginalInterpolation;
-
-        // Used to cache the authority state of this rigidbody during the last frame
-        private bool m_IsAuthority;
-
-        private void Awake()
-        {
-            m_NetworkTransform = GetComponent<NetworkTransform>();
-            m_IsServerAuthoritative = m_NetworkTransform.IsServerAuthoritative();
-
-            SetupRigidBody();
-        }
-
-        /// <summary>
-        /// If the current <see cref="NetworkTransform"/> has authority,
-        /// then use the <see cref="Rigidbody2D"/> interpolation strategy,
-        /// if the <see cref="NetworkTransform"/> is handling interpolation,
-        /// set interpolation to none on the <see cref="Rigidbody2D"/>
-        /// <br/>
-        /// Turn off physics for the rigid body until spawned, otherwise
-        /// clients can run fixed update before the first
-        /// full <see cref="NetworkTransform"/> update
-        /// </summary>
-        private void SetupRigidBody()
-        {
-            m_Rigidbody = GetComponent<Rigidbody2D>();
-            m_OriginalInterpolation = m_Rigidbody.interpolation;
-
-            m_Rigidbody.interpolation = m_IsAuthority ? m_OriginalInterpolation : (m_NetworkTransform.Interpolate ? RigidbodyInterpolation2D.None : m_OriginalInterpolation);
-            // Turn off physics for the rigid body until spawned, otherwise
-            // clients can run fixed update before the first full
-            // NetworkTransform update
-            m_Rigidbody.isKinematic = true;
-        }
-
-        /// <summary>
-        /// For owner authoritative (i.e. ClientNetworkTransform)
-        /// we adjust our authority when we gain ownership
-        /// </summary>
-        public override void OnGainedOwnership()
-        {
-            UpdateOwnershipAuthority();
-        }
-
-        /// <summary>
-        /// For owner authoritative(i.e. ClientNetworkTransform)
-        /// we adjust our authority when we have lost ownership
-        /// </summary>
-        public override void OnLostOwnership()
-        {
-            UpdateOwnershipAuthority();
-        }
-
-        /// <summary>
-        /// Sets the authority differently depending upon
-        /// whether it is server or owner authoritative
-        /// </summary>
-        private void UpdateOwnershipAuthority()
-        {
-            if (m_IsServerAuthoritative)
-            {
-                m_IsAuthority = NetworkManager.IsServer;
-            }
-            else
-            {
-                m_IsAuthority = IsOwner;
-            }
-
-            // If you have authority then you are not kinematic
-            m_Rigidbody.isKinematic = !m_IsAuthority;
-
-            // Set interpolation of the Rigidbody2D based on authority
-            // With authority: let local transform handle interpolation
-            // Without authority: let the NetworkTransform handle interpolation
-            m_Rigidbody.interpolation = m_IsAuthority ? m_OriginalInterpolation : RigidbodyInterpolation2D.None;
-        }
-
-        /// <inheritdoc />
-        public override void OnNetworkSpawn()
-        {
-            UpdateOwnershipAuthority();
-        }
-
-        /// <inheritdoc />
-        public override void OnNetworkDespawn()
-        {
-            UpdateOwnershipAuthority();
-        }
-    }
-}
-#endif // COM_UNITY_MODULES_PHYSICS2D
diff --git a/com.unity.netcode.gameobjects/Components/com.unity.netcode.components.asmdef b/com.unity.netcode.gameobjects/Components/com.unity.netcode.components.asmdef
deleted file mode 100644
index 3505da5d1a..0000000000
--- a/com.unity.netcode.gameobjects/Components/com.unity.netcode.components.asmdef
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "name": "Unity.Netcode.Components",
-    "rootNamespace": "Unity.Netcode.Components",
-    "references": [
-        "Unity.Netcode.Runtime",
-        "Unity.Collections",
-        "Unity.Mathematics"
-    ],
-    "allowUnsafeCode": true,
-    "versionDefines": [
-        {
-            "name": "com.unity.modules.animation",
-            "expression": "",
-            "define": "COM_UNITY_MODULES_ANIMATION"
-        },
-        {
-            "name": "com.unity.modules.physics",
-            "expression": "",
-            "define": "COM_UNITY_MODULES_PHYSICS"
-        },
-        {
-            "name": "com.unity.modules.physics2d",
-            "expression": "",
-            "define": "COM_UNITY_MODULES_PHYSICS2D"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Documentation~/index.md b/com.unity.netcode.gameobjects/Documentation~/index.md
index bd5e331a18..d07cf7b5b1 100644
--- a/com.unity.netcode.gameobjects/Documentation~/index.md
+++ b/com.unity.netcode.gameobjects/Documentation~/index.md
@@ -9,7 +9,7 @@ See guides below to install Unity Netcode for GameObjects, set up your project,
 - [Documentation](https://docs-multiplayer.unity3d.com/netcode/current/about)
 - [Installation](https://docs-multiplayer.unity3d.com/netcode/current/installation)
 - [First Steps](https://docs-multiplayer.unity3d.com/netcode/current/tutorials/get-started-ngo)
-- [API Reference](https://docs.unity3d.com/Packages/com.unity.netcode.gameobjects@1.6/api/index.html)
+- [API Reference](https://docs.unity3d.com/Packages/com.unity.netcode.gameobjects@2.2/api/index.html)
 
 # Technical details
 
diff --git a/com.unity.netcode.gameobjects/Editor/Analytics.meta b/com.unity.netcode.gameobjects/Editor/Analytics.meta
new file mode 100644
index 0000000000..8894158a2b
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Editor/Analytics.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: df502b16f2458f1458f8546326dc5ef1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.netcode.gameobjects/Editor/Analytics/AnalyticsHandler.cs b/com.unity.netcode.gameobjects/Editor/Analytics/AnalyticsHandler.cs
new file mode 100644
index 0000000000..b366e225eb
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Editor/Analytics/AnalyticsHandler.cs
@@ -0,0 +1,25 @@
+#if UNITY_EDITOR
+using System;
+using UnityEngine.Analytics;
+
+namespace Unity.Netcode.Editor
+{
+    internal class AnalyticsHandler<T> : IAnalytic where T : IAnalytic.IData
+    {
+        private T m_Data;
+
+        internal T Data => m_Data;
+
+        public AnalyticsHandler(T data)
+        {
+            m_Data = data;
+        }
+        public bool TryGatherData(out IAnalytic.IData data, out Exception error)
+        {
+            data = m_Data;
+            error = null;
+            return data != null;
+        }
+    }
+}
+#endif
diff --git a/com.unity.netcode.gameobjects/Editor/Analytics/AnalyticsHandler.cs.meta b/com.unity.netcode.gameobjects/Editor/Analytics/AnalyticsHandler.cs.meta
new file mode 100644
index 0000000000..e1dbb20b47
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Editor/Analytics/AnalyticsHandler.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 3f65a17a86eb08c42be3b01b67fb6781
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Editor/Analytics/NetcodeAnalytics.cs b/com.unity.netcode.gameobjects/Editor/Analytics/NetcodeAnalytics.cs
new file mode 100644
index 0000000000..4f1c4f8084
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Editor/Analytics/NetcodeAnalytics.cs
@@ -0,0 +1,229 @@
+#if UNITY_EDITOR
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.Analytics;
+
+namespace Unity.Netcode.Editor
+{
+    /// <summary>
+    /// Used to collection network session configuration information
+    /// </summary>
+    internal struct NetworkSessionInfo
+    {
+        public int SessionIndex;
+        public bool SessionStopped;
+        public bool WasServer;
+        public bool WasClient;
+        public bool UsedCMBService;
+        public string Transport;
+        public NetworkConfig NetworkConfig;
+    }
+
+    /// <summary>
+    /// Netcode for GameObjects Analytics Class
+    /// </summary>
+    internal class NetcodeAnalytics : NetworkManager.NetcodeAnalytics
+    {
+        /// <summary>
+        /// Determines if we are running an integration test of the analytics integration
+        /// </summary>
+        internal static bool IsIntegrationTest = false;
+#if ENABLE_NGO_ANALYTICS_LOGGING
+        internal static bool EnableLogging = true;
+#else
+        internal static bool EnableLogging = false;
+#endif
+
+        // Preserves the analytics enabled flag
+        private bool m_OriginalAnalyticsEnabled;
+
+        internal override void OnOneTimeSetup()
+        {
+            m_OriginalAnalyticsEnabled = EditorAnalytics.enabled;
+            // By default, we always disable analytics during integration testing
+            EditorAnalytics.enabled = false;
+        }
+
+        internal override void OnOneTimeTearDown()
+        {
+            // Reset analytics to the original value
+            EditorAnalytics.enabled = m_OriginalAnalyticsEnabled;
+        }
+
+        internal List<NetworkManagerAnalyticsHandler> AnalyticsTestResults = new List<NetworkManagerAnalyticsHandler>();
+
+        internal List<NetworkSessionInfo> RecentSessions = new List<NetworkSessionInfo>();
+        /// <summary>
+        /// Invoked from <see cref="NetworkManager.ModeChanged(PlayModeStateChange)"/>.
+        /// </summary>
+        /// <param name="playModeState">The new <see cref="PlayModeStateChange"/> state.</param>
+        /// <param name="networkManager">The current <see cref="NetworkManager"/> instance when play mode was entered.</param>
+        internal override void ModeChanged(PlayModeStateChange playModeState, NetworkManager networkManager)
+        {
+            switch (playModeState)
+            {
+                case PlayModeStateChange.EnteredPlayMode:
+                    {
+                        if (IsIntegrationTest)
+                        {
+                            AnalyticsTestResults.Clear();
+                        }
+                        break;
+                    }
+                case PlayModeStateChange.ExitingPlayMode:
+                    {
+                        // Update analytics
+                        UpdateAnalytics(networkManager);
+                        break;
+                    }
+            }
+        }
+
+        /// <summary>
+        /// Editor Only
+        /// Invoked when the session is started.
+        /// </summary>
+        /// <param name="networkManager">The <see cref="NetworkManager"/> instance when the session is started.</param>
+        internal override void SessionStarted(NetworkManager networkManager)
+        {
+            // If analytics is disabled and we are not running an integration test, then exit early.
+            if (!EditorAnalytics.enabled && !IsIntegrationTest)
+            {
+                return;
+            }
+
+            var newSession = new NetworkSessionInfo()
+            {
+                SessionIndex = RecentSessions.Count,
+                WasClient = networkManager.IsClient,
+                WasServer = networkManager.IsServer,
+                NetworkConfig = networkManager.NetworkConfig.Copy(),
+                Transport = networkManager.NetworkConfig.NetworkTransport != null ? networkManager.NetworkConfig.NetworkTransport.GetType().Name : "None",
+            };
+            RecentSessions.Add(newSession);
+        }
+
+        /// <summary>
+        /// Editor Only
+        /// Invoked when the session is stopped or upon exiting play mode.
+        /// </summary>
+        /// <param name="networkManager">The <see cref="NetworkManager"/> instance.</param>
+        internal override void SessionStopped(NetworkManager networkManager)
+        {
+            // If analytics is disabled and we are not running an integration test or there are no sessions, then exit early.
+            if ((!EditorAnalytics.enabled && !IsIntegrationTest) || RecentSessions.Count == 0)
+            {
+                return;
+            }
+
+            var lastIndex = RecentSessions.Count - 1;
+            var recentSession = RecentSessions[lastIndex];
+            // If the session has already been finalized, then exit early.
+            if (recentSession.SessionStopped)
+            {
+                return;
+            }
+            recentSession.UsedCMBService = networkManager.CMBServiceConnection;
+            recentSession.SessionStopped = true;
+            RecentSessions[lastIndex] = recentSession;
+        }
+
+        /// <summary>
+        /// Invoked from within <see cref="NetworkManager.ModeChanged"/> when exiting play mode.
+        /// </summary>
+        private void UpdateAnalytics(NetworkManager networkManager)
+        {
+            // If analytics is disabled and we are not running an integration test or there are no sessions to process, then exit early.
+            if ((!EditorAnalytics.enabled && !IsIntegrationTest) || RecentSessions.Count == 0)
+            {
+                return;
+            }
+
+            // If the NetworkManager isn't null, then make sure the last entry is marked off as stopped.
+            // If the last session is stopped, then SessionStopped will exit early.
+            if (networkManager != null)
+            {
+                SessionStopped(networkManager);
+            }
+
+            // Parse through all of the recent network sessions to generate and send NetworkManager analytics
+            for (int i = 0; i < RecentSessions.Count; i++)
+            {
+                var networkManagerAnalytics = GetNetworkManagerAnalytics(RecentSessions[i]);
+
+                var isDuplicate = false;
+                foreach (var analytics in AnalyticsTestResults)
+                {
+                    // If we have any sessions with identical configurations,
+                    // then we want to ignore those.
+                    if (analytics.Data.Equals(networkManagerAnalytics))
+                    {
+                        isDuplicate = true;
+                        break;
+                    }
+                }
+
+                if (isDuplicate)
+                {
+                    continue;
+                }
+
+                // If not running an integration test, then go ahead and send the anlytics event data.
+                if (!IsIntegrationTest)
+                {
+                    var result = EditorAnalytics.SendAnalytic(new NetworkManagerAnalyticsHandler(networkManagerAnalytics));
+                    if (EnableLogging && result != AnalyticsResult.Ok)
+                    {
+                        Debug.LogWarning($"[Analytics] Problem sending analytics: {result}");
+                    }
+                }
+                else
+                {
+                    AnalyticsTestResults.Add(new NetworkManagerAnalyticsHandler(networkManagerAnalytics));
+                }
+            }
+
+            if (IsIntegrationTest && EnableLogging)
+            {
+                var count = 0;
+                foreach (var entry in AnalyticsTestResults)
+                {
+                    entry.Data.LogAnalyticData(count);
+                    count++;
+                }
+            }
+            RecentSessions.Clear();
+        }
+
+        /// <summary>
+        /// Generates a <see cref="NetworkManagerAnalytics"/> based on the <see cref="NetworkManager.NetworkSessionInfo"/> passed in
+        /// </summary>
+        /// <param name="networkSession">Represents a network session with the used NetworkManager configuration</param>
+        /// <returns></returns>
+        private NetworkManagerAnalytics GetNetworkManagerAnalytics(NetworkSessionInfo networkSession)
+        {
+            var multiplayerSDKInstalled = false;
+#if MULTIPLAYER_SERVICES_SDK_INSTALLED
+            multiplayerSDKInstalled = true;
+#endif
+            if (EnableLogging && !networkSession.SessionStopped)
+            {
+                Debug.LogWarning($"Session-{networkSession.SessionIndex} was not considered stopped!");
+            }
+            var networkManagerAnalytics = new NetworkManagerAnalytics()
+            {
+                IsDistributedAuthority = networkSession.NetworkConfig.NetworkTopology == NetworkTopologyTypes.DistributedAuthority,
+                WasServer = networkSession.WasServer,
+                WasClient = networkSession.WasClient,
+                UsedCMBService = networkSession.UsedCMBService,
+                IsUsingMultiplayerSDK = multiplayerSDKInstalled,
+                NetworkTransport = networkSession.Transport,
+                EnableSceneManagement = networkSession.NetworkConfig.EnableSceneManagement,
+                TickRate = (int)networkSession.NetworkConfig.TickRate,
+            };
+            return networkManagerAnalytics;
+        }
+    }
+}
+#endif
diff --git a/com.unity.netcode.gameobjects/Editor/Analytics/NetcodeAnalytics.cs.meta b/com.unity.netcode.gameobjects/Editor/Analytics/NetcodeAnalytics.cs.meta
new file mode 100644
index 0000000000..757665a130
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Editor/Analytics/NetcodeAnalytics.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 05223af7b06843841868225a65c90fea
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Editor/Analytics/NetworkManagerAnalytics.cs b/com.unity.netcode.gameobjects/Editor/Analytics/NetworkManagerAnalytics.cs
new file mode 100644
index 0000000000..9ba7e46142
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Editor/Analytics/NetworkManagerAnalytics.cs
@@ -0,0 +1,47 @@
+#if UNITY_EDITOR
+using System;
+using System.Text;
+using UnityEngine;
+using UnityEngine.Analytics;
+
+namespace Unity.Netcode.Editor
+{
+    [Serializable]
+    internal struct NetworkManagerAnalytics : IAnalytic.IData, IEquatable<NetworkManagerAnalytics>
+    {
+        public bool IsDistributedAuthority;
+        public bool WasServer;
+        public bool WasClient;
+        public bool UsedCMBService;
+        public bool IsUsingMultiplayerSDK;
+        public string NetworkTransport;
+        public bool EnableSceneManagement;
+        public int TickRate;
+        public override string ToString()
+        {
+            var message = new StringBuilder();
+            message.AppendLine($"{nameof(IsDistributedAuthority)}: {IsDistributedAuthority}");
+            message.AppendLine($"{nameof(WasServer)}: {WasServer}");
+            message.AppendLine($"{nameof(WasClient)}: {WasClient}");
+            message.AppendLine($"{nameof(UsedCMBService)}: {UsedCMBService}");
+            message.AppendLine($"{nameof(IsUsingMultiplayerSDK)}: {IsUsingMultiplayerSDK}");
+            message.AppendLine($"{nameof(NetworkTransport)}: {NetworkTransport}");
+            message.AppendLine($"{nameof(EnableSceneManagement)}: {EnableSceneManagement}");
+            message.AppendLine($"{nameof(TickRate)}: {TickRate}");
+            return message.ToString();
+        }
+
+        internal void LogAnalyticData(int sessionNumber)
+        {
+            Debug.Log($"{nameof(NetworkManagerAnalytics)} Session-{sessionNumber}:\n {ToString()}");
+        }
+        public bool Equals(NetworkManagerAnalytics other)
+        {
+            return IsDistributedAuthority == other.IsDistributedAuthority && WasServer == other.WasServer && WasClient == other.WasClient
+                && UsedCMBService == other.UsedCMBService && IsUsingMultiplayerSDK == other.IsUsingMultiplayerSDK
+                && EnableSceneManagement == other.EnableSceneManagement && TickRate == other.TickRate
+                && NetworkTransport.Equals(other.NetworkTransport);
+        }
+    }
+}
+#endif
diff --git a/com.unity.netcode.gameobjects/Editor/Analytics/NetworkManagerAnalytics.cs.meta b/com.unity.netcode.gameobjects/Editor/Analytics/NetworkManagerAnalytics.cs.meta
new file mode 100644
index 0000000000..10980f86d5
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Editor/Analytics/NetworkManagerAnalytics.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: a987d18ba709af44bbe4033d29b80cb6
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Editor/Analytics/NetworkManagerAnalyticsHandler.cs b/com.unity.netcode.gameobjects/Editor/Analytics/NetworkManagerAnalyticsHandler.cs
new file mode 100644
index 0000000000..7866df9621
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Editor/Analytics/NetworkManagerAnalyticsHandler.cs
@@ -0,0 +1,12 @@
+#if UNITY_EDITOR
+using UnityEngine.Analytics;
+
+namespace Unity.Netcode.Editor
+{
+    [AnalyticInfo("NGO_NetworkManager", "unity.netcode", 5, 100, 1000)]
+    internal class NetworkManagerAnalyticsHandler : AnalyticsHandler<NetworkManagerAnalytics>
+    {
+        public NetworkManagerAnalyticsHandler(NetworkManagerAnalytics networkManagerAnalytics) : base(networkManagerAnalytics) { }
+    }
+}
+#endif
diff --git a/com.unity.netcode.gameobjects/Editor/Analytics/NetworkManagerAnalyticsHandler.cs.meta b/com.unity.netcode.gameobjects/Editor/Analytics/NetworkManagerAnalyticsHandler.cs.meta
new file mode 100644
index 0000000000..a088b0bb93
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Editor/Analytics/NetworkManagerAnalyticsHandler.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 087c955a14fef5448bcd1f7c7a95b21f
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Editor/AnticipatedNetworkTransformEditor.cs b/com.unity.netcode.gameobjects/Editor/AnticipatedNetworkTransformEditor.cs
deleted file mode 100644
index 0986808fc4..0000000000
--- a/com.unity.netcode.gameobjects/Editor/AnticipatedNetworkTransformEditor.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Unity.Netcode.Components;
-using UnityEditor;
-
-namespace Unity.Netcode.Editor
-{
-    /// <summary>
-    /// The <see cref="CustomEditor"/> for <see cref="AnticipatedNetworkTransform"/>
-    /// </summary>
-    [CustomEditor(typeof(AnticipatedNetworkTransform), true)]
-    public class AnticipatedNetworkTransformEditor : NetworkTransformEditor
-    {
-        public override bool HideInterpolateValue => true;
-    }
-}
diff --git a/com.unity.netcode.gameobjects/Editor/AnticipatedNetworkTransformEditor.cs.meta b/com.unity.netcode.gameobjects/Editor/AnticipatedNetworkTransformEditor.cs.meta
deleted file mode 100644
index 3e98b97ae2..0000000000
--- a/com.unity.netcode.gameobjects/Editor/AnticipatedNetworkTransformEditor.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 34bc168605014eeeadf97b12080e11fa
-timeCreated: 1707514321
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Editor/AssemblyInfo.cs b/com.unity.netcode.gameobjects/Editor/AssemblyInfo.cs
index f3fd38bc17..41e6599661 100644
--- a/com.unity.netcode.gameobjects/Editor/AssemblyInfo.cs
+++ b/com.unity.netcode.gameobjects/Editor/AssemblyInfo.cs
@@ -3,5 +3,6 @@
 #if UNITY_INCLUDE_TESTS
 #if UNITY_EDITOR
 [assembly: InternalsVisibleTo("Unity.Netcode.EditorTests")]
+[assembly: InternalsVisibleTo("TestProject.RuntimeTests")]
 #endif // UNITY_EDITOR
 #endif // UNITY_INCLUDE_TESTS
diff --git a/com.unity.netcode.gameobjects/Editor/CodeGen/NetworkBehaviourILPP.cs b/com.unity.netcode.gameobjects/Editor/CodeGen/NetworkBehaviourILPP.cs
index 1734d02311..e67ee0ef81 100644
--- a/com.unity.netcode.gameobjects/Editor/CodeGen/NetworkBehaviourILPP.cs
+++ b/com.unity.netcode.gameobjects/Editor/CodeGen/NetworkBehaviourILPP.cs
@@ -27,7 +27,8 @@ internal sealed class NetworkBehaviourILPP : ILPPInterface
 
         public override ILPPInterface GetInstance() => this;
 
-        public override bool WillProcess(ICompiledAssembly compiledAssembly) => compiledAssembly.References.Any(filePath => Path.GetFileNameWithoutExtension(filePath) == CodeGenHelpers.RuntimeAssemblyName);
+        public override bool WillProcess(ICompiledAssembly compiledAssembly) => compiledAssembly.Name == CodeGenHelpers.RuntimeAssemblyName ||
+            compiledAssembly.References.Any(filePath => Path.GetFileNameWithoutExtension(filePath) == CodeGenHelpers.RuntimeAssemblyName);
 
         private readonly List<DiagnosticMessage> m_Diagnostics = new List<DiagnosticMessage>();
 
@@ -721,7 +722,7 @@ private bool ImportReferences(ModuleDefinition moduleDefinition, string[] assemb
                     continue;
                 }
 
-                if (networkVariableSerializationTypesTypeDef == null && netcodeTypeDef.Name == nameof(NetworkVariableSerializationTypes))
+                if (networkVariableSerializationTypesTypeDef == null && netcodeTypeDef.Name == nameof(NetworkVariableSerializationTypedInitializers))
                 {
                     networkVariableSerializationTypesTypeDef = netcodeTypeDef;
                     continue;
@@ -1007,103 +1008,103 @@ private bool ImportReferences(ModuleDefinition moduleDefinition, string[] assemb
 
                 switch (method.Name)
                 {
-                    case nameof(NetworkVariableSerializationTypes.InitializeSerializer_UnmanagedByMemcpy):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeSerializer_UnmanagedByMemcpy):
                         m_NetworkVariableSerializationTypes_InitializeSerializer_UnmanagedByMemcpy_MethodRef = method;
                         break;
-                    case nameof(NetworkVariableSerializationTypes.InitializeSerializer_UnmanagedByMemcpyArray):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeSerializer_UnmanagedByMemcpyArray):
                         m_NetworkVariableSerializationTypes_InitializeSerializer_UnmanagedByMemcpyArray_MethodRef = method;
                         break;
 
 #if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
-                    case nameof(NetworkVariableSerializationTypes.InitializeSerializer_UnmanagedByMemcpyList):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeSerializer_UnmanagedByMemcpyList):
                         m_NetworkVariableSerializationTypes_InitializeSerializer_UnmanagedByMemcpyList_MethodRef = method;
                         break;
 #endif
-                    case nameof(NetworkVariableSerializationTypes.InitializeSerializer_UnmanagedINetworkSerializable):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeSerializer_UnmanagedINetworkSerializable):
                         m_NetworkVariableSerializationTypes_InitializeSerializer_UnmanagedINetworkSerializable_MethodRef = method;
                         break;
-                    case nameof(NetworkVariableSerializationTypes.InitializeSerializer_UnmanagedINetworkSerializableArray):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeSerializer_UnmanagedINetworkSerializableArray):
                         m_NetworkVariableSerializationTypes_InitializeSerializer_UnmanagedINetworkSerializableArray_MethodRef = method;
                         break;
 
 #if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
-                    case nameof(NetworkVariableSerializationTypes.InitializeSerializer_UnmanagedINetworkSerializableList):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeSerializer_UnmanagedINetworkSerializableList):
                         m_NetworkVariableSerializationTypes_InitializeSerializer_UnmanagedINetworkSerializableList_MethodRef = method;
                         break;
-                    case nameof(NetworkVariableSerializationTypes.InitializeSerializer_NativeHashSet):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeSerializer_NativeHashSet):
                         m_NetworkVariableSerializationTypes_InitializeSerializer_NativeHashSet_MethodRef = method;
                         break;
-                    case nameof(NetworkVariableSerializationTypes.InitializeSerializer_NativeHashMap):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeSerializer_NativeHashMap):
                         m_NetworkVariableSerializationTypes_InitializeSerializer_NativeHashMap_MethodRef = method;
                         break;
 #endif
-                    case nameof(NetworkVariableSerializationTypes.InitializeSerializer_List):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeSerializer_List):
                         m_NetworkVariableSerializationTypes_InitializeSerializer_List_MethodRef = method;
                         break;
-                    case nameof(NetworkVariableSerializationTypes.InitializeSerializer_HashSet):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeSerializer_HashSet):
                         m_NetworkVariableSerializationTypes_InitializeSerializer_HashSet_MethodRef = method;
                         break;
-                    case nameof(NetworkVariableSerializationTypes.InitializeSerializer_Dictionary):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeSerializer_Dictionary):
                         m_NetworkVariableSerializationTypes_InitializeSerializer_Dictionary_MethodRef = method;
                         break;
-                    case nameof(NetworkVariableSerializationTypes.InitializeSerializer_ManagedINetworkSerializable):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeSerializer_ManagedINetworkSerializable):
                         m_NetworkVariableSerializationTypes_InitializeSerializer_ManagedINetworkSerializable_MethodRef = method;
                         break;
-                    case nameof(NetworkVariableSerializationTypes.InitializeSerializer_FixedString):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeSerializer_FixedString):
                         m_NetworkVariableSerializationTypes_InitializeSerializer_FixedString_MethodRef = method;
                         break;
-                    case nameof(NetworkVariableSerializationTypes.InitializeSerializer_FixedStringArray):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeSerializer_FixedStringArray):
                         m_NetworkVariableSerializationTypes_InitializeSerializer_FixedStringArray_MethodRef = method;
                         break;
 
 #if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
-                    case nameof(NetworkVariableSerializationTypes.InitializeSerializer_FixedStringList):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeSerializer_FixedStringList):
                         m_NetworkVariableSerializationTypes_InitializeSerializer_FixedStringList_MethodRef = method;
                         break;
 #endif
 
-                    case nameof(NetworkVariableSerializationTypes.InitializeEqualityChecker_ManagedIEquatable):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeEqualityChecker_ManagedIEquatable):
                         m_NetworkVariableSerializationTypes_InitializeEqualityChecker_ManagedIEquatable_MethodRef = method;
                         break;
-                    case nameof(NetworkVariableSerializationTypes.InitializeEqualityChecker_UnmanagedIEquatable):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeEqualityChecker_UnmanagedIEquatable):
                         m_NetworkVariableSerializationTypes_InitializeEqualityChecker_UnmanagedIEquatable_MethodRef = method;
                         break;
-                    case nameof(NetworkVariableSerializationTypes.InitializeEqualityChecker_UnmanagedIEquatableArray):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeEqualityChecker_UnmanagedIEquatableArray):
                         m_NetworkVariableSerializationTypes_InitializeEqualityChecker_UnmanagedIEquatableArray_MethodRef = method;
                         break;
 
 #if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
-                    case nameof(NetworkVariableSerializationTypes.InitializeEqualityChecker_UnmanagedIEquatableList):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeEqualityChecker_UnmanagedIEquatableList):
                         m_NetworkVariableSerializationTypes_InitializeEqualityChecker_UnmanagedIEquatableList_MethodRef = method;
                         break;
-                    case nameof(NetworkVariableSerializationTypes.InitializeEqualityChecker_NativeHashSet):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeEqualityChecker_NativeHashSet):
                         m_NetworkVariableSerializationTypes_InitializeEqualityChecker_NativeHashSet_MethodRef = method;
                         break;
-                    case nameof(NetworkVariableSerializationTypes.InitializeEqualityChecker_NativeHashMap):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeEqualityChecker_NativeHashMap):
                         m_NetworkVariableSerializationTypes_InitializeEqualityChecker_NativeHashMap_MethodRef = method;
                         break;
 #endif
-                    case nameof(NetworkVariableSerializationTypes.InitializeEqualityChecker_List):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeEqualityChecker_List):
                         m_NetworkVariableSerializationTypes_InitializeEqualityChecker_List_MethodRef = method;
                         break;
-                    case nameof(NetworkVariableSerializationTypes.InitializeEqualityChecker_HashSet):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeEqualityChecker_HashSet):
                         m_NetworkVariableSerializationTypes_InitializeEqualityChecker_HashSet_MethodRef = method;
                         break;
-                    case nameof(NetworkVariableSerializationTypes.InitializeEqualityChecker_Dictionary):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeEqualityChecker_Dictionary):
                         m_NetworkVariableSerializationTypes_InitializeEqualityChecker_Dictionary_MethodRef = method;
                         break;
-                    case nameof(NetworkVariableSerializationTypes.InitializeEqualityChecker_UnmanagedValueEquals):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeEqualityChecker_UnmanagedValueEquals):
                         m_NetworkVariableSerializationTypes_InitializeEqualityChecker_UnmanagedValueEquals_MethodRef = method;
                         break;
-                    case nameof(NetworkVariableSerializationTypes.InitializeEqualityChecker_UnmanagedValueEqualsArray):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeEqualityChecker_UnmanagedValueEqualsArray):
                         m_NetworkVariableSerializationTypes_InitializeEqualityChecker_UnmanagedValueEqualsArray_MethodRef = method;
                         break;
 #if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
-                    case nameof(NetworkVariableSerializationTypes.InitializeEqualityChecker_UnmanagedValueEqualsList):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeEqualityChecker_UnmanagedValueEqualsList):
                         m_NetworkVariableSerializationTypes_InitializeEqualityChecker_UnmanagedValueEqualsList_MethodRef = method;
                         break;
 #endif
-                    case nameof(NetworkVariableSerializationTypes.InitializeEqualityChecker_ManagedClassEquals):
+                    case nameof(NetworkVariableSerializationTypedInitializers.InitializeEqualityChecker_ManagedClassEquals):
                         m_NetworkVariableSerializationTypes_InitializeEqualityChecker_ManagedClassEquals_MethodRef = method;
                         break;
                 }
diff --git a/com.unity.netcode.gameobjects/Editor/Configuration/NetcodeForGameObjectsProjectSettings.cs b/com.unity.netcode.gameobjects/Editor/Configuration/NetcodeForGameObjectsProjectSettings.cs
index e5d18b6bb8..52bd0ef011 100644
--- a/com.unity.netcode.gameobjects/Editor/Configuration/NetcodeForGameObjectsProjectSettings.cs
+++ b/com.unity.netcode.gameobjects/Editor/Configuration/NetcodeForGameObjectsProjectSettings.cs
@@ -3,11 +3,21 @@
 
 namespace Unity.Netcode.Editor.Configuration
 {
+    /// <summary>
+    /// A <see cref="ScriptableSingleton{T}"/> of type <see cref="NetcodeForGameObjectsProjectSettings"/>.
+    /// </summary>
     [FilePath("ProjectSettings/NetcodeForGameObjects.asset", FilePathAttribute.Location.ProjectFolder)]
     public class NetcodeForGameObjectsProjectSettings : ScriptableSingleton<NetcodeForGameObjectsProjectSettings>
     {
         internal static readonly string DefaultNetworkPrefabsPath = "Assets/DefaultNetworkPrefabs.asset";
+        /// <summary>
+        /// The path and name for the DefaultNetworkPrefabs asset.
+        /// </summary>
         [SerializeField] public string NetworkPrefabsPath = DefaultNetworkPrefabsPath;
+
+        /// <summary>
+        /// A temporary network prefabs path used internally.
+        /// </summary>
         public string TempNetworkPrefabsPath;
 
         private void OnEnable()
@@ -19,6 +29,9 @@ private void OnEnable()
             TempNetworkPrefabsPath = NetworkPrefabsPath;
         }
 
+        /// <summary>
+        /// Used to determine whether the default network prefabs asset should be generated or not.
+        /// </summary>
         [SerializeField]
         public bool GenerateDefaultNetworkPrefabs = true;
 
diff --git a/com.unity.netcode.gameobjects/Editor/Configuration/NetcodeSettingsProvider.cs b/com.unity.netcode.gameobjects/Editor/Configuration/NetcodeSettingsProvider.cs
index 0f78c43e09..26b12175dd 100644
--- a/com.unity.netcode.gameobjects/Editor/Configuration/NetcodeSettingsProvider.cs
+++ b/com.unity.netcode.gameobjects/Editor/Configuration/NetcodeSettingsProvider.cs
@@ -19,7 +19,7 @@ public static SettingsProvider CreateNetcodeSettingsProvider()
         {
             // First parameter is the path in the Settings window.
             // Second parameter is the scope of this setting: it only appears in the Settings window for the Project scope.
-            var provider = new SettingsProvider("Project/NetcodeForGameObjects", SettingsScope.Project)
+            var provider = new SettingsProvider("Project/Multiplayer/NetcodeForGameObjects", SettingsScope.Project)
             {
                 label = "Netcode for GameObjects",
                 keywords = new[] { "netcode", "editor" },
@@ -128,6 +128,7 @@ private static void OnGuiHandler(string obj)
             var autoAddNetworkObjectSetting = NetcodeForGameObjectsEditorSettings.GetAutoAddNetworkObjectSetting();
             var checkForNetworkObjectSetting = NetcodeForGameObjectsEditorSettings.GetCheckForNetworkObjectSetting();
             var multiplayerToolsTipStatus = NetcodeForGameObjectsEditorSettings.GetNetcodeInstallMultiplayerToolTips() == 0;
+
             var settings = NetcodeForGameObjectsProjectSettings.instance;
             var generateDefaultPrefabs = settings.GenerateDefaultNetworkPrefabs;
             var networkPrefabsPath = settings.TempNetworkPrefabsPath;
@@ -141,6 +142,7 @@ private static void OnGuiHandler(string obj)
             {
                 GUILayout.BeginVertical("Box");
                 NetworkObjectsSectionLabel.DrawLabel();
+
                 autoAddNetworkObjectSetting = AutoAddNetworkObjectToggle.DrawToggle(autoAddNetworkObjectSetting, checkForNetworkObjectSetting);
                 checkForNetworkObjectSetting = CheckForNetworkObjectToggle.DrawToggle(checkForNetworkObjectSetting);
                 if (autoAddNetworkObjectSetting && !checkForNetworkObjectSetting)
diff --git a/com.unity.netcode.gameobjects/Editor/Configuration/NetworkPrefabProcessor.cs b/com.unity.netcode.gameobjects/Editor/Configuration/NetworkPrefabProcessor.cs
index 55f5fcbfc4..f74530e60f 100644
--- a/com.unity.netcode.gameobjects/Editor/Configuration/NetworkPrefabProcessor.cs
+++ b/com.unity.netcode.gameobjects/Editor/Configuration/NetworkPrefabProcessor.cs
@@ -9,6 +9,9 @@ namespace Unity.Netcode.Editor.Configuration
     /// </summary>
     public class NetworkPrefabProcessor : AssetPostprocessor
     {
+        /// <summary>
+        /// The path to the default network prefabs list.
+        /// </summary>
         public static string DefaultNetworkPrefabsPath
         {
             get
diff --git a/com.unity.netcode.gameobjects/Editor/Configuration/NetworkPrefabsEditor.cs b/com.unity.netcode.gameobjects/Editor/Configuration/NetworkPrefabsEditor.cs
index 0845068be7..68113ca32f 100644
--- a/com.unity.netcode.gameobjects/Editor/Configuration/NetworkPrefabsEditor.cs
+++ b/com.unity.netcode.gameobjects/Editor/Configuration/NetworkPrefabsEditor.cs
@@ -4,6 +4,9 @@
 
 namespace Unity.Netcode.Editor
 {
+    /// <summary>
+    /// The custom editor for the <see cref="NetworkPrefabsList"/> <see cref="ScriptableObject"/>.
+    /// </summary>
     [CustomEditor(typeof(NetworkPrefabsList), true)]
     [CanEditMultipleObjects]
     public class NetworkPrefabsEditor : UnityEditor.Editor
@@ -82,6 +85,7 @@ private void OnEnable()
             m_NetworkPrefabsList.drawHeaderCallback = rect => EditorGUI.LabelField(rect, "NetworkPrefabs");
         }
 
+        /// <inheritdoc />
         public override void OnInspectorGUI()
         {
             using (new EditorGUI.DisabledScope(true))
diff --git a/com.unity.netcode.gameobjects/Editor/HiddenScriptEditor.cs b/com.unity.netcode.gameobjects/Editor/HiddenScriptEditor.cs
index 8e885ead97..f4a77abc4c 100644
--- a/com.unity.netcode.gameobjects/Editor/HiddenScriptEditor.cs
+++ b/com.unity.netcode.gameobjects/Editor/HiddenScriptEditor.cs
@@ -1,4 +1,6 @@
+#if COM_UNITY_MODULES_ANIMATION || COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
 using Unity.Netcode.Components;
+#endif
 #if UNITY_UNET_PRESENT
 using Unity.Netcode.Transports.UNET;
 #endif
diff --git a/com.unity.netcode.gameobjects/Editor/NetcodeEditorBase.cs b/com.unity.netcode.gameobjects/Editor/NetcodeEditorBase.cs
new file mode 100644
index 0000000000..b61a77e6b6
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Editor/NetcodeEditorBase.cs
@@ -0,0 +1,133 @@
+using System;
+using UnityEditor;
+using UnityEngine;
+
+namespace Unity.Netcode.Editor
+{
+    /// <summary>
+    /// The base Netcode Editor helper class to display derived <see cref="MonoBehaviour"/> based components <br />
+    /// where each child generation's properties will be displayed within a FoldoutHeaderGroup.
+    /// </summary>
+    /// <remarks>
+    /// <see cref="TT"/> Defines the base <see cref="MonoBehaviour"/> derived component type where <see cref="DrawFoldOutGroup"/>'s type T
+    /// refers to any child derived class of <see cref="TT"/>. This provides the ability to have multiple child generation derived custom
+    /// editos that each child derivation handles drawing its unique properies from that of its parent class.
+    /// </remarks>
+    /// <typeparam name="TT">The base <see cref="MonoBehaviour"/> derived component type</typeparam>
+    [CanEditMultipleObjects]
+    public partial class NetcodeEditorBase<TT> : UnityEditor.Editor where TT : MonoBehaviour
+    {
+        private const int k_IndentOffset = 15;
+        private int m_IndentOffset = 0;
+        private int m_IndentLevel = 0;
+        private float m_OriginalLabelWidth;
+
+        /// <inheritdoc cref="UnityEditor.Editor.OnEnable"/>
+        public virtual void OnEnable()
+        {
+        }
+
+        /// <summary>
+        /// Draws a <see cref="SerializedProperty"/> with the option to provide the font style to use.
+        /// </summary>
+        /// <param name="property">The serialized property (<see cref="SerializedProperty"/>) to draw within the inspector view.</param>
+        /// <param name="fontStyle">The font style (<see cref="FontStyle"/>) to use when drawing the label of the property field.</param>
+        private protected void DrawPropertyField(SerializedProperty property, FontStyle fontStyle = FontStyle.Normal)
+        {
+            var originalWidth = EditorGUIUtility.labelWidth;
+            EditorGUIUtility.labelWidth = originalWidth - (m_IndentOffset * m_IndentLevel);
+            var originalLabelFontStyle = EditorStyles.label.fontStyle;
+            EditorStyles.label.fontStyle = fontStyle;
+            EditorGUILayout.PropertyField(property);
+            EditorStyles.label.fontStyle = originalLabelFontStyle;
+            EditorGUIUtility.labelWidth = originalWidth;
+        }
+
+        /// <summary>
+        /// Will begin a new indention level for drawing propery fields.
+        /// </summary>
+        /// <remarks>
+        /// You *must* call <see cref="EndIndent"/> when returning back to the previous indention level.<br />
+        /// For additional information:<br />
+        /// - <see cref="EndIndent"/><br />
+        /// - <see cref="DrawPropertyField"/><br />
+        /// </remarks>
+        /// <param name="offset">(optional) The size in pixels of the offset. If no value passed, then it uses a default of 15 pixels.</param>
+        private protected void BeginIndent(int offset = k_IndentOffset)
+        {
+            m_IndentOffset = offset;
+            m_IndentLevel++;
+            GUILayout.BeginHorizontal();
+            GUILayout.Space(m_IndentOffset);
+            GUILayout.BeginVertical();
+        }
+
+        /// <summary>
+        /// Will end the current indention level when drawing propery fields.
+        /// </summary>
+        /// <remarks>
+        /// For additional information:<br />
+        /// - <see cref="BeginIndent"/><br />
+        /// - <see cref="DrawPropertyField"/><br />
+        /// </remarks>
+        private protected void EndIndent()
+        {
+            if (m_IndentLevel == 0)
+            {
+                Debug.LogWarning($"Invoking {nameof(EndIndent)} when the indent level is already 0!");
+                return;
+            }
+            m_IndentLevel--;
+            GUILayout.EndVertical();
+            GUILayout.EndHorizontal();
+        }
+
+        /// <summary>
+        /// Helper method to draw the properties of the specified child type <typeparamref name="T"/> component within a FoldoutHeaderGroup.
+        /// </summary>
+        /// <remarks>
+        /// <see cref="T"/> must be a sub-class of the root parent class type <see cref="TT"/>.
+        /// </remarks>
+        /// <typeparam name="T">The specific child derived type of <see cref="TT"/> or the type of <see cref="TT"/> that should have its properties drawn.</typeparam>
+        /// <param name="type">The component type of the <see cref="UnityEditor.Editor.target"/>.</param>
+        /// <param name="displayProperties">The <see cref="Action"/> to invoke that will draw the type <typeparamref name="T"/> properties.</param>
+        /// <param name="expanded">The <typeparamref name="T"/> current expanded property value</param>
+        /// <param name="setExpandedProperty">The <see cref="Action{bool}"/> invoked to apply the updated <paramref name="expanded"/> value.</param>
+        protected void DrawFoldOutGroup<T>(Type type, Action displayProperties, bool expanded, Action<bool> setExpandedProperty)
+        {
+            var baseClass = target as TT;
+            EditorGUI.BeginChangeCheck();
+            serializedObject.Update();
+            var currentClass = typeof(T);
+
+            if (type.IsSubclassOf(currentClass) || (!type.IsSubclassOf(currentClass) && currentClass.IsSubclassOf(typeof(TT))))
+            {
+                var expandedValue = EditorGUILayout.BeginFoldoutHeaderGroup(expanded, $"{currentClass.Name} Properties");
+
+                if (expandedValue)
+                {
+                    EditorGUILayout.EndFoldoutHeaderGroup();
+                    displayProperties.Invoke();
+                }
+                else
+                {
+                    EditorGUILayout.EndFoldoutHeaderGroup();
+                }
+                EditorGUILayout.Space();
+                setExpandedProperty.Invoke(expandedValue);
+            }
+            else
+            {
+                displayProperties.Invoke();
+            }
+            serializedObject.ApplyModifiedProperties();
+            EditorGUI.EndChangeCheck();
+        }
+
+        /// <inheritdoc/>
+        public override void OnInspectorGUI()
+        {
+            serializedObject.ApplyModifiedProperties();
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Editor/NetcodeEditorBase.cs.meta b/com.unity.netcode.gameobjects/Editor/NetcodeEditorBase.cs.meta
new file mode 100644
index 0000000000..25f0b07e38
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Editor/NetcodeEditorBase.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 4ce97256a2d80f94bb340e13c71a24b8
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Editor/NetworkBehaviourEditor.cs b/com.unity.netcode.gameobjects/Editor/NetworkBehaviourEditor.cs
index c98870c591..1312ff69e6 100644
--- a/com.unity.netcode.gameobjects/Editor/NetworkBehaviourEditor.cs
+++ b/com.unity.netcode.gameobjects/Editor/NetworkBehaviourEditor.cs
@@ -301,9 +301,8 @@ public override void OnInspectorGUI()
 
                 expanded = false;
             }
-
-            serializedObject.ApplyModifiedProperties();
             EditorGUI.EndChangeCheck();
+            serializedObject.ApplyModifiedProperties();
         }
 
         /// <summary>
diff --git a/com.unity.netcode.gameobjects/Editor/NetworkManagerEditor.cs b/com.unity.netcode.gameobjects/Editor/NetworkManagerEditor.cs
index 75c5765669..8ba4128b07 100644
--- a/com.unity.netcode.gameobjects/Editor/NetworkManagerEditor.cs
+++ b/com.unity.netcode.gameobjects/Editor/NetworkManagerEditor.cs
@@ -1,6 +1,3 @@
-#if UNITY_2022_3_OR_NEWER && (RELAY_SDK_INSTALLED && !UNITY_WEBGL ) || (RELAY_SDK_INSTALLED && UNITY_WEBGL && UTP_TRANSPORT_2_0_ABOVE)
-#define RELAY_INTEGRATION_AVAILABLE
-#endif
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -16,7 +13,7 @@ namespace Unity.Netcode.Editor
     /// </summary>
     [CustomEditor(typeof(NetworkManager), true)]
     [CanEditMultipleObjects]
-    public class NetworkManagerEditor : UnityEditor.Editor
+    public class NetworkManagerEditor : NetcodeEditorBase<NetworkManager>
     {
         private static GUIStyle s_CenteredWordWrappedLabelStyle;
         private static GUIStyle s_HelpBoxStyle;
@@ -33,7 +30,10 @@ public class NetworkManagerEditor : UnityEditor.Editor
         private SerializedProperty m_ProtocolVersionProperty;
         private SerializedProperty m_NetworkTransportProperty;
         private SerializedProperty m_TickRateProperty;
-        private SerializedProperty m_MaxObjectUpdatesPerTickProperty;
+#if MULTIPLAYER_SERVICES_SDK_INSTALLED
+        private SerializedProperty m_AutoSpawnPlayerPrefabClientSide;
+        private SerializedProperty m_NetworkTopologyProperty;
+#endif
         private SerializedProperty m_ClientConnectionBufferTimeoutProperty;
         private SerializedProperty m_ConnectionApprovalProperty;
         private SerializedProperty m_EnsureNetworkVariableLengthSafetyProperty;
@@ -41,37 +41,20 @@ public class NetworkManagerEditor : UnityEditor.Editor
         private SerializedProperty m_EnableSceneManagementProperty;
         private SerializedProperty m_RecycleNetworkIdsProperty;
         private SerializedProperty m_NetworkIdRecycleDelayProperty;
+        private SerializedProperty m_SpawnTimeOutProperty;
         private SerializedProperty m_RpcHashSizeProperty;
         private SerializedProperty m_LoadSceneTimeOutProperty;
         private SerializedProperty m_PrefabsList;
 
+        private SerializedProperty m_NetworkProfileMetrics;
+        private SerializedProperty m_NetworkMessageMetrics;
+
         private NetworkManager m_NetworkManager;
         private bool m_Initialized;
 
         private readonly List<Type> m_TransportTypes = new List<Type>();
         private string[] m_TransportNames = { "Select transport..." };
 
-        /// <inheritdoc/>
-        public override void OnInspectorGUI()
-        {
-            Initialize();
-            CheckNullProperties();
-
-#if !MULTIPLAYER_TOOLS
-            DrawInstallMultiplayerToolsTip();
-#endif
-
-            if (m_NetworkManager.IsServer || m_NetworkManager.IsClient)
-            {
-                DrawDisconnectButton();
-            }
-            else
-            {
-                DrawAllPropertyFields();
-                ShowStartConnectionButtons();
-            }
-        }
-
         private void ReloadTransports()
         {
             m_TransportTypes.Clear();
@@ -120,15 +103,30 @@ private void Initialize()
             m_ProtocolVersionProperty = m_NetworkConfigProperty.FindPropertyRelative("ProtocolVersion");
             m_NetworkTransportProperty = m_NetworkConfigProperty.FindPropertyRelative("NetworkTransport");
             m_TickRateProperty = m_NetworkConfigProperty.FindPropertyRelative("TickRate");
+#if MULTIPLAYER_SERVICES_SDK_INSTALLED
+            m_NetworkTopologyProperty = m_NetworkConfigProperty.FindPropertyRelative("NetworkTopology");
+            // Only display the auto spawn property when the distributed authority network topology is selected
+            if (m_NetworkManager.NetworkConfig.NetworkTopology == NetworkTopologyTypes.DistributedAuthority)
+            {
+                m_AutoSpawnPlayerPrefabClientSide = m_NetworkConfigProperty.FindPropertyRelative("AutoSpawnPlayerPrefabClientSide");
+            }
+#endif
             m_ClientConnectionBufferTimeoutProperty = m_NetworkConfigProperty.FindPropertyRelative("ClientConnectionBufferTimeout");
             m_ConnectionApprovalProperty = m_NetworkConfigProperty.FindPropertyRelative("ConnectionApproval");
             m_EnsureNetworkVariableLengthSafetyProperty = m_NetworkConfigProperty.FindPropertyRelative("EnsureNetworkVariableLengthSafety");
             m_ForceSamePrefabsProperty = m_NetworkConfigProperty.FindPropertyRelative("ForceSamePrefabs");
-            m_EnableSceneManagementProperty = m_NetworkConfigProperty.FindPropertyRelative("EnableSceneManagement");
             m_RecycleNetworkIdsProperty = m_NetworkConfigProperty.FindPropertyRelative("RecycleNetworkIds");
             m_NetworkIdRecycleDelayProperty = m_NetworkConfigProperty.FindPropertyRelative("NetworkIdRecycleDelay");
-            m_RpcHashSizeProperty = m_NetworkConfigProperty.FindPropertyRelative("RpcHashSize");
+
+            m_EnableSceneManagementProperty = m_NetworkConfigProperty.FindPropertyRelative("EnableSceneManagement");
+            m_SpawnTimeOutProperty = m_NetworkConfigProperty.FindPropertyRelative("SpawnTimeout");
             m_LoadSceneTimeOutProperty = m_NetworkConfigProperty.FindPropertyRelative("LoadSceneTimeOut");
+
+            m_NetworkProfileMetrics = m_NetworkConfigProperty.FindPropertyRelative("NetworkProfileMetrics");
+#if MULTIPLAYER_TOOLS
+            m_NetworkMessageMetrics = m_NetworkConfigProperty.FindPropertyRelative("NetworkMessageMetrics");
+#endif
+            m_RpcHashSizeProperty = m_NetworkConfigProperty.FindPropertyRelative("RpcHashSize");
             m_PrefabsList = m_NetworkConfigProperty
                 .FindPropertyRelative(nameof(NetworkConfig.Prefabs))
                 .FindPropertyRelative(nameof(NetworkPrefabs.NetworkPrefabsLists));
@@ -148,325 +146,263 @@ private void CheckNullProperties()
             m_ProtocolVersionProperty = m_NetworkConfigProperty.FindPropertyRelative("ProtocolVersion");
             m_NetworkTransportProperty = m_NetworkConfigProperty.FindPropertyRelative("NetworkTransport");
             m_TickRateProperty = m_NetworkConfigProperty.FindPropertyRelative("TickRate");
+#if MULTIPLAYER_SERVICES_SDK_INSTALLED
+            m_NetworkTopologyProperty = m_NetworkConfigProperty.FindPropertyRelative("NetworkTopology");
+            // Only display the auto spawn property when the distributed authority network topology is selected
+            if (m_NetworkManager.NetworkConfig.NetworkTopology == NetworkTopologyTypes.DistributedAuthority)
+            {
+                m_AutoSpawnPlayerPrefabClientSide = m_NetworkConfigProperty.FindPropertyRelative("AutoSpawnPlayerPrefabClientSide");
+            }
+#endif
             m_ClientConnectionBufferTimeoutProperty = m_NetworkConfigProperty.FindPropertyRelative("ClientConnectionBufferTimeout");
             m_ConnectionApprovalProperty = m_NetworkConfigProperty.FindPropertyRelative("ConnectionApproval");
             m_EnsureNetworkVariableLengthSafetyProperty = m_NetworkConfigProperty.FindPropertyRelative("EnsureNetworkVariableLengthSafety");
             m_ForceSamePrefabsProperty = m_NetworkConfigProperty.FindPropertyRelative("ForceSamePrefabs");
-            m_EnableSceneManagementProperty = m_NetworkConfigProperty.FindPropertyRelative("EnableSceneManagement");
             m_RecycleNetworkIdsProperty = m_NetworkConfigProperty.FindPropertyRelative("RecycleNetworkIds");
             m_NetworkIdRecycleDelayProperty = m_NetworkConfigProperty.FindPropertyRelative("NetworkIdRecycleDelay");
-            m_RpcHashSizeProperty = m_NetworkConfigProperty.FindPropertyRelative("RpcHashSize");
+
+
+            m_EnableSceneManagementProperty = m_NetworkConfigProperty.FindPropertyRelative("EnableSceneManagement");
+            m_SpawnTimeOutProperty = m_NetworkConfigProperty.FindPropertyRelative("SpawnTimeout");
             m_LoadSceneTimeOutProperty = m_NetworkConfigProperty.FindPropertyRelative("LoadSceneTimeOut");
+
+            m_NetworkProfileMetrics = m_NetworkConfigProperty.FindPropertyRelative("NetworkProfilingMetrics");
+#if MULTIPLAYER_TOOLS
+            m_NetworkMessageMetrics = m_NetworkConfigProperty.FindPropertyRelative("NetworkMessageMetrics");
+#endif
+
+            m_RpcHashSizeProperty = m_NetworkConfigProperty.FindPropertyRelative("RpcHashSize");
             m_PrefabsList = m_NetworkConfigProperty
                 .FindPropertyRelative(nameof(NetworkConfig.Prefabs))
                 .FindPropertyRelative(nameof(NetworkPrefabs.NetworkPrefabsLists));
         }
 
-        private void DrawAllPropertyFields()
+        private void DisplayNetworkManagerProperties()
         {
-            serializedObject.Update();
-            EditorGUILayout.PropertyField(m_RunInBackgroundProperty);
-            EditorGUILayout.PropertyField(m_LogLevelProperty);
-            EditorGUILayout.Space();
-
-            EditorGUILayout.PropertyField(m_PlayerPrefabProperty);
-            EditorGUILayout.Space();
-
-            DrawPrefabListField();
-
-            EditorGUILayout.Space();
-
-            EditorGUILayout.LabelField("General", EditorStyles.boldLabel);
-            EditorGUILayout.PropertyField(m_ProtocolVersionProperty);
-
-            DrawTransportField();
-
-            EditorGUILayout.PropertyField(m_TickRateProperty);
-
-            EditorGUILayout.LabelField("Performance", EditorStyles.boldLabel);
-
-            EditorGUILayout.PropertyField(m_EnsureNetworkVariableLengthSafetyProperty);
-
-            EditorGUILayout.LabelField("Connection", EditorStyles.boldLabel);
-            EditorGUILayout.PropertyField(m_ConnectionApprovalProperty);
-
-            using (new EditorGUI.DisabledScope(!m_NetworkManager.NetworkConfig.ConnectionApproval))
-            {
-                EditorGUILayout.PropertyField(m_ClientConnectionBufferTimeoutProperty);
-            }
-
-            EditorGUILayout.LabelField("Spawning", EditorStyles.boldLabel);
-            EditorGUILayout.PropertyField(m_ForceSamePrefabsProperty);
-
-            EditorGUILayout.PropertyField(m_RecycleNetworkIdsProperty);
-
-            using (new EditorGUI.DisabledScope(!m_NetworkManager.NetworkConfig.RecycleNetworkIds))
-            {
-                EditorGUILayout.PropertyField(m_NetworkIdRecycleDelayProperty);
-            }
-
-            EditorGUILayout.LabelField("Bandwidth", EditorStyles.boldLabel);
-            EditorGUILayout.PropertyField(m_RpcHashSizeProperty);
-
-            EditorGUILayout.LabelField("Scene Management", EditorStyles.boldLabel);
-            EditorGUILayout.PropertyField(m_EnableSceneManagementProperty);
-
-            using (new EditorGUI.DisabledScope(!m_NetworkManager.NetworkConfig.EnableSceneManagement))
+            if (!m_NetworkManager.IsServer && !m_NetworkManager.IsClient)
             {
-                EditorGUILayout.PropertyField(m_LoadSceneTimeOutProperty);
-            }
+                serializedObject.Update();
 
-            serializedObject.ApplyModifiedProperties();
-        }
+                EditorGUILayout.PropertyField(m_RunInBackgroundProperty);
+                EditorGUILayout.PropertyField(m_LogLevelProperty);
+                EditorGUILayout.Space();
 
-        private void DrawTransportField()
-        {
-#if RELAY_INTEGRATION_AVAILABLE
-            var useRelay = EditorPrefs.GetBool(m_UseEasyRelayIntegrationKey, false);
-#else
-            var useRelay = false;
+                EditorGUILayout.LabelField("Network Settings", EditorStyles.boldLabel);
+#if MULTIPLAYER_SERVICES_SDK_INSTALLED
+                EditorGUILayout.PropertyField(m_NetworkTopologyProperty);
 #endif
-
-            if (useRelay)
-            {
-                EditorGUILayout.HelpBox("Test connection with relay is enabled, so the default Unity Transport will be used", MessageType.Info);
-                GUI.enabled = false;
+                EditorGUILayout.PropertyField(m_ProtocolVersionProperty);
                 EditorGUILayout.PropertyField(m_NetworkTransportProperty);
-                GUI.enabled = true;
-                return;
-            }
+                if (m_NetworkTransportProperty.objectReferenceValue == null)
+                {
+                    EditorGUILayout.HelpBox("You have no transport selected. A transport is required for netcode to work. Which one do you want?", MessageType.Warning);
 
-            EditorGUILayout.PropertyField(m_NetworkTransportProperty);
+                    int selection = EditorGUILayout.Popup(0, m_TransportNames);
 
-            if (m_NetworkTransportProperty.objectReferenceValue == null)
-            {
-                EditorGUILayout.HelpBox("You have no transport selected. A transport is required for netcode to work. Which one do you want?", MessageType.Warning);
+                    if (selection > 0)
+                    {
+                        ReloadTransports();
 
-                int selection = EditorGUILayout.Popup(0, m_TransportNames);
+                        var transportComponent = m_NetworkManager.gameObject.GetComponent(m_TransportTypes[selection - 1]) ?? m_NetworkManager.gameObject.AddComponent(m_TransportTypes[selection - 1]);
+                        m_NetworkTransportProperty.objectReferenceValue = transportComponent;
 
-                if (selection > 0)
+                        Repaint();
+                    }
+                }
+                EditorGUILayout.PropertyField(m_TickRateProperty);
+                EditorGUILayout.PropertyField(m_SpawnTimeOutProperty);
+                EditorGUILayout.PropertyField(m_ConnectionApprovalProperty);
+                if (m_NetworkManager.NetworkConfig.ConnectionApproval)
                 {
-                    ReloadTransports();
-
-                    var transportComponent = m_NetworkManager.gameObject.GetComponent(m_TransportTypes[selection - 1]) ?? m_NetworkManager.gameObject.AddComponent(m_TransportTypes[selection - 1]);
-                    m_NetworkTransportProperty.objectReferenceValue = transportComponent;
-
-                    Repaint();
+                    EditorGUILayout.PropertyField(m_ClientConnectionBufferTimeoutProperty);
                 }
-            }
-        }
-
-#if RELAY_INTEGRATION_AVAILABLE
-        private readonly string m_UseEasyRelayIntegrationKey = "NetworkManagerUI_UseRelay_" + Application.dataPath.GetHashCode();
-        private string m_JoinCode = "";
-        private string m_StartConnectionError = null;
-        private string m_Region = "";
+                EditorGUILayout.PropertyField(m_EnsureNetworkVariableLengthSafetyProperty, new GUIContent("NetworkVariable Length Safety"));
+                EditorGUILayout.PropertyField(m_RecycleNetworkIdsProperty);
+                if (m_NetworkManager.NetworkConfig.RecycleNetworkIds)
+                {
+                    EditorGUILayout.PropertyField(m_NetworkIdRecycleDelayProperty);
+                }
+                EditorGUILayout.PropertyField(m_RpcHashSizeProperty);
 
-        // wait for next frame so that ImGui finishes the current frame
-        private static void RunNextFrame(Action action) => EditorApplication.delayCall += () => action();
+                EditorGUILayout.PropertyField(m_NetworkProfileMetrics);
+#if MULTIPLAYER_TOOLS
+                EditorGUILayout.PropertyField(m_NetworkMessageMetrics);
 #endif
 
-        private void ShowStartConnectionButtons()
-        {
-            EditorGUILayout.LabelField("Start Connection", EditorStyles.boldLabel);
-
-#if RELAY_INTEGRATION_AVAILABLE
-            // use editor prefs to persist the setting when entering / leaving play mode / exiting Unity
-            var useRelay = EditorPrefs.GetBool(m_UseEasyRelayIntegrationKey, false);
-            GUILayout.BeginHorizontal();
-            useRelay = GUILayout.Toggle(useRelay, "Try Relay in the Editor");
-
-            var icon = EditorGUIUtility.IconContent("_Help");
-            icon.tooltip = "This will help you test relay in the Editor. Click here to know how to integrate Relay in your build";
-            if (GUILayout.Button(icon, GUIStyle.none, GUILayout.Width(20)))
-            {
-                Application.OpenURL("https://docs-multiplayer.unity3d.com/netcode/current/relay/");
-            }
-            GUILayout.EndHorizontal();
-
-            EditorPrefs.SetBool(m_UseEasyRelayIntegrationKey, useRelay);
-            if (useRelay && !Application.isPlaying && !CloudProjectSettings.projectBound)
-            {
-                EditorGUILayout.HelpBox("To use relay, you need to setup your project in the Project Settings in the Services section.", MessageType.Warning);
-                if (GUILayout.Button("Open Project settings"))
+                EditorGUILayout.Space();
+                EditorGUILayout.LabelField("Prefab Settings", EditorStyles.boldLabel);
+                EditorGUILayout.PropertyField(m_ForceSamePrefabsProperty);
+#if MULTIPLAYER_SERVICES_SDK_INSTALLED
+                // Only display the auto spawn property when the distributed authority network topology is selected
+                if (m_NetworkManager.NetworkConfig.NetworkTopology == NetworkTopologyTypes.DistributedAuthority)
                 {
-                    SettingsService.OpenProjectSettings("Project/Services");
+                    EditorGUILayout.PropertyField(m_AutoSpawnPlayerPrefabClientSide, new GUIContent("Auto Spawn Player Prefab"));
                 }
-            }
-#else
-            var useRelay = false;
 #endif
+                EditorGUILayout.PropertyField(m_PlayerPrefabProperty, new GUIContent("Default Player Prefab"));
 
-            string buttonDisabledReasonSuffix = "";
 
-            if (!EditorApplication.isPlaying)
-            {
-                buttonDisabledReasonSuffix = ". This can only be done in play mode";
-                GUI.enabled = false;
-            }
 
-            if (useRelay)
-            {
-                ShowStartConnectionButtons_Relay(buttonDisabledReasonSuffix);
-            }
-            else
-            {
-                ShowStartConnectionButtons_Standard(buttonDisabledReasonSuffix);
-            }
-
-            if (!EditorApplication.isPlaying)
-            {
-                GUI.enabled = true;
-            }
-        }
-
-        private void ShowStartConnectionButtons_Relay(string buttonDisabledReasonSuffix)
-        {
-#if RELAY_INTEGRATION_AVAILABLE
-
-            void AddStartServerOrHostButton(bool isServer)
-            {
-                var type = isServer ? "Server" : "Host";
-                if (GUILayout.Button(new GUIContent($"Start {type}", $"Starts a {type} instance with Relay{buttonDisabledReasonSuffix}")))
+                if (m_NetworkManager.NetworkConfig.HasOldPrefabList())
                 {
-                    m_StartConnectionError = null;
-                    RunNextFrame(async () =>
+                    EditorGUILayout.HelpBox("Network Prefabs serialized in old format. Migrate to new format to edit the list.", MessageType.Info);
+                    if (GUILayout.Button(new GUIContent("Migrate Prefab List", "Converts the old format Network Prefab list to a new Scriptable Object")))
                     {
-                        try
+                        // Default directory
+                        var directory = "Assets/";
+                        var assetPath = AssetDatabase.GetAssetPath(m_NetworkManager);
+                        if (assetPath == "")
+                        {
+                            assetPath = PrefabUtility.GetPrefabAssetPathOfNearestInstanceRoot(m_NetworkManager);
+                        }
+
+                        if (assetPath != "")
                         {
-                            var (joinCode, allocation) = isServer ? await m_NetworkManager.StartServerWithRelay() : await m_NetworkManager.StartHostWithRelay();
-                            m_JoinCode = joinCode;
-                            m_Region = allocation.Region;
-                            Repaint();
+                            directory = Path.GetDirectoryName(assetPath);
                         }
-                        catch (Exception e)
+                        else
                         {
-                            m_StartConnectionError = e.Message;
-                            throw;
+#if UNITY_2021_1_OR_NEWER
+                            var prefabStage = UnityEditor.SceneManagement.PrefabStageUtility.GetPrefabStage(m_NetworkManager.gameObject);
+#else
+                            var prefabStage = UnityEditor.Experimental.SceneManagement.PrefabStageUtility.GetPrefabStage(m_NetworkManager.gameObject);
+#endif
+                            if (prefabStage != null)
+                            {
+                                var prefabPath = prefabStage.assetPath;
+                                if (!string.IsNullOrEmpty(prefabPath))
+                                {
+                                    directory = Path.GetDirectoryName(prefabPath);
+                                }
+                            }
+                            if (m_NetworkManager.gameObject.scene != null)
+                            {
+                                var scenePath = m_NetworkManager.gameObject.scene.path;
+                                if (!string.IsNullOrEmpty(scenePath))
+                                {
+                                    directory = Path.GetDirectoryName(scenePath);
+                                }
+                            }
                         }
-                    });
+                        var networkPrefabs = m_NetworkManager.NetworkConfig.MigrateOldNetworkPrefabsToNetworkPrefabsList();
+                        string path = Path.Combine(directory, $"NetworkPrefabs-{m_NetworkManager.GetInstanceID()}.asset");
+                        Debug.Log("Saving migrated Network Prefabs List to " + path);
+                        AssetDatabase.CreateAsset(networkPrefabs, path);
+                        EditorUtility.SetDirty(m_NetworkManager);
+                    }
                 }
-            }
-
-            AddStartServerOrHostButton(isServer: true);
-            AddStartServerOrHostButton(isServer: false);
-
-            GUILayout.Space(8f);
-            m_JoinCode = EditorGUILayout.TextField("Relay Join Code", m_JoinCode);
-            if (GUILayout.Button(new GUIContent("Start Client", "Starts a client instance with Relay" + buttonDisabledReasonSuffix)))
-            {
-                m_StartConnectionError = null;
-                RunNextFrame(async () =>
+                else
                 {
-                    if (string.IsNullOrEmpty(m_JoinCode))
+                    if (m_NetworkManager.NetworkConfig.Prefabs.NetworkPrefabsLists.Count == 0)
                     {
-                        m_StartConnectionError = "Please provide a join code!";
-                        return;
+                        EditorGUILayout.HelpBox("You have no prefab list selected. You will have to add your prefabs manually at runtime for netcode to work.", MessageType.Warning);
                     }
+                    EditorGUILayout.PropertyField(m_PrefabsList);
+                }
 
-                    try
-                    {
-                        var allocation = await m_NetworkManager.StartClientWithRelay(m_JoinCode);
-                        m_Region = allocation.Region;
-                        Repaint();
-                    }
-                    catch (Exception e)
-                    {
-                        m_StartConnectionError = e.Message;
-                        throw;
-                    }
-                });
-            }
+                EditorGUILayout.Space();
+                EditorGUILayout.LabelField("Scene Management Settings", EditorStyles.boldLabel);
+                EditorGUILayout.PropertyField(m_EnableSceneManagementProperty);
+                if (m_NetworkManager.NetworkConfig.EnableSceneManagement)
+                {
+                    EditorGUILayout.PropertyField(m_LoadSceneTimeOutProperty);
+                }
 
-            if (Application.isPlaying && !string.IsNullOrEmpty(m_StartConnectionError))
-            {
-                EditorGUILayout.HelpBox(m_StartConnectionError, MessageType.Error);
+                serializedObject.ApplyModifiedProperties();
             }
-#endif
         }
 
-        private void ShowStartConnectionButtons_Standard(string buttonDisabledReasonSuffix)
+        private void DisplayCallToActionButtons()
         {
-            if (GUILayout.Button(new GUIContent("Start Host", "Starts a host instance" + buttonDisabledReasonSuffix)))
+            if (!m_NetworkManager.IsServer && !m_NetworkManager.IsClient)
             {
-                m_NetworkManager.StartHost();
-            }
+                string buttonDisabledReasonSuffix = "";
 
-            if (GUILayout.Button(new GUIContent("Start Server", "Starts a server instance" + buttonDisabledReasonSuffix)))
-            {
-                m_NetworkManager.StartServer();
-            }
+                if (!EditorApplication.isPlaying)
+                {
+                    buttonDisabledReasonSuffix = ". This can only be done in play mode";
+                    GUI.enabled = false;
+                }
 
-            if (GUILayout.Button(new GUIContent("Start Client", "Starts a client instance" + buttonDisabledReasonSuffix)))
-            {
-                m_NetworkManager.StartClient();
-            }
-        }
+                if (m_NetworkManager.NetworkConfig.NetworkTopology == NetworkTopologyTypes.ClientServer)
+                {
+                    if (GUILayout.Button(new GUIContent("Start Host", "Starts a host instance" + buttonDisabledReasonSuffix)))
+                    {
+                        m_NetworkManager.StartHost();
+                    }
 
-        private void DrawDisconnectButton()
-        {
-            string instanceType = string.Empty;
+                    if (GUILayout.Button(new GUIContent("Start Server", "Starts a server instance" + buttonDisabledReasonSuffix)))
+                    {
+                        m_NetworkManager.StartServer();
+                    }
 
-            if (m_NetworkManager.IsHost)
-            {
-                instanceType = "Host";
-            }
-            else if (m_NetworkManager.IsServer)
-            {
-                instanceType = "Server";
-            }
-            else if (m_NetworkManager.IsClient)
-            {
-                instanceType = "Client";
-            }
+                    if (GUILayout.Button(new GUIContent("Start Client", "Starts a client instance" + buttonDisabledReasonSuffix)))
+                    {
+                        m_NetworkManager.StartClient();
+                    }
+                }
+                else
+                {
+                    if (GUILayout.Button(new GUIContent("Start Client", "Starts a distributed authority client instance" + buttonDisabledReasonSuffix)))
+                    {
+                        m_NetworkManager.StartClient();
+                    }
+                }
 
-            EditorGUILayout.HelpBox($"You cannot edit the NetworkConfig when a {instanceType} is running.", MessageType.Info);
 
-#if RELAY_INTEGRATION_AVAILABLE
-            if (!string.IsNullOrEmpty(m_JoinCode) && !string.IsNullOrEmpty(m_Region))
+                if (!EditorApplication.isPlaying)
+                {
+                    GUI.enabled = true;
+                }
+            }
+            else
             {
-                var style = new GUIStyle(EditorStyles.helpBox)
+                string instanceType = string.Empty;
+
+                if (m_NetworkManager.IsHost)
                 {
-                    fontSize = 10,
-                    alignment = TextAnchor.MiddleCenter,
-                };
+                    instanceType = "Host";
+                }
+                else if (m_NetworkManager.IsServer)
+                {
+                    instanceType = "Server";
+                }
+                else if (m_NetworkManager.IsClient)
+                {
+                    instanceType = "Client";
+                }
 
-                GUILayout.BeginHorizontal(style, GUILayout.ExpandWidth(true), GUILayout.ExpandHeight(false), GUILayout.MaxWidth(800));
-                GUILayout.Label(new GUIContent(EditorGUIUtility.IconContent(k_InfoIconName)), GUILayout.ExpandWidth(false), GUILayout.ExpandHeight(true));
-                GUILayout.Space(25f);
-                GUILayout.BeginVertical();
-                GUILayout.Space(4f);
-                GUILayout.Label($"Connected via relay ({m_Region}).\nJoin code: {m_JoinCode}", EditorStyles.miniLabel, GUILayout.ExpandHeight(true));
+                EditorGUILayout.HelpBox("You cannot edit the NetworkConfig when a " + instanceType + " is running.", MessageType.Info);
 
-                if (GUILayout.Button("Copy code", GUILayout.ExpandHeight(true)))
+                if (GUILayout.Button(new GUIContent("Stop " + instanceType, "Stops the " + instanceType + " instance.")))
                 {
-                    GUIUtility.systemCopyBuffer = m_JoinCode;
+                    m_NetworkManager.Shutdown();
                 }
-
-                GUILayout.Space(4f);
-                GUILayout.EndVertical();
-                GUILayout.Space(2f);
-                GUILayout.EndHorizontal();
             }
-#endif
+        }
 
-            if (GUILayout.Button(new GUIContent($"Stop {instanceType}", $"Stops the {instanceType} instance.")))
-            {
-#if RELAY_INTEGRATION_AVAILABLE
-                m_JoinCode = "";
+        /// <inheritdoc/>
+        public override void OnInspectorGUI()
+        {
+            var networkManager = target as NetworkManager;
+            Initialize();
+            CheckNullProperties();
+#if !MULTIPLAYER_TOOLS
+            DrawInstallMultiplayerToolsTip();
 #endif
-                m_NetworkManager.Shutdown();
-            }
+            void SetExpanded(bool expanded) { networkManager.NetworkManagerExpanded = expanded; };
+            DrawFoldOutGroup<NetworkManager>(networkManager.GetType(), DisplayNetworkManagerProperties, networkManager.NetworkManagerExpanded, SetExpanded);
+            DisplayCallToActionButtons();
+            base.OnInspectorGUI();
         }
 
-        private const string k_InfoIconName = "console.infoicon";
         private static void DrawInstallMultiplayerToolsTip()
         {
             const string getToolsText = "Access additional tools for multiplayer development by installing the Multiplayer Tools package in the Package Manager.";
             const string openDocsButtonText = "Open Docs";
             const string dismissButtonText = "Dismiss";
             const string targetUrl = "https://docs-multiplayer.unity3d.com/tools/current/install-tools";
-
+            const string infoIconName = "console.infoicon";
 
             if (NetcodeForGameObjectsEditorSettings.GetNetcodeInstallMultiplayerToolTips() != 0)
             {
@@ -497,7 +433,7 @@ private static void DrawInstallMultiplayerToolsTip()
             GUILayout.FlexibleSpace();
             GUILayout.BeginHorizontal(s_HelpBoxStyle, GUILayout.ExpandWidth(true), GUILayout.ExpandHeight(false), GUILayout.MaxWidth(800));
             {
-                GUILayout.Label(new GUIContent(EditorGUIUtility.IconContent(k_InfoIconName)), GUILayout.ExpandWidth(false), GUILayout.ExpandHeight(true));
+                GUILayout.Label(new GUIContent(EditorGUIUtility.IconContent(infoIconName)), GUILayout.ExpandWidth(false), GUILayout.ExpandHeight(true));
                 GUILayout.Space(4);
                 GUILayout.Label(getToolsText, s_CenteredWordWrappedLabelStyle, GUILayout.ExpandHeight(true));
 
@@ -530,69 +466,5 @@ private static void DrawInstallMultiplayerToolsTip()
 
             GUILayout.Space(10);
         }
-
-        private void DrawPrefabListField()
-        {
-            if (!m_NetworkManager.NetworkConfig.HasOldPrefabList())
-            {
-                if (m_NetworkManager.NetworkConfig.Prefabs.NetworkPrefabsLists.Count == 0)
-                {
-                    EditorGUILayout.HelpBox("You have no prefab list selected. You will have to add your prefabs manually at runtime for netcode to work.", MessageType.Warning);
-                }
-
-                EditorGUILayout.PropertyField(m_PrefabsList);
-                return;
-            }
-
-            // Old format of prefab list
-            EditorGUILayout.HelpBox("Network Prefabs serialized in old format. Migrate to new format to edit the list.", MessageType.Info);
-            if (GUILayout.Button(new GUIContent("Migrate Prefab List", "Converts the old format Network Prefab list to a new Scriptable Object")))
-            {
-                // Default directory
-                var directory = "Assets/";
-                var assetPath = AssetDatabase.GetAssetPath(m_NetworkManager);
-                if (assetPath == "")
-                {
-                    assetPath = PrefabUtility.GetPrefabAssetPathOfNearestInstanceRoot(m_NetworkManager);
-                }
-
-                if (assetPath != "")
-                {
-                    directory = Path.GetDirectoryName(assetPath);
-                }
-                else
-                {
-
-#if UNITY_2021_1_OR_NEWER
-                    var prefabStage = UnityEditor.SceneManagement.PrefabStageUtility.GetPrefabStage(m_NetworkManager.gameObject);
-#else
-                    var prefabStage = UnityEditor.Experimental.SceneManagement.PrefabStageUtility.GetPrefabStage(m_NetworkManager.gameObject);
-#endif
-                    if (prefabStage != null)
-                    {
-                        var prefabPath = prefabStage.assetPath;
-                        if (!string.IsNullOrEmpty(prefabPath))
-                        {
-                            directory = Path.GetDirectoryName(prefabPath);
-                        }
-                    }
-
-                    if (m_NetworkManager.gameObject.scene != null)
-                    {
-                        var scenePath = m_NetworkManager.gameObject.scene.path;
-                        if (!string.IsNullOrEmpty(scenePath))
-                        {
-                            directory = Path.GetDirectoryName(scenePath);
-                        }
-                    }
-                }
-
-                var networkPrefabs = m_NetworkManager.NetworkConfig.MigrateOldNetworkPrefabsToNetworkPrefabsList();
-                string path = Path.Combine(directory, $"NetworkPrefabs-{m_NetworkManager.GetInstanceID()}.asset");
-                Debug.Log("Saving migrated Network Prefabs List to " + path);
-                AssetDatabase.CreateAsset(networkPrefabs, path);
-                EditorUtility.SetDirty(m_NetworkManager);
-            }
-        }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Editor/NetworkManagerHelper.cs b/com.unity.netcode.gameobjects/Editor/NetworkManagerHelper.cs
index 3138369d57..5cba906f2a 100644
--- a/com.unity.netcode.gameobjects/Editor/NetworkManagerHelper.cs
+++ b/com.unity.netcode.gameobjects/Editor/NetworkManagerHelper.cs
@@ -27,6 +27,7 @@ public class NetworkManagerHelper : NetworkManager.INetworkManagerHelper
         private static void InitializeOnload()
         {
             Singleton = new NetworkManagerHelper();
+
             NetworkManager.NetworkManagerHelper = Singleton;
             EditorApplication.playModeStateChanged -= EditorApplication_playModeStateChanged;
             EditorApplication.hierarchyChanged -= EditorApplication_hierarchyChanged;
@@ -224,6 +225,17 @@ public bool NotifyUserOfNestedNetworkManager(NetworkManager networkManager, bool
             }
             return isParented;
         }
+
+        internal NetcodeAnalytics NetcodeAnalytics = new NetcodeAnalytics();
+
+        /// <summary>
+        /// Directly define the interface method to keep this internal
+        /// </summary>
+        /// <returns>The <see cref="NetcodeAnalytics"/> instance which is derived from the <see cref="NetworkManager.NetcodeAnalytics"/> abstract class.</returns>
+        NetworkManager.NetcodeAnalytics NetworkManager.INetworkManagerHelper.Analytics()
+        {
+            return NetcodeAnalytics;
+        }
     }
 #endif
 }
diff --git a/com.unity.netcode.gameobjects/Editor/NetworkManagerRelayIntegration.cs b/com.unity.netcode.gameobjects/Editor/NetworkManagerRelayIntegration.cs
index a3cfd36d7a..d9d48c003f 100644
--- a/com.unity.netcode.gameobjects/Editor/NetworkManagerRelayIntegration.cs
+++ b/com.unity.netcode.gameobjects/Editor/NetworkManagerRelayIntegration.cs
@@ -1,4 +1,4 @@
-#if UNITY_2022_3_OR_NEWER && (RELAY_SDK_INSTALLED && !UNITY_WEBGL ) || (RELAY_SDK_INSTALLED && UNITY_WEBGL && UTP_TRANSPORT_2_0_ABOVE)
+#if UNITY_2022_3_OR_NEWER && (RELAY_SDK_INSTALLED && !UNITY_WEBGL ) || (RELAY_SDK_INSTALLED && UNITY_WEBGL)
 using System;
 using System.Threading.Tasks;
 using Unity.Netcode.Transports.UTP;
@@ -109,9 +109,7 @@ private static UnityTransport GetUnityTransport(NetworkManager networkManager, s
             {
                 transport = networkManager.gameObject.AddComponent<UnityTransport>();
             }
-#if UTP_TRANSPORT_2_0_ABOVE
             transport.UseWebSockets = connectionType.StartsWith("ws"); // Probably should be part of SetRelayServerData, but not possible at this point
-#endif
             networkManager.NetworkConfig.NetworkTransport = transport; // Force using UnityTransport
             return transport;
         }
diff --git a/com.unity.netcode.gameobjects/Editor/NetworkObjectEditor.cs b/com.unity.netcode.gameobjects/Editor/NetworkObjectEditor.cs
index 1b582f88e2..04e0d1f698 100644
--- a/com.unity.netcode.gameobjects/Editor/NetworkObjectEditor.cs
+++ b/com.unity.netcode.gameobjects/Editor/NetworkObjectEditor.cs
@@ -1,4 +1,7 @@
 using System.Collections.Generic;
+#if BYPASS_DEFAULT_ENUM_DRAWER && MULTIPLAYER_SERVICES_SDK_INSTALLED
+using System.Linq;
+#endif
 using UnityEditor;
 using UnityEngine;
 
@@ -11,6 +14,9 @@ namespace Unity.Netcode.Editor
     [CanEditMultipleObjects]
     public class NetworkObjectEditor : UnityEditor.Editor
     {
+        private const NetworkObject.OwnershipStatus k_AllOwnershipFlags = NetworkObject.OwnershipStatus.RequestRequired | NetworkObject.OwnershipStatus.Transferable | NetworkObject.OwnershipStatus.Distributable;
+        private const int k_SessionOwnerFlagAsInt = (int)NetworkObject.OwnershipStatus.SessionOwner;
+
         private bool m_Initialized;
         private NetworkObject m_NetworkObject;
         private bool m_ShowObservers;
@@ -49,6 +55,10 @@ public override void OnInspectorGUI()
             {
                 var guiEnabled = GUI.enabled;
                 GUI.enabled = false;
+                if (m_NetworkObject.NetworkManager.DistributedAuthorityMode)
+                {
+                    EditorGUILayout.PropertyField(serializedObject.FindProperty(nameof(NetworkObject.Ownership)));
+                }
                 EditorGUILayout.TextField(nameof(NetworkObject.GlobalObjectIdHash), m_NetworkObject.GlobalObjectIdHash.ToString());
                 EditorGUILayout.TextField(nameof(NetworkObject.NetworkObjectId), m_NetworkObject.NetworkObjectId.ToString());
                 EditorGUILayout.TextField(nameof(NetworkObject.OwnerClientId), m_NetworkObject.OwnerClientId.ToString());
@@ -81,6 +91,14 @@ public override void OnInspectorGUI()
 
                         while (observerClientIds.MoveNext())
                         {
+                            if (!m_NetworkObject.NetworkManager.ConnectedClients.ContainsKey(observerClientIds.Current))
+                            {
+                                if ((observerClientIds.Current == 0 && m_NetworkObject.NetworkManager.IsHost) || observerClientIds.Current > 0)
+                                {
+                                    Debug.LogWarning($"Client-{observerClientIds.Current} is listed as an observer but is not connected!");
+                                }
+                                continue;
+                            }
                             if (m_NetworkObject.NetworkManager.ConnectedClients[observerClientIds.Current].PlayerObject != null)
                             {
                                 EditorGUILayout.ObjectField($"ClientId: {observerClientIds.Current}", m_NetworkObject.NetworkManager.ConnectedClients[observerClientIds.Current].PlayerObject, typeof(GameObject), false);
@@ -99,7 +117,39 @@ public override void OnInspectorGUI()
             {
                 EditorGUI.BeginChangeCheck();
                 serializedObject.UpdateIfRequiredOrScript();
+
+                // Get the current ownership property and precalculate values in order to handle
+                // the exclusion or inclusion of "all" or just the session owner flags.
+                var ownershipProperty = serializedObject.FindProperty(nameof(NetworkObject.Ownership));
+                var previousOwnership = (NetworkObject.OwnershipStatus)ownershipProperty.intValue;
+                var hadAll = previousOwnership == k_AllOwnershipFlags;
+                var hadSessionOwner = ownershipProperty.intValue == k_SessionOwnerFlagAsInt;
+
                 DrawPropertiesExcluding(serializedObject, k_HiddenFields);
+
+                // If the ownership flags were changed
+                var currentOwnership = (NetworkObject.OwnershipStatus)ownershipProperty.intValue;
+                if (currentOwnership != previousOwnership)
+                {
+                    // Determine if we need to handle setting or removing the session owner flag specifically
+                    // when a user selects the "All" enum flag value.
+                    var hasSessionOwner = currentOwnership.HasFlag(NetworkObject.OwnershipStatus.SessionOwner);
+                    if (hasSessionOwner)
+                    {
+                        if (ownershipProperty.intValue == -1 && !hadAll)
+                        {
+                            ownershipProperty.intValue = (int)k_AllOwnershipFlags;
+                        }
+                        else if ((hadAll && !hadSessionOwner) || (!hadAll && !hadSessionOwner))
+                        {
+                            ownershipProperty.intValue = k_SessionOwnerFlagAsInt;
+                        }
+                        else if (hadSessionOwner && hasSessionOwner)
+                        {
+                            ownershipProperty.intValue &= ~k_SessionOwnerFlagAsInt;
+                        }
+                    }
+                }
                 serializedObject.ApplyModifiedProperties();
                 EditorGUI.EndChangeCheck();
 
@@ -138,4 +188,52 @@ private void OnDestroy()
             NetworkBehaviourEditor.CheckForNetworkObject(m_GameObject, true);
         }
     }
+
+    // Keeping this here just in case, but it appears that in Unity 6 the visual bugs with
+    // enum flags is resolved
+#if BYPASS_DEFAULT_ENUM_DRAWER && MULTIPLAYER_SERVICES_SDK_INSTALLED
+    [CustomPropertyDrawer(typeof(NetworkObject.OwnershipStatus))]
+    public class NetworkObjectOwnership : PropertyDrawer
+    {
+        public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
+        {
+            label = EditorGUI.BeginProperty(position, label, property);
+            // Don't allow modification while in play mode
+            EditorGUI.BeginDisabledGroup(EditorApplication.isPlaying);
+
+            // This is a temporary work around due to EditorGUI.EnumFlagsField having a bug in how it displays mask values.
+            // For now, we will just display the flags as a toggle and handle the masking of the value ourselves.
+            EditorGUILayout.BeginHorizontal();
+            var names = System.Enum.GetNames(typeof(NetworkObject.OwnershipStatus)).ToList();
+            names.RemoveAt(0);
+            var value = property.enumValueFlag;
+            var compareValue = 0x01;
+            GUILayout.Label(label);
+            foreach (var name in names)
+            {
+                var isSet = (value & compareValue) > 0;
+                isSet = GUILayout.Toggle(isSet, name);
+                if (isSet)
+                {
+                    value |= compareValue;
+                }
+                else
+                {
+                    value &= ~compareValue;
+                }
+                compareValue = compareValue << 1;
+            }
+            property.enumValueFlag = value;
+            EditorGUILayout.EndHorizontal();
+
+            // The below can cause visual anomalies and/or throws an exception within the EditorGUI itself (index out of bounds of the array). and has
+            // The visual anomaly is when you select one field it is set in the drop down but then the flags selection in the popup menu selects more items
+            // even though if you exit the popup menu the flag setting is correct.
+            // var ownership = (NetworkObject.OwnershipStatus)EditorGUI.EnumFlagsField(position, label, (NetworkObject.OwnershipStatus)property.enumValueFlag);
+            // property.enumValueFlag = (int)ownership;
+            EditorGUI.EndDisabledGroup();
+            EditorGUI.EndProperty();
+        }
+    }
+#endif
 }
diff --git a/com.unity.netcode.gameobjects/Editor/NetworkRigidbodyBaseEditor.cs b/com.unity.netcode.gameobjects/Editor/NetworkRigidbodyBaseEditor.cs
new file mode 100644
index 0000000000..8ab99436d8
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Editor/NetworkRigidbodyBaseEditor.cs
@@ -0,0 +1,42 @@
+#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
+using Unity.Netcode.Components;
+using UnityEditor;
+
+namespace Unity.Netcode.Editor
+{
+    [CustomEditor(typeof(NetworkRigidbodyBase), true)]
+    [CanEditMultipleObjects]
+    public class NetworkRigidbodyBaseEditor : NetcodeEditorBase<NetworkBehaviour>
+    {
+        private SerializedProperty m_UseRigidBodyForMotion;
+        private SerializedProperty m_AutoUpdateKinematicState;
+        private SerializedProperty m_AutoSetKinematicOnDespawn;
+
+
+        public override void OnEnable()
+        {
+            m_UseRigidBodyForMotion = serializedObject.FindProperty(nameof(NetworkRigidbodyBase.UseRigidBodyForMotion));
+            m_AutoUpdateKinematicState = serializedObject.FindProperty(nameof(NetworkRigidbodyBase.AutoUpdateKinematicState));
+            m_AutoSetKinematicOnDespawn = serializedObject.FindProperty(nameof(NetworkRigidbodyBase.AutoSetKinematicOnDespawn));
+
+            base.OnEnable();
+        }
+
+        private void DisplayNetworkRigidbodyProperties()
+        {
+            EditorGUILayout.PropertyField(m_UseRigidBodyForMotion);
+            EditorGUILayout.PropertyField(m_AutoUpdateKinematicState);
+            EditorGUILayout.PropertyField(m_AutoSetKinematicOnDespawn);
+        }
+
+        /// <inheritdoc/>
+        public override void OnInspectorGUI()
+        {
+            var networkRigidbodyBase = target as NetworkRigidbodyBase;
+            void SetExpanded(bool expanded) { networkRigidbodyBase.NetworkRigidbodyBaseExpanded = expanded; };
+            DrawFoldOutGroup<NetworkRigidbodyBase>(networkRigidbodyBase.GetType(), DisplayNetworkRigidbodyProperties, networkRigidbodyBase.NetworkRigidbodyBaseExpanded, SetExpanded);
+            base.OnInspectorGUI();
+        }
+    }
+}
+#endif
diff --git a/com.unity.netcode.gameobjects/Editor/NetworkRigidbodyBaseEditor.cs.meta b/com.unity.netcode.gameobjects/Editor/NetworkRigidbodyBaseEditor.cs.meta
new file mode 100644
index 0000000000..c7fef8a318
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Editor/NetworkRigidbodyBaseEditor.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 06561c57f81a6354f8bb16076f1de3a9
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Editor/NetworkTransformEditor.cs b/com.unity.netcode.gameobjects/Editor/NetworkTransformEditor.cs
index a5abeb0c99..53d09b782f 100644
--- a/com.unity.netcode.gameobjects/Editor/NetworkTransformEditor.cs
+++ b/com.unity.netcode.gameobjects/Editor/NetworkTransformEditor.cs
@@ -8,8 +8,11 @@ namespace Unity.Netcode.Editor
     /// The <see cref="CustomEditor"/> for <see cref="NetworkTransform"/>
     /// </summary>
     [CustomEditor(typeof(NetworkTransform), true)]
-    public class NetworkTransformEditor : UnityEditor.Editor
+    [CanEditMultipleObjects]
+    public class NetworkTransformEditor : NetcodeEditorBase<NetworkTransform>
     {
+        private SerializedProperty m_SwitchTransformSpaceWhenParented;
+        private SerializedProperty m_TickSyncChildren;
         private SerializedProperty m_UseUnreliableDeltas;
         private SerializedProperty m_SyncPositionXProperty;
         private SerializedProperty m_SyncPositionYProperty;
@@ -25,23 +28,35 @@ public class NetworkTransformEditor : UnityEditor.Editor
         private SerializedProperty m_ScaleThresholdProperty;
         private SerializedProperty m_InLocalSpaceProperty;
         private SerializedProperty m_InterpolateProperty;
+        private SerializedProperty m_PositionInterpolationTypeProperty;
+        private SerializedProperty m_RotationInterpolationTypeProperty;
+        private SerializedProperty m_ScaleInterpolationTypeProperty;
+        private SerializedProperty m_PositionLerpSmoothing;
+        private SerializedProperty m_RotationLerpSmoothing;
+        private SerializedProperty m_ScaleLerpSmoothing;
+
+        private SerializedProperty m_PositionMaximumInterpolationTimeProperty;
+        private SerializedProperty m_RotationMaximumInterpolationTimeProperty;
+        private SerializedProperty m_ScaleMaximumInterpolationTimeProperty;
 
         private SerializedProperty m_UseQuaternionSynchronization;
         private SerializedProperty m_UseQuaternionCompression;
         private SerializedProperty m_UseHalfFloatPrecision;
         private SerializedProperty m_SlerpPosition;
+        private SerializedProperty m_AuthorityMode;
 
         private static int s_ToggleOffset = 45;
+
         private static float s_MaxRowWidth = EditorGUIUtility.labelWidth + EditorGUIUtility.fieldWidth + 5;
         private static GUIContent s_PositionLabel = EditorGUIUtility.TrTextContent("Position");
         private static GUIContent s_RotationLabel = EditorGUIUtility.TrTextContent("Rotation");
         private static GUIContent s_ScaleLabel = EditorGUIUtility.TrTextContent("Scale");
 
-        public virtual bool HideInterpolateValue => false;
-
         /// <inheritdoc/>
-        public void OnEnable()
+        public override void OnEnable()
         {
+            m_SwitchTransformSpaceWhenParented = serializedObject.FindProperty(nameof(NetworkTransform.SwitchTransformSpaceWhenParented));
+            m_TickSyncChildren = serializedObject.FindProperty(nameof(NetworkTransform.TickSyncChildren));
             m_UseUnreliableDeltas = serializedObject.FindProperty(nameof(NetworkTransform.UseUnreliableDeltas));
             m_SyncPositionXProperty = serializedObject.FindProperty(nameof(NetworkTransform.SyncPositionX));
             m_SyncPositionYProperty = serializedObject.FindProperty(nameof(NetworkTransform.SyncPositionY));
@@ -57,16 +72,32 @@ public void OnEnable()
             m_ScaleThresholdProperty = serializedObject.FindProperty(nameof(NetworkTransform.ScaleThreshold));
             m_InLocalSpaceProperty = serializedObject.FindProperty(nameof(NetworkTransform.InLocalSpace));
             m_InterpolateProperty = serializedObject.FindProperty(nameof(NetworkTransform.Interpolate));
+
+            m_PositionInterpolationTypeProperty = serializedObject.FindProperty(nameof(NetworkTransform.PositionInterpolationType));
+            m_PositionMaximumInterpolationTimeProperty = serializedObject.FindProperty(nameof(NetworkTransform.PositionMaxInterpolationTime));
+            m_RotationInterpolationTypeProperty = serializedObject.FindProperty(nameof(NetworkTransform.RotationInterpolationType));
+            m_RotationMaximumInterpolationTimeProperty = serializedObject.FindProperty(nameof(NetworkTransform.RotationMaxInterpolationTime));
+            m_ScaleInterpolationTypeProperty = serializedObject.FindProperty(nameof(NetworkTransform.ScaleInterpolationType));
+            m_ScaleMaximumInterpolationTimeProperty = serializedObject.FindProperty(nameof(NetworkTransform.ScaleMaxInterpolationTime));
+
+            m_PositionLerpSmoothing = serializedObject.FindProperty(nameof(NetworkTransform.PositionLerpSmoothing));
+            m_RotationLerpSmoothing = serializedObject.FindProperty(nameof(NetworkTransform.RotationLerpSmoothing));
+            m_ScaleLerpSmoothing = serializedObject.FindProperty(nameof(NetworkTransform.ScaleLerpSmoothing));
+
+
+
             m_UseQuaternionSynchronization = serializedObject.FindProperty(nameof(NetworkTransform.UseQuaternionSynchronization));
             m_UseQuaternionCompression = serializedObject.FindProperty(nameof(NetworkTransform.UseQuaternionCompression));
             m_UseHalfFloatPrecision = serializedObject.FindProperty(nameof(NetworkTransform.UseHalfFloatPrecision));
             m_SlerpPosition = serializedObject.FindProperty(nameof(NetworkTransform.SlerpPosition));
+            m_AuthorityMode = serializedObject.FindProperty(nameof(NetworkTransform.AuthorityMode));
+            base.OnEnable();
         }
 
-        /// <inheritdoc/>
-        public override void OnInspectorGUI()
+        private void DisplayNetworkTransformProperties()
         {
-            EditorGUILayout.LabelField("Syncing", EditorStyles.boldLabel);
+            var networkTransform = target as NetworkTransform;
+            EditorGUILayout.LabelField("Axis to Synchronize", EditorStyles.boldLabel);
             {
                 GUILayout.BeginHorizontal();
 
@@ -128,23 +159,95 @@ public override void OnInspectorGUI()
                 GUILayout.EndHorizontal();
             }
 
+            EditorGUILayout.Space();
+            EditorGUILayout.LabelField("Authority", EditorStyles.boldLabel);
+            {
+                EditorGUILayout.PropertyField(m_AuthorityMode);
+            }
             EditorGUILayout.Space();
             EditorGUILayout.LabelField("Thresholds", EditorStyles.boldLabel);
-            EditorGUILayout.PropertyField(m_PositionThresholdProperty);
-            EditorGUILayout.PropertyField(m_RotAngleThresholdProperty);
-            EditorGUILayout.PropertyField(m_ScaleThresholdProperty);
+            if (networkTransform.SynchronizePosition)
+            {
+                EditorGUILayout.PropertyField(m_PositionThresholdProperty);
+            }
+
+            if (networkTransform.SynchronizeRotation)
+            {
+                EditorGUILayout.PropertyField(m_RotAngleThresholdProperty);
+            }
+
+            if (networkTransform.SynchronizeScale)
+            {
+                EditorGUILayout.PropertyField(m_ScaleThresholdProperty);
+            }
+
             EditorGUILayout.Space();
             EditorGUILayout.LabelField("Delivery", EditorStyles.boldLabel);
+            EditorGUILayout.PropertyField(m_TickSyncChildren);
             EditorGUILayout.PropertyField(m_UseUnreliableDeltas);
             EditorGUILayout.Space();
             EditorGUILayout.LabelField("Configurations", EditorStyles.boldLabel);
+            EditorGUILayout.PropertyField(m_SwitchTransformSpaceWhenParented);
+            if (m_SwitchTransformSpaceWhenParented.boolValue)
+            {
+                m_TickSyncChildren.boolValue = true;
+            }
             EditorGUILayout.PropertyField(m_InLocalSpaceProperty);
-            if (!HideInterpolateValue)
+            if (!networkTransform.HideInterpolateValue)
             {
-                EditorGUILayout.PropertyField(m_InterpolateProperty);
+                if (networkTransform.Interpolate)
+                {
+                    EditorGUILayout.Space();
+                }
+                DrawPropertyField(m_InterpolateProperty, networkTransform.Interpolate ? FontStyle.Bold : FontStyle.Normal);
+                if (networkTransform.Interpolate)
+                {
+                    BeginIndent();
+                    if (networkTransform.SynchronizePosition)
+                    {
+                        DrawPropertyField(m_PositionInterpolationTypeProperty);
+
+                        BeginIndent();
+                        if (networkTransform.PositionInterpolationType != NetworkTransform.InterpolationTypes.SmoothDampening)
+                        {
+                            DrawPropertyField(m_SlerpPosition);
+                        }
+                        DrawPropertyField(m_PositionLerpSmoothing);
+                        if (networkTransform.PositionLerpSmoothing)
+                        {
+                            DrawPropertyField(m_PositionMaximumInterpolationTimeProperty);
+                        }
+                        EndIndent();
+                    }
+                    if (networkTransform.SynchronizeRotation)
+                    {
+                        DrawPropertyField(m_RotationInterpolationTypeProperty);
+
+                        BeginIndent();
+                        DrawPropertyField(m_RotationLerpSmoothing);
+                        if (networkTransform.RotationLerpSmoothing)
+                        {
+                            DrawPropertyField(m_RotationMaximumInterpolationTimeProperty);
+                        }
+                        EndIndent();
+                    }
+                    if (networkTransform.SynchronizeScale)
+                    {
+                        DrawPropertyField(m_ScaleInterpolationTypeProperty);
+
+                        BeginIndent();
+                        DrawPropertyField(m_ScaleLerpSmoothing);
+                        if (networkTransform.ScaleLerpSmoothing)
+                        {
+                            DrawPropertyField(m_ScaleMaximumInterpolationTimeProperty);
+                        }
+                        EndIndent();
+                    }
+                    EndIndent();
+                    EditorGUILayout.Space();
+                }
             }
 
-            EditorGUILayout.PropertyField(m_SlerpPosition);
             EditorGUILayout.PropertyField(m_UseQuaternionSynchronization);
             if (m_UseQuaternionSynchronization.boolValue)
             {
@@ -156,11 +259,9 @@ public override void OnInspectorGUI()
             }
             EditorGUILayout.PropertyField(m_UseHalfFloatPrecision);
 
-            // if rigidbody is present but network rigidbody is not present
-            var go = ((NetworkTransform)target).gameObject;
-
 #if COM_UNITY_MODULES_PHYSICS
-            if (go.TryGetComponent<Rigidbody>(out _) && go.TryGetComponent<NetworkRigidbody>(out _) == false)
+            // if rigidbody is present but network rigidbody is not present
+            if (networkTransform.TryGetComponent<Rigidbody>(out _) && networkTransform.TryGetComponent<NetworkRigidbody>(out _) == false)
             {
                 EditorGUILayout.HelpBox("This GameObject contains a Rigidbody but no NetworkRigidbody.\n" +
                     "Add a NetworkRigidbody component to improve Rigidbody synchronization.", MessageType.Warning);
@@ -168,14 +269,21 @@ public override void OnInspectorGUI()
 #endif // COM_UNITY_MODULES_PHYSICS
 
 #if COM_UNITY_MODULES_PHYSICS2D
-            if (go.TryGetComponent<Rigidbody2D>(out _) && go.TryGetComponent<NetworkRigidbody2D>(out _) == false)
+            if (networkTransform.TryGetComponent<Rigidbody2D>(out _) && networkTransform.TryGetComponent<NetworkRigidbody2D>(out _) == false)
             {
                 EditorGUILayout.HelpBox("This GameObject contains a Rigidbody2D but no NetworkRigidbody2D.\n" +
                     "Add a NetworkRigidbody2D component to improve Rigidbody2D synchronization.", MessageType.Warning);
             }
 #endif // COM_UNITY_MODULES_PHYSICS2D
+        }
 
-            serializedObject.ApplyModifiedProperties();
+        /// <inheritdoc/>
+        public override void OnInspectorGUI()
+        {
+            var networkTransform = target as NetworkTransform;
+            void SetExpanded(bool expanded) { networkTransform.NetworkTransformExpanded = expanded; };
+            DrawFoldOutGroup<NetworkTransform>(networkTransform.GetType(), DisplayNetworkTransformProperties, networkTransform.NetworkTransformExpanded, SetExpanded);
+            base.OnInspectorGUI();
         }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Editor/com.unity.netcode.editor.asmdef b/com.unity.netcode.gameobjects/Editor/com.unity.netcode.editor.asmdef
index 8eb62d05f4..490c1b2d55 100644
--- a/com.unity.netcode.gameobjects/Editor/com.unity.netcode.editor.asmdef
+++ b/com.unity.netcode.gameobjects/Editor/com.unity.netcode.editor.asmdef
@@ -50,9 +50,9 @@
             "define": "RELAY_SDK_INSTALLED"
         },
         {
-            "name": "com.unity.transport",
-            "expression": "2.0",
-            "define": "UTP_TRANSPORT_2_0_ABOVE"
+            "name": "com.unity.services.multiplayer",
+            "expression": "0.2.0",
+            "define": "MULTIPLAYER_SERVICES_SDK_INSTALLED"
         }
     ],
     "noEngineReferences": false
diff --git a/com.unity.netcode.gameobjects/LICENSE.md b/com.unity.netcode.gameobjects/LICENSE.md
index a5eb171398..ee8cecf4bf 100644
--- a/com.unity.netcode.gameobjects/LICENSE.md
+++ b/com.unity.netcode.gameobjects/LICENSE.md
@@ -1,9 +1,5 @@
-MIT License
+Unity Companion License (UCL License)
 
-Copyright (c) 2021 Unity Technologies
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+com.unity.netcode.gameobjects copyright © 2024 Unity Technologies
+Licensed under the Unity Companion License for Unity-dependent projects (see https://unity3d.com/legal/licenses/unity_companion_license).
+Unless expressly provided otherwise, the Software under this license is made available strictly on an “AS IS” BASIS WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED. Please review the license for details on these and other terms and conditions.
diff --git a/com.unity.netcode.gameobjects/Runtime/Components.meta b/com.unity.netcode.gameobjects/Runtime/Components.meta
new file mode 100644
index 0000000000..27ca3f3cd8
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Components.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2e42215d00468b549bbc69ebf8a74a1e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.netcode.gameobjects/Components/AnticipatedNetworkTransform.cs b/com.unity.netcode.gameobjects/Runtime/Components/AnticipatedNetworkTransform.cs
similarity index 80%
rename from com.unity.netcode.gameobjects/Components/AnticipatedNetworkTransform.cs
rename to com.unity.netcode.gameobjects/Runtime/Components/AnticipatedNetworkTransform.cs
index f39bda43b8..193a292136 100644
--- a/com.unity.netcode.gameobjects/Components/AnticipatedNetworkTransform.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Components/AnticipatedNetworkTransform.cs
@@ -13,24 +13,24 @@ namespace Unity.Netcode.Components
     ///
     /// <list type="bullet">
     ///
-    /// <item><b>Snap:</b> In this mode (with <see cref="StaleDataHandling"/> set to
+    /// <item><description><b>Snap:</b> In this mode (with <see cref="StaleDataHandling"/> set to
     /// <see cref="StaleDataHandling.Ignore"/> and no <see cref="NetworkBehaviour.OnReanticipate"/> callback),
     /// the moment a more up-to-date value is received from the authority, it will simply replace the anticipated value,
-    /// resulting in a "snap" to the new value if it is different from the anticipated value.</item>
+    /// resulting in a "snap" to the new value if it is different from the anticipated value.</description></item>
     ///
-    /// <item><b>Smooth:</b> In this mode (with <see cref="StaleDataHandling"/> set to
+    /// <item><description><b>Smooth:</b> In this mode (with <see cref="StaleDataHandling"/> set to
     /// <see cref="Netcode.StaleDataHandling.Ignore"/> and an <see cref="NetworkBehaviour.OnReanticipate"/> callback that calls
     /// <see cref="Smooth"/> from the anticipated value to the authority value with an appropriate
     /// <see cref="Mathf.Lerp"/>-style smooth function), when a more up-to-date value is received from the authority,
-    /// it will interpolate over time from an incorrect anticipated value to the correct authoritative value.</item>
+    /// it will interpolate over time from an incorrect anticipated value to the correct authoritative value.</description></item>
     ///
-    /// <item><b>Constant Reanticipation:</b> In this mode (with <see cref="StaleDataHandling"/> set to
+    /// <item><description><b>Constant Reanticipation:</b> In this mode (with <see cref="StaleDataHandling"/> set to
     /// <see cref="Netcode.StaleDataHandling.Reanticipate"/> and an <see cref="NetworkBehaviour.OnReanticipate"/> that calculates a
     /// new anticipated value based on the current authoritative value), when a more up-to-date value is received from
     /// the authority, user code calculates a new anticipated value, possibly calling <see cref="Smooth"/> to interpolate
     /// between the previous anticipation and the new anticipation. This is useful for values that change frequently and
     /// need to constantly be re-evaluated, as opposed to values that change only in response to user action and simply
-    /// need a one-time anticipation when the user performs that action.</item>
+    /// need a one-time anticipation when the user performs that action.</description></item>
     ///
     /// </list>
     ///
@@ -43,13 +43,31 @@ namespace Unity.Netcode.Components
 #pragma warning restore IDE0001
     [DisallowMultipleComponent]
     [AddComponentMenu("Netcode/Anticipated Network Transform")]
-    [DefaultExecutionOrder(100000)] // this is needed to catch the update time after the transform was updated by user scripts
     public class AnticipatedNetworkTransform : NetworkTransform
     {
+
+#if UNITY_EDITOR
+        internal override bool HideInterpolateValue => true;
+#endif
+
+        /// <summary>
+        /// Represents a complete transform state for network synchronization and anticipation
+        /// </summary>
         public struct TransformState
         {
+            /// <summary>
+            /// The position component of the transform state in world space coordinates.
+            /// </summary>
             public Vector3 Position;
+
+            /// <summary>
+            /// The rotation component of the transform state as a quaternion.
+            /// </summary>
             public Quaternion Rotation;
+
+            /// <summary>
+            /// The scale component of the transform state in local space.
+            /// </summary>
             public Vector3 Scale;
         }
 
@@ -57,7 +75,6 @@ public struct TransformState
         private TransformState m_AnticipatedTransform = new TransformState();
         private TransformState m_PreviousAnticipatedTransform = new TransformState();
         private ulong m_LastAnticipaionCounter;
-        private double m_LastAnticipationTime;
         private ulong m_LastAuthorityUpdateCounter;
 
         private TransformState m_SmoothFrom;
@@ -135,7 +152,7 @@ public bool ShouldReanticipate
         /// Anticipate that, at the end of one round trip to the server, this transform will be in the given
         /// <see cref="newPosition"/>
         /// </summary>
-        /// <param name="newPosition"></param>
+        /// <param name="newPosition">The anticipated position</param>
         public void AnticipateMove(Vector3 newPosition)
         {
             if (NetworkManager.ShutdownInProgress || !NetworkManager.IsListening)
@@ -152,7 +169,6 @@ public void AnticipateMove(Vector3 newPosition)
             m_PreviousAnticipatedTransform = m_AnticipatedTransform;
 
             m_LastAnticipaionCounter = NetworkManager.AnticipationSystem.AnticipationCounter;
-            m_LastAnticipationTime = NetworkManager.LocalTime.Time;
 
             m_SmoothDuration = 0;
             m_CurrentSmoothTime = 0;
@@ -162,7 +178,7 @@ public void AnticipateMove(Vector3 newPosition)
         /// Anticipate that, at the end of one round trip to the server, this transform will have the given
         /// <see cref="newRotation"/>
         /// </summary>
-        /// <param name="newRotation"></param>
+        /// <param name="newRotation">The anticipated rotation</param>
         public void AnticipateRotate(Quaternion newRotation)
         {
             if (NetworkManager.ShutdownInProgress || !NetworkManager.IsListening)
@@ -179,7 +195,6 @@ public void AnticipateRotate(Quaternion newRotation)
             m_PreviousAnticipatedTransform = m_AnticipatedTransform;
 
             m_LastAnticipaionCounter = NetworkManager.AnticipationSystem.AnticipationCounter;
-            m_LastAnticipationTime = NetworkManager.LocalTime.Time;
 
             m_SmoothDuration = 0;
             m_CurrentSmoothTime = 0;
@@ -189,7 +204,7 @@ public void AnticipateRotate(Quaternion newRotation)
         /// Anticipate that, at the end of one round trip to the server, this transform will have the given
         /// <see cref="newScale"/>
         /// </summary>
-        /// <param name="newScale"></param>
+        /// <param name="newScale">The anticipated scale</param>
         public void AnticipateScale(Vector3 newScale)
         {
             if (NetworkManager.ShutdownInProgress || !NetworkManager.IsListening)
@@ -206,7 +221,6 @@ public void AnticipateScale(Vector3 newScale)
             m_PreviousAnticipatedTransform = m_AnticipatedTransform;
 
             m_LastAnticipaionCounter = NetworkManager.AnticipationSystem.AnticipationCounter;
-            m_LastAnticipationTime = NetworkManager.LocalTime.Time;
 
             m_SmoothDuration = 0;
             m_CurrentSmoothTime = 0;
@@ -216,7 +230,7 @@ public void AnticipateScale(Vector3 newScale)
         /// Anticipate that, at the end of one round trip to the server, the transform will have the given
         /// <see cref="newState"/>
         /// </summary>
-        /// <param name="newState"></param>
+        /// <param name="newState">The anticipated transform state</param>
         public void AnticipateState(TransformState newState)
         {
             if (NetworkManager.ShutdownInProgress || !NetworkManager.IsListening)
@@ -235,26 +249,17 @@ public void AnticipateState(TransformState newState)
 
             m_PreviousAnticipatedTransform = m_AnticipatedTransform;
 
-            m_LastAnticipaionCounter = NetworkManager.AnticipationSystem.AnticipationCounter;
-            m_LastAnticipationTime = NetworkManager.LocalTime.Time;
-
             m_SmoothDuration = 0;
             m_CurrentSmoothTime = 0;
         }
 
-        protected override void Update()
+        private void ProcessSmoothing()
         {
             // If not spawned or this instance has authority, exit early
             if (!IsSpawned)
             {
                 return;
             }
-            // Do not call the base class implementation...
-            // AnticipatedNetworkTransform applies its authoritative state immediately rather than waiting for update
-            // This is because AnticipatedNetworkTransforms may need to reference each other in reanticipating
-            // and we will want all reanticipation done before anything else wants to reference the transform in
-            // Update()
-            //base.Update();
 
             if (m_CurrentSmoothTime < m_SmoothDuration)
             {
@@ -265,7 +270,7 @@ protected override void Update()
                 m_AnticipatedTransform = new TransformState
                 {
                     Position = Vector3.Lerp(m_SmoothFrom.Position, m_SmoothTo.Position, pct),
-                    Rotation = Quaternion.Slerp(m_SmoothFrom.Rotation, m_SmoothTo.Rotation, pct),
+                    Rotation = Quaternion.Lerp(m_SmoothFrom.Rotation, m_SmoothTo.Rotation, pct),
                     Scale = Vector3.Lerp(m_SmoothFrom.Scale, m_SmoothTo.Scale, pct)
                 };
                 m_PreviousAnticipatedTransform = m_AnticipatedTransform;
@@ -278,6 +283,33 @@ protected override void Update()
             }
         }
 
+        // TODO: This does not handle OnFixedUpdate
+        // This requires a complete overhaul in this class to switch between using
+        // NetworkRigidbody's position and rotation values.
+        /// <inheritdoc/>
+        public override void OnUpdate()
+        {
+            ProcessSmoothing();
+            // Do not call the base class implementation...
+            // AnticipatedNetworkTransform applies its authoritative state immediately rather than waiting for update
+            // This is because AnticipatedNetworkTransforms may need to reference each other in reanticipating
+            // and we will want all reanticipation done before anything else wants to reference the transform in
+            // OnUpdate()
+            //base.OnUpdate();
+        }
+
+        /// <summary>
+        /// Since authority does not subscribe to updates (OnUpdate or OnFixedUpdate),
+        /// we have to update every frame to assure authority processes soothing.
+        /// </summary>
+        private void Update()
+        {
+            if (CanCommitToTransform && IsSpawned)
+            {
+                ProcessSmoothing();
+            }
+        }
+
         internal class AnticipatedObject : IAnticipationEventReceiver, IAnticipatedObject
         {
             public AnticipatedNetworkTransform Transform;
@@ -321,7 +353,7 @@ public void SetupForUpdate()
 
             public void Update()
             {
-                // No need to do this, it's handled by NetworkBehaviour.Update
+                // No need to do this, it's handled by NetworkTransform.OnUpdate
             }
 
             public void ResetAnticipation()
@@ -350,20 +382,62 @@ private void ResetAnticipatedState()
             m_CurrentSmoothTime = 0;
         }
 
-        protected override void OnSynchronize<T>(ref BufferSerializer<T> serializer)
+        /// <summary>
+        /// (This replaces the first OnSynchronize for NetworkTransforms)
+        /// This is needed to initialize when fully synchronized since non-authority instances
+        /// don't apply the initial synchronization (new client synchronization) until after
+        /// everything has been spawned and synchronized.
+        /// </summary>
+        protected internal override void InternalOnNetworkSessionSynchronized()
         {
-            base.OnSynchronize(ref serializer);
-            if (!CanCommitToTransform)
+            var wasSynchronizing = SynchronizeState.IsSynchronizing;
+            base.InternalOnNetworkSessionSynchronized();
+            if (!CanCommitToTransform && wasSynchronizing && !SynchronizeState.IsSynchronizing)
+            {
+                m_OutstandingAuthorityChange = true;
+                ApplyAuthoritativeState();
+                ResetAnticipatedState();
+
+                m_AnticipatedObject = new AnticipatedObject { Transform = this };
+                NetworkManager.AnticipationSystem.RegisterForAnticipationEvents(m_AnticipatedObject);
+                NetworkManager.AnticipationSystem.AllAnticipatedObjects.Add(m_AnticipatedObject);
+            }
+        }
+
+        /// <summary>
+        /// (This replaces the any subsequent OnSynchronize for NetworkTransforms post client synchronization)
+        /// This occurs on already connected clients when dynamically spawning a NetworkObject for
+        /// non-authoritative instances.
+        /// </summary>
+        protected internal override void InternalOnNetworkPostSpawn()
+        {
+            base.InternalOnNetworkPostSpawn();
+            if (!CanCommitToTransform && NetworkManager.IsConnectedClient && !SynchronizeState.IsSynchronizing)
             {
                 m_OutstandingAuthorityChange = true;
                 ApplyAuthoritativeState();
                 ResetAnticipatedState();
+                m_AnticipatedObject = new AnticipatedObject { Transform = this };
+                NetworkManager.AnticipationSystem.RegisterForAnticipationEvents(m_AnticipatedObject);
+                NetworkManager.AnticipationSystem.AllAnticipatedObjects.Add(m_AnticipatedObject);
             }
         }
 
+        /// <inheritdoc/>
         public override void OnNetworkSpawn()
         {
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                Debug.LogWarning($"This component is not currently supported in distributed authority.");
+            }
             base.OnNetworkSpawn();
+
+            // Non-authoritative instances exit early if the synchronization has yet to
+            // be applied at this point
+            if (SynchronizeState.IsSynchronizing && !CanCommitToTransform)
+            {
+                return;
+            }
             m_OutstandingAuthorityChange = true;
             ApplyAuthoritativeState();
             ResetAnticipatedState();
@@ -373,6 +447,7 @@ public override void OnNetworkSpawn()
             NetworkManager.AnticipationSystem.AllAnticipatedObjects.Add(m_AnticipatedObject);
         }
 
+        /// <inheritdoc/>
         public override void OnNetworkDespawn()
         {
             if (m_AnticipatedObject != null)
@@ -387,6 +462,7 @@ public override void OnNetworkDespawn()
             base.OnNetworkDespawn();
         }
 
+        /// <inheritdoc/>
         public override void OnDestroy()
         {
             if (m_AnticipatedObject != null)
@@ -405,9 +481,9 @@ public override void OnDestroy()
         /// <see cref="to"/> over <see cref="durationSeconds"/> of real time. The duration uses
         /// <see cref="Time.deltaTime"/>, so it is affected by <see cref="Time.timeScale"/>.
         /// </summary>
-        /// <param name="from"></param>
-        /// <param name="to"></param>
-        /// <param name="durationSeconds"></param>
+        /// <param name="from">Starting transform state</param>
+        /// <param name="to">Target transform state</param>
+        /// <param name="durationSeconds">Interpolation time in seconds</param>
         public void Smooth(TransformState from, TransformState to, float durationSeconds)
         {
             var transform_ = transform;
@@ -438,6 +514,7 @@ public void Smooth(TransformState from, TransformState to, float durationSeconds
             m_CurrentSmoothTime = 0;
         }
 
+        /// <inheritdoc/>
         protected override void OnBeforeUpdateTransformState()
         {
             // this is called when new data comes from the server
@@ -445,12 +522,14 @@ protected override void OnBeforeUpdateTransformState()
             m_OutstandingAuthorityChange = true;
         }
 
+        /// <inheritdoc/>
         protected override void OnNetworkTransformStateUpdated(ref NetworkTransformState oldState, ref NetworkTransformState newState)
         {
             base.OnNetworkTransformStateUpdated(ref oldState, ref newState);
             ApplyAuthoritativeState();
         }
 
+        /// <inheritdoc/>
         protected override void OnTransformUpdated()
         {
             if (CanCommitToTransform || m_AnticipatedObject == null)
diff --git a/com.unity.netcode.gameobjects/Runtime/Components/AnticipatedNetworkTransform.cs.meta b/com.unity.netcode.gameobjects/Runtime/Components/AnticipatedNetworkTransform.cs.meta
new file mode 100644
index 0000000000..bb48f930d7
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Components/AnticipatedNetworkTransform.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 5abfce83aadd948498d4990c645a017b
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Components/HalfVector3.cs b/com.unity.netcode.gameobjects/Runtime/Components/HalfVector3.cs
similarity index 94%
rename from com.unity.netcode.gameobjects/Components/HalfVector3.cs
rename to com.unity.netcode.gameobjects/Runtime/Components/HalfVector3.cs
index 679496452c..d9367b010a 100644
--- a/com.unity.netcode.gameobjects/Components/HalfVector3.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Components/HalfVector3.cs
@@ -8,7 +8,7 @@ namespace Unity.Netcode.Components
     /// Half float precision <see cref="Vector3"/>.
     /// </summary>
     /// <remarks>
-    /// The Vector3T<ushort> values are half float values returned by <see cref="Mathf.FloatToHalf(float)"/> for each
+    /// The Vector3T&lt;ushort&gt; values are half float values returned by <see cref="Mathf.FloatToHalf(float)"/> for each
     /// individual axis and the 16 bits of the half float are stored as <see cref="ushort"/> values since C# does not have
     /// a half float type.
     /// </remarks>
@@ -74,9 +74,7 @@ private void SerializeRead(FastBufferReader reader)
             }
         }
 
-        /// <summary>
-        /// The serialization implementation of <see cref="INetworkSerializable"/>.
-        /// </summary>
+        /// <inheritdoc />
         public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReaderWriter
         {
             if (serializer.IsReader)
@@ -129,7 +127,7 @@ public void UpdateFrom(ref Vector3 vector3)
         /// Constructor
         /// </summary>
         /// <param name="vector3">The initial axial values (converted to half floats) when instantiated.</param>
-        /// <param name="vector3AxisToSynchronize">The axis to synchronize.</param>
+        /// <param name="axisToSynchronize">The axis to synchronize.</param>
         public HalfVector3(Vector3 vector3, bool3 axisToSynchronize)
         {
             Axis = half3.zero;
diff --git a/com.unity.netcode.gameobjects/Components/HalfVector3.cs.meta b/com.unity.netcode.gameobjects/Runtime/Components/HalfVector3.cs.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Components/HalfVector3.cs.meta
rename to com.unity.netcode.gameobjects/Runtime/Components/HalfVector3.cs.meta
diff --git a/com.unity.netcode.gameobjects/Components/HalfVector4.cs b/com.unity.netcode.gameobjects/Runtime/Components/HalfVector4.cs
similarity index 95%
rename from com.unity.netcode.gameobjects/Components/HalfVector4.cs
rename to com.unity.netcode.gameobjects/Runtime/Components/HalfVector4.cs
index 35ba13859a..8d7a000f38 100644
--- a/com.unity.netcode.gameobjects/Components/HalfVector4.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Components/HalfVector4.cs
@@ -8,7 +8,7 @@ namespace Unity.Netcode.Components
     /// Half Precision <see cref="Vector4"/> that can also be used to convert a <see cref="Quaternion"/> to half precision.
     /// </summary>
     /// <remarks>
-    /// The Vector4T<ushort> values are half float values returned by <see cref="Mathf.FloatToHalf(float)"/> for each
+    /// The Vector4T&lt;ushort&gt; values are half float values returned by <see cref="Mathf.FloatToHalf(float)"/> for each
     /// individual axis and the 16 bits of the half float are stored as <see cref="ushort"/> values since C# does not have
     /// a half float type.
     /// </remarks>
@@ -58,9 +58,7 @@ private void SerializeRead(FastBufferReader reader)
             }
         }
 
-        /// <summary>
-        /// The serialization implementation of <see cref="INetworkSerializable"/>.
-        /// </summary>
+        /// <inheritdoc />
         public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReaderWriter
         {
             if (serializer.IsReader)
diff --git a/com.unity.netcode.gameobjects/Components/HalfVector4.cs.meta b/com.unity.netcode.gameobjects/Runtime/Components/HalfVector4.cs.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Components/HalfVector4.cs.meta
rename to com.unity.netcode.gameobjects/Runtime/Components/HalfVector4.cs.meta
diff --git a/com.unity.netcode.gameobjects/Components/Interpolator.meta b/com.unity.netcode.gameobjects/Runtime/Components/Interpolator.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Components/Interpolator.meta
rename to com.unity.netcode.gameobjects/Runtime/Components/Interpolator.meta
diff --git a/com.unity.netcode.gameobjects/Runtime/Components/Interpolator/BufferedLinearInterpolator.cs b/com.unity.netcode.gameobjects/Runtime/Components/Interpolator/BufferedLinearInterpolator.cs
new file mode 100644
index 0000000000..f96bb55392
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Components/Interpolator/BufferedLinearInterpolator.cs
@@ -0,0 +1,728 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using UnityEngine;
+
+namespace Unity.Netcode
+{
+    /// <summary>
+    /// Solves for incoming values that are jittered.
+    /// Partially solves for message loss. Unclamped lerping helps hide this, but not completely
+    /// </summary>
+    /// <typeparam name="T">The type of interpolated value</typeparam>
+    public abstract class BufferedLinearInterpolator<T> where T : struct
+    {
+        // Constant absolute value for max buffer count instead of dynamic time based value. This is in case we have very low tick rates, so
+        // that we don't have a very small buffer because of this.
+        private const int k_BufferCountLimit = 100;
+        private const float k_ApproximateLowPrecision = 0.000001f;
+        private const float k_ApproximateHighPrecision = 1E-10f;
+        private const double k_SmallValue = 9.999999439624929E-11; // copied from Vector3's equal operator
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private float GetPrecision()
+        {
+            return m_BufferQueue.Count == 0 ? k_ApproximateHighPrecision : k_ApproximateLowPrecision;
+        }
+
+        #region Legacy notes
+        // Buffer consumption scenarios
+        // Perfect case consumption
+        // | 1 | 2 | 3 |
+        // | 2 | 3 | 4 | consume 1
+        // | 3 | 4 | 5 | consume 2
+        // | 4 | 5 | 6 | consume 3
+        // | 5 | 6 | 7 | consume 4
+        // jittered case
+        // | 1 | 2 | 3 |
+        // | 2 | 3 |   | consume 1
+        // | 3 |   |   | consume 2
+        // | 4 | 5 | 6 | consume 3
+        // | 5 | 6 | 7 | consume 4
+        // bursted case (assuming max count is 5)
+        // | 1 | 2 | 3 |
+        // | 2 | 3 |   | consume 1
+        // | 3 |   |   | consume 2
+        // |   |   |   | consume 3
+        // |   |   |   |
+        // | 4 | 5 | 6 | 7 | 8 | --> consume all and teleport to last value <8> --> this is the nuclear option, ideally this example would consume 4 and 5
+        // instead of jumping to 8, but since in OnValueChange we don't yet have an updated server time (updated in pre-update) to know which value
+        // we should keep and which we should drop, we don't have enough information to do this. Another thing would be to not have the burst in the first place.
+        #endregion
+
+        #region Properties being deprecated
+        /// <summary>
+        /// The legacy list of <see cref="BufferedItem"/> items.
+        /// </summary>
+        /// <remarks>
+        /// This is replaced by the <see cref="m_BufferQueue"/> of type <see cref="Queue{T}"/>.
+        /// </remarks>
+        [Obsolete("This list is no longer used and will be deprecated.", false)]
+        protected internal readonly List<BufferedItem> m_Buffer = new List<BufferedItem>();
+
+        /// <summary>
+        /// ** Deprecating **
+        /// The starting value of type <see cref="T"/> to interpolate from.
+        /// </summary>
+        [Obsolete("This property will be deprecated.", false)]
+        protected internal T m_InterpStartValue;
+
+        /// <summary>
+        /// ** Deprecating **
+        /// The current value of type <see cref="T"/>.
+        /// </summary>
+        [Obsolete("This property will be deprecated.", false)]
+        protected internal T m_CurrentInterpValue;
+
+        /// <summary>
+        /// ** Deprecating **
+        /// The end (or target) value of type <see cref="T"/> to interpolate towards.
+        /// </summary>
+        [Obsolete("This property will be deprecated.", false)]
+        protected internal T m_InterpEndValue;
+        #endregion
+
+        /// <summary>
+        /// Represents a buffered item measurement.
+        /// </summary>
+        protected internal struct BufferedItem
+        {
+            /// <summary>
+            /// THe item identifier
+            /// </summary>
+            public int ItemId;
+            /// <summary>
+            /// The item value
+            /// </summary>
+            public T Item;
+            /// <summary>
+            /// The time the item was sent.
+            /// </summary>
+            public double TimeSent;
+
+            /// <summary>
+            /// Constructor that accepts an item identifier.
+            /// </summary>
+            /// <param name="item">The item value.</param>
+            /// <param name="timeSent">The time the item was sent.</param>
+            /// <param name="itemId">The item identifier</param>
+            public BufferedItem(T item, double timeSent, int itemId)
+            {
+                Item = item;
+                TimeSent = timeSent;
+                ItemId = itemId;
+            }
+
+            /// <summary>
+            /// The original constructor.
+            /// </summary>
+            /// <param name="item">The item value.</param>
+            /// <param name="timeSent">The time the item was sent.</param>
+            public BufferedItem(T item, double timeSent)
+            {
+                Item = item;
+                TimeSent = timeSent;
+                // Generate a unique item id based on the time to the 2nd decimal place
+                ItemId = (int)(timeSent * 100);
+            }
+        }
+
+        /// <summary>
+        /// The current internal state of the <see cref="BufferedLinearInterpolator{T}"/>.
+        /// </summary>
+        /// <remarks>
+        /// Not public API ready yet.
+        /// </remarks>
+        internal struct CurrentState
+        {
+            public BufferedItem? Target;
+            public double StartTime;
+            public double EndTime;
+            public double TimeToTargetValue;
+            public double DeltaTime;
+            public double MaxDeltaTime;
+            public double LastRemainingTime;
+            public float LerpT;
+            public bool TargetReached;
+            public T CurrentValue;
+            public T PreviousValue;
+            public T NextValue;
+
+            private float m_CurrentDeltaTime;
+
+            public float CurrentDeltaTime => m_CurrentDeltaTime;
+            public double FinalTimeToTarget => Math.Max(0.0, TimeToTargetValue - DeltaTime);
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public void AddDeltaTime(float deltaTime)
+            {
+                m_CurrentDeltaTime = deltaTime;
+                DeltaTime = Math.Min(DeltaTime + deltaTime, TimeToTargetValue);
+                LerpT = (float)(TimeToTargetValue == 0.0 ? 1.0 : DeltaTime / TimeToTargetValue);
+            }
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public void SetTimeToTarget(double timeToTarget)
+            {
+                LerpT = 0.0f;
+                DeltaTime = 0.0f;
+                TimeToTargetValue = timeToTarget;
+            }
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public bool TargetTimeAproximatelyReached()
+            {
+                if (!Target.HasValue)
+                {
+                    return false;
+                }
+                return FinalTimeToTarget <= m_CurrentDeltaTime * 0.5f;
+            }
+
+            public void Reset(T currentValue)
+            {
+                Target = null;
+                CurrentValue = currentValue;
+                NextValue = currentValue;
+                PreviousValue = currentValue;
+                TargetReached = false;
+                LerpT = 0.0f;
+                EndTime = 0.0;
+                StartTime = 0.0;
+                TimeToTargetValue = 0.0f;
+                DeltaTime = 0.0f;
+                m_CurrentDeltaTime = 0.0f;
+            }
+        }
+
+        internal bool LerpSmoothEnabled;
+
+        /// <summary>
+        /// Determines how much smoothing will be applied to the 2nd lerp when using the <see cref="Update(float, double, double)"/> (i.e. lerping and not smooth dampening).
+        /// </summary>
+        /// <remarks>
+        /// There's two factors affecting interpolation: <br />
+        /// - Buffering: Which can be adjusted in set in the <see cref="NetworkManager.NetworkTimeSystem"/>.<br />
+        /// - Interpolation time: The divisor applied to delta time where the quotient is used as the lerp time.
+        /// </remarks>
+        [Range(0.016f, 1.0f)]
+        public float MaximumInterpolationTime = 0.1f;
+
+        /// <summary>
+        /// The current buffered items received by the authority.
+        /// </summary>
+        protected internal readonly Queue<BufferedItem> m_BufferQueue = new Queue<BufferedItem>(k_BufferCountLimit);
+
+        /// <summary>
+        /// The current interpolation state
+        /// </summary>
+        internal CurrentState InterpolateState;
+
+        /// <summary>
+        /// The maximum Lerp "t" boundary when using standard lerping for interpolation
+        /// </summary>
+        internal float MaxInterpolationBound = 3.0f;
+        internal bool EndOfBuffer => m_BufferQueue.Count == 0;
+        internal bool InLocalSpace;
+
+        private double m_LastMeasurementAddedTime = 0.0f;
+        private int m_BufferCount;
+        private int m_NbItemsReceivedThisFrame;
+        private BufferedItem m_LastBufferedItemReceived;
+        /// <summary>
+        /// Represents the rate of change for the value being interpolated when smooth dampening is enabled.
+        /// </summary>
+        private T m_RateOfChange;
+
+        /// <summary>
+        /// Resets interpolator to the defaults.
+        /// </summary>
+        public void Clear()
+        {
+            m_BufferQueue.Clear();
+            m_BufferCount = 0;
+            m_LastMeasurementAddedTime = 0.0;
+            InterpolateState.Reset(default);
+            m_RateOfChange = default;
+        }
+
+        /// <summary>
+        /// Resets the current interpolator to the target value.
+        /// </summary>
+        /// <remarks>
+        /// This is used when first synchronizing/initializing and when telporting an object.
+        /// </remarks>
+        /// <param name="targetValue">The target value to reset the interpolator to</param>
+        /// <param name="serverTime">The current server time</param>
+        public void ResetTo(T targetValue, double serverTime)
+        {
+            // Clear the interpolator
+            Clear();
+            InternalReset(targetValue, serverTime);
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void InternalReset(T targetValue, double serverTime, bool addMeasurement = true)
+        {
+            m_RateOfChange = default;
+            // Set our initial value
+            InterpolateState.Reset(targetValue);
+
+            if (addMeasurement)
+            {
+                // Add the first measurement for our baseline
+                AddMeasurement(targetValue, serverTime);
+            }
+        }
+
+        #region Smooth Dampening and Lerp Ahead Interpolation Handling
+        /// <summary>
+        /// TryConsumeFromBuffer: Smooth Dampening and Lerp Ahead Version
+        /// </summary>
+        /// <param name="renderTime">render time: the time in "ticks ago" relative to the current tick latency.</param>
+        /// <param name="minDeltaTime">minimum time delta (defaults to tick frequency).</param>
+        /// <param name="maxDeltaTime">maximum time delta which defines the maximum time duration when consuming more than one item from the buffer.</param>
+        /// <param name="lerpAhead">when true, the predicted target <see cref="CurrentState.Phase2Value"/> will lerp towards the next target by the current delta.</param>
+        private void TryConsumeFromBuffer(double renderTime, double minDeltaTime, double maxDeltaTime)
+        {
+            BufferedItem? previousItem = null;
+            var startTime = 0.0;
+            var alreadyHasBufferItem = false;
+            var noStateSet = !InterpolateState.Target.HasValue;
+            var potentialItemNeedsProcessing = false;
+
+            // In the event there is nothing left in the queue (i.e. motion/change stopped), we still need to determine if the target has been reached.
+            if (!noStateSet && m_BufferQueue.Count == 0)
+            {
+                if (!InterpolateState.TargetReached)
+                {
+                    InterpolateState.TargetReached = IsApproximately(InterpolateState.CurrentValue, InterpolateState.Target.Value.Item, GetPrecision());
+                }
+                return;
+            }
+
+            // Continue to process any remaining state updates in the queue (if any)
+            while (m_BufferQueue.TryPeek(out BufferedItem potentialItem))
+            {
+                // If we are still on the same buffered item (FIFO Queue), then exit early as there is nothing
+                // to consume.
+                if (previousItem.HasValue && previousItem.Value.TimeSent == potentialItem.TimeSent)
+                {
+                    break;
+                }
+
+                if (!noStateSet)
+                {
+                    potentialItemNeedsProcessing = ((potentialItem.TimeSent <= renderTime) && potentialItem.TimeSent > InterpolateState.Target.Value.TimeSent);
+                    if (!InterpolateState.TargetReached)
+                    {
+                        InterpolateState.TargetReached = IsApproximately(InterpolateState.CurrentValue, InterpolateState.Target.Value.Item, GetPrecision());
+                    }
+                }
+
+                // If we haven't set a target or we have another item that needs processing.
+                if (noStateSet || potentialItemNeedsProcessing)
+                {
+                    if (m_BufferQueue.TryDequeue(out BufferedItem target))
+                    {
+                        if (!InterpolateState.Target.HasValue)
+                        {
+                            InterpolateState.Target = target;
+                            alreadyHasBufferItem = true;
+                            InterpolateState.NextValue = InterpolateState.CurrentValue;
+                            InterpolateState.PreviousValue = InterpolateState.CurrentValue;
+                            InterpolateState.SetTimeToTarget(minDeltaTime);
+                            startTime = InterpolateState.Target.Value.TimeSent;
+                            InterpolateState.TargetReached = false;
+                            InterpolateState.MaxDeltaTime = maxDeltaTime;
+                        }
+                        else
+                        {
+                            if (!alreadyHasBufferItem)
+                            {
+                                alreadyHasBufferItem = true;
+                                InterpolateState.LastRemainingTime = InterpolateState.FinalTimeToTarget;
+                                InterpolateState.TargetReached = false;
+                                InterpolateState.MaxDeltaTime = maxDeltaTime;
+                                InterpolateState.PreviousValue = InterpolateState.NextValue;
+                                startTime = InterpolateState.Target.Value.TimeSent;
+                            }
+                            InterpolateState.SetTimeToTarget(Math.Max(target.TimeSent - startTime, minDeltaTime));
+                            InterpolateState.Target = target;
+                        }
+                    }
+                }
+                else
+                {
+                    break;
+                }
+
+                if (!InterpolateState.Target.HasValue)
+                {
+                    break;
+                }
+                previousItem = potentialItem;
+            }
+        }
+
+        internal void ResetCurrentState()
+        {
+            if (InterpolateState.Target.HasValue)
+            {
+                InterpolateState.Reset(InterpolateState.CurrentValue);
+                m_RateOfChange = default;
+            }
+        }
+
+        /// <summary>
+        /// Interpolation Update to use when smooth dampening is enabled on a <see cref="Components.NetworkTransform"/>.
+        /// </summary>
+        /// <remarks>
+        /// Alternate recommended interpolation when <see cref="Components.NetworkRigidbodyBase.UseRigidBodyForMotion"/> is enabled.<br />
+        /// This can provide a precise interpolation result between the current and target values at the expense of not being as smooth as then doulbe Lerp approach.
+        /// </remarks>
+        /// <param name="deltaTime">The last frame time that is either <see cref="Time.deltaTime"/> for non-rigidbody motion and <see cref="Time.fixedDeltaTime"/> when using ridigbody motion.</param>
+        /// <param name="tickLatencyAsTime">The tick latency in relative local time.</param>
+        /// <param name="minDeltaTime">The minimum time delta between the current and target value.</param>
+        /// <param name="maxDeltaTime">The maximum time delta between the current and target value.</param>
+        /// <param name="lerp">Determines whether to use smooth dampening or lerp interpolation type.</param>
+        /// <returns>The newly interpolated value of type 'T'</returns>
+        internal T Update(float deltaTime, double tickLatencyAsTime, double minDeltaTime, double maxDeltaTime, bool lerp)
+        {
+            TryConsumeFromBuffer(tickLatencyAsTime, minDeltaTime, maxDeltaTime);
+            // Only begin interpolation when there is a start and end point
+            if (InterpolateState.Target.HasValue)
+            {
+                // As long as the target hasn't been reached, interpolate or smooth dampen.
+                if (!InterpolateState.TargetReached)
+                {
+                    // Increases the time delta relative to the time to target.
+                    // Also calculates the LerpT and LerpTPredicted values.
+                    InterpolateState.AddDeltaTime(deltaTime);
+                    // SmoothDampen
+                    if (!lerp)
+                    {
+                        InterpolateState.NextValue = SmoothDamp(InterpolateState.NextValue, InterpolateState.Target.Value.Item, ref m_RateOfChange, (float)InterpolateState.TimeToTargetValue * InterpolateState.LerpT, deltaTime);
+                    }
+                    else// Lerp
+                    {
+                        InterpolateState.NextValue = Interpolate(InterpolateState.PreviousValue, InterpolateState.Target.Value.Item, InterpolateState.LerpT);
+                    }
+
+                    // If lerp smoothing is enabled, then smooth current value towards the target value
+                    if (LerpSmoothEnabled)
+                    {
+                        // Apply the smooth lerp to the target to help smooth the final value.
+                        InterpolateState.CurrentValue = Interpolate(InterpolateState.CurrentValue, InterpolateState.NextValue, Mathf.Clamp(1.0f - MaximumInterpolationTime, 0.0f, 1.0f));
+                    }
+                    else
+                    {
+                        // Otherwise, just assign the target value.
+                        InterpolateState.CurrentValue = InterpolateState.NextValue;
+                    }
+                }
+                else // If the target is reached and we have no more state updates, we want to check to see if we need to reset.
+                if (m_BufferQueue.Count == 0)
+                {
+                    // When the delta between the time sent and the current tick latency time-window is greater than the max delta time
+                    // plus the minimum delta time (a rough estimate of time to wait before we consider rate of change equal to zero),
+                    // we will want to reset the interpolator with the current known value. This prevents the next received state update's
+                    // time to be calculated against the last calculated time which if there is an extended period of time between the two
+                    // it would cause a large delta time period between the two states (i.e. it stops moving for a second or two and then
+                    // starts moving again).
+                    if ((tickLatencyAsTime - InterpolateState.Target.Value.TimeSent) > InterpolateState.MaxDeltaTime + minDeltaTime)
+                    {
+                        InterpolateState.Reset(InterpolateState.CurrentValue);
+                    }
+                }
+            }
+            m_NbItemsReceivedThisFrame = 0;
+            return InterpolateState.CurrentValue;
+        }
+        #endregion
+
+        #region Lerp Interpolation
+        /// <summary>
+        /// TryConsumeFromBuffer: Lerping Version
+        /// </summary>
+        /// <remarks>
+        /// This version of TryConsumeFromBuffer adheres to the original BufferedLinearInterpolator buffer consumption pattern.
+        /// </remarks>
+        /// <param name="renderTime"></param>
+        /// <param name="serverTime"></param>
+        private void TryConsumeFromBuffer(double renderTime, double serverTime)
+        {
+            if (!InterpolateState.Target.HasValue || (InterpolateState.Target.Value.TimeSent <= renderTime))
+            {
+                BufferedItem? previousItem = null;
+                var alreadyHasBufferItem = false;
+                while (m_BufferQueue.TryPeek(out BufferedItem potentialItem))
+                {
+                    // If we are still on the same buffered item (FIFO Queue), then exit early as there is nothing
+                    // to consume. (just a safety check but this scenario should never happen based on the below legacy approach of
+                    // consuming until the most current state)
+                    if (previousItem.HasValue && previousItem.Value.TimeSent == potentialItem.TimeSent)
+                    {
+                        break;
+                    }
+
+                    // Continue to processing until we reach the most current state
+                    if ((potentialItem.TimeSent <= serverTime) && // Inverted logic (below) from original since we have to go from past to present
+                        (!InterpolateState.Target.HasValue || potentialItem.TimeSent > InterpolateState.Target.Value.TimeSent))
+                    {
+                        if (m_BufferQueue.TryDequeue(out BufferedItem target))
+                        {
+                            if (!InterpolateState.Target.HasValue)
+                            {
+                                InterpolateState.Target = target;
+                                alreadyHasBufferItem = true;
+                                InterpolateState.NextValue = InterpolateState.CurrentValue;
+                                InterpolateState.PreviousValue = InterpolateState.CurrentValue;
+                                InterpolateState.StartTime = target.TimeSent;
+                                InterpolateState.EndTime = target.TimeSent;
+                            }
+                            else
+                            {
+                                if (!alreadyHasBufferItem)
+                                {
+                                    alreadyHasBufferItem = true;
+                                    InterpolateState.StartTime = InterpolateState.Target.Value.TimeSent;
+                                    InterpolateState.PreviousValue = InterpolateState.NextValue;
+                                    InterpolateState.TargetReached = false;
+                                }
+                                InterpolateState.EndTime = target.TimeSent;
+                                InterpolateState.TimeToTargetValue = InterpolateState.EndTime - InterpolateState.StartTime;
+                                InterpolateState.Target = target;
+                            }
+                        }
+                    }
+
+                    if (!InterpolateState.Target.HasValue)
+                    {
+                        break;
+                    }
+                    previousItem = potentialItem;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Call to update the state of the interpolators using Lerp.
+        /// </summary>
+        /// <remarks>
+        /// This approah uses double lerping which can result in an over-smoothed result.
+        /// </remarks>
+        /// <param name="deltaTime">time since last call</param>
+        /// <param name="renderTime">our current time</param>
+        /// <param name="serverTime">current server time</param>
+        /// <returns>The newly interpolated value of type 'T'</returns>
+        public T Update(float deltaTime, double renderTime, double serverTime)
+        {
+            TryConsumeFromBuffer(renderTime, serverTime);
+            // Only interpolate when there is a start and end point and we have not already reached the end value
+            if (InterpolateState.Target.HasValue && !InterpolateState.TargetReached)
+            {
+                // The original BufferedLinearInterpolator lerping script to assure the Smooth Dampening updates do not impact
+                // this specific behavior.
+                InterpolateState.LerpT = 1.0f;
+                if (InterpolateState.TimeToTargetValue > k_SmallValue)
+                {
+                    InterpolateState.LerpT = Math.Clamp((float)((renderTime - InterpolateState.StartTime) / InterpolateState.TimeToTargetValue), 0.0f, 1.0f);
+                }
+
+                InterpolateState.NextValue = Interpolate(InterpolateState.PreviousValue, InterpolateState.Target.Value.Item, InterpolateState.LerpT);
+
+                if (LerpSmoothEnabled)
+                {
+                    // Assure our MaximumInterpolationTime is valid and that the second lerp time ranges between deltaTime and 1.0f.
+                    InterpolateState.CurrentValue = Interpolate(InterpolateState.CurrentValue, InterpolateState.NextValue, deltaTime / MaximumInterpolationTime);
+                }
+                else
+                {
+                    InterpolateState.CurrentValue = InterpolateState.NextValue;
+                }
+
+                // Determine if we have reached our target
+                InterpolateState.TargetReached = IsApproximately(InterpolateState.CurrentValue, InterpolateState.Target.Value.Item, GetPrecision());
+            }
+            else // If the target is reached and we have no more state updates, we want to check to see if we need to reset.
+            if (m_BufferQueue.Count == 0 && InterpolateState.TargetReached)
+            {
+                // When the delta between the time sent and the current tick latency time-window is greater than the max delta time
+                // plus the minimum delta time (a rough estimate of time to wait before we consider rate of change equal to zero),
+                // we will want to reset the interpolator with the current known value. This prevents the next received state update's
+                // time to be calculated against the last calculated time which if there is an extended period of time between the two
+                // it would cause a large delta time period between the two states (i.e. it stops moving for a second or two and then
+                // starts moving again).
+                if ((renderTime - InterpolateState.Target.Value.TimeSent) > 0.3f) // If we haven't recevied anything within 300ms, assume we stopped motion.
+                {
+                    InterpolateState.Reset(InterpolateState.CurrentValue);
+                }
+            }
+            m_NbItemsReceivedThisFrame = 0;
+            return InterpolateState.CurrentValue;
+        }
+        #endregion
+
+        /// <summary>
+        /// Convenience version of 'Update' mainly for testing
+        ///  the reason we don't want to always call this version is so that on the calling side we can compute
+        ///  the renderTime once for the many things being interpolated (and the many interpolators per object)
+        /// </summary>
+        /// <param name="deltaTime">time since call</param>
+        /// <param name="serverTime">current server time</param>
+        /// <returns>The newly interpolated value of type 'T'</returns>
+        [Obsolete("This method is being deprecated due to it being only used for internal testing purposes.", false)]
+        public T Update(float deltaTime, NetworkTime serverTime)
+        {
+            return UpdateInternal(deltaTime, serverTime);
+        }
+
+        /// <summary>
+        /// Used for internal testing
+        /// </summary>
+        internal T UpdateInternal(float deltaTime, NetworkTime serverTime, int ticksAgo = 1)
+        {
+            return Update(deltaTime, serverTime.TimeTicksAgo(ticksAgo).Time, serverTime.Time);
+        }
+
+        /// <summary>
+        /// Add measurements to be used during interpolation. These will be buffered before being made available to be displayed as "latest value".
+        /// </summary>
+        /// <param name="newMeasurement">The new measurement value to use</param>
+        /// <param name="sentTime">The time to record for measurement</param>
+        public void AddMeasurement(T newMeasurement, double sentTime)
+        {
+            m_NbItemsReceivedThisFrame++;
+
+            // This situation can happen after a game is paused. When starting to receive again, the server will have sent a bunch of messages in the meantime
+            // instead of going through thousands of value updates just to get a big teleport, we're giving up on interpolation and teleporting to the latest value
+            if (m_NbItemsReceivedThisFrame > k_BufferCountLimit)
+            {
+                if (m_LastBufferedItemReceived.TimeSent < sentTime)
+                {
+                    // Clear the interpolator
+                    Clear();
+                    // Reset to the new value but don't automatically add the measurement (prevents recursion)
+                    InternalReset(newMeasurement, sentTime, false);
+                    m_LastMeasurementAddedTime = sentTime;
+                    m_LastBufferedItemReceived = new BufferedItem(newMeasurement, sentTime, m_BufferCount);
+                    // Next line keeps renderTime above m_StartTimeConsumed. Fixes pause/unpause issues
+                    m_BufferQueue.Enqueue(m_LastBufferedItemReceived);
+                }
+                return;
+            }
+
+            // Drop measurements that are received out of order/late (i.e. user unreliable delta)
+            if (sentTime > m_LastMeasurementAddedTime || m_BufferCount == 0)
+            {
+                m_BufferCount++;
+                m_LastBufferedItemReceived = new BufferedItem(newMeasurement, sentTime, m_BufferCount);
+                m_BufferQueue.Enqueue(m_LastBufferedItemReceived);
+                m_LastMeasurementAddedTime = sentTime;
+            }
+        }
+
+        /// <summary>
+        /// Gets latest value from the interpolator. This is updated every update as time goes by.
+        /// </summary>
+        /// <returns>The current interpolated value of type 'T'</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public T GetInterpolatedValue()
+        {
+            return InterpolateState.CurrentValue;
+        }
+
+        /// <summary>
+        /// Method to override and adapted to the generic type. This assumes interpolation for that value will be clamped.
+        /// </summary>
+        /// <param name="start">The start value (min)</param>
+        /// <param name="end">The end value (max)</param>
+        /// <param name="time">The time value used to interpolate between start and end values (pos)</param>
+        /// <returns>The interpolated value</returns>
+        protected abstract T Interpolate(T start, T end, float time);
+
+        /// <summary>
+        /// Method to override and adapted to the generic type. This assumes interpolation for that value will not be clamped.
+        /// </summary>
+        /// <param name="start">The start value (min)</param>
+        /// <param name="end">The end value (max)</param>
+        /// <param name="time">The time value used to interpolate between start and end values (pos)</param>
+        /// <returns>The interpolated value</returns>
+        protected abstract T InterpolateUnclamped(T start, T end, float time);
+
+
+        /// <summary>
+        /// An alternate smoothing method to Lerp.
+        /// </summary>
+        /// <remarks>
+        /// Not public API ready yet.
+        /// </remarks>
+        /// <param name="current">Current item <see cref="T"/> value.</param>
+        /// <param name="target">Target item <see cref="T"/> value.</param>
+        /// <param name="rateOfChange">The velocity of change.</param>
+        /// <param name="duration">Total time to smooth between the <paramref name="current"/> and <paramref name="target"/>.</param>
+        /// <param name="deltaTime">The increasing delta time from when start to finish.</param>
+        /// <param name="maxSpeed">Maximum rate of change per pass.</param>
+        /// <returns>The smoothed <see cref="T"/> value.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private protected virtual T SmoothDamp(T current, T target, ref T rateOfChange, float duration, float deltaTime, float maxSpeed = Mathf.Infinity)
+        {
+            return target;
+        }
+
+        /// <summary>
+        /// Determines if two values of type <see cref="T"/> are close to the same value.
+        /// </summary>
+        /// <remarks>
+        /// Not public API ready yet.
+        /// </remarks>
+        /// <param name="first">First value of type <see cref="T"/>.</param>
+        /// <param name="second">Second value of type <see cref="T"/>.</param>
+        /// <param name="precision">The precision of the aproximation.</param>
+        /// <returns>true if the two values are aproximately the same and false if they are not</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private protected virtual bool IsApproximately(T first, T second, float precision = k_ApproximateLowPrecision)
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// Converts a value of type <see cref="T"/> from world to local space or vice versa.
+        /// </summary>
+        /// <param name="transform">Reference transform.</param>
+        /// <param name="item">The item to convert.</param>
+        /// <param name="inLocalSpace">local or world space (true or false).</param>
+        /// <returns>The converted value.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        protected internal virtual T OnConvertTransformSpace(Transform transform, T item, bool inLocalSpace)
+        {
+            return default;
+        }
+
+        /// <summary>
+        /// Invoked by <see cref="Components.NetworkTransform"/> when the transform has transitioned between local to world or vice versa.
+        /// </summary>
+        /// <param name="transform">The transform that the <see cref="Components.NetworkTransform"/> is associated with.</param>
+        /// <param name="inLocalSpace">Whether the <see cref="Components.NetworkTransform"/> is now being tracked in local or world spaced.</param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal void ConvertTransformSpace(Transform transform, bool inLocalSpace)
+        {
+            var count = m_BufferQueue.Count;
+            for (int i = 0; i < count; i++)
+            {
+                var entry = m_BufferQueue.Dequeue();
+                entry.Item = OnConvertTransformSpace(transform, entry.Item, inLocalSpace);
+                m_BufferQueue.Enqueue(entry);
+            }
+            InterpolateState.CurrentValue = OnConvertTransformSpace(transform, InterpolateState.CurrentValue, inLocalSpace);
+            if (InterpolateState.Target.HasValue)
+            {
+                var end = InterpolateState.Target.Value;
+                end.Item = OnConvertTransformSpace(transform, end.Item, inLocalSpace);
+                InterpolateState.Target = end;
+            }
+            InLocalSpace = inLocalSpace;
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Components/Interpolator/BufferedLinearInterpolator.cs.meta b/com.unity.netcode.gameobjects/Runtime/Components/Interpolator/BufferedLinearInterpolator.cs.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Components/Interpolator/BufferedLinearInterpolator.cs.meta
rename to com.unity.netcode.gameobjects/Runtime/Components/Interpolator/BufferedLinearInterpolator.cs.meta
diff --git a/com.unity.netcode.gameobjects/Runtime/Components/Interpolator/BufferedLinearInterpolatorFloat.cs b/com.unity.netcode.gameobjects/Runtime/Components/Interpolator/BufferedLinearInterpolatorFloat.cs
new file mode 100644
index 0000000000..654d64917a
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Components/Interpolator/BufferedLinearInterpolatorFloat.cs
@@ -0,0 +1,40 @@
+using System.Runtime.CompilerServices;
+using UnityEngine;
+
+namespace Unity.Netcode
+{
+    /// <inheritdoc />
+    /// <remarks>
+    /// This is a buffered linear interpolator for a <see cref="float"/> type value
+    /// </remarks>
+    public class BufferedLinearInterpolatorFloat : BufferedLinearInterpolator<float>
+    {
+        /// <inheritdoc />
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        protected override float InterpolateUnclamped(float start, float end, float time)
+        {
+            return Mathf.LerpUnclamped(start, end, time);
+        }
+
+        /// <inheritdoc />
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        protected override float Interpolate(float start, float end, float time)
+        {
+            return Mathf.Lerp(start, end, time);
+        }
+
+        /// <inheritdoc />
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private protected override bool IsApproximately(float first, float second, float precision = 1E-06F)
+        {
+            return Mathf.Approximately(first, second);
+        }
+
+        /// <inheritdoc />
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private protected override float SmoothDamp(float current, float target, ref float rateOfChange, float duration, float deltaTime, float maxSpeed = float.PositiveInfinity)
+        {
+            return Mathf.SmoothDamp(current, target, ref rateOfChange, duration, maxSpeed, deltaTime);
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Runtime/Components/Interpolator/BufferedLinearInterpolatorFloat.cs.meta b/com.unity.netcode.gameobjects/Runtime/Components/Interpolator/BufferedLinearInterpolatorFloat.cs.meta
new file mode 100644
index 0000000000..e7fb84d836
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Components/Interpolator/BufferedLinearInterpolatorFloat.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 46f1c3f1bf9520b4581097f389f1612e
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Runtime/Components/Interpolator/BufferedLinearInterpolatorQuaternion.cs b/com.unity.netcode.gameobjects/Runtime/Components/Interpolator/BufferedLinearInterpolatorQuaternion.cs
new file mode 100644
index 0000000000..628498ada0
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Components/Interpolator/BufferedLinearInterpolatorQuaternion.cs
@@ -0,0 +1,91 @@
+using System.Runtime.CompilerServices;
+using UnityEngine;
+
+namespace Unity.Netcode
+{
+    /// <inheritdoc />
+    /// <remarks>
+    /// This is a buffered linear interpolator for a <see cref="Quaternion"/> type value
+    /// </remarks>
+    public class BufferedLinearInterpolatorQuaternion : BufferedLinearInterpolator<Quaternion>
+    {
+        /// <summary>
+        /// Use <see cref="Quaternion.Slerp"/> when <see cref="true"/>.
+        /// Use <see cref="Quaternion.Lerp"/> when <see cref="false"/>
+        /// </summary>
+        /// <remarks>
+        /// When using half precision (due to the imprecision) using <see cref="Quaternion.Lerp"/> is
+        /// less processor intensive (i.e. precision is already "imprecise").
+        /// When using full precision (to maintain precision) using <see cref="Quaternion.Slerp"/> is
+        /// more processor intensive yet yields more precise results.
+        /// </remarks>
+        public bool IsSlerp;
+
+        /// <inheritdoc />
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        protected override Quaternion InterpolateUnclamped(Quaternion start, Quaternion end, float time)
+        {
+            if (IsSlerp)
+            {
+                return Quaternion.SlerpUnclamped(start, end, time);
+            }
+            else
+            {
+                return Quaternion.LerpUnclamped(start, end, time);
+            }
+        }
+
+        /// <inheritdoc />
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        protected override Quaternion Interpolate(Quaternion start, Quaternion end, float time)
+        {
+            if (IsSlerp)
+            {
+                return Quaternion.Slerp(start, end, time);
+            }
+            else
+            {
+                return Quaternion.Lerp(start, end, time);
+            }
+        }
+
+        /// <inheritdoc />
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private protected override Quaternion SmoothDamp(Quaternion current, Quaternion target, ref Quaternion rateOfChange, float duration, float deltaTime, float maxSpeed = float.PositiveInfinity)
+        {
+            Vector3 currentEuler = current.eulerAngles;
+            Vector3 targetEuler = target.eulerAngles;
+            for (int i = 0; i < 3; i++)
+            {
+                var velocity = rateOfChange[i];
+                currentEuler[i] = Mathf.SmoothDampAngle(currentEuler[i], targetEuler[i], ref velocity, duration, maxSpeed, deltaTime);
+                rateOfChange[i] = velocity;
+            }
+            return Quaternion.Euler(currentEuler);
+        }
+
+        /// <inheritdoc />
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private protected override bool IsApproximately(Quaternion first, Quaternion second, float precision = 1E-06F)
+        {
+            return Mathf.Abs(first.x - second.x) <= precision &&
+                Mathf.Abs(first.y - second.y) <= precision &&
+                Mathf.Abs(first.z - second.z) <= precision &&
+                Mathf.Abs(first.w - second.w) <= precision;
+        }
+
+        /// <inheritdoc />
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        protected internal override Quaternion OnConvertTransformSpace(Transform transform, Quaternion rotation, bool inLocalSpace)
+        {
+            if (inLocalSpace)
+            {
+                return Quaternion.Inverse(transform.rotation) * rotation;
+            }
+            else
+            {
+                return transform.rotation * rotation;
+            }
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Runtime/Components/Interpolator/BufferedLinearInterpolatorQuaternion.cs.meta b/com.unity.netcode.gameobjects/Runtime/Components/Interpolator/BufferedLinearInterpolatorQuaternion.cs.meta
new file mode 100644
index 0000000000..b064df1cc6
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Components/Interpolator/BufferedLinearInterpolatorQuaternion.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: b8ad8124b66f0d54d871841d09fc176b
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Runtime/Components/Interpolator/BufferedLinearInterpolatorVector3.cs b/com.unity.netcode.gameobjects/Runtime/Components/Interpolator/BufferedLinearInterpolatorVector3.cs
new file mode 100644
index 0000000000..ce836bc199
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Components/Interpolator/BufferedLinearInterpolatorVector3.cs
@@ -0,0 +1,76 @@
+using System;
+using System.Runtime.CompilerServices;
+using UnityEngine;
+
+namespace Unity.Netcode
+{
+    /// <summary>
+    /// A <see cref="BufferedLinearInterpolator{T}"/> <see cref="Vector3"/> implementation.
+    /// </summary>
+    public class BufferedLinearInterpolatorVector3 : BufferedLinearInterpolator<Vector3>
+    {
+        /// <summary>
+        /// Use <see cref="Vector3.Slerp"/> when <see cref="true"/>.
+        /// Use <see cref="Vector3.Lerp"/> when <see cref="false"/>
+        /// </summary>
+        public bool IsSlerp;
+        /// <inheritdoc />
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        protected override Vector3 InterpolateUnclamped(Vector3 start, Vector3 end, float time)
+        {
+            if (IsSlerp)
+            {
+                return Vector3.SlerpUnclamped(start, end, time);
+            }
+            else
+            {
+                return Vector3.LerpUnclamped(start, end, time);
+            }
+        }
+
+        /// <inheritdoc />
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        protected override Vector3 Interpolate(Vector3 start, Vector3 end, float time)
+        {
+            if (IsSlerp)
+            {
+                return Vector3.Slerp(start, end, time);
+            }
+            else
+            {
+                return Vector3.Lerp(start, end, time);
+            }
+        }
+
+        /// <inheritdoc />
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        protected internal override Vector3 OnConvertTransformSpace(Transform transform, Vector3 position, bool inLocalSpace)
+        {
+            if (inLocalSpace)
+            {
+                return transform.InverseTransformPoint(position);
+
+            }
+            else
+            {
+                return transform.TransformPoint(position);
+            }
+        }
+
+        /// <inheritdoc />
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private protected override bool IsApproximately(Vector3 first, Vector3 second, float precision = 1E-06F)
+        {
+            return Math.Round(Mathf.Abs(first.x - second.x), 2) <= precision &&
+                Math.Round(Mathf.Abs(first.y - second.y), 2) <= precision &&
+                Math.Round(Mathf.Abs(first.z - second.z), 2) <= precision;
+        }
+
+        /// <inheritdoc />
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private protected override Vector3 SmoothDamp(Vector3 current, Vector3 target, ref Vector3 rateOfChange, float duration, float deltaTime, float maxSpeed)
+        {
+            return Vector3.SmoothDamp(current, target, ref rateOfChange, duration, maxSpeed, deltaTime);
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Runtime/Components/Interpolator/BufferedLinearInterpolatorVector3.cs.meta b/com.unity.netcode.gameobjects/Runtime/Components/Interpolator/BufferedLinearInterpolatorVector3.cs.meta
new file mode 100644
index 0000000000..311a618f17
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Components/Interpolator/BufferedLinearInterpolatorVector3.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 2e7fdc0f62b12c749bab58b047203e12
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Components/NetworkAnimator.cs b/com.unity.netcode.gameobjects/Runtime/Components/NetworkAnimator.cs
similarity index 86%
rename from com.unity.netcode.gameobjects/Components/NetworkAnimator.cs
rename to com.unity.netcode.gameobjects/Runtime/Components/NetworkAnimator.cs
index 2cae1d61a2..583e7bda4a 100644
--- a/com.unity.netcode.gameobjects/Components/NetworkAnimator.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Components/NetworkAnimator.cs
@@ -25,26 +25,48 @@ private void FlushMessages()
         {
             foreach (var animationUpdate in m_SendAnimationUpdates)
             {
-                m_NetworkAnimator.SendAnimStateClientRpc(animationUpdate.AnimationMessage, animationUpdate.ClientRpcParams);
+
+                if (m_NetworkAnimator.NetworkManager.DistributedAuthorityMode)
+                {
+                    m_NetworkAnimator.SendAnimStateRpc(animationUpdate.AnimationMessage);
+                }
+                else
+                {
+                    m_NetworkAnimator.SendAnimStateClientRpc(animationUpdate.AnimationMessage, animationUpdate.ClientRpcParams);
+                }
             }
 
             m_SendAnimationUpdates.Clear();
 
             foreach (var sendEntry in m_SendParameterUpdates)
             {
-                m_NetworkAnimator.SendParametersUpdateClientRpc(sendEntry.ParametersUpdateMessage, sendEntry.ClientRpcParams);
+                if (m_NetworkAnimator.NetworkManager.DistributedAuthorityMode)
+                {
+                    m_NetworkAnimator.SendParametersUpdateRpc(sendEntry.ParametersUpdateMessage);
+                }
+                else
+                {
+                    m_NetworkAnimator.SendParametersUpdateClientRpc(sendEntry.ParametersUpdateMessage, sendEntry.ClientRpcParams);
+                }
             }
             m_SendParameterUpdates.Clear();
 
             foreach (var sendEntry in m_SendTriggerUpdates)
             {
-                if (!sendEntry.SendToServer)
+                if (m_NetworkAnimator.NetworkManager.DistributedAuthorityMode)
                 {
-                    m_NetworkAnimator.SendAnimTriggerClientRpc(sendEntry.AnimationTriggerMessage, sendEntry.ClientRpcParams);
+                    m_NetworkAnimator.SendAnimTriggerRpc(sendEntry.AnimationTriggerMessage);
                 }
                 else
                 {
-                    m_NetworkAnimator.SendAnimTriggerServerRpc(sendEntry.AnimationTriggerMessage);
+                    if (!sendEntry.SendToServer)
+                    {
+                        m_NetworkAnimator.SendAnimTriggerClientRpc(sendEntry.AnimationTriggerMessage, sendEntry.ClientRpcParams);
+                    }
+                    else
+                    {
+                        m_NetworkAnimator.SendAnimTriggerServerRpc(sendEntry.AnimationTriggerMessage);
+                    }
                 }
             }
             m_SendTriggerUpdates.Clear();
@@ -208,6 +230,7 @@ private void BuildDestinationToTransitionInfoTable()
             }
         }
 
+
 #if UNITY_EDITOR
         private void ParseStateMachineStates(int layerIndex, ref AnimatorController animatorController, ref AnimatorStateMachine stateMachine)
         {
@@ -241,7 +264,6 @@ private void ParseStateMachineStates(int layerIndex, ref AnimatorController anim
                             {
                                 case AnimatorControllerParameterType.Trigger:
                                     {
-
                                         if (transition.destinationStateMachine != null)
                                         {
                                             var destinationStateMachine = transition.destinationStateMachine;
@@ -275,18 +297,12 @@ private void ParseStateMachineStates(int layerIndex, ref AnimatorController anim
                 }
             }
         }
-#endif
 
         /// <summary>
         /// Creates the TransitionStateInfoList table
         /// </summary>
         private void BuildTransitionStateInfoList()
         {
-#if UNITY_EDITOR
-            if (UnityEditor.EditorApplication.isUpdating || UnityEditor.EditorApplication.isPlayingOrWillChangePlaymode)
-            {
-                return;
-            }
             if (m_Animator == null)
             {
                 return;
@@ -304,9 +320,18 @@ private void BuildTransitionStateInfoList()
                 var stateMachine = animatorController.layers[x].stateMachine;
                 ParseStateMachineStates(x, ref animatorController, ref stateMachine);
             }
-#endif
         }
 
+        /// <summary>
+        /// In-Editor Only
+        /// Virtual OnValidate method for custom derived NetworkAnimator classes.
+        /// </summary>
+        protected virtual void OnValidate()
+        {
+            BuildTransitionStateInfoList();
+        }
+#endif
+
         public void OnAfterDeserialize()
         {
             BuildDestinationToTransitionInfoTable();
@@ -314,7 +339,7 @@ public void OnAfterDeserialize()
 
         public void OnBeforeSerialize()
         {
-            BuildTransitionStateInfoList();
+            // Do nothing when serializing (handled during OnValidate)
         }
 
         internal struct AnimationState : INetworkSerializable
@@ -397,8 +422,8 @@ internal struct AnimationMessage : INetworkSerializable
             internal bool HasBeenProcessed;
 
             // This is preallocated/populated in OnNetworkSpawn for all instances in the event ownership or
-            // authority changes.  When serializing, IsDirtyCount determines how many AnimationState entries
-            // should be serialized from the list.  When deserializing the list is created and populated with
+            // authority changes. When serializing, IsDirtyCount determines how many AnimationState entries
+            // should be serialized from the list. When deserializing the list is created and populated with
             // only the number of AnimationStates received which is dictated by the deserialized IsDirtyCount.
             internal List<AnimationState> AnimationStates;
 
@@ -474,17 +499,17 @@ internal bool IsServerAuthoritative()
         }
 
         /// <summary>
-        /// Override this method and return false to switch to owner authoritative mode
+        /// Override this method and return false to switch to owner authoritative mode.
         /// </summary>
+        /// <remarks>
+        /// When using a distributed authority network topology, this will default to
+        /// owner authoritative.
+        /// </remarks>
         protected virtual bool OnIsServerAuthoritative()
         {
-            return true;
+            return NetworkManager ? !NetworkManager.DistributedAuthorityMode : true;
         }
 
-        // Animators only support up to 32 parameters
-        // TODO: Look into making this a range limited property
-        private const int k_MaxAnimationParams = 32;
-
         private int[] m_TransitionHash;
         private int[] m_AnimationHash;
         private float[] m_LayerWeights;
@@ -508,7 +533,7 @@ private unsafe struct AnimatorParamCache
         }
 
         // 128 bytes per Animator
-        private FastBufferWriter m_ParameterWriter = new FastBufferWriter(k_MaxAnimationParams * sizeof(float), Allocator.Persistent);
+        private FastBufferWriter m_ParameterWriter;
 
         private NativeArray<AnimatorParamCache> m_CachedAnimatorParameters;
 
@@ -558,8 +583,16 @@ public override void OnDestroy()
             base.OnDestroy();
         }
 
-        private void Awake()
+        protected virtual void Awake()
         {
+            if (!m_Animator)
+            {
+#if !UNITY_EDITOR
+                Debug.LogError($"{nameof(NetworkAnimator)} {name} does not have an {nameof(UnityEngine.Animator)} assigned to it. The {nameof(NetworkAnimator)} will not initialize properly.");
+#endif
+                return;
+            }
+
             int layers = m_Animator.layerCount;
             // Initializing the below arrays for everyone handles an issue
             // when running in owner authoritative mode and the owner changes.
@@ -589,6 +622,9 @@ private void Awake()
                 }
             }
 
+            // The total initialization size calculated for the m_ParameterWriter write buffer.
+            var totalParameterSize = sizeof(uint);
+
             // Build our reference parameter values to detect when they change
             var parameters = m_Animator.parameters;
             m_CachedAnimatorParameters = new NativeArray<AnimatorParamCache>(parameters.Length, Allocator.Persistent);
@@ -629,7 +665,37 @@ private void Awake()
                 }
 
                 m_CachedAnimatorParameters[i] = cacheParam;
+
+                // Calculate parameter sizes (index + type size)
+                switch (parameter.type)
+                {
+                    case AnimatorControllerParameterType.Int:
+                        {
+                            totalParameterSize += sizeof(int) * 2;
+                            break;
+                        }
+                    case AnimatorControllerParameterType.Bool:
+                    case AnimatorControllerParameterType.Trigger:
+                        {
+                            // Bool is serialized to 1 byte
+                            totalParameterSize += sizeof(int) + 1;
+                            break;
+                        }
+                    case AnimatorControllerParameterType.Float:
+                        {
+                            totalParameterSize += sizeof(int) + sizeof(float);
+                            break;
+                        }
+                }
             }
+
+            if (m_ParameterWriter.IsInitialized)
+            {
+                m_ParameterWriter.Dispose();
+            }
+
+            // Create our parameter write buffer for serialization
+            m_ParameterWriter = new FastBufferWriter(totalParameterSize, Allocator.Persistent);
         }
 
         /// <summary>
@@ -651,17 +717,14 @@ public override void OnNetworkSpawn()
                 NetworkLog.LogWarningServer($"[{gameObject.name}][{nameof(NetworkAnimator)}] {nameof(Animator)} is not assigned! Animation synchronization will not work for this instance!");
             }
 
-            if (IsServer)
+            m_ClientSendList = new List<ulong>(128);
+            m_ClientRpcParams = new ClientRpcParams
             {
-                m_ClientSendList = new List<ulong>(128);
-                m_ClientRpcParams = new ClientRpcParams
+                Send = new ClientRpcSendParams
                 {
-                    Send = new ClientRpcSendParams
-                    {
-                        TargetClientIds = m_ClientSendList
-                    }
-                };
-            }
+                    TargetClientIds = m_ClientSendList
+                }
+            };
 
             // Create a handler for state changes
             m_NetworkAnimatorStateChangeHandler = new NetworkAnimatorStateChangeHandler(this);
@@ -674,7 +737,7 @@ public override void OnNetworkDespawn()
         }
 
         /// <summary>
-        /// Wries all parameter and state information needed to initially synchronize a client
+        /// Writes all parameter and state information needed to initially synchronize a client
         /// </summary>
         private void WriteSynchronizationData<T>(ref BufferSerializer<T> serializer) where T : IReaderWriter
         {
@@ -749,8 +812,10 @@ private void WriteSynchronizationData<T>(ref BufferSerializer<T> serializer) whe
                         }
                     }
 
-                    animationState.Transition = isInTransition;        // The only time this could be set to true
-                    animationState.StateHash = stateHash;              // When a transition, this is the originating/starting state
+                    // The only time this could be set to true
+                    animationState.Transition = isInTransition;
+                    // When a transition, this is the originating/starting state
+                    animationState.StateHash = stateHash;
                     animationState.NormalizedTime = normalizedTime;
                     animationState.Layer = layer;
                     animationState.Weight = m_LayerWeights[layer];
@@ -824,7 +889,8 @@ private void CheckForStateChange(int layer)
                 {
                     m_TransitionHash[layer] = nt.fullPathHash;
                     m_AnimationHash[layer] = 0;
-                    animState.DestinationStateHash = nt.fullPathHash; // Next state is the destination state for cross fade
+                    // Next state is the destination state for cross fade
+                    animState.DestinationStateHash = nt.fullPathHash;
                     animState.CrossFade = true;
                     animState.Transition = true;
                     animState.Duration = tt.duration;
@@ -842,7 +908,8 @@ private void CheckForStateChange(int layer)
                     // first time in this transition for this layer
                     m_TransitionHash[layer] = tt.fullPathHash;
                     m_AnimationHash[layer] = 0;
-                    animState.StateHash = tt.fullPathHash; // Transitioning from state
+                    // Transitioning from state
+                    animState.StateHash = tt.fullPathHash;
                     animState.CrossFade = false;
                     animState.Transition = true;
                     animState.NormalizedTime = tt.normalizedTime;
@@ -916,6 +983,11 @@ internal void CheckForAnimatorChanges()
             // Send an AnimationMessage only if there are dirty AnimationStates to send
             if (m_AnimationMessage.IsDirtyCount > 0)
             {
+                if (NetworkManager.DistributedAuthorityMode)
+                {
+                    SendAnimStateRpc(m_AnimationMessage);
+                }
+                else
                 if (!IsServer && IsOwner)
                 {
                     SendAnimStateServerRpc(m_AnimationMessage);
@@ -946,20 +1018,33 @@ private void SendParametersUpdate(ClientRpcParams clientRpcParams = default, boo
             {
                 Parameters = m_ParameterWriter.ToArray()
             };
-
-            if (!IsServer)
+            if (NetworkManager.DistributedAuthorityMode)
             {
-                SendParametersUpdateServerRpc(parametersMessage);
+                if (IsOwner)
+                {
+                    SendParametersUpdateRpc(parametersMessage);
+                }
+                else
+                {
+                    Debug.LogError($"[{name}][Client-{NetworkManager.LocalClientId}] Attempting to send parameter updates but not the owner!");
+                }
             }
             else
             {
-                if (sendDirect)
+                if (!IsServer)
                 {
-                    SendParametersUpdateClientRpc(parametersMessage, clientRpcParams);
+                    SendParametersUpdateServerRpc(parametersMessage);
                 }
                 else
                 {
-                    m_NetworkAnimatorStateChangeHandler.SendParameterUpdate(parametersMessage, clientRpcParams);
+                    if (sendDirect)
+                    {
+                        SendParametersUpdateClientRpc(parametersMessage, clientRpcParams);
+                    }
+                    else
+                    {
+                        m_NetworkAnimatorStateChangeHandler.SendParameterUpdate(parametersMessage, clientRpcParams);
+                    }
                 }
             }
         }
@@ -1040,7 +1125,7 @@ private unsafe void WriteParameters(ref FastBufferWriter writer)
         {
             writer.Seek(0);
             writer.Truncate();
-            // Write how many parameter entries we are going to write
+            // Write out how many parameter entries to read
             BytePacker.WriteValuePacked(writer, (uint)m_ParametersToUpdate.Count);
             foreach (var parameterIndex in m_ParametersToUpdate)
             {
@@ -1189,10 +1274,11 @@ internal void UpdateAnimationState(AnimationState animationState)
                         NetworkLog.LogError($"[DestinationState To Transition Info] Layer ({animationState.Layer}) sub-table does not contain destination state ({animationState.DestinationStateHash})!");
                     }
                 }
-                else if (NetworkManager.LogLevel == LogLevel.Developer)
-                {
-                    NetworkLog.LogError($"[DestinationState To Transition Info] Layer ({animationState.Layer}) does not exist!");
-                }
+                // For reference, it is valid to have no transition information
+                //else if (NetworkManager.LogLevel == LogLevel.Developer)
+                //{
+                //    NetworkLog.LogError($"[DestinationState To Transition Info] Layer ({animationState.Layer}) does not exist!");
+                //}
             }
             else if (animationState.Transition && animationState.CrossFade)
             {
@@ -1237,6 +1323,7 @@ private unsafe void SendParametersUpdateServerRpc(ParametersUpdateMessage parame
                         }
                         m_ClientSendList.Add(clientId);
                     }
+
                     m_ClientRpcParams.Send.TargetClientIds = m_ClientSendList;
                     m_NetworkAnimatorStateChangeHandler.SendParameterUpdate(parametersUpdate, m_ClientRpcParams);
                 }
@@ -1244,10 +1331,19 @@ private unsafe void SendParametersUpdateServerRpc(ParametersUpdateMessage parame
         }
 
         /// <summary>
-        /// Updates the client's animator's parameters
+        /// Distributed Authority: Updates the client's animator's parameters
+        /// </summary>
+        [Rpc(SendTo.NotAuthority)]
+        internal void SendParametersUpdateRpc(ParametersUpdateMessage parametersUpdate)
+        {
+            m_NetworkAnimatorStateChangeHandler.ProcessParameterUpdate(parametersUpdate);
+        }
+
+        /// <summary>
+        /// Client-Server: Updates the client's animator's parameters
         /// </summary>
         [ClientRpc]
-        internal unsafe void SendParametersUpdateClientRpc(ParametersUpdateMessage parametersUpdate, ClientRpcParams clientRpcParams = default)
+        internal void SendParametersUpdateClientRpc(ParametersUpdateMessage parametersUpdate, ClientRpcParams clientRpcParams = default)
         {
             var isServerAuthoritative = IsServerAuthoritative();
             if (!isServerAuthoritative && !IsOwner || isServerAuthoritative)
@@ -1261,7 +1357,7 @@ internal unsafe void SendParametersUpdateClientRpc(ParametersUpdateMessage param
         /// The server sets its local state and then forwards the message to the remaining clients
         /// </summary>
         [ServerRpc]
-        private unsafe void SendAnimStateServerRpc(AnimationMessage animationMessage, ServerRpcParams serverRpcParams = default)
+        private void SendAnimStateServerRpc(AnimationMessage animationMessage, ServerRpcParams serverRpcParams = default)
         {
             if (IsServerAuthoritative())
             {
@@ -1297,26 +1393,44 @@ private unsafe void SendAnimStateServerRpc(AnimationMessage animationMessage, Se
         }
 
         /// <summary>
-        /// Internally-called RPC client receiving function to update some animation state on a client
+        /// Client-Server: Internally-called RPC client-side receiving function to update animation states
         /// </summary>
         [ClientRpc]
-        internal unsafe void SendAnimStateClientRpc(AnimationMessage animationMessage, ClientRpcParams clientRpcParams = default)
+        internal void SendAnimStateClientRpc(AnimationMessage animationMessage, ClientRpcParams clientRpcParams = default)
+        {
+            ProcessAnimStates(animationMessage);
+        }
+
+        /// <summary>
+        /// Distributed Authority: Internally-called RPC non-authority receiving function to update animation states
+        /// </summary>
+        [Rpc(SendTo.NotAuthority)]
+        internal void SendAnimStateRpc(AnimationMessage animationMessage)
+        {
+            ProcessAnimStates(animationMessage);
+        }
+
+        private void ProcessAnimStates(AnimationMessage animationMessage)
         {
-            // This should never happen
-            if (IsHost)
+            if (HasAuthority)
             {
                 if (NetworkManager.LogLevel == LogLevel.Developer)
                 {
-                    NetworkLog.LogWarning("Detected the Host is sending itself animation updates! Please report this issue.");
+                    var hostOrOwner = NetworkManager.DistributedAuthorityMode ? "Owner" : "Host";
+                    var clientServerOrDAMode = NetworkManager.DistributedAuthorityMode ? "distributed authority" : "client-server";
+                    NetworkLog.LogWarning($"Detected the {hostOrOwner} is sending itself animation updates in {clientServerOrDAMode} mode! Please report this issue.");
                 }
                 return;
             }
+
             foreach (var animationState in animationMessage.AnimationStates)
             {
                 UpdateAnimationState(animationState);
             }
         }
 
+
+
         /// <summary>
         /// Server-side trigger state update request
         /// The server sets its local state and then forwards the message to the remaining clients
@@ -1346,7 +1460,6 @@ internal void SendAnimTriggerServerRpc(AnimationTriggerMessage animationTriggerM
                 }
                 m_ClientSendList.Add(clientId);
             }
-
             if (IsServerAuthoritative())
             {
                 m_NetworkAnimatorStateChangeHandler.QueueTriggerUpdateToClient(animationTriggerMessage, m_ClientRpcParams);
@@ -1367,8 +1480,19 @@ private void InternalSetTrigger(int hash, bool isSet = true)
         }
 
         /// <summary>
-        /// Internally-called RPC client receiving function to update a trigger when the server wants to forward
-        ///   a trigger for a client to play / reset
+        /// Distributed Authority: Internally-called RPC client receiving function to update a trigger when the server wants to forward
+        ///  a trigger to a client
+        /// </summary>
+        /// <param name="animationTriggerMessage">the payload containing the trigger data to apply</param>
+        [Rpc(SendTo.NotAuthority)]
+        internal void SendAnimTriggerRpc(AnimationTriggerMessage animationTriggerMessage)
+        {
+            InternalSetTrigger(animationTriggerMessage.Hash, animationTriggerMessage.IsTriggerSet);
+        }
+
+        /// <summary>
+        /// Client Server: Internally-called RPC client receiving function to update a trigger when the server wants to forward
+        ///  a trigger to a client
         /// </summary>
         /// <param name="animationTriggerMessage">the payload containing the trigger data to apply</param>
         /// <param name="clientRpcParams">unused</param>
@@ -1392,15 +1516,26 @@ public void SetTrigger(string triggerName)
         /// <param name="setTrigger">sets (true) or resets (false) the trigger. The default is to set it (true).</param>
         public void SetTrigger(int hash, bool setTrigger = true)
         {
+            if (!IsSpawned)
+            {
+                NetworkLog.LogError($"[{gameObject.name}] Cannot set a synchronized trigger when the {nameof(NetworkObject)} is not spawned!");
+                return;
+            }
+
             // MTT-3564:
             // After fixing the issue with trigger controlled Transitions being synchronized twice,
             // it exposed additional issues with this logic.  Now, either the owner or the server can
             // update triggers. Since server-side RPCs are immediately invoked, for a host a trigger
             // will happen when SendAnimTriggerClientRpc is called.  For a client owner, we call the
             // SendAnimTriggerServerRpc and then trigger locally when running in owner authority mode.
-            if (IsOwner || IsServer)
+            var animTriggerMessage = new AnimationTriggerMessage() { Hash = hash, IsTriggerSet = setTrigger };
+            if (NetworkManager.DistributedAuthorityMode && HasAuthority)
+            {
+                m_NetworkAnimatorStateChangeHandler.QueueTriggerUpdateToClient(animTriggerMessage);
+                InternalSetTrigger(hash, setTrigger);
+            }
+            else if (!NetworkManager.DistributedAuthorityMode && (IsOwner || IsServer))
             {
-                var animTriggerMessage = new AnimationTriggerMessage() { Hash = hash, IsTriggerSet = setTrigger };
                 if (IsServer)
                 {
                     /// <see cref="UpdatePendingTriggerStates"/> as to why we queue
@@ -1423,7 +1558,7 @@ public void SetTrigger(int hash, bool setTrigger = true)
         }
 
         /// <summary>
-        /// Resets the trigger for the associated animation.  See <see cref="SetTrigger(string)">SetTrigger</see> for more on how triggers are special
+        /// Resets the trigger for the associated animation. See <see cref="SetTrigger(string)">SetTrigger</see> for more on how triggers are special
         /// </summary>
         /// <param name="triggerName">The string name of the trigger to reset</param>
         public void ResetTrigger(string triggerName)
@@ -1439,4 +1574,5 @@ public void ResetTrigger(int hash)
         }
     }
 }
-#endif // COM_UNITY_MODULES_ANIMATION
+// COM_UNITY_MODULES_ANIMATION
+#endif
diff --git a/com.unity.netcode.gameobjects/Components/NetworkAnimator.cs.meta b/com.unity.netcode.gameobjects/Runtime/Components/NetworkAnimator.cs.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Components/NetworkAnimator.cs.meta
rename to com.unity.netcode.gameobjects/Runtime/Components/NetworkAnimator.cs.meta
diff --git a/com.unity.netcode.gameobjects/Components/NetworkDeltaPosition.cs b/com.unity.netcode.gameobjects/Runtime/Components/NetworkDeltaPosition.cs
similarity index 97%
rename from com.unity.netcode.gameobjects/Components/NetworkDeltaPosition.cs
rename to com.unity.netcode.gameobjects/Runtime/Components/NetworkDeltaPosition.cs
index 2ed982d3e3..1a112991db 100644
--- a/com.unity.netcode.gameobjects/Components/NetworkDeltaPosition.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Components/NetworkDeltaPosition.cs
@@ -27,9 +27,7 @@ public struct NetworkDeltaPosition : INetworkSerializable
 
         internal bool CollapsedDeltaIntoBase;
 
-        /// <summary>
-        /// The serialization implementation of <see cref="INetworkSerializable"/>
-        /// </summary>
+        /// <inheritdoc />
         public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReaderWriter
         {
             if (!SynchronizeBase)
@@ -105,6 +103,7 @@ public Vector3 GetFullPosition()
         /// <remarks>
         /// Only applies to the authoritative side for <see cref="NetworkTransform"/> instances.
         /// </remarks>
+        /// <returns>Returns the half float <see cref="Vector3"/> version of the current delta position.</returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public Vector3 GetConvertedDelta()
         {
@@ -120,6 +119,7 @@ public Vector3 GetConvertedDelta()
         /// Precision loss adjustments are one network tick behind on the
         /// non-authoritative side.
         /// </remarks>
+        /// <returns>The full precision delta position value as a <see cref="Vector3"/>.</returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public Vector3 GetDeltaPosition()
         {
diff --git a/com.unity.netcode.gameobjects/Components/NetworkDeltaPosition.cs.meta b/com.unity.netcode.gameobjects/Runtime/Components/NetworkDeltaPosition.cs.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Components/NetworkDeltaPosition.cs.meta
rename to com.unity.netcode.gameobjects/Runtime/Components/NetworkDeltaPosition.cs.meta
diff --git a/com.unity.netcode.gameobjects/Runtime/Components/NetworkRigidBodyBase.cs b/com.unity.netcode.gameobjects/Runtime/Components/NetworkRigidBodyBase.cs
new file mode 100644
index 0000000000..18b393bec0
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Components/NetworkRigidBodyBase.cs
@@ -0,0 +1,878 @@
+#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
+using System.Runtime.CompilerServices;
+using UnityEngine;
+
+namespace Unity.Netcode.Components
+{
+    /// <summary>
+    /// NetworkRigidbodyBase is a unified <see cref="Rigidbody"/> and <see cref="Rigidbody2D"/> integration that helps to synchronize physics motion, collision, and interpolation
+    /// when used with a <see cref="NetworkTransform"/>.
+    /// </summary>
+    /// <remarks>
+    /// For a customizable netcode Rigidbody, create your own component from this class and use <see cref="Initialize(RigidbodyTypes, NetworkTransform, Rigidbody2D, Rigidbody)"/>
+    /// during instantiation (i.e. invoked from within the Awake method). You can re-initialize after having initialized but only when the <see cref="NetworkObject"/> is not spawned.
+    /// </remarks>
+    public abstract class NetworkRigidbodyBase : NetworkBehaviour
+    {
+#if UNITY_EDITOR
+        [HideInInspector]
+        [SerializeField]
+        internal bool NetworkRigidbodyBaseExpanded;
+#endif
+
+        /// <summary>
+        /// When enabled, the associated <see cref="NetworkTransform"/> will use the Rigidbody/Rigidbody2D to apply and synchronize changes in position, rotation, and
+        /// allows for the use of Rigidbody interpolation/extrapolation.
+        /// </summary>
+        /// <remarks>
+        /// If <see cref="NetworkTransform.Interpolate"/> is enabled, non-authoritative instances can only use Rigidbody interpolation. If a network prefab is set to
+        /// extrapolation and <see cref="NetworkTransform.Interpolate"/> is enabled, then non-authoritative instances will automatically be adjusted to use Rigidbody
+        /// interpolation while the authoritative instance will still use extrapolation.
+        /// </remarks>
+        [Tooltip("When enabled and a NetworkTransform component is attached, the NetworkTransform will use the rigid body for motion and detecting changes in state.")]
+        public bool UseRigidBodyForMotion;
+
+        /// <summary>
+        /// When enabled (default), automatically set the Kinematic state of the Rigidbody based on ownership.
+        /// When disabled, Kinematic state needs to be set by external script(s).
+        /// </summary>
+        public bool AutoUpdateKinematicState = true;
+
+        /// <summary>
+        /// Primarily applies to the <see cref="AutoUpdateKinematicState"/> property when disabled but you still want
+        /// the Rigidbody to be automatically set to Kinematic when despawned.
+        /// </summary>
+        public bool AutoSetKinematicOnDespawn = true;
+
+        // Determines if this is a Rigidbody or Rigidbody2D implementation
+        private bool m_IsRigidbody2D => RigidbodyType == RigidbodyTypes.Rigidbody2D;
+        // Used to cache the authority state of this Rigidbody during the last frame
+        private bool m_IsAuthority;
+
+        protected internal Rigidbody m_InternalRigidbody { get; private set; }
+        protected internal Rigidbody2D m_InternalRigidbody2D { get; private set; }
+
+        internal NetworkTransform NetworkTransform;
+        private float m_TickFrequency;
+        private float m_TickRate;
+
+        private enum InterpolationTypes
+        {
+            None,
+            Interpolate,
+            Extrapolate
+        }
+        private InterpolationTypes m_OriginalInterpolation;
+
+        /// <summary>
+        /// Used to define the type of Rigidbody implemented.
+        /// <see cref=""/>
+        /// </summary>
+        public enum RigidbodyTypes
+        {
+            Rigidbody,
+            Rigidbody2D,
+        }
+
+        public RigidbodyTypes RigidbodyType { get; private set; }
+
+        /// <summary>
+        /// Initializes the networked Rigidbody based on the <see cref="RigidbodyTypes"/>
+        /// passed in as a parameter.
+        /// </summary>
+        /// <remarks>
+        /// Cannot be initialized while the associated <see cref="NetworkObject"/> is spawned.
+        /// </remarks>
+        /// <param name="rigidbodyType">type of rigid body being initialized</param>
+        /// <param name="rigidbody2D">(optional) The <see cref="Rigidbody2D"/> to be used</param>
+        /// <param name="rigidbody">(optional) The <see cref="Rigidbody"/> to be used</param>
+        protected void Initialize(RigidbodyTypes rigidbodyType, NetworkTransform networkTransform = null, Rigidbody2D rigidbody2D = null, Rigidbody rigidbody = null)
+        {
+            // Don't initialize if already spawned
+            if (IsSpawned)
+            {
+                Debug.LogError($"[{name}] Attempting to initialize while spawned is not allowed.");
+                return;
+            }
+            RigidbodyType = rigidbodyType;
+            m_InternalRigidbody2D = rigidbody2D;
+            m_InternalRigidbody = rigidbody;
+            NetworkTransform = networkTransform;
+
+            if (m_IsRigidbody2D && m_InternalRigidbody2D == null)
+            {
+                m_InternalRigidbody2D = GetComponent<Rigidbody2D>();
+
+            }
+            else if (m_InternalRigidbody == null)
+            {
+                m_InternalRigidbody = GetComponent<Rigidbody>();
+            }
+
+            SetOriginalInterpolation();
+
+            if (NetworkTransform == null)
+            {
+                NetworkTransform = GetComponent<NetworkTransform>();
+            }
+
+            if (NetworkTransform != null)
+            {
+                NetworkTransform.RegisterRigidbody(this);
+            }
+            else
+            {
+                throw new System.Exception($"[Missing {nameof(NetworkTransform)}] No {nameof(NetworkTransform)} is assigned or can be found during initialization!");
+            }
+
+            if (AutoUpdateKinematicState)
+            {
+                SetIsKinematic(true);
+            }
+        }
+
+        internal Vector3 GetAdjustedPositionThreshold()
+        {
+            // Since the threshold is a measurement of unity world space units per tick, we will allow for the maximum threshold
+            // to be no greater than the threshold measured in unity world space units per second
+            var thresholdMax = NetworkTransform.PositionThreshold * m_TickRate;
+            // Get the velocity in unity world space units per tick
+            var perTickVelocity = GetLinearVelocity() * m_TickFrequency;
+            // Since a rigid body can have "micro-motion" when allowed to come to rest (based on friction etc), we will allow for
+            // no less than 1/10th the threshold value.
+            var minThreshold = NetworkTransform.PositionThreshold * 0.1f;
+
+            // Finally, we adjust the threshold based on the body's current velocity
+            perTickVelocity.x = Mathf.Clamp(Mathf.Abs(perTickVelocity.x), minThreshold, thresholdMax);
+            perTickVelocity.y = Mathf.Clamp(Mathf.Abs(perTickVelocity.y), minThreshold, thresholdMax);
+            // 2D Rigidbody only moves on x & y axis
+            if (!m_IsRigidbody2D)
+            {
+                perTickVelocity.z = Mathf.Clamp(Mathf.Abs(perTickVelocity.z), minThreshold, thresholdMax);
+            }
+
+            return perTickVelocity;
+        }
+
+        internal Vector3 GetAdjustedRotationThreshold()
+        {
+            // Since the rotation threshold is a measurement pf degrees per tick, we get the maximum threshold
+            // by calculating the threshold in degrees per second.
+            var thresholdMax = NetworkTransform.RotAngleThreshold * m_TickRate;
+            // Angular velocity is expressed in radians per second where as the rotation being checked is in degrees.
+            // Convert the angular velocity to degrees per second and then convert that to degrees per tick.
+            var rotationPerTick = (GetAngularVelocity() * Mathf.Rad2Deg) * m_TickFrequency;
+            var minThreshold = NetworkTransform.RotAngleThreshold * m_TickFrequency;
+
+            // 2D Rigidbody only rotates around Z axis
+            if (!m_IsRigidbody2D)
+            {
+                rotationPerTick.x = Mathf.Clamp(Mathf.Abs(rotationPerTick.x), minThreshold, thresholdMax);
+                rotationPerTick.y = Mathf.Clamp(Mathf.Abs(rotationPerTick.y), minThreshold, thresholdMax);
+            }
+            rotationPerTick.z = Mathf.Clamp(Mathf.Abs(rotationPerTick.z), minThreshold, thresholdMax);
+
+            return rotationPerTick;
+        }
+
+        /// <summary>
+        /// Sets the linear velocity of the Rigidbody.
+        /// </summary>
+        /// <remarks>
+        /// For <see cref="Rigidbody2D"/>, only the x and y components of the <see cref="Vector3"/> are applied.
+        /// </remarks>
+        public void SetLinearVelocity(Vector3 linearVelocity)
+        {
+            if (m_IsRigidbody2D)
+            {
+#if COM_UNITY_MODULES_PHYSICS2D_LINEAR
+                m_InternalRigidbody2D.linearVelocity = linearVelocity;
+#else
+                m_InternalRigidbody2D.velocity = linearVelocity;
+#endif
+            }
+            else
+            {
+                m_InternalRigidbody.linearVelocity = linearVelocity;
+            }
+        }
+
+        /// <summary>
+        /// Gets the linear velocity of the Rigidbody.
+        /// </summary>
+        /// <remarks>
+        /// For <see cref="Rigidbody2D"/>, the <see cref="Vector3"/> velocity returned is only applied to the x and y components.
+        /// </remarks>
+        /// <returns><see cref="Vector3"/> as the linear velocity</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public Vector3 GetLinearVelocity()
+        {
+            if (m_IsRigidbody2D)
+            {
+#if COM_UNITY_MODULES_PHYSICS2D_LINEAR
+                return m_InternalRigidbody2D.linearVelocity;
+#else
+                return m_InternalRigidbody2D.velocity;
+#endif
+            }
+            else
+            {
+                return m_InternalRigidbody.linearVelocity;
+            }
+        }
+
+        /// <summary>
+        /// Sets the angular velocity for the Rigidbody.
+        /// </summary>
+        /// <remarks>
+        /// For <see cref="Rigidbody2D"/>, the z component of <param name="angularVelocity"/> is only used to set the angular velocity.
+        /// A quick way to pass in a 2D angular velocity component is: <see cref="Vector3.forward"/> * angularVelocity (where angularVelocity is a float)
+        /// </remarks>
+        /// <param name="angularVelocity">the angular velocity to apply to the body</param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void SetAngularVelocity(Vector3 angularVelocity)
+        {
+            if (m_IsRigidbody2D)
+            {
+                m_InternalRigidbody2D.angularVelocity = angularVelocity.z;
+            }
+            else
+            {
+                m_InternalRigidbody.angularVelocity = angularVelocity;
+            }
+        }
+
+        /// <summary>
+        /// Gets the angular velocity for the Rigidbody.
+        /// </summary>
+        /// <remarks>
+        /// For <see cref="Rigidbody2D"/>, the z component of the <see cref="Vector3"/> returned is the angular velocity of the object.
+        /// </remarks>
+        /// <returns>angular velocity as a <see cref="Vector3"/></returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public Vector3 GetAngularVelocity()
+        {
+            if (m_IsRigidbody2D)
+            {
+                return Vector3.forward * m_InternalRigidbody2D.angularVelocity;
+            }
+            else
+            {
+                return m_InternalRigidbody.angularVelocity;
+            }
+        }
+
+        /// <summary>
+        /// Gets the position of the Rigidbody
+        /// </summary>
+        /// <returns><see cref="Vector3"/></returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public Vector3 GetPosition()
+        {
+            if (m_IsRigidbody2D)
+            {
+                return m_InternalRigidbody2D.position;
+            }
+            else
+            {
+                return m_InternalRigidbody.position;
+            }
+        }
+
+        /// <summary>
+        /// Gets the rotation of the Rigidbody
+        /// </summary>
+        /// <returns><see cref="Quaternion"/></returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public Quaternion GetRotation()
+        {
+            if (m_IsRigidbody2D)
+            {
+                var quaternion = Quaternion.identity;
+                var angles = quaternion.eulerAngles;
+                angles.z = m_InternalRigidbody2D.rotation;
+                quaternion.eulerAngles = angles;
+                return quaternion;
+            }
+            else
+            {
+                return m_InternalRigidbody.rotation;
+            }
+        }
+
+        /// <summary>
+        /// Moves the rigid body
+        /// </summary>
+        /// <param name="position">The <see cref="Vector3"/> position to move towards</param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void MovePosition(Vector3 position)
+        {
+            if (m_IsRigidbody2D)
+            {
+                m_InternalRigidbody2D.MovePosition(position);
+            }
+            else
+            {
+                m_InternalRigidbody.MovePosition(position);
+            }
+        }
+
+        /// <summary>
+        /// Directly applies a position (like teleporting)
+        /// </summary>
+        /// <param name="position"><see cref="Vector3"/> position to apply to the Rigidbody</param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void SetPosition(Vector3 position)
+        {
+            if (m_IsRigidbody2D)
+            {
+                m_InternalRigidbody2D.position = position;
+            }
+            else
+            {
+                m_InternalRigidbody.position = position;
+            }
+        }
+
+        /// <summary>
+        /// Applies the rotation and position of the <see cref="GameObject"/>'s <see cref="Transform"/>
+        /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void ApplyCurrentTransform()
+        {
+            if (m_IsRigidbody2D)
+            {
+                m_InternalRigidbody2D.position = transform.position;
+                m_InternalRigidbody2D.rotation = transform.eulerAngles.z;
+            }
+            else
+            {
+                m_InternalRigidbody.position = transform.position;
+                m_InternalRigidbody.rotation = transform.rotation;
+            }
+        }
+
+        // Used for Rigidbody only (see info on normalized below)
+        private Vector4 m_QuaternionCheck = Vector4.zero;
+
+        /// <summary>
+        /// Rotatates the Rigidbody towards a specified rotation
+        /// </summary>
+        /// <param name="rotation">The rotation expressed as a <see cref="Quaternion"/></param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void MoveRotation(Quaternion rotation)
+        {
+            if (m_IsRigidbody2D)
+            {
+                var quaternion = Quaternion.identity;
+                var angles = quaternion.eulerAngles;
+                angles.z = m_InternalRigidbody2D.rotation;
+                quaternion.eulerAngles = angles;
+                m_InternalRigidbody2D.MoveRotation(quaternion);
+            }
+            else
+            {
+                // Evidently we need to check to make sure the quaternion is a perfect
+                // magnitude of 1.0f when applying the rotation to a rigid body.
+                m_QuaternionCheck.x = rotation.x;
+                m_QuaternionCheck.y = rotation.y;
+                m_QuaternionCheck.z = rotation.z;
+                m_QuaternionCheck.w = rotation.w;
+                // If the magnitude is greater than 1.0f (even by a very small fractional value), then normalize the quaternion
+                if (m_QuaternionCheck.magnitude != 1.0f)
+                {
+                    rotation.Normalize();
+                }
+                m_InternalRigidbody.MoveRotation(rotation);
+            }
+        }
+
+        /// <summary>
+        /// Applies a rotation to the Rigidbody
+        /// </summary>
+        /// <param name="rotation">The rotation to apply expressed as a <see cref="Quaternion"/></param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void SetRotation(Quaternion rotation)
+        {
+            if (m_IsRigidbody2D)
+            {
+                m_InternalRigidbody2D.rotation = rotation.eulerAngles.z;
+            }
+            else
+            {
+                m_InternalRigidbody.rotation = rotation;
+            }
+        }
+
+        /// <summary>
+        /// Sets the original interpolation of the Rigidbody while taking the Rigidbody type into consideration
+        /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void SetOriginalInterpolation()
+        {
+            if (m_IsRigidbody2D)
+            {
+                switch (m_InternalRigidbody2D.interpolation)
+                {
+                    case RigidbodyInterpolation2D.None:
+                        {
+                            m_OriginalInterpolation = InterpolationTypes.None;
+                            break;
+                        }
+                    case RigidbodyInterpolation2D.Interpolate:
+                        {
+                            m_OriginalInterpolation = InterpolationTypes.Interpolate;
+                            break;
+                        }
+                    case RigidbodyInterpolation2D.Extrapolate:
+                        {
+                            m_OriginalInterpolation = InterpolationTypes.Extrapolate;
+                            break;
+                        }
+                }
+            }
+            else
+            {
+                switch (m_InternalRigidbody.interpolation)
+                {
+                    case RigidbodyInterpolation.None:
+                        {
+                            m_OriginalInterpolation = InterpolationTypes.None;
+                            break;
+                        }
+                    case RigidbodyInterpolation.Interpolate:
+                        {
+                            m_OriginalInterpolation = InterpolationTypes.Interpolate;
+                            break;
+                        }
+                    case RigidbodyInterpolation.Extrapolate:
+                        {
+                            m_OriginalInterpolation = InterpolationTypes.Extrapolate;
+                            break;
+                        }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Wakes the Rigidbody if it is sleeping
+        /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void WakeIfSleeping()
+        {
+            if (m_IsRigidbody2D)
+            {
+                if (m_InternalRigidbody2D.IsSleeping())
+                {
+                    m_InternalRigidbody2D.WakeUp();
+                }
+            }
+            else
+            {
+                if (m_InternalRigidbody.IsSleeping())
+                {
+                    m_InternalRigidbody.WakeUp();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Puts the Rigidbody to sleep
+        /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void SleepRigidbody()
+        {
+            if (m_IsRigidbody2D)
+            {
+                m_InternalRigidbody2D.Sleep();
+            }
+            else
+            {
+                m_InternalRigidbody.Sleep();
+            }
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public bool IsKinematic()
+        {
+            if (m_IsRigidbody2D)
+            {
+                return m_InternalRigidbody2D.bodyType == RigidbodyType2D.Kinematic;
+            }
+            else
+            {
+                return m_InternalRigidbody.isKinematic;
+            }
+        }
+
+        /// <summary>
+        /// Sets the kinematic state of the Rigidbody and handles updating the Rigidbody's
+        /// interpolation setting based on the Kinematic state.
+        /// </summary>
+        /// <remarks>
+        /// When using the Rigidbody for <see cref="NetworkTransform"/> motion, this automatically
+        /// adjusts from extrapolation to interpolation if:
+        /// - The Rigidbody was originally set to extrapolation
+        /// - The NetworkTransform is set to interpolate
+        /// When the two above conditions are true:
+        /// - When switching from non-kinematic to kinematic this will automatically
+        /// switch the Rigidbody from extrapolation to interpolate.
+        /// - When switching from kinematic to non-kinematic this will automatically
+        /// switch the Rigidbody from interpolation back to extrapolation.
+        /// </remarks>
+        /// <param name="isKinematic"></param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void SetIsKinematic(bool isKinematic)
+        {
+            if (m_IsRigidbody2D)
+            {
+                m_InternalRigidbody2D.bodyType = isKinematic ? RigidbodyType2D.Kinematic : RigidbodyType2D.Dynamic;
+            }
+            else
+            {
+                m_InternalRigidbody.isKinematic = isKinematic;
+            }
+
+            // If we are not spawned, then exit early
+            if (!IsSpawned)
+            {
+                return;
+            }
+
+            if (UseRigidBodyForMotion)
+            {
+                // Only if the NetworkTransform is set to interpolate do we need to check for extrapolation
+                if (NetworkTransform.Interpolate && m_OriginalInterpolation == InterpolationTypes.Extrapolate)
+                {
+                    if (IsKinematic())
+                    {
+                        // If not already set to interpolate then set the Rigidbody to interpolate
+                        if (m_InternalRigidbody.interpolation == RigidbodyInterpolation.Extrapolate)
+                        {
+                            // Sleep until the next fixed update when switching from extrapolation to interpolation
+                            SleepRigidbody();
+                            SetInterpolation(InterpolationTypes.Interpolate);
+                        }
+                    }
+                    else
+                    {
+                        // Switch it back to the original interpolation if non-kinematic (doesn't require sleep).
+                        SetInterpolation(m_OriginalInterpolation);
+                    }
+                }
+            }
+            else
+            {
+                SetInterpolation(m_IsAuthority ? m_OriginalInterpolation : (NetworkTransform.Interpolate ? InterpolationTypes.None : m_OriginalInterpolation));
+            }
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void SetInterpolation(InterpolationTypes interpolationType)
+        {
+            switch (interpolationType)
+            {
+                case InterpolationTypes.None:
+                    {
+                        if (m_IsRigidbody2D)
+                        {
+                            m_InternalRigidbody2D.interpolation = RigidbodyInterpolation2D.None;
+                        }
+                        else
+                        {
+                            m_InternalRigidbody.interpolation = RigidbodyInterpolation.None;
+                        }
+                        break;
+                    }
+                case InterpolationTypes.Interpolate:
+                    {
+                        if (m_IsRigidbody2D)
+                        {
+                            m_InternalRigidbody2D.interpolation = RigidbodyInterpolation2D.Interpolate;
+                        }
+                        else
+                        {
+                            m_InternalRigidbody.interpolation = RigidbodyInterpolation.Interpolate;
+                        }
+                        break;
+                    }
+                case InterpolationTypes.Extrapolate:
+                    {
+                        if (m_IsRigidbody2D)
+                        {
+                            m_InternalRigidbody2D.interpolation = RigidbodyInterpolation2D.Extrapolate;
+                        }
+                        else
+                        {
+                            m_InternalRigidbody.interpolation = RigidbodyInterpolation.Extrapolate;
+                        }
+                        break;
+                    }
+            }
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void ResetInterpolation()
+        {
+            SetInterpolation(m_OriginalInterpolation);
+        }
+
+        protected override void OnOwnershipChanged(ulong previous, ulong current)
+        {
+            UpdateOwnershipAuthority();
+            base.OnOwnershipChanged(previous, current);
+        }
+
+        /// <summary>
+        /// Sets the authority based on whether it is server or owner authoritative
+        /// </summary>
+        /// <remarks>
+        /// Distributed authority sessions will always be owner authoritative.
+        /// </remarks>
+        internal void UpdateOwnershipAuthority()
+        {
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                // When in distributed authority mode, always use HasAuthority
+                m_IsAuthority = HasAuthority;
+            }
+            else
+            {
+                if (NetworkTransform.IsServerAuthoritative())
+                {
+                    m_IsAuthority = NetworkManager.IsServer;
+                }
+                else
+                {
+                    m_IsAuthority = IsOwner;
+                }
+            }
+
+            if (AutoUpdateKinematicState)
+            {
+                SetIsKinematic(!m_IsAuthority);
+            }
+        }
+
+        /// <inheritdoc />
+        public override void OnNetworkSpawn()
+        {
+            m_TickFrequency = 1.0f / NetworkManager.NetworkConfig.TickRate;
+            m_TickRate = NetworkManager.NetworkConfig.TickRate;
+            UpdateOwnershipAuthority();
+        }
+
+        /// <inheritdoc />
+        public override void OnNetworkDespawn()
+        {
+            if (UseRigidBodyForMotion && HasAuthority)
+            {
+                DetachFromFixedJoint();
+                NetworkRigidbodyConnections.Clear();
+            }
+
+            // If we are automatically handling the kinematic state...
+            if (AutoUpdateKinematicState || AutoSetKinematicOnDespawn)
+            {
+                // Turn off physics for the rigid body until spawned, otherwise
+                // non-owners can run fixed updates before the first full
+                // NetworkTransform update and physics will be applied (i.e. gravity, etc)
+                SetIsKinematic(true);
+            }
+            SetInterpolation(m_OriginalInterpolation);
+        }
+
+        // TODO: Possibly provide a NetworkJoint that allows for more options than fixed.
+        // Rigidbodies do not have the concept of "local space", and as such using a fixed joint will hold the object
+        // in place relative to the parent so jitter/stutter does not occur.
+        // Alternately, users can affix the fixed joint to a child GameObject (without a rigid body) of the parent NetworkObject
+        // and then add a NetworkTransform to that in order to get the parented child NetworkObject to move around in "local space"
+        public FixedJoint FixedJoint { get; private set; }
+        public FixedJoint2D FixedJoint2D { get; private set; }
+
+        internal System.Collections.Generic.List<NetworkRigidbodyBase> NetworkRigidbodyConnections = new System.Collections.Generic.List<NetworkRigidbodyBase>();
+        internal NetworkRigidbodyBase ParentBody;
+
+        private bool m_FixedJoint2DUsingGravity;
+        private bool m_OriginalGravitySetting;
+        private float m_OriginalGravityScale;
+
+        /// <summary>
+        /// When using a custom <see cref="NetworkRigidbodyBase"/>, this virtual method is invoked when the
+        /// <see cref="FixedJoint"/> is created in the event any additional adjustments are needed.
+        /// </summary>
+        protected virtual void OnFixedJointCreated()
+        {
+
+        }
+
+        /// <summary>
+        /// When using a custom <see cref="NetworkRigidbodyBase"/>, this virtual method is invoked when the
+        /// <see cref="FixedJoint2D"/> is created in the event any additional adjustments are needed.
+        /// </summary>
+        protected virtual void OnFixedJoint2DCreated()
+        {
+
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void ApplyFixedJoint2D(NetworkRigidbodyBase bodyToConnect, Vector3 position, float connectedMassScale = 0.0f, float massScale = 1.0f, bool useGravity = false, bool zeroVelocity = true)
+        {
+            transform.position = position;
+            m_InternalRigidbody2D.position = position;
+            m_OriginalGravitySetting = bodyToConnect.m_InternalRigidbody.useGravity;
+            m_FixedJoint2DUsingGravity = useGravity;
+
+            if (!useGravity)
+            {
+                m_OriginalGravityScale = m_InternalRigidbody2D.gravityScale;
+                m_InternalRigidbody2D.gravityScale = 0.0f;
+            }
+
+            if (zeroVelocity)
+            {
+#if COM_UNITY_MODULES_PHYSICS2D_LINEAR
+                m_InternalRigidbody2D.linearVelocity = Vector2.zero;
+#else
+                m_InternalRigidbody2D.velocity = Vector2.zero;
+#endif
+                m_InternalRigidbody2D.angularVelocity = 0.0f;
+            }
+
+            FixedJoint2D = gameObject.AddComponent<FixedJoint2D>();
+            FixedJoint2D.connectedBody = bodyToConnect.m_InternalRigidbody2D;
+            OnFixedJoint2DCreated();
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void ApplyFixedJoint(NetworkRigidbodyBase bodyToConnectTo, Vector3 position, float connectedMassScale = 0.0f, float massScale = 1.0f, bool useGravity = false, bool zeroVelocity = true)
+        {
+            transform.position = position;
+            m_InternalRigidbody.position = position;
+            if (zeroVelocity)
+            {
+                m_InternalRigidbody.linearVelocity = Vector3.zero;
+                m_InternalRigidbody.angularVelocity = Vector3.zero;
+            }
+            m_OriginalGravitySetting = m_InternalRigidbody.useGravity;
+            m_InternalRigidbody.useGravity = useGravity;
+            FixedJoint = gameObject.AddComponent<FixedJoint>();
+            FixedJoint.connectedBody = bodyToConnectTo.m_InternalRigidbody;
+            FixedJoint.connectedMassScale = connectedMassScale;
+            FixedJoint.massScale = massScale;
+            OnFixedJointCreated();
+        }
+
+
+        /// <summary>
+        /// Authority Only:
+        /// When invoked and not already attached to a fixed joint, this will connect two rigid bodies with <see cref="UseRigidBodyForMotion"/> enabled.
+        /// Invoke this method on the rigid body you wish to attach to another (i.e. weapon to player, sticky bomb to player/object, etc).
+        /// <seealso cref="FixedJoint"/>
+        /// <seealso cref="FixedJoint2D"/>
+        /// </summary>
+        /// <remarks>
+        /// Parenting relative:
+        /// - This instance can be viewed as the child.
+        /// - The <param name="objectToConnectTo"/> can be viewed as the parent.
+        /// <br/>
+        /// This is the recommended way, as opposed to parenting, to attached/detatch two rigid bodies to one another when <see cref="UseRigidBodyForMotion"/> is enabled.
+        /// For more details on using <see cref="UnityEngine.FixedJoint"/> and <see cref="UnityEngine.FixedJoint2D"/>.
+        /// <br/>
+        /// This provides a simple joint solution between two rigid bodies and serves as an example. You can add different joint types by creating a customized/derived
+        /// version of <see cref="NetworkRigidbodyBase"/>.
+        /// </remarks>
+        /// <param name="objectToConnectTo">The target object to attach to.</param>
+        /// <param name="positionOfConnection">The position of the connection (i.e. where you want the object to be affixed).</param>
+        /// <param name="connectedMassScale">The target object's mass scale relative to this object being attached.</param>
+        /// <param name="massScale">This object's mass scale relative to the target object's.</param>
+        /// <param name="useGravity">Determines if this object will have gravity applied to it along with the object you are connecting this one to (the default is to not use gravity for this object)</param>
+        /// <param name="zeroVelocity">When true (the default), both linear and angular velocities of this object are set to zero.</param>
+        /// <param name="teleportObject">When true (the default), this object will teleport itself to the position of connection.</param>
+        /// <returns>true (success) false (failed)</returns>
+        public bool AttachToFixedJoint(NetworkRigidbodyBase objectToConnectTo, Vector3 positionOfConnection, float connectedMassScale = 0.0f, float massScale = 1.0f, bool useGravity = false, bool zeroVelocity = true, bool teleportObject = true)
+        {
+            if (!UseRigidBodyForMotion)
+            {
+                Debug.LogError($"[{GetType().Name}] {name} does not have {nameof(UseRigidBodyForMotion)} set! Either enable {nameof(UseRigidBodyForMotion)} on this component or do not use a {nameof(FixedJoint)} when parenting under a {nameof(NetworkObject)}.");
+                return false;
+            }
+
+            if (IsKinematic())
+            {
+                Debug.LogError($"[{GetType().Name}] {name} is currently kinematic! You cannot use a {nameof(FixedJoint)} with Kinematic bodies!");
+                return false;
+            }
+
+            if (objectToConnectTo != null)
+            {
+                if (m_IsRigidbody2D)
+                {
+                    ApplyFixedJoint2D(objectToConnectTo, positionOfConnection, connectedMassScale, massScale, useGravity, zeroVelocity);
+                }
+                else
+                {
+                    ApplyFixedJoint(objectToConnectTo, positionOfConnection, connectedMassScale, massScale, useGravity, zeroVelocity);
+                }
+
+                ParentBody = objectToConnectTo;
+                ParentBody.NetworkRigidbodyConnections.Add(this);
+                if (teleportObject)
+                {
+                    NetworkTransform.SetState(teleportDisabled: false);
+                }
+                return true;
+            }
+            return false;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void RemoveFromParentBody()
+        {
+            ParentBody.NetworkRigidbodyConnections.Remove(this);
+            ParentBody = null;
+        }
+
+        /// <summary>
+        /// Authority Only:
+        /// When invoked and already connected to an object via <see cref="FixedJoint"/> or <see cref="FixedJoint2D"/> (depending upon the type of rigid body),
+        /// this will detach from the fixed joint and destroy the fixed joint component.
+        /// </summary>
+        /// <remarks>
+        /// This is the recommended way, as opposed to parenting, to attached/detatch two rigid bodies to one another when <see cref="UseRigidBodyForMotion"/> is enabled.
+        /// </remarks>
+        public void DetachFromFixedJoint()
+        {
+            if (!HasAuthority)
+            {
+                Debug.LogError($"[{name}] Only authority can invoke {nameof(DetachFromFixedJoint)}!");
+            }
+            if (UseRigidBodyForMotion)
+            {
+                if (m_IsRigidbody2D && FixedJoint2D != null)
+                {
+                    if (!m_FixedJoint2DUsingGravity)
+                    {
+                        FixedJoint2D.connectedBody.gravityScale = m_OriginalGravityScale;
+                    }
+                    FixedJoint2D.connectedBody = null;
+                    Destroy(FixedJoint2D);
+                    FixedJoint2D = null;
+                    ResetInterpolation();
+                    RemoveFromParentBody();
+                }
+                else if (FixedJoint != null)
+                {
+                    FixedJoint.connectedBody = null;
+                    m_InternalRigidbody.useGravity = m_OriginalGravitySetting;
+                    Destroy(FixedJoint);
+                    FixedJoint = null;
+                    ResetInterpolation();
+                    RemoveFromParentBody();
+                }
+            }
+        }
+    }
+}
+// COM_UNITY_MODULES_PHYSICS
+#endif
diff --git a/com.unity.netcode.gameobjects/Runtime/Components/NetworkRigidBodyBase.cs.meta b/com.unity.netcode.gameobjects/Runtime/Components/NetworkRigidBodyBase.cs.meta
new file mode 100644
index 0000000000..544ddbab48
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Components/NetworkRigidBodyBase.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8c4434f0563fb7f42b3b2993c97ae81a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.netcode.gameobjects/Runtime/Components/NetworkRigidbody.cs b/com.unity.netcode.gameobjects/Runtime/Components/NetworkRigidbody.cs
new file mode 100644
index 0000000000..a157d26c63
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Components/NetworkRigidbody.cs
@@ -0,0 +1,24 @@
+#if COM_UNITY_MODULES_PHYSICS
+using UnityEngine;
+
+namespace Unity.Netcode.Components
+{
+    /// <summary>
+    /// NetworkRigidbody allows for the use of <see cref="Rigidbody"/> on network objects. By controlling the kinematic
+    /// mode of the <see cref="Rigidbody"/> and disabling it on all peers but the authoritative one.
+    /// </summary>
+    [RequireComponent(typeof(NetworkTransform))]
+    [RequireComponent(typeof(Rigidbody))]
+    [AddComponentMenu("Netcode/Network Rigidbody")]
+    public class NetworkRigidbody : NetworkRigidbodyBase
+    {
+
+        public Rigidbody Rigidbody => m_InternalRigidbody;
+
+        protected virtual void Awake()
+        {
+            Initialize(RigidbodyTypes.Rigidbody);
+        }
+    }
+}
+#endif // COM_UNITY_MODULES_PHYSICS
diff --git a/com.unity.netcode.gameobjects/Components/NetworkRigidbody.cs.meta b/com.unity.netcode.gameobjects/Runtime/Components/NetworkRigidbody.cs.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Components/NetworkRigidbody.cs.meta
rename to com.unity.netcode.gameobjects/Runtime/Components/NetworkRigidbody.cs.meta
diff --git a/com.unity.netcode.gameobjects/Runtime/Components/NetworkRigidbody2D.cs b/com.unity.netcode.gameobjects/Runtime/Components/NetworkRigidbody2D.cs
new file mode 100644
index 0000000000..f7c9e14d1e
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Components/NetworkRigidbody2D.cs
@@ -0,0 +1,22 @@
+#if COM_UNITY_MODULES_PHYSICS2D
+using UnityEngine;
+
+namespace Unity.Netcode.Components
+{
+    /// <summary>
+    /// NetworkRigidbody allows for the use of <see cref="Rigidbody2D"/> on network objects. By controlling the kinematic
+    /// mode of the rigidbody and disabling it on all peers but the authoritative one.
+    /// </summary>
+    [RequireComponent(typeof(NetworkTransform))]
+    [RequireComponent(typeof(Rigidbody2D))]
+    [AddComponentMenu("Netcode/Network Rigidbody 2D")]
+    public class NetworkRigidbody2D : NetworkRigidbodyBase
+    {
+        public Rigidbody2D Rigidbody2D => m_InternalRigidbody2D;
+        protected virtual void Awake()
+        {
+            Initialize(RigidbodyTypes.Rigidbody2D);
+        }
+    }
+}
+#endif // COM_UNITY_MODULES_PHYSICS2D
diff --git a/com.unity.netcode.gameobjects/Components/NetworkRigidbody2D.cs.meta b/com.unity.netcode.gameobjects/Runtime/Components/NetworkRigidbody2D.cs.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Components/NetworkRigidbody2D.cs.meta
rename to com.unity.netcode.gameobjects/Runtime/Components/NetworkRigidbody2D.cs.meta
diff --git a/com.unity.netcode.gameobjects/Components/NetworkTransform.cs b/com.unity.netcode.gameobjects/Runtime/Components/NetworkTransform.cs
similarity index 59%
rename from com.unity.netcode.gameobjects/Components/NetworkTransform.cs
rename to com.unity.netcode.gameobjects/Runtime/Components/NetworkTransform.cs
index 13f17e99e5..10e95c6017 100644
--- a/com.unity.netcode.gameobjects/Components/NetworkTransform.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Components/NetworkTransform.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
+using System.Text;
 using Unity.Mathematics;
 using UnityEngine;
 
@@ -13,76 +14,24 @@ namespace Unity.Netcode.Components
     /// </summary>
     [DisallowMultipleComponent]
     [AddComponentMenu("Netcode/Network Transform")]
-    [DefaultExecutionOrder(100000)] // this is needed to catch the update time after the transform was updated by user scripts
     public class NetworkTransform : NetworkBehaviour
     {
-        /// <summary>
-        /// The default position change threshold value.
-        /// Any changes above this threshold will be replicated.
-        /// </summary>
-        public const float PositionThresholdDefault = 0.001f;
-
-        /// <summary>
-        /// The default rotation angle change threshold value.
-        /// Any changes above this threshold will be replicated.
-        /// </summary>
-        public const float RotAngleThresholdDefault = 0.01f;
-
-        /// <summary>
-        /// The default scale change threshold value.
-        /// Any changes above this threshold will be replicated.
-        /// </summary>
-        public const float ScaleThresholdDefault = 0.01f;
-
-        /// <summary>
-        /// The handler delegate type that takes client requested changes and returns resulting changes handled by the server.
-        /// </summary>
-        /// <param name="pos">The position requested by the client.</param>
-        /// <param name="rot">The rotation requested by the client.</param>
-        /// <param name="scale">The scale requested by the client.</param>
-        /// <returns>The resulting position, rotation and scale changes after handling.</returns>
-        public delegate (Vector3 pos, Quaternion rotOut, Vector3 scale) OnClientRequestChangeDelegate(Vector3 pos, Quaternion rot, Vector3 scale);
-
-        /// <summary>
-        /// The handler that gets invoked when server receives a change from a client.
-        /// This handler would be useful for server to modify pos/rot/scale before applying client's request.
-        /// </summary>
-        public OnClientRequestChangeDelegate OnClientRequestChange;
-
-        /// <summary>
-        /// When set each state update will contain a state identifier
-        /// </summary>
-        internal static bool TrackByStateId;
+#if UNITY_EDITOR
+        internal virtual bool HideInterpolateValue => false;
 
-        /// <summary>
-        /// Enabled by default.
-        /// When set (enabled by default), NetworkTransform will send common state updates using unreliable network delivery
-        /// to provide a higher tolerance to poor network conditions (especially packet loss). When disabled, all state updates
-        /// are sent using a reliable fragmented sequenced network delivery.
-        /// </summary>
-        /// <remarks>
-        /// The following more critical state updates are still sent as reliable fragmented sequenced:
-        /// - The initial synchronization state update
-        /// - The teleporting state update.
-        /// - When using half float precision and the `NetworkDeltaPosition` delta exceeds the maximum delta forcing the axis in
-        /// question to be collapsed into the core base position, this state update will be sent as reliable fragmented sequenced.
-        /// 
-        /// In order to preserve a continual consistency of axial values when unreliable delta messaging is enabled (due to the
-        /// possibility of dropping packets), NetworkTransform instances will send 1 axial frame synchronization update per
-        /// second (only for the axis marked to synchronize are sent as reliable fragmented sequenced) as long as a delta state
-        /// update had been previously sent. When a NetworkObject is at rest, axial frame synchronization updates are not sent.
-        /// </remarks>
-        [Tooltip("When set, NetworkTransform will send common state updates using unreliable network delivery " +
-            "to provide a higher tolerance to poor network conditions (especially packet loss). When disabled, all state updates are " +
-            "sent using reliable fragmented sequenced network delivery.")]
-        public bool UseUnreliableDeltas = false;
+        [HideInInspector]
+        [SerializeField]
+        internal bool NetworkTransformExpanded;
+#endif
 
+        #region NETWORK TRANSFORM STATE
         /// <summary>
         /// Data structure used to synchronize the <see cref="NetworkTransform"/>
         /// </summary>
         public struct NetworkTransformState : INetworkSerializable
         {
-            private const int k_InLocalSpaceBit = 0x00000001; // Persists between state updates (authority dictates if this is set)
+            // Persists between state updates (authority dictates if this is set)
+            private const int k_InLocalSpaceBit = 0x00000001;
             private const int k_PositionXBit = 0x00000002;
             private const int k_PositionYBit = 0x00000004;
             private const int k_PositionZBit = 0x00000008;
@@ -93,18 +42,25 @@ public struct NetworkTransformState : INetworkSerializable
             private const int k_ScaleYBit = 0x00000100;
             private const int k_ScaleZBit = 0x00000200;
             private const int k_TeleportingBit = 0x00000400;
-            private const int k_Interpolate = 0x00000800; // Persists between state updates (authority dictates if this is set)
-            private const int k_QuaternionSync = 0x00001000; // Persists between state updates (authority dictates if this is set)
-            private const int k_QuaternionCompress = 0x00002000; // Persists between state updates (authority dictates if this is set)
-            private const int k_UseHalfFloats = 0x00004000; // Persists between state updates (authority dictates if this is set)
+            // Persists between state updates (authority dictates if this is set)
+            private const int k_Interpolate = 0x00000800;
+            // Persists between state updates (authority dictates if this is set)
+            private const int k_QuaternionSync = 0x00001000;
+            // Persists between state updates (authority dictates if this is set)
+            private const int k_QuaternionCompress = 0x00002000;
+            // Persists between state updates (authority dictates if this is set)
+            private const int k_UseHalfFloats = 0x00004000;
             private const int k_Synchronization = 0x00008000;
-            private const int k_PositionSlerp = 0x00010000; // Persists between state updates (authority dictates if this is set)
-            private const int k_IsParented = 0x00020000; // When parented and synchronizing, we need to have both lossy and local scale due to varying spawn order
+            // Persists between state updates (authority dictates if this is set)
+            private const int k_PositionSlerp = 0x00010000;
+            // When parented and synchronizing, we need to have both lossy and local scale due to varying spawn order
+            private const int k_IsParented = 0x00020000;
             private const int k_SynchBaseHalfFloat = 0x00040000;
             private const int k_ReliableSequenced = 0x00080000;
             private const int k_UseUnreliableDeltas = 0x00100000;
             private const int k_UnreliableFrameSync = 0x00200000;
-            private const int k_TrackStateId = 0x10000000; // (Internal Debugging) When set each state update will contain a state identifier 
+            // (Internal Debugging) When set each state update will contain a state identifier
+            private const int k_TrackStateId = 0x10000000;
 
             // Stores persistent and state relative flags
             private uint m_Bitset;
@@ -459,10 +415,11 @@ internal set
             }
 
             /// <summary>
-            /// Returns whether this state update was a frame synchronization when 
-            /// UseUnreliableDeltas is enabled. When set, the entire transform will 
+            /// Returns whether this state update was a frame synchronization when
+            /// UseUnreliableDeltas is enabled. When set, the entire transform will
             /// be or has been synchronized.
             /// </summary>
+            /// <returns>true or false as to whether this state update was an unreliable frame synchronization.</returns>
             public bool IsUnreliableFrameSync()
             {
                 return UnreliableFrameSync;
@@ -475,6 +432,7 @@ public bool IsUnreliableFrameSync()
             /// <remarks>
             /// Unreliable delivery will only be used if <see cref="UseUnreliableDeltas"/> is set.
             /// </remarks>
+            /// <returns>true or false as to whether this state update was sent with reliable delivery.</returns>
             public bool IsReliableStateUpdate()
             {
                 return ReliableSequenced;
@@ -586,7 +544,7 @@ public Quaternion GetRotation()
             /// <remarks>
             /// When there is no change in an updated state's position then there are no values to return.
             /// Checking for <see cref="HasPositionChange"/> is one way to detect this.
-            /// When used with half precision it returns the half precision delta position state update 
+            /// When used with half precision it returns the half precision delta position state update
             /// which will not be the full position.
             /// To get a NettworkTransform's full position, use <see cref="GetSpaceRelativePosition(bool)"/> and
             /// pass true as the parameter.
@@ -658,9 +616,7 @@ public int GetNetworkTick()
 
             internal HalfVector3 HalfEulerRotation;
 
-            /// <summary>
-            /// Serializes this <see cref="NetworkTransformState"/>
-            /// </summary>
+            /// <inheritdoc />
             public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReaderWriter
             {
                 // Used to calculate the LastSerializedSize value
@@ -703,7 +659,6 @@ public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReade
                         // We use network ticks as opposed to absolute time as the authoritative
                         // side updates on every new tick.
                         BytePacker.WriteValueBitPacked(m_Writer, NetworkTick);
-
                     }
                     else
                     {
@@ -897,7 +852,7 @@ public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReade
                 if (HasScaleChange)
                 {
                     // If we are teleporting (which includes synchronizing) and the associated NetworkObject has a parent
-                    // then we want to serialize the LossyScale since NetworkObject spawn order is not  guaranteed 
+                    // then we want to serialize the LossyScale since NetworkObject spawn order is not  guaranteed
                     if (IsTeleportingNextFrame && IsParented)
                     {
                         serializer.SerializeValue(ref LossyScale);
@@ -976,6 +931,325 @@ public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReade
                 }
             }
         }
+        #endregion
+
+        #region PROPERTIES AND GENERAL METHODS
+
+        /// <summary>
+        /// Pertains to Owner Authority and Interpolation<br />
+        /// When enabled (default), 1 additional tick is added to the total number of ticks used to calculate the tick latency ("ticks ago") as a time.
+        /// This calculated time value is passed into the respective <see cref="BufferedLinearInterpolator{T}"/> and used to determine if any pending
+        /// state updates in the queue should be processed.
+        /// The additional tick value is only applied when:
+        /// <list type="bullet">
+        /// <item><description>The <see cref="NetworkTransform"/> is using a <see cref="AuthorityModes.Owner"/> authority mode.</description></item>
+        /// <item><description>The non-authority instance is a client (i.e. not host or server).</description></item>
+        /// <item><description>The network topology being used is <see cref="NetworkTopologyTypes.ClientServer"/>.</description></item>
+        /// </list>
+        /// </summary>
+        /// <remarks>
+        /// When calculating the total tick latency as time value, the <see cref="NetworkTimeSystem.TickLatency"/> is added to the <see cref="InterpolationBufferTickOffset"/>
+        /// and if this property is enabled (and the conditions above are met) an additional tick is added to the final resultant value. <br />
+        /// Note: The reason behind this additional tick latency value is due to the 2 RTT timespan when a client state update is sent to the host or server (1 RTT)
+        /// and the host or server relays this state update to all non-authority instances (1 RTT).
+        /// </remarks>
+        public bool AutoOwnerAuthorityTickOffset = true;
+
+        /// <summary>
+        /// The different interpolation types used with <see cref="BufferedLinearInterpolator{T}"/> to help smooth interpolation results.
+        /// Interpolation types can be changed during runtime.
+        /// </summary>
+        public enum InterpolationTypes
+        {
+            /// <summary>
+            /// Legacy Lerp (original NGO lerping model)<br />
+            /// Uses a 1 to 2 phase lerp approach where:<br />
+            /// <list type="bullet">
+            /// <item><description>The first phase lerps from the previous state update value to the next state update value.</description></item>
+            /// <item><description>The second phase (optional) performs lerp smoothing where the current respective transform value is lerped towards the result of the first phase at a rate of delta time divided by the respective max interpolation time.</description></item>
+            /// </list>
+            /// !!! NOTE !!!<br />
+            /// The legacy lerp interpolation type does not use <see cref="NetworkTimeSystem.TickLatency"/> to determine the buffer depth. This is to preserve the same interpolation results when lerp smoothing is enabled.<br />
+            /// </summary>
+            /// <remarks>
+            /// For more information:<br />
+            /// <list type="bullet">
+            /// <item><term><see cref="PositionMaxInterpolationTime"/></term></item>
+            /// <item><term><see cref="PositionLerpSmoothing"/></term></item>
+            /// <item><term><see cref="RotationMaxInterpolationTime"/></term></item>
+            /// <item><term><see cref="RotationLerpSmoothing"/></term></item>
+            /// <item><term><see cref="ScaleMaxInterpolationTime"/></term></item>
+            /// <item><term><see cref="ScaleLerpSmoothing"/></term></item>
+            /// </list>
+            /// </remarks>
+            LegacyLerp,
+            /// <summary>
+            /// Lerp (maintains time to target when <see cref="InterpolationBufferTickOffset"/> under higher <see cref="NetworkTimeSystem.TickLatency"/> conditions) <br />
+            /// Uses a 1 to 2 phase interpolation approach where:<br />
+            /// <list type="bullet">
+            /// <item><description>The first phase lerps from the previous state update value to the next state update value.</description></item>
+            /// <item><description>The second phase (optional) performs lerp smoothing where the current respective transform value is lerped towards the result of the first phase at a rate of 1.0 minus the respective maximum interpolation time.</description></item>
+            /// </list>
+            /// </summary>
+            /// <remarks>
+            /// For more information:<br />
+            /// <list type="bullet">
+            /// <item><term><see cref="PositionMaxInterpolationTime"/></term></item>
+            /// <item><term><see cref="PositionLerpSmoothing"/></term></item>
+            /// <item><term><see cref="RotationMaxInterpolationTime"/></term></item>
+            /// <item><term><see cref="RotationLerpSmoothing"/></term></item>
+            /// <item><term><see cref="ScaleMaxInterpolationTime"/></term></item>
+            /// <item><term><see cref="ScaleLerpSmoothing"/></term></item>
+            /// </list>
+            /// </remarks>
+            Lerp,
+            /// <summary>
+            /// Smooth Dampening (maintains time to target when <see cref="InterpolationBufferTickOffset"/> under higher <see cref="NetworkTimeSystem.TickLatency"/> conditions) <br />
+            /// Uses a 1 to 2 phase smooth dampening approach where:<br />
+            /// <list type="bullet">
+            /// <item><description>The first phase smooth dampens towards the current tick state update being processed by the accumulated delta time relative to the time to target.</description></item>
+            /// <item><description>The second phase (optional) performs lerp smoothing where the current respective transform value is lerped towards the result of the third phase at a rate of delta time divided by the respective max interpolation time.</description></item>
+            /// </list>
+            /// </summary>
+            /// <remarks>
+            /// Note: Smooth dampening is computationally more expensive than the <see cref="Lerp"/> and <see cref="LegacyLerp"/> approaches.<br />
+            /// It is recommended to turn lerp smoothing off or adjust the maximum interpolation time to a lower value if you want a more precise end result.
+            /// For more information:<br />
+            /// <list type="bullet">
+            /// <item><term><see cref="PositionMaxInterpolationTime"/></term></item>
+            /// <item><term><see cref="PositionLerpSmoothing"/></term></item>
+            /// <item><term><see cref="RotationMaxInterpolationTime"/></term></item>
+            /// <item><term><see cref="RotationLerpSmoothing"/></term></item>
+            /// <item><term><see cref="ScaleMaxInterpolationTime"/></term></item>
+            /// <item><term><see cref="ScaleLerpSmoothing"/></term></item>
+            /// </list>
+            /// </remarks>
+            SmoothDampening
+        }
+
+        /// <summary>
+        /// The position interpolation type to use for the <see cref="NetworkTransform"/> instance.
+        /// </summary>
+        /// <remarks>
+        /// <list type="bullet">
+        /// <item><term><see cref="InterpolationTypes.LegacyLerp"/></term><description>Yields the original Netcode for GameObjects lerp result.</description></item>
+        /// <item><term><see cref="InterpolationTypes.Lerp"/></term><description>Uses the newer linear buffer queue consumption approach that maintains a consistent time to the next target.</description></item>
+        /// <item><term><see cref="InterpolationTypes.SmoothDampening"/></term><description>Uses the newer linear buffer queue consumption approach and adjusts based on the rate of change.</description></item>
+        /// </list>
+        /// Things to consider:<br />
+        /// <list type="bullet">
+        /// <item><description>You can have mixed interpolation types between position, rotation, and scale on the same <see cref="NetworkTransform"/> instance.</description></item>
+        /// <item><description>You can change the interpolation type during runtime, but changing between <see cref="InterpolationTypes"/> can result in a slight stutter if the object is in motion.</description></item>
+        /// </list>
+        /// </remarks>
+        [Tooltip("Lerping yields a traditional linear result where smooth dampening will adjust based on the rate of change. You can mix interpolation types for position, rotation, and scale.")]
+        public InterpolationTypes PositionInterpolationType;
+        private InterpolationTypes m_PreviousPositionInterpolationType;
+
+        /// <summary>
+        /// The rotation interpolation type to use for the <see cref="NetworkTransform"/> instance.
+        /// </summary>
+        /// <remarks>
+        /// <list type="bullet">
+        /// <item><term><see cref="InterpolationTypes.LegacyLerp"/></term><description>Yields the original Netcode for GameObjects lerp result.</description></item>
+        /// <item><term><see cref="InterpolationTypes.Lerp"/></term><description>Uses the newer linear buffer queue consumption approach that maintains a consistent time to the next target.</description></item>
+        /// <item><term><see cref="InterpolationTypes.SmoothDampening"/></term><description>Uses the newer linear buffer queue consumption approach and adjusts based on the rate of change.</description></item>
+        /// </list>
+        /// Things to consider:<br />
+        /// <list type="bullet">
+        /// <item><description>You can have mixed interpolation types between position, rotation, and scale on the same <see cref="NetworkTransform"/> instance.</description></item>
+        /// <item><description>You can change the interpolation type during runtime, but changing between <see cref="InterpolationTypes"/> can result in a slight stutter if the object is in motion.</description></item>
+        /// </list>
+        /// </remarks>
+        [Tooltip("Lerping yields a traditional linear result where smooth dampening will adjust based on the rate of change. You can mix interpolation types for position, rotation, and scale.")]
+        public InterpolationTypes RotationInterpolationType;
+        private InterpolationTypes m_PreviousRotationInterpolationType;
+
+        /// <summary>
+        /// The scale interpolation type to use for the <see cref="NetworkTransform"/> instance.
+        /// </summary>
+        /// <remarks>
+        /// <list type="bullet">
+        /// <item><term><see cref="InterpolationTypes.LegacyLerp"/></term><description>Yields the original Netcode for GameObjects lerp result.</description></item>
+        /// <item><term><see cref="InterpolationTypes.Lerp"/></term><description>Uses the newer linear buffer queue consumption approach that maintains a consistent time to the next target.</description></item>
+        /// <item><term><see cref="InterpolationTypes.SmoothDampening"/></term><description>Uses the newer linear buffer queue consumption approach and adjusts based on the rate of change.</description></item>
+        /// </list>
+        /// Things to consider:<br />
+        /// <list type="bullet">
+        /// <item><description>You can have mixed interpolation types between position, rotation, and scale on the same <see cref="NetworkTransform"/> instance.</description></item>
+        /// <item><description>You can change the interpolation type during runtime, but changing between <see cref="InterpolationTypes"/> can result in a slight stutter if the object is in motion.</description></item>
+        /// </list>
+        /// </remarks>
+        [Tooltip("Lerping yields a traditional linear result where smooth dampening will adjust based on the rate of change. You can mix interpolation types for position, rotation, and scale.")]
+        public InterpolationTypes ScaleInterpolationType;
+        private InterpolationTypes m_PreviousScaleInterpolationType;
+
+        /// <summary>
+        /// Controls position interpolation smoothing.
+        /// </summary>
+        /// <remarks>
+        /// When enabled, the <see cref="BufferedLinearInterpolator{T}"/> will apply a final lerping pass where the "t" parameter is calculated by dividing the frame time divided by the <see cref="PositionMaxInterpolationTime"/>.
+        /// </remarks>
+        public bool PositionLerpSmoothing = true;
+        private bool m_PreviousPositionLerpSmoothing;
+
+        /// <summary>
+        /// The position interoplation maximum interpolation time.<br />
+        /// <list type="bullet">
+        /// <item><description>The higher the value the smoother, but can result in lost data points (i.e. quick changes in direct).</description></item>
+        /// <item><description>The lower the value the more accurate/precise, but can result in slight stutter (i.e. due to jitter, latency, or a high threshold value).</description></item>
+        /// <item><description>This value can be adjusted during runtime in the event you want to dynamically adjust it based on some other value (i.e. linear velocity or the like).</description></item>
+        /// </list>
+        /// </summary>
+        [Tooltip("The higher the value the smoother, but can result in lost data points (i.e. quick changes in direct). The lower the value the more accurate/precise, but can result in slight stutter (i.e. due to jitter, latency, or a high threshold value).")]
+        [Range(0.01f, 1.0f)]
+        public float PositionMaxInterpolationTime = 0.1f;
+
+        /// <summary>
+        /// Controls rotation interpolation smoothing.
+        /// </summary>
+        /// <remarks>
+        /// When enabled, the <see cref="BufferedLinearInterpolator{T}"/> will apply a final lerping pass where the "t" parameter is calculated by dividing the frame time divided by the <see cref="RotationMaxInterpolationTime"/>.
+        /// </remarks>
+        public bool RotationLerpSmoothing = true;
+        private bool m_PreviousRotationLerpSmoothing;
+
+        /// <summary>
+        /// The rotation interoplation maximum interpolation time.<br />
+        /// <list type="bullet">
+        /// <item><description>The higher the value the smoother, but can result in lost data points (i.e. quick changes in direct).</description></item>
+        /// <item><description>The lower the value the more accurate/precise, but can result in slight stutter (i.e. due to jitter, latency, or a high threshold value).</description></item>
+        /// <item><description>This value can be adjusted during runtime in the event you want to dynamically adjust it based on some other value (i.e. angular velocity).</description></item>
+        /// </list>
+        /// </summary>
+        [Tooltip("The higher the value the smoother, but can result in lost data points (i.e. quick changes in direct). The lower the value the more accurate/precise, but can result in slight stutter (i.e. due to jitter, latency, or a high threshold value).")]
+        [Range(0.01f, 1.0f)]
+        public float RotationMaxInterpolationTime = 0.1f;
+
+        /// <summary>
+        /// Controls scale interpolation smoothing.
+        /// </summary>
+        /// <remarks>
+        /// When enabled, the <see cref="BufferedLinearInterpolator{T}"/> will apply a final lerping pass where the "t" parameter is calculated by dividing the frame time divided by the <see cref="ScaleMaxInterpolationTime"/>.
+        /// </remarks>
+        public bool ScaleLerpSmoothing = true;
+        private bool m_PreviousScaleLerpSmoothing;
+
+        /// <summary>
+        /// The scale interoplation maximum interpolation time.<br />
+        /// <list type="bullet">
+        /// <item><description>The higher the value the smoother, but can result in lost data points (i.e. quick changes in direct).</description></item>
+        /// <item><description>The lower the value the more accurate/precise, but can result in slight stutter (i.e. due to jitter, latency, or a high threshold value).</description></item>
+        /// <item><description>This value can be adjusted during runtime in the event you want to dynamically adjust it based on some other value.</description></item>
+        /// </list>
+        /// </summary>
+        [Tooltip("The higher the value the smoother, but can result in lost data points (i.e. quick changes in direct). The lower the value the more accurate/precise, but can result in slight stutter (i.e. due to jitter, latency, or a high threshold value).")]
+        [Range(0.01f, 1.0f)]
+        public float ScaleMaxInterpolationTime = 0.1f;
+
+        /// <summary>
+        /// Determines if the server or client owner pushes transform states.
+        /// </summary>
+        public enum AuthorityModes
+        {
+            /// <summary>
+            /// Server pushes transform state updates.
+            /// </summary>
+            Server,
+            /// <summary>
+            /// Client owner pushes transform state updates.
+            /// </summary>
+            Owner,
+        }
+
+        /// <summary>
+        /// Determines whether this <see cref="NetworkTransform"/> instance will have state updates pushed by the server or the client owner.
+        /// <see cref="AuthorityModes"/>
+        /// </summary>
+#if MULTIPLAYER_SERVICES_SDK_INSTALLED
+        [Tooltip("Selects who has authority (sends state updates) over the transform. When the network topology is set to distributed authority, this always defaults to owner authority. If server (the default), then only server-side adjustments to the " +
+            "transform will be synchronized with clients. If owner (or client), then only the owner-side adjustments to the transform will be synchronized with both the server and other clients.")]
+#else
+        [Tooltip("Selects who has authority (sends state updates) over the transform. If server (the default), then only server-side adjustments to the transform will be synchronized with clients. If owner (or client), " +
+            "then only the owner-side adjustments to the transform will be synchronized with both the server and other clients.")]
+#endif
+        public AuthorityModes AuthorityMode;
+
+        /// <summary>
+        /// When enabled, any parented <see cref="NetworkObject"/>s (children) of this <see cref="NetworkObject"/> will be forced to synchronize their transform when this <see cref="NetworkObject"/> instance sends a state update.<br />
+        /// This can help to reduce out of sync updates that can lead to slight jitter between a parent and its child/children.
+        /// </summary>
+        /// <remarks>
+        /// <list type="bullet">
+        /// <item><description>If this is set on a child and the parent does not have this set then the child will not be tick synchronized with its parent.</description></item>
+        /// <item><description>If the parent instance does not send any state updates, the children will still send state updates when exceeding axis delta threshold.</description></item>
+        /// <item><description>This does not need to be set on children to be applied.</description></item>
+        /// </list>
+        /// </remarks>
+        [Tooltip("When enabled, any parented children of this instance will send a state update when this instance sends a state update. If this instance doesn't send a state update, the children will still send state updates when reaching their axis specified threshold delta. Children do not have to have this setting enabled.")]
+        public bool TickSyncChildren = false;
+
+        /// <summary>
+        /// The default position change threshold value.<br />
+        /// Any changes above this threshold will be replicated.
+        /// </summary>
+        public const float PositionThresholdDefault = 0.001f;
+
+        /// <summary>
+        /// The default rotation angle change threshold value.<br />
+        /// Any changes above this threshold will be replicated.
+        /// </summary>
+        public const float RotAngleThresholdDefault = 0.01f;
+
+        /// <summary>
+        /// The default scale change threshold value.<br />
+        /// Any changes above this threshold will be replicated.
+        /// </summary>
+        public const float ScaleThresholdDefault = 0.01f;
+
+        /// <summary>
+        /// The handler delegate type that takes client requested changes and returns resulting changes handled by the server.
+        /// </summary>
+        /// <param name="pos">The position requested by the client.</param>
+        /// <param name="rot">The rotation requested by the client.</param>
+        /// <param name="scale">The scale requested by the client.</param>
+        /// <returns>The resulting position, rotation and scale changes after handling.</returns>
+        public delegate (Vector3 pos, Quaternion rotOut, Vector3 scale) OnClientRequestChangeDelegate(Vector3 pos, Quaternion rot, Vector3 scale);
+
+        /// <summary>
+        /// The handler that gets invoked when server receives a change from a client.
+        /// This handler would be useful for server to modify pos/rot/scale before applying client's request.
+        /// </summary>
+        public OnClientRequestChangeDelegate OnClientRequestChange;
+
+        /// <summary>
+        /// When set each state update will contain a state identifier
+        /// </summary>
+        internal static bool TrackByStateId = false;
+
+        /// <summary>
+        /// Enabled by default.
+        /// When set (enabled by default), NetworkTransform will send common state updates using unreliable network delivery
+        /// to provide a higher tolerance to poor network conditions (especially packet loss). When disabled, all state updates
+        /// are sent using a reliable fragmented sequenced network delivery.
+        /// </summary>
+        /// <remarks>
+        /// The following more critical state updates are still sent as reliable fragmented sequenced:<br />
+        /// <list type="bullet">
+        /// <item><description>The initial synchronization state update.</description></item>
+        /// <item><description>The teleporting state update.</description></item>
+        /// <item><description>When using half float precision and the `NetworkDeltaPosition` delta exceeds the maximum delta forcing the axis in
+        /// question to be collapsed into the core base position, this state update will be sent as reliable fragmented sequenced.</description></item>
+        /// </list>
+        /// In order to preserve a continual consistency of axial values when unreliable delta messaging is enabled (due to the
+        /// possibility of dropping packets), NetworkTransform instances will send 1 axial frame synchronization update per
+        /// second (only for the axis marked to synchronize are sent as reliable fragmented sequenced) as long as a delta state
+        /// update had been previously sent. When a NetworkObject is at rest, axial frame synchronization updates are not sent.
+        /// </remarks>
+        [Tooltip("When set, NetworkTransform will send common state updates using unreliable network delivery " +
+            "to provide a higher tolerance to poor network conditions (especially packet loss). When disabled, all state updates are " +
+            "sent using reliable fragmented sequenced network delivery.")]
+        public bool UseUnreliableDeltas = false;
 
         /// <summary>
         /// When enabled (default), the x component of position will be synchronized by authority.
@@ -1001,7 +1275,7 @@ public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReade
         /// </remarks>
         public bool SyncPositionZ = true;
 
-        private bool SynchronizePosition
+        internal bool SynchronizePosition
         {
             get
             {
@@ -1036,7 +1310,7 @@ private bool SynchronizePosition
         /// </remarks>
         public bool SyncRotAngleZ = true;
 
-        private bool SynchronizeRotation
+        internal bool SynchronizeRotation
         {
             get
             {
@@ -1068,7 +1342,7 @@ private bool SynchronizeRotation
         /// </remarks>
         public bool SyncScaleZ = true;
 
-        private bool SynchronizeScale
+        internal bool SynchronizeScale
         {
             get
             {
@@ -1088,8 +1362,16 @@ private bool SynchronizeScale
         /// The rotation threshold value that triggers a delta state update by the authoritative instance.
         /// </summary>
         /// <remarks>
-        /// Minimum Value: 0.00001
-        /// Maximum Value: 360.0
+        /// <list type="bullet">
+        /// <item>
+        /// <term>Minimum Value</term>
+        /// <description>0.00001</description>
+        /// </item>
+        /// <item>
+        /// <term>Maximum Value</term>
+        /// <description>360.0</description>
+        /// </item>
+        /// </list>
         /// </remarks>
         [Range(0.00001f, 360.0f)]
         public float RotAngleThreshold = RotAngleThresholdDefault;
@@ -1103,7 +1385,7 @@ private bool SynchronizeScale
         public float ScaleThreshold = ScaleThresholdDefault;
 
         /// <summary>
-        /// Enable this on the authority side for quaternion synchronization
+        /// Enable this on the authority side for quaternion synchronization.
         /// </summary>
         /// <remarks>
         /// This is synchronized by authority. During runtime, this should only be changed by the
@@ -1119,7 +1401,7 @@ private bool SynchronizeScale
         /// <remarks>
         /// This has a lower precision than half float precision. Recommended only for low precision
         /// scenarios. <see cref="UseHalfFloatPrecision"/> provides better precision at roughly half
-        /// the cost of a full quaternion update.
+        /// the cost of a full quaternion update.<br />
         /// This is synchronized by authority. During runtime, this should only be changed by the
         /// authoritative side. Non-authoritative instances will be overridden by the next
         /// authoritative state update.
@@ -1128,7 +1410,7 @@ private bool SynchronizeScale
         public bool UseQuaternionCompression = false;
 
         /// <summary>
-        /// Enable this to use half float precision for position, rotation, and scale.
+        /// Enable this to use half float precision for position, rotation, and scale.<br />
         /// When enabled, delta position synchronization is used.
         /// </summary>
         /// <remarks>
@@ -1150,6 +1432,29 @@ private bool SynchronizeScale
         [Tooltip("Sets whether this transform should sync in local space or in world space")]
         public bool InLocalSpace = false;
 
+        /// <summary>
+        /// When enabled, the NetworkTransform will automatically handle transitioning into the respective transform space when its <see cref="NetworkObject"/> parent changes.<br />
+        /// When parented: Automatically transitions into local space and coverts any existing pending interpolated states to local space on non-authority instances.<br />
+        /// When deparented: Automatically transitions into world space and converts any existing pending interpolated states to world space on non-authority instances.<br />
+        /// Set on the root <see cref="NetworkTransform"/> instance (nested <see cref="NetworkTransform"/> components should be pre-set in-editor to local space. <br />
+        /// </summary>
+        /// <remarks>
+        /// Only works with <see cref="NetworkTransform"/> components that are not paired with a <see cref="NetworkRigidbody"/> or <see cref="NetworkRigidbody2D"/> component that is configured to use the rigid body for motion.<br />
+        /// <see cref="TickSyncChildren"/> will automatically be set when this is enabled.
+        /// Does not auto-synchronize clients if changed on the authority instance during runtime (i.e. apply this setting in-editor).
+        /// </remarks>
+        public bool SwitchTransformSpaceWhenParented = false;
+
+        /// <summary>
+        /// Returns true if position is currently in local space and false if it is in world space.
+        /// </summary>
+        protected bool PositionInLocalSpace => (!SwitchTransformSpaceWhenParented && InLocalSpace) || (m_PositionInterpolator != null && m_PositionInterpolator.InLocalSpace && SwitchTransformSpaceWhenParented);
+
+        /// <summary>
+        /// Returns true if rotation is currently in local space and false if it is in world space.
+        /// </summary>
+        protected bool RotationInLocalSpace => (!SwitchTransformSpaceWhenParented && InLocalSpace) || (m_RotationInterpolator != null && m_RotationInterpolator.InLocalSpace && SwitchTransformSpaceWhenParented);
+
         /// <summary>
         /// When enabled (default) interpolation is applied.
         /// When disabled interpolation is disabled.
@@ -1180,12 +1485,6 @@ private bool SynchronizeScale
         /// </summary>
         public bool CanCommitToTransform { get; protected set; }
 
-        /// <summary>
-        /// Internally used by <see cref="NetworkTransform"/> to keep track of whether this <see cref="NetworkBehaviour"/> derived class instance
-        /// was instantiated on the server side or not.
-        /// </summary>
-        protected bool m_CachedIsServer; // Note: we no longer use this and are only keeping it until we decide to deprecate it
-
         /// <summary>
         /// Internally used by <see cref="NetworkTransform"/> to keep track of the <see cref="NetworkManager"/> instance assigned to this
         /// this <see cref="NetworkBehaviour"/> derived class instance.
@@ -1196,19 +1495,27 @@ private bool SynchronizeScale
         /// Helper method that returns the space relative position of the transform.
         /// </summary>
         /// <remarks>
-        /// If InLocalSpace is <see cref="true"/> then it returns the transform.localPosition
-        /// If InLocalSpace is <see cref="false"/> then it returns the transform.position
-        /// When invoked on the non-authority side:
-        /// If <see cref="getCurrentState"/> is true then it will return the most
+        /// <list type="bullet">
+        /// <item><description>If InLocalSpace is <see cref="true"/> then it returns the transform.localPosition.</description></item>
+        /// <item><description>If InLocalSpace is <see cref="false"/> then it returns the transform.position.</description></item>
+        /// </list>
+        /// <list type="bullet">
+        /// <item>
+        /// <term>When invoked on the non-authority side:</term>
+        /// <description>If <see cref="getCurrentState"/> is true then it will return the most
         /// current authority position from the most recent state update. This can be useful
         /// if interpolation is enabled and you need to determine the final target position.
-        /// When invoked on the authority side:
-        /// It will always return the space relative position.
+        /// </description></item>
+        /// <item>
+        /// <term>When invoked on the authority side:</term>
+        /// <description>It will always return the space relative position.
+        /// </description></item>
+        /// </list>
         /// </remarks>
         /// <param name="getCurrentState">
-        /// Authority always returns the space relative transform position (whether true or false).
-        /// Non-authority:
-        /// When false (default): returns the space relative transform position
+        /// Authority always returns the space relative transform position (whether true or false).<br />
+        /// Non-authority:<br />
+        /// When false (default): returns the space relative transform position.<br />
         /// When true: returns the authority position from the most recent state update.
         /// </param>
         /// <returns><see cref="Vector3"/></returns>
@@ -1229,7 +1536,7 @@ public Vector3 GetSpaceRelativePosition(bool getCurrentState = false)
                 else
                 {
                     // Otherwise, just get the current position
-                    return m_CurrentPosition;
+                    return m_InternalCurrentPosition;
                 }
             }
         }
@@ -1238,19 +1545,27 @@ public Vector3 GetSpaceRelativePosition(bool getCurrentState = false)
         /// Helper method that returns the space relative rotation of the transform.
         /// </summary>
         /// <remarks>
-        /// If InLocalSpace is <see cref="true"/> then it returns the transform.localRotation
-        /// If InLocalSpace is <see cref="false"/> then it returns the transform.rotation
-        /// When invoked on the non-authority side:
-        /// If <see cref="getCurrentState"/> is true then it will return the most
-        /// current authority rotation from the most recent state update. This can be useful
+        /// <list type="bullet">
+        /// <item><description>If InLocalSpace is <see cref="true"/> then it returns the transform.localRotation.</description></item>
+        /// <item><description>If InLocalSpace is <see cref="false"/> then it returns the transform.rotation.</description></item>
+        /// </list>
+        /// <list type="bullet">
+        /// <item>
+        /// <term>When invoked on the non-authority side:</term>
+        /// <description>If <see cref="getCurrentState"/> is true then it will return the most
+        /// current authority position from the most recent state update. This can be useful
         /// if interpolation is enabled and you need to determine the final target rotation.
-        /// When invoked on the authority side:
-        /// It will always return the space relative rotation.
+        /// </description></item>
+        /// <item>
+        /// <term>When invoked on the authority side:</term>
+        /// <description>It will always return the space relative rotation.
+        /// </description></item>
+        /// </list>
         /// </remarks>
         /// <param name="getCurrentState">
-        /// Authority always returns the space relative transform rotation (whether true or false).
-        /// Non-authority:
-        /// When false (default): returns the space relative transform rotation
+        /// Authority always returns the space relative transform rotation (whether true or false).<br />
+        /// Non-authority:<br />
+        /// When false (default): returns the space relative transform rotation.<br />
         /// When true: returns the authority rotation from the most recent state update.
         /// </param>
         /// <returns><see cref="Quaternion"/></returns>
@@ -1262,7 +1577,7 @@ public Quaternion GetSpaceRelativeRotation(bool getCurrentState = false)
             }
             else
             {
-                return m_CurrentRotation;
+                return m_InternalCurrentRotation;
             }
         }
 
@@ -1270,17 +1585,17 @@ public Quaternion GetSpaceRelativeRotation(bool getCurrentState = false)
         /// Helper method that returns the scale of the transform.
         /// </summary>
         /// <remarks>
-        /// When invoked on the non-authority side:
+        /// When invoked on the non-authority side:<br />
         /// If <see cref="getCurrentState"/> is true then it will return the most
         /// current authority scale from the most recent state update. This can be useful
-        /// if interpolation is enabled and you need to determine the final target scale.
-        /// When invoked on the authority side:
+        /// if interpolation is enabled and you need to determine the final target scale.<br />
+        /// When invoked on the authority side:<br />
         /// It will always return the space relative scale.
         /// </remarks>
         /// <param name="getCurrentState">
-        /// Authority always returns the space relative transform scale (whether true or false).
-        /// Non-authority:
-        /// When false (default): returns the space relative transform scale
+        /// Authority always returns the space relative transform scale (whether true or false).<br />
+        /// Non-authority:<br />
+        /// When false (default): returns the space relative transform scale.<br />
         /// When true: returns the authority scale from the most recent state update.
         /// </param>
         /// <returns><see cref="Vector3"/></returns>
@@ -1293,7 +1608,7 @@ public Vector3 GetScale(bool getCurrentState = false)
             }
             else
             {
-                return m_CurrentScale;
+                return m_InternalCurrentScale;
             }
         }
 
@@ -1318,33 +1633,34 @@ internal NetworkTransformState LocalAuthoritativeNetworkState
 
         private BufferedLinearInterpolatorVector3 m_PositionInterpolator;
         private BufferedLinearInterpolatorVector3 m_ScaleInterpolator;
-        private BufferedLinearInterpolatorQuaternion m_RotationInterpolator; // rotation is a single Quaternion since each Euler axis will affect the quaternion's final value
+        // rotation is a single Quaternion since each Euler axis will affect the quaternion's final value
+        private BufferedLinearInterpolatorQuaternion m_RotationInterpolator;
+
+        // The previous network state
+        private NetworkTransformState m_OldState = new NetworkTransformState();
 
         // Non-Authoritative's current position, scale, and rotation that is used to assure the non-authoritative side cannot make adjustments to
         // the portions of the transform being synchronized.
-        private Vector3 m_CurrentPosition;
+        private Vector3 m_InternalCurrentPosition;
         private Vector3 m_TargetPosition;
-        private Vector3 m_CurrentScale;
+        private Vector3 m_InternalCurrentScale;
         private Vector3 m_TargetScale;
-        private Quaternion m_CurrentRotation;
+        private Quaternion m_InternalCurrentRotation;
         private Vector3 m_TargetRotation;
 
+#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
+        private bool m_UseRigidbodyForMotion;
+        private NetworkRigidbodyBase m_NetworkRigidbodyInternal;
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal void UpdatePositionInterpolator(Vector3 position, double time, bool resetInterpolator = false)
+        internal void RegisterRigidbody(NetworkRigidbodyBase networkRigidbody)
         {
-            if (!CanCommitToTransform)
+            if (networkRigidbody != null)
             {
-                if (resetInterpolator)
-                {
-                    m_PositionInterpolator.ResetTo(position, time);
-                }
-                else
-                {
-                    m_PositionInterpolator.AddMeasurement(position, time);
-                }
+                m_NetworkRigidbodyInternal = networkRigidbody;
+                m_UseRigidbodyForMotion = m_NetworkRigidbodyInternal.UseRigidBodyForMotion;
             }
         }
+#endif
 
 #if DEBUG_NETWORKTRANSFORM || UNITY_INCLUDE_TESTS
         /// <summary>
@@ -1402,8 +1718,8 @@ private bool ShouldSynchronizeHalfFloat(ulong targetClientId)
         {
             if (!IsServerAuthoritative() && NetworkObject.OwnerClientId == targetClientId)
             {
-                // Return false for all client owners but return true for the server
-                return NetworkObject.IsOwnedByServer;
+                // In distributed authority mode we want to synchronize the half float if we are the owner.
+                return (!NetworkManager.DistributedAuthorityMode && NetworkObject.IsOwnedByServer) || (NetworkManager.DistributedAuthorityMode);
             }
             return true;
         }
@@ -1411,22 +1727,20 @@ private bool ShouldSynchronizeHalfFloat(ulong targetClientId)
         // For test logging purposes
         internal NetworkTransformState SynchronizeState;
 
-        /// <summary>
-        /// This is invoked when a new client joins (server and client sides)
-        /// Server Side: Serializes as if we were teleporting (everything is sent via NetworkTransformState)
-        /// Client Side: Adds the interpolated state which applies the NetworkTransformState as well
-        /// </summary>
+        #endregion
+
+        #region ONSYNCHRONIZE
+
+        /// <inheritdoc />
         /// <remarks>
-        /// If a derived class overrides this, then make sure to invoke this base method!
+        /// This is invoked when a new client joins (server and client sides).
+        /// Server Side: Serializes as if we were teleporting (everything is sent via NetworkTransformState).
+        /// Client Side: Adds the interpolated state which applies the NetworkTransformState as well.
         /// </remarks>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="serializer"></param>
-        /// <param name="targetClientId">the clientId being synchronized (both reading and writing)</param>
         protected override void OnSynchronize<T>(ref BufferSerializer<T> serializer)
         {
-            m_CachedNetworkManager = NetworkManager;
             var targetClientId = m_TargetIdBeingSynchronized;
-            var synchronizationState = new NetworkTransformState()
+            SynchronizeState = new NetworkTransformState()
             {
                 HalfEulerRotation = new HalfVector3(),
                 HalfVectorRotation = new HalfVector4(),
@@ -1436,35 +1750,42 @@ protected override void OnSynchronize<T>(ref BufferSerializer<T> serializer)
 
             if (serializer.IsWriter)
             {
-                synchronizationState.IsTeleportingNextFrame = true;
+                SynchronizeState.IsTeleportingNextFrame = true;
                 var transformToCommit = transform;
                 // If we are using Half Float Precision, then we want to only synchronize the authority's m_HalfPositionState.FullPosition in order for
                 // for the non-authority side to be able to properly synchronize delta position updates.
-                ApplyTransformToNetworkStateWithInfo(ref synchronizationState, ref transformToCommit, true, targetClientId);
-                synchronizationState.NetworkSerialize(serializer);
-                SynchronizeState = synchronizationState;
+                CheckForStateChange(ref SynchronizeState, ref transformToCommit, true, targetClientId);
+                SynchronizeState.NetworkSerialize(serializer);
             }
             else
             {
-                synchronizationState.NetworkSerialize(serializer);
-                // Set the transform's synchronization modes
-                InLocalSpace = synchronizationState.InLocalSpace;
-                Interpolate = synchronizationState.UseInterpolation;
-                UseQuaternionSynchronization = synchronizationState.QuaternionSync;
-                UseHalfFloatPrecision = synchronizationState.UseHalfFloatPrecision;
-                UseQuaternionCompression = synchronizationState.QuaternionCompression;
-                SlerpPosition = synchronizationState.UsePositionSlerp;
-                UpdatePositionSlerp();
-
-                // Teleport/Fully Initialize based on the state
-                ApplyTeleportingState(synchronizationState);
-                SynchronizeState = synchronizationState;
-                m_LocalAuthoritativeNetworkState = synchronizationState;
-                m_LocalAuthoritativeNetworkState.IsTeleportingNextFrame = false;
-                m_LocalAuthoritativeNetworkState.IsSynchronizing = false;
+                SynchronizeState.NetworkSerialize(serializer);
             }
         }
 
+        /// <summary>
+        /// We now apply synchronization after everything has spawned
+        /// </summary>
+        private void ApplySynchronization()
+        {
+            // Set the transform's synchronization modes
+            InLocalSpace = SynchronizeState.InLocalSpace;
+            Interpolate = SynchronizeState.UseInterpolation;
+            UseQuaternionSynchronization = SynchronizeState.QuaternionSync;
+            UseHalfFloatPrecision = SynchronizeState.UseHalfFloatPrecision;
+            UseQuaternionCompression = SynchronizeState.QuaternionCompression;
+            SlerpPosition = SynchronizeState.UsePositionSlerp;
+            UpdatePositionSlerp();
+            // Teleport/Fully Initialize based on the state
+            ApplyTeleportingState(SynchronizeState);
+            m_LocalAuthoritativeNetworkState = SynchronizeState;
+            m_LocalAuthoritativeNetworkState.IsTeleportingNextFrame = false;
+            m_LocalAuthoritativeNetworkState.IsSynchronizing = false;
+            SynchronizeState.IsSynchronizing = false;
+        }
+        #endregion
+
+        #region AUTHORITY STATE UPDATE
         /// <summary>
         /// This will try to send/commit the current transform delta states (if any)
         /// </summary>
@@ -1473,7 +1794,7 @@ protected override void OnSynchronize<T>(ref BufferSerializer<T> serializer)
         /// </remarks>
         /// <param name="transformToCommit">the transform to be committed</param>
         /// <param name="dirtyTime">time it was marked dirty</param>
-        protected void TryCommitTransformToServer(Transform transformToCommit, double dirtyTime)
+        internal void TryCommitTransformToServer(Transform transformToCommit, double dirtyTime)
         {
             if (!IsSpawned)
             {
@@ -1542,12 +1863,18 @@ private void TryCommitTransform(ref Transform transformToCommit, bool synchroniz
                 NetworkLog.LogError($"[{name}] is trying to commit the transform without authority!");
                 return;
             }
+#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
+            // TODO: Make this an authority flag
+            // For now, just synchronize with the NetworkRigidbodyBase UseRigidBodyForMotion
+            if (m_NetworkRigidbodyInternal != null)
+            {
+                m_UseRigidbodyForMotion = m_NetworkRigidbodyInternal.UseRigidBodyForMotion;
+            }
+#endif
 
             // If the transform has deltas (returns dirty) or if an explicitly set state is pending
-            if (m_LocalAuthoritativeNetworkState.ExplicitSet || ApplyTransformToNetworkStateWithInfo(ref m_LocalAuthoritativeNetworkState, ref transformToCommit, synchronize))
+            if (m_LocalAuthoritativeNetworkState.ExplicitSet || CheckForStateChange(ref m_LocalAuthoritativeNetworkState, ref transformToCommit, synchronize, forceState: settingState))
             {
-                m_LocalAuthoritativeNetworkState.LastSerializedSize = m_OldState.LastSerializedSize;
-
                 // If the state was explicitly set, then update the network tick to match the locally calculate tick
                 if (m_LocalAuthoritativeNetworkState.ExplicitSet)
                 {
@@ -1575,11 +1902,11 @@ private void TryCommitTransform(ref Transform transformToCommit, bool synchroniz
                     Debug.LogException(ex);
                 }
 
-                // The below is part of assuring we only send a frame synch, when sending unreliable deltas, if 
+                // The below is part of assuring we only send a frame synch, when sending unreliable deltas, if
                 // we have already sent at least one unreliable delta state update. At this point in the callstack,
                 // a delta state update has just been sent in the above UpdateTransformState() call and as long as
                 // we didn't send a frame synch and we are not synchronizing then we know at least one unreliable
-                // delta has been sent. Under this scenario, we should start checking for this instance's alloted 
+                // delta has been sent. Under this scenario, we should start checking for this instance's alloted
                 // frame synch "tick slot". Once we send a frame synch, if no other deltas occur after that
                 // (i.e. the object is at rest) then we will stop sending frame synch's until the object begins
                 // moving, rotating, or scaling again.
@@ -1587,28 +1914,55 @@ private void TryCommitTransform(ref Transform transformToCommit, bool synchroniz
                 {
                     m_DeltaSynch = true;
                 }
-            }
-        }
-
-        /// <summary>
-        /// Initializes the interpolators with the current transform values
-        /// </summary>
-        private void ResetInterpolatedStateToCurrentAuthoritativeState()
-        {
-            var serverTime = NetworkManager.ServerTime.Time;
-
-            UpdatePositionInterpolator(GetSpaceRelativePosition(), serverTime, true);
-            UpdatePositionSlerp();
 
-            m_ScaleInterpolator.ResetTo(transform.localScale, serverTime);
-            m_RotationInterpolator.ResetTo(GetSpaceRelativeRotation(), serverTime);
-        }
-
-        /// <summary>
-        /// Used for integration testing:
-        /// Will apply the transform to the LocalAuthoritativeNetworkState and get detailed dirty information returned
-        /// in the <see cref="NetworkTransformState"/> returned.
-        /// </summary>
+#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
+                // We handle updating attached bodies when the "parent" body has a state update in order to keep their delta state updates tick synchronized.
+                if (m_UseRigidbodyForMotion && m_NetworkRigidbodyInternal.NetworkRigidbodyConnections.Count > 0)
+                {
+                    foreach (var childRigidbody in m_NetworkRigidbodyInternal.NetworkRigidbodyConnections)
+                    {
+                        childRigidbody.NetworkTransform.OnNetworkTick(true);
+                    }
+                }
+#endif
+                // When enabled, any children will get tick synchronized with state updates
+                if (TickSyncChildren)
+                {
+                    // Synchronize any nested NetworkTransforms with the parent's
+                    foreach (var childNetworkTransform in NetworkObject.NetworkTransforms)
+                    {
+                        // Don't update the same instance or any nested NetworkTransform with a different authority mode
+                        if (childNetworkTransform == this || childNetworkTransform.AuthorityMode != AuthorityMode)
+                        {
+                            continue;
+                        }
+                        if (childNetworkTransform.CanCommitToTransform)
+                        {
+                            childNetworkTransform.OnNetworkTick(true);
+                        }
+                    }
+
+                    // Synchronize any parented children with the parent's motion
+                    foreach (var child in m_ParentedChildren)
+                    {
+                        // Synchronize any nested NetworkTransforms of the child with the parent's
+                        foreach (var childNetworkTransform in child.NetworkTransforms)
+                        {
+                            if (childNetworkTransform.CanCommitToTransform)
+                            {
+                                childNetworkTransform.OnNetworkTick(true);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Used for integration testing:
+        /// Will apply the transform to the LocalAuthoritativeNetworkState and get detailed dirty information returned
+        /// in the <see cref="NetworkTransformState"/> returned.
+        /// </summary>
         /// <param name="transform">transform to apply</param>
         /// <returns>NetworkTransformState</returns>
         internal NetworkTransformState ApplyLocalNetworkState(Transform transform)
@@ -1618,7 +1972,7 @@ internal NetworkTransformState ApplyLocalNetworkState(Transform transform)
             m_LocalAuthoritativeNetworkState.ClearBitSetForNextTick();
 
             // Now check the transform for any threshold value changes
-            ApplyTransformToNetworkStateWithInfo(ref m_LocalAuthoritativeNetworkState, ref transform);
+            CheckForStateChange(ref m_LocalAuthoritativeNetworkState, ref transform);
 
             // Return the entire state to be used by the integration test
             return m_LocalAuthoritativeNetworkState;
@@ -1638,14 +1992,14 @@ internal bool ApplyTransformToNetworkState(ref NetworkTransformState networkStat
             networkState.UseUnreliableDeltas = UseUnreliableDeltas;
             m_HalfPositionState = new NetworkDeltaPosition(Vector3.zero, 0, math.bool3(SyncPositionX, SyncPositionY, SyncPositionZ));
 
-            return ApplyTransformToNetworkStateWithInfo(ref networkState, ref transformToUse);
+            return CheckForStateChange(ref networkState, ref transformToUse);
         }
 
         /// <summary>
         /// Applies the transform to the <see cref="NetworkTransformState"/> specified.
         /// </summary>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private bool ApplyTransformToNetworkStateWithInfo(ref NetworkTransformState networkState, ref Transform transformToUse, bool isSynchronization = false, ulong targetClientId = 0)
+        private bool CheckForStateChange(ref NetworkTransformState networkState, ref Transform transformToUse, bool isSynchronization = false, ulong targetClientId = 0, bool forceState = false)
         {
             // As long as we are not doing our first synchronization and we are sending unreliable deltas, each
             // NetworkTransform will stagger its full transfom synchronization over a 1 second period based on the
@@ -1677,18 +2031,48 @@ private bool ApplyTransformToNetworkStateWithInfo(ref NetworkTransformState netw
             var isRotationDirty = isTeleportingAndNotSynchronizing ? networkState.HasRotAngleChange : false;
             var isScaleDirty = isTeleportingAndNotSynchronizing ? networkState.HasScaleChange : false;
 
+#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
+            var position = m_UseRigidbodyForMotion ? m_NetworkRigidbodyInternal.GetPosition() : InLocalSpace ? transformToUse.localPosition : transformToUse.position;
+            var rotation = m_UseRigidbodyForMotion ? m_NetworkRigidbodyInternal.GetRotation() : InLocalSpace ? transformToUse.localRotation : transformToUse.rotation;
+
+            var positionThreshold = Vector3.one * PositionThreshold;
+            var rotationThreshold = Vector3.one * RotAngleThreshold;
+
+            // NSS: Disabling this for the time being
+            // TODO: Determine if we actually need this and if not remove this from NetworkRigidBodyBase
+            //if (m_UseRigidbodyForMotion)
+            //{
+            //    positionThreshold = m_NetworkRigidbodyInternal.GetAdjustedPositionThreshold();
+            //    rotationThreshold = m_NetworkRigidbodyInternal.GetAdjustedRotationThreshold();
+            //}
+#else
             var position = InLocalSpace ? transformToUse.localPosition : transformToUse.position;
-            var rotAngles = InLocalSpace ? transformToUse.localEulerAngles : transformToUse.eulerAngles;
+            var rotation = InLocalSpace ? transformToUse.localRotation : transformToUse.rotation;
+            var positionThreshold = Vector3.one * PositionThreshold;
+            var rotationThreshold = Vector3.one * RotAngleThreshold;
+#endif
+            var rotAngles = rotation.eulerAngles;
             var scale = transformToUse.localScale;
             networkState.IsSynchronizing = isSynchronization;
 
             // All of the checks below, up to the delta position checking portion, are to determine if the
             // authority changed a property during runtime that requires a full synchronizing.
+#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
+            if ((InLocalSpace != networkState.InLocalSpace || isSynchronization) && !m_UseRigidbodyForMotion)
+#else
             if (InLocalSpace != networkState.InLocalSpace)
+#endif
             {
-                networkState.InLocalSpace = InLocalSpace;
+                // When SwitchTransformSpaceWhenParented is set we automatically set our local space based on whether
+                // we are parented or not.
+                networkState.InLocalSpace = SwitchTransformSpaceWhenParented ? transform.parent != null : InLocalSpace;
                 isDirty = true;
-                networkState.IsTeleportingNextFrame = true;
+                // If SwitchTransformSpaceWhenParented is not set, then we will want to teleport
+                networkState.IsTeleportingNextFrame = !SwitchTransformSpaceWhenParented;
+                // Otherwise, if SwitchTransformSpaceWhenParented is set we force a full state update.
+                // If interpolation is enabled, then any non-authority instance will update any pending
+                // buffered values to the correct world or local space values.
+                forceState = SwitchTransformSpaceWhenParented;
             }
 
             // Check for parenting when synchronizing and/or teleporting
@@ -1722,28 +2106,6 @@ private bool ApplyTransformToNetworkStateWithInfo(ref NetworkTransformState netw
                 }
 
                 networkState.IsParented = hasParentNetworkObject;
-
-                // When synchronizing with a parent, world position stays impacts position whether
-                // the NetworkTransform is using world or local space synchronization.
-                // WorldPositionStays: (always use world space)
-                // !WorldPositionStays: (always use local space)
-                // Exception: If it is an in-scene placed NetworkObject and it is parented under a GameObject
-                // then always use local space unless AutoObjectParentSync is disabled and the NetworkTransform
-                // is synchronizing in world space.
-                if (isSynchronization && networkState.IsParented)
-                {
-                    var parentedUnderGameObject = NetworkObject.transform.parent != null && !parentNetworkObject && NetworkObject.IsSceneObject.Value;
-                    if (NetworkObject.WorldPositionStays() && (!parentedUnderGameObject || (parentedUnderGameObject && !NetworkObject.AutoObjectParentSync && !InLocalSpace)))
-                    {
-                        position = transformToUse.position;
-                        networkState.InLocalSpace = false;
-                    }
-                    else
-                    {
-                        position = transformToUse.localPosition;
-                        networkState.InLocalSpace = true;
-                    }
-                }
             }
 
             if (Interpolate != networkState.UseInterpolation)
@@ -1792,21 +2154,21 @@ private bool ApplyTransformToNetworkStateWithInfo(ref NetworkTransformState netw
             // Begin delta checks against last sent state update
             if (!UseHalfFloatPrecision)
             {
-                if (SyncPositionX && (Mathf.Abs(networkState.PositionX - position.x) >= PositionThreshold || networkState.IsTeleportingNextFrame || isAxisSync))
+                if (SyncPositionX && (Mathf.Abs(networkState.PositionX - position.x) >= positionThreshold.x || networkState.IsTeleportingNextFrame || isAxisSync || forceState))
                 {
                     networkState.PositionX = position.x;
                     networkState.HasPositionX = true;
                     isPositionDirty = true;
                 }
 
-                if (SyncPositionY && (Mathf.Abs(networkState.PositionY - position.y) >= PositionThreshold || networkState.IsTeleportingNextFrame || isAxisSync))
+                if (SyncPositionY && (Mathf.Abs(networkState.PositionY - position.y) >= positionThreshold.y || networkState.IsTeleportingNextFrame || isAxisSync || forceState))
                 {
                     networkState.PositionY = position.y;
                     networkState.HasPositionY = true;
                     isPositionDirty = true;
                 }
 
-                if (SyncPositionZ && (Mathf.Abs(networkState.PositionZ - position.z) >= PositionThreshold || networkState.IsTeleportingNextFrame || isAxisSync))
+                if (SyncPositionZ && (Mathf.Abs(networkState.PositionZ - position.z) >= positionThreshold.z || networkState.IsTeleportingNextFrame || isAxisSync || forceState))
                 {
                     networkState.PositionZ = position.z;
                     networkState.HasPositionZ = true;
@@ -1816,7 +2178,7 @@ private bool ApplyTransformToNetworkStateWithInfo(ref NetworkTransformState netw
             else if (SynchronizePosition)
             {
                 // If we are teleporting then we can skip the delta threshold check
-                isPositionDirty = networkState.IsTeleportingNextFrame || isAxisSync;
+                isPositionDirty = networkState.IsTeleportingNextFrame || isAxisSync || forceState;
                 if (m_HalfFloatTargetTickOwnership > m_CachedNetworkManager.ServerTime.Tick)
                 {
                     isPositionDirty = true;
@@ -1827,7 +2189,7 @@ private bool ApplyTransformToNetworkStateWithInfo(ref NetworkTransformState netw
                 {
                     for (int i = 0; i < 3; i++)
                     {
-                        if (Math.Abs(position[i] - m_HalfPositionState.PreviousPosition[i]) >= PositionThreshold)
+                        if (Math.Abs(position[i] - m_HalfPositionState.PreviousPosition[i]) >= positionThreshold[i])
                         {
                             isPositionDirty = i == 0 ? SyncPositionX : i == 1 ? SyncPositionY : SyncPositionZ;
                             if (!isPositionDirty)
@@ -1862,7 +2224,7 @@ private bool ApplyTransformToNetworkStateWithInfo(ref NetworkTransformState netw
 
                         networkState.NetworkDeltaPosition = m_HalfPositionState;
 
-                        // If ownership offset is greater or we are doing an axial synchronization then synchronize the base position 
+                        // If ownership offset is greater or we are doing an axial synchronization then synchronize the base position
                         if ((m_HalfFloatTargetTickOwnership > m_CachedNetworkManager.ServerTime.Tick || isAxisSync) && !networkState.IsTeleportingNextFrame)
                         {
                             networkState.SynchronizeBaseHalfFloat = true;
@@ -1922,21 +2284,21 @@ private bool ApplyTransformToNetworkStateWithInfo(ref NetworkTransformState netw
 
             if (!UseQuaternionSynchronization)
             {
-                if (SyncRotAngleX && (Mathf.Abs(Mathf.DeltaAngle(networkState.RotAngleX, rotAngles.x)) >= RotAngleThreshold || networkState.IsTeleportingNextFrame || isAxisSync))
+                if (SyncRotAngleX && (Mathf.Abs(Mathf.DeltaAngle(networkState.RotAngleX, rotAngles.x)) >= rotationThreshold.x || networkState.IsTeleportingNextFrame || isAxisSync || forceState))
                 {
                     networkState.RotAngleX = rotAngles.x;
                     networkState.HasRotAngleX = true;
                     isRotationDirty = true;
                 }
 
-                if (SyncRotAngleY && (Mathf.Abs(Mathf.DeltaAngle(networkState.RotAngleY, rotAngles.y)) >= RotAngleThreshold || networkState.IsTeleportingNextFrame || isAxisSync))
+                if (SyncRotAngleY && (Mathf.Abs(Mathf.DeltaAngle(networkState.RotAngleY, rotAngles.y)) >= rotationThreshold.y || networkState.IsTeleportingNextFrame || isAxisSync || forceState))
                 {
                     networkState.RotAngleY = rotAngles.y;
                     networkState.HasRotAngleY = true;
                     isRotationDirty = true;
                 }
 
-                if (SyncRotAngleZ && (Mathf.Abs(Mathf.DeltaAngle(networkState.RotAngleZ, rotAngles.z)) >= RotAngleThreshold || networkState.IsTeleportingNextFrame || isAxisSync))
+                if (SyncRotAngleZ && (Mathf.Abs(Mathf.DeltaAngle(networkState.RotAngleZ, rotAngles.z)) >= rotationThreshold.z || networkState.IsTeleportingNextFrame || isAxisSync || forceState))
                 {
                     networkState.RotAngleZ = rotAngles.z;
                     networkState.HasRotAngleZ = true;
@@ -1946,14 +2308,14 @@ private bool ApplyTransformToNetworkStateWithInfo(ref NetworkTransformState netw
             else if (SynchronizeRotation)
             {
                 // If we are teleporting then we can skip the delta threshold check
-                isRotationDirty = networkState.IsTeleportingNextFrame || isAxisSync;
+                isRotationDirty = networkState.IsTeleportingNextFrame || isAxisSync || forceState;
                 // For quaternion synchronization, if one angle is dirty we send a full update
                 if (!isRotationDirty)
                 {
                     var previousRotation = networkState.Rotation.eulerAngles;
                     for (int i = 0; i < 3; i++)
                     {
-                        if (Mathf.Abs(Mathf.DeltaAngle(previousRotation[i], rotAngles[i])) >= RotAngleThreshold)
+                        if (Mathf.Abs(Mathf.DeltaAngle(previousRotation[i], rotAngles[i])) >= rotationThreshold[i])
                         {
                             isRotationDirty = true;
                             break;
@@ -1962,15 +2324,15 @@ private bool ApplyTransformToNetworkStateWithInfo(ref NetworkTransformState netw
                 }
                 if (isRotationDirty)
                 {
-                    networkState.Rotation = InLocalSpace ? transformToUse.localRotation : transformToUse.rotation;
+                    networkState.Rotation = rotation;
                     networkState.HasRotAngleX = true;
                     networkState.HasRotAngleY = true;
                     networkState.HasRotAngleZ = true;
                 }
             }
 
-            // For scale, we need to check for parenting when synchronizing and/or teleporting
-            if (isSynchronization || networkState.IsTeleportingNextFrame)
+            // For scale, we need to check for parenting when synchronizing and/or teleporting (synchronization is always teleporting)
+            if (networkState.IsTeleportingNextFrame)
             {
                 // If we are synchronizing and the associated NetworkObject has a parent then we want to send the
                 // LossyScale if the NetworkObject has a parent since NetworkObject spawn order is not guaranteed
@@ -1985,21 +2347,21 @@ private bool ApplyTransformToNetworkStateWithInfo(ref NetworkTransformState netw
             {
                 if (!UseHalfFloatPrecision)
                 {
-                    if (SyncScaleX && (Mathf.Abs(networkState.ScaleX - scale.x) >= ScaleThreshold || networkState.IsTeleportingNextFrame || isAxisSync))
+                    if (SyncScaleX && (Mathf.Abs(networkState.ScaleX - scale.x) >= ScaleThreshold || networkState.IsTeleportingNextFrame || isAxisSync || forceState))
                     {
                         networkState.ScaleX = scale.x;
                         networkState.HasScaleX = true;
                         isScaleDirty = true;
                     }
 
-                    if (SyncScaleY && (Mathf.Abs(networkState.ScaleY - scale.y) >= ScaleThreshold || networkState.IsTeleportingNextFrame || isAxisSync))
+                    if (SyncScaleY && (Mathf.Abs(networkState.ScaleY - scale.y) >= ScaleThreshold || networkState.IsTeleportingNextFrame || isAxisSync || forceState))
                     {
                         networkState.ScaleY = scale.y;
                         networkState.HasScaleY = true;
                         isScaleDirty = true;
                     }
 
-                    if (SyncScaleZ && (Mathf.Abs(networkState.ScaleZ - scale.z) >= ScaleThreshold || networkState.IsTeleportingNextFrame || isAxisSync))
+                    if (SyncScaleZ && (Mathf.Abs(networkState.ScaleZ - scale.z) >= ScaleThreshold || networkState.IsTeleportingNextFrame || isAxisSync || forceState))
                     {
                         networkState.ScaleZ = scale.z;
                         networkState.HasScaleZ = true;
@@ -2011,7 +2373,7 @@ private bool ApplyTransformToNetworkStateWithInfo(ref NetworkTransformState netw
                     var previousScale = networkState.Scale;
                     for (int i = 0; i < 3; i++)
                     {
-                        if (Mathf.Abs(scale[i] - previousScale[i]) >= ScaleThreshold || networkState.IsTeleportingNextFrame || isAxisSync)
+                        if (Mathf.Abs(scale[i] - previousScale[i]) >= ScaleThreshold || networkState.IsTeleportingNextFrame || isAxisSync || forceState)
                         {
                             isScaleDirty = true;
                             networkState.Scale[i] = scale[i];
@@ -2056,6 +2418,81 @@ private bool ApplyTransformToNetworkStateWithInfo(ref NetworkTransformState netw
             return isDirty;
         }
 
+        /// <summary>
+        /// Authority subscribes to network tick events and will invoke
+        /// <see cref="OnUpdateAuthoritativeState(ref Transform)"/> each network tick.
+        /// </summary>
+        private void OnNetworkTick(bool isCalledFromParent = false)
+        {
+            // If not active, then ignore the update
+            if (!gameObject.activeInHierarchy)
+            {
+                return;
+            }
+
+            // As long as we are still authority
+            if (CanCommitToTransform)
+            {
+                if (m_CachedNetworkManager.DistributedAuthorityMode && !IsOwner)
+                {
+                    Debug.LogError($"Non-owner Client-{m_CachedNetworkManager.LocalClientId} is being updated by network tick still!!!!");
+                    return;
+                }
+
+                // If we are nested and have already sent a state update this tick, then exit early (otherwise check for any changes in state)
+                if (IsNested && m_LocalAuthoritativeNetworkState.NetworkTick == m_CachedNetworkManager.ServerTime.Tick)
+                {
+                    return;
+                }
+
+#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
+                // Let the parent handle the updating of this to keep the two synchronized
+                if (!isCalledFromParent && m_UseRigidbodyForMotion && m_NetworkRigidbodyInternal.ParentBody != null && !m_LocalAuthoritativeNetworkState.IsTeleportingNextFrame)
+                {
+                    return;
+                }
+#endif
+
+                // Update any changes to the transform
+                var transformSource = transform;
+                OnUpdateAuthoritativeState(ref transformSource, isCalledFromParent);
+#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
+                m_InternalCurrentPosition = m_TargetPosition = m_UseRigidbodyForMotion ? m_NetworkRigidbodyInternal.GetPosition() : GetSpaceRelativePosition();
+#else
+                m_InternalCurrentPosition = GetSpaceRelativePosition();
+                m_TargetPosition = GetSpaceRelativePosition();
+#endif
+            }
+            else // If we are no longer authority, unsubscribe to the tick event
+            {
+                DeregisterForTickUpdate(this);
+            }
+        }
+        #endregion
+
+        #region NON-AUTHORITY STATE UPDATE
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal void UpdatePositionInterpolator(Vector3 position, double time, bool resetInterpolator = false)
+        {
+            if (!CanCommitToTransform)
+            {
+                if (resetInterpolator)
+                {
+                    m_PositionInterpolator.ResetTo(position, time);
+                }
+                else
+                {
+                    m_PositionInterpolator.AddMeasurement(position, time);
+                }
+            }
+        }
+
+        internal bool LogMotion;
+
+        /// <summary>
+        /// Virtual method invoked on the non-authority side after a new state has been received and applied.
+        /// </summary>
         protected virtual void OnTransformUpdated()
         {
 
@@ -2066,14 +2503,23 @@ protected virtual void OnTransformUpdated()
         /// </summary>
         protected internal void ApplyAuthoritativeState()
         {
+#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
+            // TODO: Make this an authority flag
+            // For now, just synchronize with the NetworkRigidbodyBase UseRigidBodyForMotion
+            if (m_NetworkRigidbodyInternal != null)
+            {
+                m_UseRigidbodyForMotion = m_NetworkRigidbodyInternal.UseRigidBodyForMotion;
+            }
+#endif
             var networkState = m_LocalAuthoritativeNetworkState;
-            // The m_CurrentPosition, m_CurrentRotation, and m_CurrentScale values are continually updated
+            // The m_InternalCurrentPosition, m_InternalCurrentRotation, and m_InternalCurrentScale values are continually updated
             // at the end of this method and assure that when not interpolating the non-authoritative side
             // cannot make adjustments to any portions the transform not being synchronized.
-            var adjustedPosition = m_CurrentPosition;
-            var adjustedRotation = m_CurrentRotation;
+            var adjustedPosition = m_InternalCurrentPosition;
+            var adjustedRotation = m_InternalCurrentRotation;
+
             var adjustedRotAngles = adjustedRotation.eulerAngles;
-            var adjustedScale = m_CurrentScale;
+            var adjustedScale = m_InternalCurrentScale;
 
             // Non-Authority Preservers the authority's transform state update modes
             InLocalSpace = networkState.InLocalSpace;
@@ -2092,6 +2538,7 @@ protected internal void ApplyAuthoritativeState()
             // NOTE ABOUT INTERPOLATING AND THE CODE BELOW:
             // We always apply the interpolated state for any axis we are synchronizing even when the state has no deltas
             // to assure we fully interpolate to our target even after we stop extrapolating 1 tick later.
+
             if (Interpolate)
             {
                 if (SynchronizePosition)
@@ -2195,15 +2642,43 @@ protected internal void ApplyAuthoritativeState()
                 // Update our current position if it changed or we are interpolating
                 if (networkState.HasPositionChange || Interpolate)
                 {
-                    m_CurrentPosition = adjustedPosition;
+                    m_InternalCurrentPosition = adjustedPosition;
                 }
-                if (InLocalSpace)
+#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
+                if (m_UseRigidbodyForMotion)
                 {
-                    transform.localPosition = m_CurrentPosition;
+                    m_NetworkRigidbodyInternal.MovePosition(m_InternalCurrentPosition);
+                    if (LogMotion)
+                    {
+                        Debug.Log($"[Client-{m_CachedNetworkManager.LocalClientId}][Interpolate: {networkState.UseInterpolation}][TransPos: {transform.position}][RBPos: {m_NetworkRigidbodyInternal.GetPosition()}][CurrentPos: {m_InternalCurrentPosition}");
+                    }
+
                 }
                 else
+#endif
                 {
-                    transform.position = m_CurrentPosition;
+                    if (PositionInLocalSpace)
+                    {
+                        // This handles the edge case of transitioning from local to world space where applying a local
+                        // space value to a non-parented transform will be applied in world space. Since parenting is not
+                        // tick synchronized, there can be one or two ticks between a state update with the InLocalSpace
+                        // state update which can cause the body to seemingly "teleport" when it is just applying a local
+                        // space value relative to world space 0,0,0.
+                        if (SwitchTransformSpaceWhenParented && m_IsFirstNetworkTransform && Interpolate && m_PreviousNetworkObjectParent != null
+                            && transform.parent == null)
+                        {
+                            m_InternalCurrentPosition = m_PreviousNetworkObjectParent.transform.TransformPoint(m_InternalCurrentPosition);
+                            transform.position = m_InternalCurrentPosition;
+                        }
+                        else
+                        {
+                            transform.localPosition = m_InternalCurrentPosition;
+                        }
+                    }
+                    else
+                    {
+                        transform.position = m_InternalCurrentPosition;
+                    }
                 }
             }
 
@@ -2213,15 +2688,38 @@ protected internal void ApplyAuthoritativeState()
                 // Update our current rotation if it changed or we are interpolating
                 if (networkState.HasRotAngleChange || Interpolate)
                 {
-                    m_CurrentRotation = adjustedRotation;
+                    m_InternalCurrentRotation = adjustedRotation;
                 }
-                if (InLocalSpace)
+
+#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
+                if (m_UseRigidbodyForMotion)
                 {
-                    transform.localRotation = m_CurrentRotation;
+                    m_NetworkRigidbodyInternal.MoveRotation(m_InternalCurrentRotation);
                 }
                 else
+#endif
                 {
-                    transform.rotation = m_CurrentRotation;
+                    if (RotationInLocalSpace)
+                    {
+                        // This handles the edge case of transitioning from local to world space where applying a local
+                        // space value to a non-parented transform will be applied in world space. Since parenting is not
+                        // tick synchronized, there can be one or two ticks between a state update with the InLocalSpace
+                        // state update which can cause the body to rotate world space relative and cause a slight rotation
+                        // of the body in-between this transition period.
+                        if (SwitchTransformSpaceWhenParented && m_IsFirstNetworkTransform && Interpolate && m_PreviousNetworkObjectParent != null && transform.parent == null)
+                        {
+                            m_InternalCurrentRotation = m_PreviousNetworkObjectParent.transform.rotation * m_InternalCurrentRotation;
+                            transform.rotation = m_InternalCurrentRotation;
+                        }
+                        else
+                        {
+                            transform.localRotation = m_InternalCurrentRotation;
+                        }
+                    }
+                    else
+                    {
+                        transform.rotation = m_InternalCurrentRotation;
+                    }
                 }
             }
 
@@ -2231,9 +2729,9 @@ protected internal void ApplyAuthoritativeState()
                 // Update our current scale if it changed or we are interpolating
                 if (networkState.HasScaleChange || Interpolate)
                 {
-                    m_CurrentScale = adjustedScale;
+                    m_InternalCurrentScale = adjustedScale;
                 }
-                transform.localScale = m_CurrentScale;
+                transform.localScale = m_InternalCurrentScale;
             }
             OnTransformUpdated();
         }
@@ -2315,7 +2813,7 @@ private void ApplyTeleportingState(NetworkTransformState newState)
                     }
                 }
 
-                m_CurrentPosition = currentPosition;
+                m_InternalCurrentPosition = currentPosition;
                 m_TargetPosition = currentPosition;
 
                 // Apply the position
@@ -2328,6 +2826,13 @@ private void ApplyTeleportingState(NetworkTransformState newState)
                     transform.position = currentPosition;
                 }
 
+#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
+                if (m_UseRigidbodyForMotion)
+                {
+                    m_NetworkRigidbodyInternal.SetPosition(transform.position);
+                }
+#endif
+
                 if (Interpolate)
                 {
                     UpdatePositionInterpolator(currentPosition, sentTime, true);
@@ -2337,17 +2842,6 @@ private void ApplyTeleportingState(NetworkTransformState newState)
             if (newState.HasScaleChange)
             {
                 bool shouldUseLossy = false;
-                if (newState.IsParented)
-                {
-                    if (transform.parent == null)
-                    {
-                        shouldUseLossy = NetworkObject.WorldPositionStays();
-                    }
-                    else
-                    {
-                        shouldUseLossy = !NetworkObject.WorldPositionStays();
-                    }
-                }
 
                 if (UseHalfFloatPrecision)
                 {
@@ -2372,7 +2866,7 @@ private void ApplyTeleportingState(NetworkTransformState newState)
                     }
                 }
 
-                m_CurrentScale = currentScale;
+                m_InternalCurrentScale = currentScale;
                 m_TargetScale = currentScale;
 
                 // Apply the adjusted scale
@@ -2410,7 +2904,7 @@ private void ApplyTeleportingState(NetworkTransformState newState)
                     currentRotation.eulerAngles = currentEulerAngles;
                 }
 
-                m_CurrentRotation = currentRotation;
+                m_InternalCurrentRotation = currentRotation;
                 m_TargetRotation = currentRotation.eulerAngles;
 
                 if (InLocalSpace)
@@ -2422,6 +2916,13 @@ private void ApplyTeleportingState(NetworkTransformState newState)
                     transform.rotation = currentRotation;
                 }
 
+#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
+                if (m_UseRigidbodyForMotion)
+                {
+                    m_NetworkRigidbodyInternal.SetRotation(transform.rotation);
+                }
+#endif
+
                 if (Interpolate)
                 {
                     m_RotationInterpolator.ResetTo(currentRotation, sentTime);
@@ -2433,6 +2934,7 @@ private void ApplyTeleportingState(NetworkTransformState newState)
             {
                 AddLogEntry(ref newState, NetworkObject.OwnerClientId);
             }
+
             OnTransformUpdated();
         }
 
@@ -2467,7 +2969,6 @@ private void ApplyUpdatedState(NetworkTransformState newState)
 
             var sentTime = newState.SentTime;
             var currentRotation = GetSpaceRelativeRotation();
-            var currentEulerAngles = currentRotation.eulerAngles;
 
             // Only if using half float precision and our position had changed last update then
             if (UseHalfFloatPrecision && m_LocalAuthoritativeNetworkState.HasPositionChange)
@@ -2495,6 +2996,8 @@ private void ApplyUpdatedState(NetworkTransformState newState)
                 return;
             }
 
+            AdjustForChangeInTransformSpace();
+
             // Apply axial changes from the new state
             // Either apply the delta position target position or the current state's delta position
             // depending upon whether UsePositionDeltaCompression is enabled
@@ -2502,20 +3005,21 @@ private void ApplyUpdatedState(NetworkTransformState newState)
             {
                 if (!m_LocalAuthoritativeNetworkState.UseHalfFloatPrecision)
                 {
+                    var position = m_LocalAuthoritativeNetworkState.GetPosition();
                     var newTargetPosition = m_TargetPosition;
                     if (m_LocalAuthoritativeNetworkState.HasPositionX)
                     {
-                        newTargetPosition.x = m_LocalAuthoritativeNetworkState.PositionX;
+                        newTargetPosition.x = position.x;
                     }
 
                     if (m_LocalAuthoritativeNetworkState.HasPositionY)
                     {
-                        newTargetPosition.y = m_LocalAuthoritativeNetworkState.PositionY;
+                        newTargetPosition.y = position.y;
                     }
 
                     if (m_LocalAuthoritativeNetworkState.HasPositionZ)
                     {
-                        newTargetPosition.z = m_LocalAuthoritativeNetworkState.PositionZ;
+                        newTargetPosition.z = position.z;
                     }
                     m_TargetPosition = newTargetPosition;
                 }
@@ -2567,7 +3071,7 @@ private void ApplyUpdatedState(NetworkTransformState newState)
                 }
                 else
                 {
-                    currentEulerAngles = m_TargetRotation;
+                    var currentEulerAngles = m_TargetRotation;
                     // Adjust based on which axis changed
                     // (both half precision and full precision apply Eulers to the RotAngle properties when reading the update)
                     if (m_LocalAuthoritativeNetworkState.HasRotAngleX)
@@ -2602,13 +3106,15 @@ protected virtual void OnNetworkTransformStateUpdated(ref NetworkTransformState
 
         }
 
+        /// <summary>
+        /// Virtual method that is invoked on the non-authority side when a state update has been recieved but not yet applied.
+        /// </summary>
         protected virtual void OnBeforeUpdateTransformState()
         {
 
         }
 
-        private NetworkTransformState m_OldState = new NetworkTransformState();
-
+        internal bool LogStateUpdate;
         /// <summary>
         /// Only non-authoritative instances should invoke this method
         /// </summary>
@@ -2628,13 +3134,64 @@ private void OnNetworkStateChanged(NetworkTransformState oldState, NetworkTransf
             }
 
             // Get the time when this new state was sent
-            newState.SentTime = new NetworkTime(m_CachedNetworkManager.NetworkConfig.TickRate, newState.NetworkTick).Time;
+            newState.SentTime = new NetworkTime(m_CachedNetworkManager.NetworkTickSystem.TickRate, newState.NetworkTick).Time;
+
+            if (LogStateUpdate)
+            {
+                var builder = new StringBuilder();
+                builder.AppendLine($"[Client-{m_CachedNetworkManager.LocalClientId}][State Update: {newState.GetNetworkTick()}][HasPos: {newState.HasPositionChange}][Has Rot: {newState.HasRotAngleChange}][Has Scale: {newState.HasScaleChange}]");
+                if (newState.HasPositionChange)
+                {
+                    builder.AppendLine($"Position = {newState.GetPosition()}");
+                }
+                if (newState.HasRotAngleChange)
+                {
+                    builder.AppendLine($"Rotation = {newState.GetRotation()}");
+                }
+                if (newState.HasScaleChange)
+                {
+                    builder.AppendLine($"Scale = {newState.GetScale()}");
+                }
+                Debug.Log(builder);
+            }
 
+            // Notification prior to applying a state update
             OnBeforeUpdateTransformState();
 
             // Apply the new state
             ApplyUpdatedState(newState);
 
+            // Tick synchronize any parented child NetworkObject(s) NetworkTransform(s)
+            if (TickSyncChildren && m_IsFirstNetworkTransform)
+            {
+                // Synchronize any nested NetworkTransforms with the parent's
+                foreach (var childNetworkTransform in NetworkObject.NetworkTransforms)
+                {
+                    // Don't update the same instance or any nested NetworkTransform with a different authority mode
+                    if (childNetworkTransform == this || childNetworkTransform.AuthorityMode != AuthorityMode)
+                    {
+                        continue;
+                    }
+                    if (childNetworkTransform.CanCommitToTransform)
+                    {
+                        childNetworkTransform.OnNetworkTick(true);
+                    }
+                }
+
+                // Synchronize any parented children with the parent's motion
+                foreach (var child in m_ParentedChildren)
+                {
+                    // Synchronize any nested NetworkTransforms of the child with the parent's
+                    foreach (var childNetworkTransform in child.NetworkTransforms)
+                    {
+                        if (childNetworkTransform.CanCommitToTransform)
+                        {
+                            childNetworkTransform.OnNetworkTick(true);
+                        }
+                    }
+                }
+            }
+
             // Provide notifications when the state has been updated
             // We use the m_LocalAuthoritativeNetworkState because newState has been applied and adjustments could have
             // been made (i.e. half float precision position values will have been updated)
@@ -2647,26 +3204,23 @@ private void OnNetworkStateChanged(NetworkTransformState oldState, NetworkTransf
         /// <see cref="Quaternion.Lerp(Quaternion, Quaternion, float)"/> for all transform elements being monitored by
         /// <see cref="NetworkTransform"/> (i.e. Position, Scale, and Rotation)
         /// </summary>
+        /// <remarks>
+        /// All of three max interpolation time properties will have this maximum interpolation bound value applied:<br />
+        /// - <see cref="PositionMaxInterpolationTime"/><br />
+        /// - <see cref="RotationMaxInterpolationTime"/><br />
+        /// - <see cref="ScaleMaxInterpolationTime"/><br />
+        /// </remarks>
         /// <param name="maxInterpolationBound">Maximum time boundary that can be used in a frame when interpolating between two values</param>
         public void SetMaxInterpolationBound(float maxInterpolationBound)
         {
+            PositionMaxInterpolationTime = maxInterpolationBound;
+            RotationMaxInterpolationTime = maxInterpolationBound;
+            ScaleMaxInterpolationTime = maxInterpolationBound;
             m_RotationInterpolator.MaxInterpolationBound = maxInterpolationBound;
             m_PositionInterpolator.MaxInterpolationBound = maxInterpolationBound;
             m_ScaleInterpolator.MaxInterpolationBound = maxInterpolationBound;
         }
 
-        /// <summary>
-        /// Create interpolators when first instantiated to avoid memory allocations if the
-        /// associated NetworkObject persists (i.e. despawned but not destroyed or pools)
-        /// </summary>
-        protected virtual void Awake()
-        {
-            // Rotation is a single Quaternion since each Euler axis will affect the quaternion's final value
-            m_RotationInterpolator = new BufferedLinearInterpolatorQuaternion();
-            m_PositionInterpolator = new BufferedLinearInterpolatorVector3();
-            m_ScaleInterpolator = new BufferedLinearInterpolatorVector3();
-        }
-
         /// <summary>
         /// Checks for changes in the axis to synchronize. If one or more did change it
         /// then determines if the axis were enabled and if the delta between the last known
@@ -2715,7 +3269,7 @@ private void AxisChangedDeltaPositionCheck()
         /// Called by authority to check for deltas and update non-authoritative instances
         /// if any are found.
         /// </summary>
-        internal void OnUpdateAuthoritativeState(ref Transform transformSource)
+        internal void OnUpdateAuthoritativeState(ref Transform transformSource, bool settingState = false)
         {
             // If our replicated state is not dirty and our local authority state is dirty, clear it.
             if (!m_LocalAuthoritativeNetworkState.ExplicitSet && m_LocalAuthoritativeNetworkState.IsDirty && !m_LocalAuthoritativeNetworkState.IsTeleportingNextFrame)
@@ -2735,95 +3289,183 @@ internal void OnUpdateAuthoritativeState(ref Transform transformSource)
 
             AxisChangedDeltaPositionCheck();
 
-            TryCommitTransform(ref transformSource);
+            TryCommitTransform(ref transformSource, settingState: settingState);
         }
+        #endregion
 
-        /// <summary>
-        /// Authority subscribes to network tick events and will invoke
-        /// <see cref="OnUpdateAuthoritativeState(ref Transform)"/> each network tick.
-        /// </summary>
-        private void NetworkTickSystem_Tick()
+        #region SPAWN, DESPAWN, AND INITIALIZATION
+
+        private void NonAuthorityFinalizeSynchronization()
         {
-            // As long as we are still authority
-            if (CanCommitToTransform)
+            // For all child NetworkTransforms nested under the same NetworkObject,
+            // we apply the initial synchronization based on their parented/ordered
+            // heirarchy.
+            if (SynchronizeState.IsSynchronizing)
             {
-                // Update any changes to the transform
-                var transformSource = transform;
-                OnUpdateAuthoritativeState(ref transformSource);
+                if (m_IsFirstNetworkTransform)
+                {
+                    foreach (var child in NetworkObject.NetworkTransforms)
+                    {
+                        // Don't initialize any nested NetworkTransforms that this instance has authority over
+                        if (child.CanCommitToTransform)
+                        {
+                            continue;
+                        }
+                        child.ApplySynchronization();
 
-                m_CurrentPosition = GetSpaceRelativePosition();
-                m_TargetPosition = GetSpaceRelativePosition();
-            }
-            else // If we are no longer authority, unsubscribe to the tick event
-            if (NetworkManager != null && NetworkManager.NetworkTickSystem != null)
-            {
-                NetworkManager.NetworkTickSystem.Tick -= NetworkTickSystem_Tick;
+                        // For all like-authority nested (under the root/same NetworkObject) child NetworkTransforms, we need to run through
+                        // initialization once more to assure any values applied or stored are relative to the Root's transform.
+                        child.InternalInitialization();
+                    }
+                }
+                else // Otherwise, just run through standard synchronization of this instance
+                if (!CanCommitToTransform)
+                {
+                    ApplySynchronization();
+                    InternalInitialization();
+                }
             }
         }
 
-        /// <inheritdoc/>
-        public override void OnNetworkSpawn()
+        /// <summary>
+        /// Handle applying the synchronization state once everything has spawned.
+        /// The first NetowrkTransform handles invoking this on any other nested NetworkTransform.
+        /// </summary>
+        protected internal override void InternalOnNetworkSessionSynchronized()
         {
-            ///////////////////////////////////////////////////////////////
-            // NOTE: Legacy and no longer used (candidates for deprecation)
-            m_CachedIsServer = IsServer;
-            ///////////////////////////////////////////////////////////////
-
-            // Started using this again to avoid the getter processing cost of NetworkBehaviour.NetworkManager
-            m_CachedNetworkManager = NetworkManager;
+            NonAuthorityFinalizeSynchronization();
 
-            Initialize();
+            base.InternalOnNetworkSessionSynchronized();
+        }
 
-            if (CanCommitToTransform && UseHalfFloatPrecision)
-            {
-                SetState(GetSpaceRelativePosition(), GetSpaceRelativeRotation(), GetScale(), false);
-            }
+        private void ApplyPlayerTransformState()
+        {
+            SynchronizeState.InLocalSpace = InLocalSpace;
+            SynchronizeState.UseInterpolation = Interpolate;
+            SynchronizeState.QuaternionSync = UseQuaternionSynchronization;
+            SynchronizeState.UseHalfFloatPrecision = UseHalfFloatPrecision;
+            SynchronizeState.QuaternionCompression = UseQuaternionCompression;
+            SynchronizeState.UsePositionSlerp = SlerpPosition;
         }
 
-        /// <inheritdoc/>
-        public override void OnNetworkDespawn()
+        /// <summary>
+        /// For dynamically spawned NetworkObjects, when the non-authority instance's client is already connected and
+        /// the SynchronizeState is still pending synchronization then we want to finalize the synchornization at this time.
+        /// </summary>
+        protected internal override void InternalOnNetworkPostSpawn()
         {
-            DeregisterForTickUpdate(this);
+            // This is a special case for client-server where a server is spawning an owner authoritative NetworkObject but has yet to serialize anything.
+            // When the server detects that:
+            // - We are not in a distributed authority session (DAHost check).
+            // - We are in owner authoritative mode.
+            // - The NetworkObject is not owned by the server.
+            // - The SynchronizeState.IsSynchronizing is set to false.
+            // Then we want to:
+            // - Force the "IsSynchronizing" flag so the NetworkTransform has its state updated properly and runs through the initialization again.
+            // - Make sure the SynchronizingState is updated to the instantiated prefab's default flags/settings.
+            if (NetworkManager.IsServer && !NetworkManager.DistributedAuthorityMode && !IsOwner && !OnIsServerAuthoritative() && !SynchronizeState.IsSynchronizing)
+            {
+                // Handle the first/root NetworkTransform slightly differently to have a sequenced synchronization of like authority nested NetworkTransform components
+                if (m_IsFirstNetworkTransform)
+                {
+                    // Assure the NetworkTransform has the synchronizing flag set so the server runs through the final post initialization steps
+                    SynchronizeState.IsSynchronizing = true;
 
-            CanCommitToTransform = false;
-            if (NetworkManager != null && NetworkManager.NetworkTickSystem != null)
-            {
-                NetworkManager.NetworkTickSystem.Tick -= NetworkTickSystem_Tick;
+                    // Assure the SynchronizeState matches the initial prefab's values for each associated NetworkTransfrom (this includes root + all children)
+                    foreach (var child in NetworkObject.NetworkTransforms)
+                    {
+                        // Don't ApplyPlayerTransformState to any nested NetworkTransform with a different authority mode
+                        if (child != this && child.AuthorityMode != AuthorityMode)
+                        {
+                            continue;
+                        }
+                        child.ApplyPlayerTransformState();
+                    }
+                }
+                else
+                {
+                    ApplyPlayerTransformState();
+                }
+
+                // Now fall through to the final synchronization portion of the spawning for NetworkTransform
             }
-        }
 
-        /// <inheritdoc/>
-        public override void OnDestroy()
-        {
-            // During destroy, use NetworkBehaviour.NetworkManager as opposed to m_CachedNetworkManager
-            if (NetworkManager != null && NetworkManager.NetworkTickSystem != null)
+            // Standard non-authority synchronization is handled here
+            if (!CanCommitToTransform && NetworkManager.IsConnectedClient && SynchronizeState.IsSynchronizing)
             {
-                NetworkManager.NetworkTickSystem.Tick -= NetworkTickSystem_Tick;
+                NonAuthorityFinalizeSynchronization();
             }
-            CanCommitToTransform = false;
-            base.OnDestroy();
+
+            base.InternalOnNetworkPostSpawn();
         }
 
-        /// <inheritdoc/>
-        public override void OnLostOwnership()
+        /// <summary>
+        /// For testing purposes to quickly change the default from Lerp to SmoothDamp
+        /// </summary>
+        internal static bool AssignDefaultInterpolationType;
+        internal static InterpolationTypes DefaultInterpolationType;
+
+        /// <summary>
+        /// Create interpolators when first instantiated to avoid memory allocations if the
+        /// associated NetworkObject persists (i.e. despawned but not destroyed or pools)
+        /// </summary>
+        protected virtual void Awake()
         {
-            base.OnLostOwnership();
+            if (AssignDefaultInterpolationType)
+            {
+                PositionInterpolationType = DefaultInterpolationType;
+                RotationInterpolationType = DefaultInterpolationType;
+                ScaleInterpolationType = DefaultInterpolationType;
+            }
+            // Rotation is a single Quaternion since each Euler axis will affect the quaternion's final value
+            m_RotationInterpolator = new BufferedLinearInterpolatorQuaternion();
+            m_PositionInterpolator = new BufferedLinearInterpolatorVector3();
+            m_ScaleInterpolator = new BufferedLinearInterpolatorVector3();
         }
 
         /// <inheritdoc/>
-        public override void OnGainedOwnership()
+        public override void OnNetworkSpawn()
         {
-            base.OnGainedOwnership();
+            m_ParentedChildren.Clear();
+            m_CachedNetworkManager = NetworkManager;
+
+            Initialize();
+
+            if (CanCommitToTransform)
+            {
+                SetState(GetSpaceRelativePosition(), GetSpaceRelativeRotation(), GetScale(), false);
+            }
         }
 
-        protected override void OnOwnershipChanged(ulong previous, ulong current)
+        private void CleanUpOnDestroyOrDespawn()
         {
-            // If we were the previous owner or the newly assigned owner then reinitialize
-            if (current == m_CachedNetworkManager.LocalClientId || previous == m_CachedNetworkManager.LocalClientId)
+            m_ParentedChildren.Clear();
+#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
+            var forUpdate = !m_UseRigidbodyForMotion;
+#else
+            var forUpdate = true;
+#endif
+            if (m_CachedNetworkObject != null)
             {
-                InternalInitialization(true);
+                NetworkManager?.NetworkTransformRegistration(m_CachedNetworkObject, forUpdate, false);
             }
-            base.OnOwnershipChanged(previous, current);
+
+            DeregisterForTickUpdate(this);
+            CanCommitToTransform = false;
+        }
+
+        /// <inheritdoc/>
+        public override void OnNetworkDespawn()
+        {
+            CleanUpOnDestroyOrDespawn();
+            base.OnNetworkDespawn();
+        }
+
+        /// <inheritdoc/>
+        public override void OnDestroy()
+        {
+            CleanUpOnDestroyOrDespawn();
+            base.OnDestroy();
         }
 
         /// <summary>
@@ -2834,15 +3476,11 @@ protected virtual void OnInitialize(ref NetworkTransformState replicatedState)
         {
         }
 
-        /// <summary>
-        /// An owner read and owner write NetworkVariable so it doesn't generate any messages
-        /// </summary>
-        private NetworkVariable<NetworkTransformState> m_InternalStatNetVar = new NetworkVariable<NetworkTransformState>(default, NetworkVariableReadPermission.Owner, NetworkVariableWritePermission.Owner);
         /// <summary>
         /// This method is only invoked by the owner
         /// Use: OnInitialize(ref NetworkTransformState replicatedState) to be notified on all instances
         /// </summary>
-        /// <param name="replicatedState"></param>
+        /// <param name="replicatedState">The NetworkVariable containing the <see cref="NetworkTransformState"/></param>
         protected virtual void OnInitialize(ref NetworkVariable<NetworkTransformState> replicatedState)
         {
 
@@ -2850,6 +3488,29 @@ protected virtual void OnInitialize(ref NetworkVariable<NetworkTransformState> r
 
         private int m_HalfFloatTargetTickOwnership;
 
+        /// <summary>
+        /// Initializes the interpolators with the current transform values
+        /// </summary>
+        private void ResetInterpolatedStateToCurrentAuthoritativeState()
+        {
+            var serverTime = NetworkManager.ServerTime.Time;
+#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
+            var position = m_UseRigidbodyForMotion ? m_NetworkRigidbodyInternal.GetPosition() : GetSpaceRelativePosition();
+            var rotation = m_UseRigidbodyForMotion ? m_NetworkRigidbodyInternal.GetRotation() : GetSpaceRelativeRotation();
+#else
+            var position = GetSpaceRelativePosition();
+            var rotation = GetSpaceRelativeRotation();
+#endif
+            m_PositionInterpolator.InLocalSpace = InLocalSpace;
+            m_RotationInterpolator.InLocalSpace = InLocalSpace;
+
+            UpdatePositionInterpolator(position, serverTime, true);
+            UpdatePositionSlerp();
+
+            m_ScaleInterpolator.ResetTo(transform.localScale, serverTime);
+            m_RotationInterpolator.ResetTo(rotation, serverTime);
+        }
+        private NetworkObject m_CachedNetworkObject;
         /// <summary>
         /// The internal initialzation method to allow for internal API adjustments
         /// </summary>
@@ -2860,23 +3521,74 @@ private void InternalInitialization(bool isOwnershipChange = false)
             {
                 return;
             }
+            m_CachedNetworkObject = NetworkObject;
+
+            // Determine if this is the first NetworkTransform in the associated NetworkObject's list
+            m_IsFirstNetworkTransform = NetworkObject.NetworkTransforms[0] == this;
 
+            if (m_CachedNetworkManager && m_CachedNetworkManager.DistributedAuthorityMode)
+            {
+                AuthorityMode = AuthorityModes.Owner;
+            }
             CanCommitToTransform = IsServerAuthoritative() ? IsServer : IsOwner;
+
+            if (SwitchTransformSpaceWhenParented)
+            {
+                if (CanCommitToTransform)
+                {
+                    if (NetworkObject.HasParentNetworkObject(transform))
+                    {
+                        InLocalSpace = true;
+                    }
+                }
+                // Always apply this if SwitchTransformSpaceWhenParented is set.
+                TickSyncChildren = true;
+            }
+
             var currentPosition = GetSpaceRelativePosition();
             var currentRotation = GetSpaceRelativeRotation();
 
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                RegisterNetworkManagerForTickUpdate(NetworkManager);
+                m_NetworkTransformTickRegistration = s_NetworkTickRegistration[m_CachedNetworkManager];
+            }
+
+#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
+            // Depending upon order of operations, we invoke this in order to assure that proper settings are applied.
+            if (m_NetworkRigidbodyInternal)
+            {
+                m_NetworkRigidbodyInternal.UpdateOwnershipAuthority();
+            }
+
+            if (m_UseRigidbodyForMotion)
+            {
+                m_NetworkRigidbodyInternal.SetPosition(currentPosition);
+                m_NetworkRigidbodyInternal.SetRotation(currentRotation);
+            }
+
+            var forUpdate = !m_UseRigidbodyForMotion;
+#else
+            var forUpdate = true;
+#endif
+            m_LocalAuthoritativeNetworkState.SynchronizeBaseHalfFloat = false;
+
             if (CanCommitToTransform)
             {
+                // Make sure authority doesn't get added to updates (no need to do this on the authority side)
+                m_CachedNetworkManager.NetworkTransformRegistration(NetworkObject, forUpdate, false);
                 if (UseHalfFloatPrecision)
                 {
                     m_HalfPositionState = new NetworkDeltaPosition(currentPosition, m_CachedNetworkManager.ServerTime.Tick, math.bool3(SyncPositionX, SyncPositionY, SyncPositionZ));
+                    m_LocalAuthoritativeNetworkState.SynchronizeBaseHalfFloat = isOwnershipChange;
+                    SetState(teleportDisabled: false);
                 }
-                m_CurrentPosition = currentPosition;
+
+                m_InternalCurrentPosition = currentPosition;
                 m_TargetPosition = currentPosition;
 
                 RegisterForTickUpdate(this);
 
-                m_LocalAuthoritativeNetworkState.SynchronizeBaseHalfFloat = false;
                 if (UseHalfFloatPrecision && isOwnershipChange && !IsServerAuthoritative() && Interpolate)
                 {
                     m_HalfFloatTargetTickOwnership = m_CachedNetworkManager.ServerTime.Tick;
@@ -2884,26 +3596,27 @@ private void InternalInitialization(bool isOwnershipChange = false)
             }
             else
             {
+                // Always set these during initialization for non-authority so we can detect a change in interpolator types
+                m_PreviousPositionInterpolationType = PositionInterpolationType;
+                m_PreviousRotationInterpolationType = RotationInterpolationType;
+                m_PreviousScaleInterpolationType = ScaleInterpolationType;
+                m_PreviousPositionLerpSmoothing = PositionLerpSmoothing;
+                m_PreviousRotationLerpSmoothing = RotationLerpSmoothing;
+                m_PreviousScaleLerpSmoothing = ScaleLerpSmoothing;
+
+                // Non-authority needs to be added to updates for interpolation and applying state purposes
+                m_CachedNetworkManager.NetworkTransformRegistration(NetworkObject, forUpdate, true);
                 // Remove this instance from the tick update
                 DeregisterForTickUpdate(this);
-
                 ResetInterpolatedStateToCurrentAuthoritativeState();
-                m_LocalAuthoritativeNetworkState.SynchronizeBaseHalfFloat = false;
-                m_CurrentPosition = currentPosition;
+                m_InternalCurrentPosition = currentPosition;
                 m_TargetPosition = currentPosition;
-                m_CurrentScale = transform.localScale;
+                m_InternalCurrentScale = transform.localScale;
                 m_TargetScale = transform.localScale;
-                m_CurrentRotation = currentRotation;
+                m_InternalCurrentRotation = currentRotation;
                 m_TargetRotation = currentRotation.eulerAngles;
-
             }
             OnInitialize(ref m_LocalAuthoritativeNetworkState);
-
-            if (IsOwner)
-            {
-                m_InternalStatNetVar.Value = m_LocalAuthoritativeNetworkState;
-                OnInitialize(ref m_InternalStatNetVar);
-            }
         }
 
         /// <summary>
@@ -2913,41 +3626,190 @@ protected void Initialize()
         {
             InternalInitialization();
         }
+        #endregion
+
+        #region PARENTING AND OWNERSHIP
+        // This might seem aweful, but when transitioning between two parents in local space we need to
+        // catch the moment the transition happens and only apply the special case parenting from one parent
+        // to another parent once. Keeping track of the "previous previous" allows us to detect the
+        // back and fourth scenario:
+        // - No parent (world space)
+        // - Parent under NetworkObjectA (world to local)
+        // - Parent under NetworkObjectB (local to local) (catch with "previous previous")
+        // - Parent under NetworkObjectA (local to local) (catch with "previous previous")
+        // - Parent under NetworkObjectB (local to local) (catch with "previous previous")
+        private NetworkObject m_PreviousCurrentParent;
+        private NetworkObject m_PreviousPreviousParent;
+        private void AdjustForChangeInTransformSpace()
+        {
+            if (SwitchTransformSpaceWhenParented && m_IsFirstNetworkTransform && (m_PositionInterpolator.InLocalSpace != InLocalSpace ||
+                m_RotationInterpolator.InLocalSpace != InLocalSpace ||
+                (InLocalSpace && m_CurrentNetworkObjectParent && m_PreviousNetworkObjectParent && m_PreviousCurrentParent != m_CurrentNetworkObjectParent && m_PreviousPreviousParent != m_PreviousNetworkObjectParent)))
+            {
+                var parent = m_CurrentNetworkObjectParent ? m_CurrentNetworkObjectParent : m_PreviousNetworkObjectParent;
+                if (parent)
+                {
+                    // In the event it is a NetworkObject to NetworkObject parenting transfer, we will need to migrate our interpolators
+                    // and our current position and rotation to world space relative to the previous parent before converting them to local
+                    // space relative to the new parent
+                    if (InLocalSpace && m_CurrentNetworkObjectParent && m_PreviousNetworkObjectParent)
+                    {
+                        m_PreviousCurrentParent = m_CurrentNetworkObjectParent;
+                        m_PreviousPreviousParent = m_PreviousNetworkObjectParent;
+                        // Convert our current postion and rotation to world space based on the previous parent's transform
+                        m_InternalCurrentPosition = m_PreviousNetworkObjectParent.transform.TransformPoint(m_InternalCurrentPosition);
+                        m_InternalCurrentRotation = m_PreviousNetworkObjectParent.transform.rotation * m_InternalCurrentRotation;
+                        // Convert our current postion and rotation to local space based on the current parent's transform
+                        m_InternalCurrentPosition = m_CurrentNetworkObjectParent.transform.InverseTransformPoint(m_InternalCurrentPosition);
+                        m_InternalCurrentRotation = Quaternion.Inverse(m_CurrentNetworkObjectParent.transform.rotation) * m_InternalCurrentRotation;
+                        // Convert both interpolators to world space based on the previous parent's transform
+                        m_PositionInterpolator.ConvertTransformSpace(m_PreviousNetworkObjectParent.transform, false);
+                        m_RotationInterpolator.ConvertTransformSpace(m_PreviousNetworkObjectParent.transform, false);
+                        // Next, fall into normal transform space conversion of both interpolators to local space based on the current parent's transform
+                    }
+
+                    m_PositionInterpolator.ConvertTransformSpace(parent.transform, InLocalSpace);
+                    m_RotationInterpolator.ConvertTransformSpace(parent.transform, InLocalSpace);
+                }
+            }
+        }
+
+        /// <inheritdoc/>
+        public override void OnLostOwnership()
+        {
+            base.OnLostOwnership();
+        }
+
+        /// <inheritdoc/>
+        public override void OnGainedOwnership()
+        {
+            base.OnGainedOwnership();
+        }
+
+        /// <inheritdoc/>
+        protected override void OnOwnershipChanged(ulong previous, ulong current)
+        {
+            // If we were the previous owner or the newly assigned owner then reinitialize
+            if (current == m_CachedNetworkManager.LocalClientId || previous == m_CachedNetworkManager.LocalClientId)
+            {
+                InternalInitialization(true);
+            }
+            base.OnOwnershipChanged(previous, current);
+        }
+
+        internal bool IsNested;
+        private List<NetworkObject> m_ParentedChildren = new List<NetworkObject>();
+
+        private bool m_IsFirstNetworkTransform;
+        private NetworkObject m_CurrentNetworkObjectParent = null;
+        private NetworkObject m_PreviousNetworkObjectParent = null;
+
+        internal void ChildRegistration(NetworkObject child, bool isAdding)
+        {
+            if (isAdding)
+            {
+                m_ParentedChildren.Add(child);
+            }
+            else
+            {
+                m_ParentedChildren.Remove(child);
+            }
+        }
 
         /// <inheritdoc/>
         /// <remarks>
-        /// When a parent changes, non-authoritative instances should:
-        /// - Apply the resultant position, rotation, and scale from the parenting action.
-        /// - Clear interpolators (even if not enabled on this frame)
-        /// - Reset the interpolators to the position, rotation, and scale resultant values.
-        /// This prevents interpolation visual anomalies and issues during initial synchronization
+        /// When not using a NetworkRigidbody and using an owner authoritative motion model, you can <br />
+        /// improve parenting transitions into and out of world and local space by:<br />
+        /// - Disabling <see cref="NetworkObject.SyncOwnerTransformWhenParented"/><br />
+        /// - Enabling <see cref="NetworkObject.AllowOwnerToParent"/><br />
+        /// - Enabling <see cref="SwitchTransformSpaceWhenParented"/><br />
+        /// -- Note: This handles changing from world space to local space for you.<br />
+        /// When these settings are applied, transitioning from: <br />
+        /// - World space to local space (root-null parent/null to <see cref="NetworkObject"/> parent)
+        /// - Local space back to world space (<see cref="NetworkObject"/> parent to root-null parent)
+        /// - Local space to local space (<see cref="NetworkObject"/> parent to <see cref="NetworkObject"/> parent)
+        /// Will all smoothly transition while interpolation is enabled.
+        /// (Does not work if using a <see cref="Rigidbody"/> or <see cref="Rigidbody2D"/> for motion)
+        ///
+        /// When a parent changes, non-authoritative instances should:<br />
+        /// - Apply the resultant position, rotation, and scale from the parenting action.<br />
+        /// - Clear interpolators (even if not enabled on this frame)<br />
+        /// - Reset the interpolators to the position, rotation, and scale resultant values.<br />
+        /// This prevents interpolation visual anomalies and issues during initial synchronization<br />
         /// </remarks>
         public override void OnNetworkObjectParentChanged(NetworkObject parentNetworkObject)
         {
-            // Only if we are not authority
-            if (!CanCommitToTransform)
-            {
-                m_TargetPosition = m_CurrentPosition = GetSpaceRelativePosition();
-                m_CurrentRotation = GetSpaceRelativeRotation();
-                m_TargetRotation = m_CurrentRotation.eulerAngles;
-                m_TargetScale = m_CurrentScale = GetScale();
+            base.OnNetworkObjectParentChanged(parentNetworkObject);
+        }
 
-                if (Interpolate)
+
+        internal override void InternalOnNetworkObjectParentChanged(NetworkObject parentNetworkObject)
+        {
+            // The root NetworkTransform handles tracking any NetworkObject parenting since nested NetworkTransforms (of the same NetworkObject)
+            // will never (or rather should never) change their world space once spawned.
+#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
+            // Handling automatic transform space switching can only be applied to NetworkTransforms that don't use the Rigidbody for motion
+            if (!m_UseRigidbodyForMotion && SwitchTransformSpaceWhenParented)
+#else
+            if (SwitchTransformSpaceWhenParented)
+#endif
+            {
+                m_PreviousNetworkObjectParent = m_CurrentNetworkObjectParent;
+                m_CurrentNetworkObjectParent = parentNetworkObject;
+                if (m_IsFirstNetworkTransform)
+                {
+                    if (CanCommitToTransform)
+                    {
+                        InLocalSpace = m_CurrentNetworkObjectParent != null;
+                    }
+                    if (m_PreviousNetworkObjectParent && m_PreviousNetworkObjectParent.NetworkTransforms != null && m_PreviousNetworkObjectParent.NetworkTransforms.Count > 0)
+                    {
+                        // Always deregister with the first NetworkTransform in the list
+                        m_PreviousNetworkObjectParent.NetworkTransforms[0].ChildRegistration(NetworkObject, false);
+                    }
+                    if (m_CurrentNetworkObjectParent && m_CurrentNetworkObjectParent.NetworkTransforms != null && m_CurrentNetworkObjectParent.NetworkTransforms.Count > 0)
+                    {
+                        // Always register with the first NetworkTransform in the list
+                        m_CurrentNetworkObjectParent.NetworkTransforms[0].ChildRegistration(NetworkObject, true);
+                    }
+                }
+            }
+            else
+            {
+                // Keep the same legacy behaviour for compatibility purposes
+                if (!CanCommitToTransform)
                 {
-                    m_ScaleInterpolator.Clear();
-                    m_PositionInterpolator.Clear();
-                    m_RotationInterpolator.Clear();
+#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
+                    var position = m_UseRigidbodyForMotion ? m_NetworkRigidbodyInternal.GetPosition() : GetSpaceRelativePosition();
+                    var rotation = m_UseRigidbodyForMotion ? m_NetworkRigidbodyInternal.GetRotation() : GetSpaceRelativeRotation();
+#else
+                    var position = GetSpaceRelativePosition();
+                    var rotation = GetSpaceRelativeRotation();
+#endif
+                    m_TargetPosition = m_InternalCurrentPosition = position;
+                    m_InternalCurrentRotation = rotation;
+                    m_TargetRotation = m_InternalCurrentRotation.eulerAngles;
+                    m_TargetScale = m_InternalCurrentScale = GetScale();
 
-                    // Always use NetworkManager here as this can be invoked prior to spawning
-                    var tempTime = new NetworkTime(NetworkManager.NetworkConfig.TickRate, NetworkManager.ServerTime.Tick).Time;
-                    UpdatePositionInterpolator(m_CurrentPosition, tempTime, true);
-                    m_ScaleInterpolator.ResetTo(m_CurrentScale, tempTime);
-                    m_RotationInterpolator.ResetTo(m_CurrentRotation, tempTime);
+                    if (Interpolate)
+                    {
+                        m_ScaleInterpolator.Clear();
+                        m_PositionInterpolator.Clear();
+                        m_RotationInterpolator.Clear();
+
+                        // Always use NetworkManager here as this can be invoked prior to spawning
+                        var tempTime = new NetworkTime(NetworkManager.NetworkConfig.TickRate, NetworkManager.ServerTime.Tick).Time;
+                        UpdatePositionInterpolator(m_InternalCurrentPosition, tempTime, true);
+                        m_ScaleInterpolator.ResetTo(m_InternalCurrentScale, tempTime);
+                        m_RotationInterpolator.ResetTo(m_InternalCurrentRotation, tempTime);
+                    }
                 }
             }
-            base.OnNetworkObjectParentChanged(parentNetworkObject);
+            base.InternalOnNetworkObjectParentChanged(parentNetworkObject);
         }
+        #endregion
 
+        #region API STATE UPDATE METHODS
         /// <summary>
         /// Directly sets a state on the authoritative transform.
         /// Owner clients can directly set the state on a server authoritative transform
@@ -2956,11 +3818,11 @@ public override void OnNetworkObjectParentChanged(NetworkObject parentNetworkObj
         /// The parameters are broken up into pos / rot / scale on purpose so that the caller can perturb
         ///  just the desired one(s)
         /// </summary>
-        /// <param name="posIn"></param> new position to move to.  Can be null
-        /// <param name="rotIn"></param> new rotation to rotate to.  Can be null
+        /// <param name="posIn">new position to move to. Can be null</param>
+        /// <param name="rotIn">new rotation to rotate to. Can be null</param>
         /// <param name="scaleIn">new scale to scale to. Can be null</param>
         /// <param name="teleportDisabled">When true (the default) the <see cref="NetworkObject"/> will not be teleported and, if enabled, will interpolate. When false the <see cref="NetworkObject"/> will teleport/apply the parameters provided immediately.</param>
-        /// <exception cref="Exception"></exception>
+        /// <exception cref="Exception">Thrown when the function is called on non-spawned object or, when it's called without proper authority</exception>
         public void SetState(Vector3? posIn = null, Quaternion? rotIn = null, Vector3? scaleIn = null, bool teleportDisabled = true)
         {
             if (!IsSpawned)
@@ -2978,9 +3840,15 @@ public void SetState(Vector3? posIn = null, Quaternion? rotIn = null, Vector3? s
                 NetworkLog.LogError(errorMessage);
                 return;
             }
-
-            Vector3 pos = posIn == null ? GetSpaceRelativePosition() : posIn.Value;
-            Quaternion rot = rotIn == null ? GetSpaceRelativeRotation() : rotIn.Value;
+#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
+            var position = m_UseRigidbodyForMotion ? m_NetworkRigidbodyInternal.GetPosition() : GetSpaceRelativePosition();
+            var rotation = m_UseRigidbodyForMotion ? m_NetworkRigidbodyInternal.GetRotation() : GetSpaceRelativeRotation();
+#else
+            var position = GetSpaceRelativePosition();
+            var rotation = GetSpaceRelativeRotation();
+#endif
+            Vector3 pos = posIn == null ? position : posIn.Value;
+            Quaternion rot = rotIn == null ? rotation : rotIn.Value;
             Vector3 scale = scaleIn == null ? transform.localScale : scaleIn.Value;
 
             if (!CanCommitToTransform)
@@ -3009,28 +3877,39 @@ public void SetState(Vector3? posIn = null, Quaternion? rotIn = null, Vector3? s
         /// </summary>
         private void SetStateInternal(Vector3 pos, Quaternion rot, Vector3 scale, bool shouldTeleport)
         {
-            if (InLocalSpace)
+#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
+            if (m_UseRigidbodyForMotion)
             {
-                transform.localPosition = pos;
-                transform.localRotation = rot;
+                m_NetworkRigidbodyInternal.SetPosition(pos);
+                m_NetworkRigidbodyInternal.SetRotation(rot);
             }
             else
+#endif
             {
-                transform.SetPositionAndRotation(pos, rot);
+                if (InLocalSpace)
+                {
+                    transform.localPosition = pos;
+                    transform.localRotation = rot;
+                }
+                else
+                {
+                    transform.SetPositionAndRotation(pos, rot);
+                }
             }
+
             transform.localScale = scale;
             m_LocalAuthoritativeNetworkState.IsTeleportingNextFrame = shouldTeleport;
 
             var transformToCommit = transform;
 
-            // Explicit set states are cumulative during a fractional tick period of time (i.e. each SetState invocation will 
+            // Explicit set states are cumulative during a fractional tick period of time (i.e. each SetState invocation will
             // update the axial deltas to whatever changes are applied). As such, we need to preserve the dirty and explicit
             // state flags.
             var stateWasDirty = m_LocalAuthoritativeNetworkState.IsDirty;
             var explicitState = m_LocalAuthoritativeNetworkState.ExplicitSet;
 
             // Apply any delta states to the m_LocalAuthoritativeNetworkState
-            var isDirty = ApplyTransformToNetworkStateWithInfo(ref m_LocalAuthoritativeNetworkState, ref transformToCommit);
+            var isDirty = CheckForStateChange(ref m_LocalAuthoritativeNetworkState, ref transformToCommit);
 
             // If we were dirty and the explicit state was set (prior to checking for deltas) or the current explicit state is dirty,
             // then we set the explicit state flag.
@@ -3040,7 +3919,6 @@ private void SetStateInternal(Vector3 pos, Quaternion rot, Vector3 scale, bool s
             // in between a fractional tick period and the current explicit set state did not find any deltas that we preserve any
             // previous dirty state.
             m_LocalAuthoritativeNetworkState.IsDirty = m_LocalAuthoritativeNetworkState.ExplicitSet;
-
         }
 
         /// <summary>
@@ -3073,130 +3951,507 @@ private void SetStateServerRpc(Vector3 pos, Quaternion rot, Vector3 scale, bool
             SetStateInternal(pos, rot, scale, shouldTeleport);
         }
 
+        /// <summary>
+        /// Teleport an already spawned object to the given values without interpolating.
+        /// </summary>
+        /// <remarks>
+        /// This is intended to be used on already spawned objects, for setting the position of a dynamically spawned object just apply the transform values prior to spawning. <br />
+        /// With player objects, override the <see cref="OnNetworkSpawn"/> method and have the authority make adjustments to the transform prior to invoking base.OnNetworkSpawn.
+        /// </remarks>
+        /// <param name="newPosition">new position to move to.</param>
+        /// <param name="newRotation">new rotation to rotate to.</param>
+        /// <param name="newScale">new scale to scale to.</param>
+        /// <exception cref="Exception">Thrown when called from a non-authoritative context (client without ownership)</exception>
+        public void Teleport(Vector3 newPosition, Quaternion newRotation, Vector3 newScale)
+        {
+            if (!CanCommitToTransform)
+            {
+                throw new Exception("Teleporting on non-authoritative side is not allowed!");
+            }
+
+            // Teleporting now is as simple as setting the internal state and passing the teleport flag
+            SetStateInternal(newPosition, newRotation, newScale, true);
+        }
+        #endregion
 
+        #region UPDATES AND AUTHORITY CHECKS
+        private NetworkTransformTickRegistration m_NetworkTransformTickRegistration;
+
+#if DEBUG_LINEARBUFFER
+#if UNITY_EDITOR
+        // For debugging purposes
+        public struct BufferEntry
+        {
+            public double TimeSent;
+            public Vector3 Position;
+        }
+        public struct NTPositionStats
+        {
+            public int FrameCount;
+            public int FixedFrameCount;
+            public int FixedUpdatesPerFrameCount;
+            public int TimeSynchCount;
+            public int Tick;
+            public double Time;
+            public double TicksAgoTime;
+            public int BufferCount;
+            public int TickMeasured;
+            public float LerpT;
+            public double DeltaTime;
+            public double MaxDeltaTime;
+            public double TimeSent;
+            public double TimeToTargetValue;
+            public Vector3 PreviousValue;
+            public Vector3 NextValue;
+            public Vector3 CurrentValue;
+            public Vector3 TargetValue;
+
+            public List<BufferEntry> Buffer;
+        }
+
+        public Dictionary<int, List<NTPositionStats>> PositionStats = new Dictionary<int, List<NTPositionStats>>();
+        public bool GatherStats;
+        private int m_LastTimeSyncCount;
+
+        public void ClearStats()
+        {
+            PositionStats.Clear();
+        }
+
+        public BufferedLinearInterpolatorVector3 GetPositionInterpolator()
+        {
+            return m_PositionInterpolator;
+        }
+
+        public BufferedLinearInterpolatorQuaternion GetRotationInterpolator()
+        {
+            return m_RotationInterpolator;
+        }
+#endif
+        public int GetPositionBufferCount()
+        {
+            return m_PositionInterpolator.m_BufferQueue.Count;
+        }
+
+        public double GetPositionCurrentStateTimeToTarget()
+        {
+            return m_PositionInterpolator.InterpolateState.TimeToTargetValue;
+        }
+
+        public double GetPositionLerpT()
+        {
+            return m_PositionInterpolator.InterpolateState.LerpT;
+        }
+
+        public double GetPositionLastRemainingTime()
+        {
+            return m_PositionInterpolator.InterpolateState.LastRemainingTime;
+        }
+#endif
+
+
+
+        // Non-Authority
         private void UpdateInterpolation()
         {
-            // Non-Authority
-            if (Interpolate)
+            AdjustForChangeInTransformSpace();
+            var timeSystem = m_CachedNetworkManager.ServerTime;
+            var currentTime = timeSystem.Time;
+#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
+            var cachedDeltaTime = m_UseRigidbodyForMotion ? m_CachedNetworkManager.RealTimeProvider.FixedDeltaTime : m_CachedNetworkManager.RealTimeProvider.DeltaTime;
+#else
+            var cachedDeltaTime = m_CachedNetworkManager.RealTimeProvider.DeltaTime;
+#endif
+            // Optional user defined tick offset to be used to push the "render time" (the time that will be used to determine if a state update is available)
+            // back in order to provide more room for the interpolator to interpolate towards when latency conditions are impacting the frequency that state
+            // updates are received.
+            var tickLatency = Mathf.Max(1, m_CachedNetworkManager.NetworkTimeSystem.TickLatency + InterpolationBufferTickOffset);
+
+            // If using an owner authoritative motion model
+            if (!IsServerAuthoritative())
             {
-                var serverTime = m_CachedNetworkManager.ServerTime;
-                var cachedDeltaTime = m_CachedNetworkManager.RealTimeProvider.DeltaTime;
-                var cachedServerTime = serverTime.Time;
+                // and if we are in a client-server topology (including DAHost)
+                if (!m_CachedNetworkManager.DistributedAuthorityMode ||
+                    (m_CachedNetworkManager.DistributedAuthorityMode && !m_CachedNetworkManager.CMBServiceConnection))
+                {
+                    // If this instance belongs to another client (i.e. not the server/host), then add 1 to our tick latency.
+                    if (!m_CachedNetworkManager.IsServer && !NetworkObject.IsOwnedByServer)
+                    {
+                        // Account for the 2xRTT with owner authoritative
+                        tickLatency += 1;
+                    }
+                }
+            }
 
-                // With owner authoritative mode, non-authority clients can lag behind
-                // by more than 1 tick period of time. The current "solution" for now
-                // is to make their cachedRenderTime run 2 ticks behind.
-                var ticksAgo = !IsServerAuthoritative() && !IsServer ? 2 : 1;
-                var cachedRenderTime = serverTime.TimeTicksAgo(ticksAgo).Time;
+            // Note: This is for the legacy lerp type in order to maintain the same end result for any games under development that have tuned their
+            // project's to match the legacy lerp's end result. This will not allow changes
+            var cachedRenderTime = 0.0;
+            if (PositionInterpolationType == InterpolationTypes.LegacyLerp || RotationInterpolationType == InterpolationTypes.LegacyLerp || ScaleInterpolationType == InterpolationTypes.LegacyLerp)
+            {
+                // Since InterpolationBufferTickOffset defaults to zero, this should not impact exist projects but still provides users with the ability to tweak
+                // their ticks ago time. 
+                var ticksAgo = (!IsServerAuthoritative() && !IsServer ? 2 : 1) + InterpolationBufferTickOffset;
+                cachedRenderTime = timeSystem.TimeTicksAgo(ticksAgo).Time;
+            }
 
-                // Now only update the interpolators for the portions of the transform being synchronized
-                if (SynchronizePosition)
+            // Get the tick latency (ticks ago) as time (in the past) to process state updates in the queue.
+            var tickLatencyAsTime = timeSystem.TimeTicksAgo(tickLatency).Time;
+
+#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
+            // If using rigid body for motion, then we need to increment
+            // our tick latency based on the number of times FixedUpdate
+            // is executed.
+            if (m_UseRigidbodyForMotion)
+            {
+                tickLatencyAsTime += m_FixedTimeFrameDelta;
+                currentTime += m_FixedTimeFrameDelta;
+            }
+#endif
+
+            // Smooth dampening and extrapolation specific:
+            // We clamp between the tick rate frequency and the tick latency x tick rate frequency
+            var minDeltaTime = timeSystem.FixedDeltaTimeAsDouble;
+
+            // Maximum delta time is the maximum time we will lerp between values. If the time exceeds this due to extreme
+            // latency then the value's interpolation rate will be accelerated to reach the goal and continue interpolating
+            // the next state updates.
+            var maxDeltaTime = tickLatency * minDeltaTime;
+
+            // Now only update the interpolators for the portions of the transform being synchronized
+            if (SynchronizePosition)
+            {
+                if (PositionLerpSmoothing)
                 {
-                    m_PositionInterpolator.Update(cachedDeltaTime, cachedRenderTime, cachedServerTime);
+                    m_PositionInterpolator.MaximumInterpolationTime = PositionMaxInterpolationTime;
                 }
+                m_PositionInterpolator.LerpSmoothEnabled = PositionLerpSmoothing;
 
-                if (SynchronizeRotation)
+                // If either of these two position interpolation related values have changed, then reset the current state being interpolated.
+                if (m_PreviousPositionInterpolationType != PositionInterpolationType || m_PreviousPositionLerpSmoothing != PositionLerpSmoothing)
                 {
-                    // When using half precision Lerp towards the target rotation.
-                    // When using full precision Slerp towards the target rotation.
-                    /// <see cref="BufferedLinearInterpolatorQuaternion.IsSlerp"/>
-                    m_RotationInterpolator.IsSlerp = !UseHalfFloatPrecision;
-                    m_RotationInterpolator.Update(cachedDeltaTime, cachedRenderTime, cachedServerTime);
+                    m_PreviousPositionInterpolationType = PositionInterpolationType;
+                    m_PreviousPositionLerpSmoothing = PositionLerpSmoothing;
+                    m_PositionInterpolator.ResetCurrentState();
                 }
 
-                if (SynchronizeScale)
+                if (PositionInterpolationType == InterpolationTypes.LegacyLerp)
+                {
+                    m_PositionInterpolator.Update(cachedDeltaTime, cachedRenderTime, currentTime);
+                }
+                else
+                {
+                    m_PositionInterpolator.Update(cachedDeltaTime, tickLatencyAsTime, minDeltaTime, maxDeltaTime,
+                        PositionInterpolationType == InterpolationTypes.Lerp);
+                }
+            }
+
+            if (SynchronizeRotation)
+            {
+                if (RotationLerpSmoothing)
                 {
-                    m_ScaleInterpolator.Update(cachedDeltaTime, cachedRenderTime, cachedServerTime);
+                    m_RotationInterpolator.MaximumInterpolationTime = RotationMaxInterpolationTime;
+                }
+
+                m_RotationInterpolator.LerpSmoothEnabled = RotationLerpSmoothing;
+
+                // If either of these two rotation interpolation related values have changed, then reset the current state being interpolated.
+                if (m_PreviousRotationInterpolationType != RotationInterpolationType || m_PreviousRotationLerpSmoothing != RotationLerpSmoothing)
+                {
+                    m_PreviousRotationInterpolationType = RotationInterpolationType;
+                    m_PreviousRotationLerpSmoothing = RotationLerpSmoothing;
+                    m_RotationInterpolator.ResetCurrentState();
+                }
+                // When using half precision Lerp towards the target rotation.
+                // When using full precision Slerp towards the target rotation.
+                /// <see cref="BufferedLinearInterpolatorQuaternion.IsSlerp"/>
+                m_RotationInterpolator.IsSlerp = !UseHalfFloatPrecision;
+                if (RotationInterpolationType == InterpolationTypes.LegacyLerp)
+                {
+                    m_RotationInterpolator.Update(cachedDeltaTime, cachedRenderTime, currentTime);
+                }
+                else
+                {
+                    m_RotationInterpolator.Update(cachedDeltaTime, tickLatencyAsTime, minDeltaTime, maxDeltaTime,
+                        RotationInterpolationType == InterpolationTypes.Lerp);
+                }
+            }
+
+            if (SynchronizeScale)
+            {
+                if (ScaleLerpSmoothing)
+                {
+                    m_ScaleInterpolator.MaximumInterpolationTime = ScaleMaxInterpolationTime;
+                }
+
+                m_ScaleInterpolator.LerpSmoothEnabled = ScaleLerpSmoothing;
+
+                // If either of these two rotation interpolation related values have changed, then reset the current state being interpolated.
+                if (m_PreviousScaleInterpolationType != ScaleInterpolationType || m_PreviousScaleLerpSmoothing != ScaleLerpSmoothing)
+                {
+                    m_PreviousScaleInterpolationType = ScaleInterpolationType;
+                    m_PreviousScaleLerpSmoothing = ScaleLerpSmoothing;
+                    m_ScaleInterpolator.ResetCurrentState();
+                }
+
+                if (ScaleInterpolationType == InterpolationTypes.LegacyLerp)
+                {
+                    m_ScaleInterpolator.Update(cachedDeltaTime, cachedRenderTime, currentTime);
+                }
+                else
+                {
+                    m_ScaleInterpolator.Update(cachedDeltaTime, tickLatencyAsTime, minDeltaTime, maxDeltaTime,
+                        ScaleInterpolationType == InterpolationTypes.Lerp);
                 }
             }
+
+#if DEBUG_LINEARBUFFER && UNITY_EDITOR
+            // For debugging purposes
+            if (GatherStats)
+            {
+                if (!m_PositionInterpolator.InterpolateState.Target.HasValue)
+                {
+                    return;
+                }
+                var posStats = new NTPositionStats()
+                {
+                    FrameCount = m_FrameCount,
+                    FixedFrameCount = m_FixedFrameCount,
+                    FixedUpdatesPerFrameCount = m_FixedUpdatesPerFrameCount,
+                    TimeSynchCount = m_CachedNetworkManager.NetworkTimeSystem.SyncCount,
+                    Tick = timeSystem.Tick,
+                    Time = timeSystem.Time,
+                    TicksAgoTime = tickLatencyAsTime,
+                    BufferCount = m_PositionInterpolator.m_BufferQueue.Count,
+                    TickMeasured = (int)Math.Round(m_PositionInterpolator.InterpolateState.Target.Value.TimeSent / timeSystem.FixedDeltaTimeAsDouble, MidpointRounding.AwayFromZero),
+                    LerpT = m_PositionInterpolator.InterpolateState.LerpT,
+                    DeltaTime = m_PositionInterpolator.InterpolateState.DeltaTime,
+                    MaxDeltaTime = m_PositionInterpolator.InterpolateState.MaxDeltaTime,
+                    TimeSent = m_PositionInterpolator.InterpolateState.Target.Value.TimeSent,
+                    TimeToTargetValue = m_PositionInterpolator.InterpolateState.TimeToTargetValue,
+                    PreviousValue = m_PositionInterpolator.InterpolateState.PreviousValue,
+                    NextValue = m_PositionInterpolator.InterpolateState.NextValue,
+                    CurrentValue = m_PositionInterpolator.InterpolateState.CurrentValue,
+                    TargetValue = m_PositionInterpolator.InterpolateState.Target.Value.Item,
+                    Buffer = new List<BufferEntry>(),
+                };
+
+                foreach (var entry in m_PositionInterpolator.m_BufferQueue)
+                {
+                    posStats.Buffer.Add(new BufferEntry()
+                    {
+                        TimeSent = entry.TimeSent,
+                        Position = entry.Item,
+                    });
+                }
+                if (!PositionStats.ContainsKey(posStats.TickMeasured))
+                {
+                    PositionStats.Add(posStats.TickMeasured, new List<NTPositionStats>());
+                }
+                PositionStats[posStats.TickMeasured].Add(posStats);
+            }
+#endif
         }
 
-        /// <inheritdoc/>
+        /// <inheritdoc cref="INetworkUpdateSystem.OnUpdate"/>
         /// <remarks>
         /// If you override this method, be sure that:
         /// - Non-authority always invokes this base class method.
         /// </remarks>
-        protected virtual void Update()
+        public virtual void OnUpdate()
         {
             // If not spawned or this instance has authority, exit early
+#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
+            if (!IsSpawned || CanCommitToTransform || m_UseRigidbodyForMotion)
+#else
             if (!IsSpawned || CanCommitToTransform)
+#endif
             {
                 return;
             }
 
-            // Non-Authority
-            UpdateInterpolation();
+            // Update interpolation
+            if (Interpolate)
+            {
+                UpdateInterpolation();
+            }
 
             // Apply the current authoritative state
             ApplyAuthoritativeState();
         }
 
+#if COM_UNITY_MODULES_PHYSICS || COM_UNITY_MODULES_PHYSICS2D
+#if DEBUG_LINEARBUFFER && UNITY_EDITOR
+        // For debugging purposes
+        private int m_FrameCount = 0;
+        private int m_FixedFrameCount = 0;
+        private int m_FixedUpdatesPerFrameCount = 0;
+#endif
+
+        // This is used during fixed update in case there are multiple fixed update passes without any frame pass.
+        private float m_FixedTimeFrameDelta;
+
+        // The fixed time (static time step) value for the current frame (in the event it is changed at runtime).
+        private float m_DeltaFixedUpdateCached;
+
         /// <summary>
-        /// Teleport the transform to the given values without interpolating
+        /// Resets the total fixed update time passed.
+        /// This handles dealing with multiple passes within FixedUpdate and interpolation.
         /// </summary>
-        /// <param name="newPosition"></param> new position to move to.
-        /// <param name="newRotation"></param> new rotation to rotate to.
-        /// <param name="newScale">new scale to scale to.</param>
-        /// <exception cref="Exception"></exception>
-        public void Teleport(Vector3 newPosition, Quaternion newRotation, Vector3 newScale)
+        internal void ResetFixedTimeDelta()
         {
-            if (!CanCommitToTransform)
+            // If not spawned or this instance has authority, exit early
+            if (!m_UseRigidbodyForMotion || !IsSpawned || CanCommitToTransform)
             {
-                throw new Exception("Teleporting on non-authoritative side is not allowed!");
+                return;
             }
 
-            // Teleporting now is as simple as setting the internal state and passing the teleport flag
-            SetStateInternal(newPosition, newRotation, newScale, true);
+            // Get the current fixed delta time (used in fixed upate)
+            m_DeltaFixedUpdateCached = m_CachedNetworkManager.RealTimeProvider.FixedDeltaTime;
+            // Reset the total fixed update time (increased each time physics invokes FixedUpdate within the same frame)
+            m_FixedTimeFrameDelta = 0.0f;
+#if DEBUG_LINEARBUFFER && UNITY_EDITOR
+            // For debugging purposes
+            m_FrameCount++;
+            m_FixedUpdatesPerFrameCount = 0;
+#endif
         }
 
         /// <summary>
-        /// Override this method and return false to switch to owner authoritative mode
+        /// When paired with a NetworkRigidbody and NetworkRigidbody.UseRigidBodyForMotion is enabled,
+        /// this will be invoked during <see cref="NetworkRigidbody.FixedUpdate"/>.
         /// </summary>
-        /// <returns>(<see cref="true"/> or <see cref="false"/>) where when false it runs as owner-client authoritative</returns>
+        public virtual void OnFixedUpdate()
+        {
+            // If not spawned or this instance has authority, exit early
+            if (!m_UseRigidbodyForMotion || !IsSpawned || CanCommitToTransform)
+            {
+                return;
+            }
+
+            m_NetworkRigidbodyInternal.WakeIfSleeping();
+
+#if DEBUG_LINEARBUFFER && UNITY_EDITOR
+            // For debugging purposes
+            m_FixedFrameCount++;
+            m_FixedUpdatesPerFrameCount++;
+#endif
+
+            // Update interpolation when enabled
+            if (Interpolate)
+            {
+                UpdateInterpolation();
+            }
+
+            // Apply the current authoritative state
+            ApplyAuthoritativeState();
+
+            // Increment the time passed based on our current fixed update rate in case
+            // FixedUpdate is invoked more than once within a single frame.
+            m_FixedTimeFrameDelta += m_DeltaFixedUpdateCached;
+        }
+#endif
+
+        /// <summary>
+        /// Determines whether the <see cref="NetworkTransform"/> is <see cref="AuthorityModes.Server"/> or <see cref="AuthorityModes.Owner"/> based on the <see cref="AuthorityMode"/> property.
+        /// You can override this method to control this logic.
+        /// </summary>
+        /// <returns><see cref="true"/> or <see cref="false"/></returns>
         protected virtual bool OnIsServerAuthoritative()
         {
-            return true;
+            return AuthorityMode == AuthorityModes.Server;
         }
 
         /// <summary>
         /// Method to determine if this <see cref="NetworkTransform"/> instance is owner or server authoritative.
         /// </summary>
         /// <remarks>
-        /// Used by <see cref="NetworkRigidbody"/> to determines if this is server or owner authoritative.
+        /// When using a <see cref="NetworkTopologyTypes.DistributedAuthority"/> <see cref="NetworkConfig.NetworkTopology"/>, this will always be viewed as a <see cref="AuthorityModes.Owner"/> authoritative motion model.
         /// </remarks>
         /// <returns><see cref="true"/> or <see cref="false"/></returns>
         public bool IsServerAuthoritative()
         {
-            return OnIsServerAuthoritative();
+            if (m_CachedNetworkManager && m_CachedNetworkManager.DistributedAuthorityMode)
+            {
+                return false;
+            }
+            else
+            {
+                return OnIsServerAuthoritative();
+            }
+        }
+        #endregion
+
+        #region MESSAGE HANDLING
+
+        internal NetworkTransformState InboundState = new NetworkTransformState();
+        internal NetworkTransformState OutboundState
+        {
+            get
+            {
+                return m_LocalAuthoritativeNetworkState;
+            }
         }
 
         /// <summary>
         /// Invoked by <see cref="NetworkTransformMessage"/> to update the transform state
         /// </summary>
         /// <param name="networkTransformState"></param>
-        internal void TransformStateUpdate(ref NetworkTransformState networkTransformState)
+        internal void TransformStateUpdate(ulong senderId)
         {
+            if (CanCommitToTransform)
+            {
+                // TODO: Investigate where this state should be applied or just discarded.
+                // For now, discard the state if we assumed ownership.
+                return;
+            }
             // Store the previous/old state
             m_OldState = m_LocalAuthoritativeNetworkState;
 
             // Assign the new incoming state
-            m_LocalAuthoritativeNetworkState = networkTransformState;
+            m_LocalAuthoritativeNetworkState = InboundState;
 
             // Apply the state update
             OnNetworkStateChanged(m_OldState, m_LocalAuthoritativeNetworkState);
         }
 
+        // Used to send outbound messages
+        private NetworkTransformMessage m_OutboundMessage = new NetworkTransformMessage();
+
+
+        internal int SerializeMessage(FastBufferWriter writer, int targetVersion)
+        {
+            var networkObject = NetworkObject;
+            var position = writer.Position;
+            BytePacker.WriteValueBitPacked(writer, NetworkObjectId);
+            BytePacker.WriteValueBitPacked(writer, (int)NetworkBehaviourId);
+            writer.WriteNetworkSerializable(m_LocalAuthoritativeNetworkState);
+            if (m_CachedNetworkManager.DistributedAuthorityMode)
+            {
+                BytePacker.WriteValuePacked(writer, networkObject.Observers.Count - 1);
+
+                foreach (var targetId in networkObject.Observers)
+                {
+                    if (OwnerClientId == targetId)
+                    {
+                        continue;
+                    }
+                    BytePacker.WriteValuePacked(writer, targetId);
+                }
+            }
+            return writer.Position - position;
+        }
+
         /// <summary>
         /// Invoked by the authoritative instance to sends a <see cref="NetworkTransformMessage"/> containing the <see cref="NetworkTransformState"/>
         /// </summary>
         private void UpdateTransformState()
         {
-            if (m_CachedNetworkManager.ShutdownInProgress)
+            if (m_CachedNetworkManager.ShutdownInProgress || (m_CachedNetworkManager.DistributedAuthorityMode && !m_CachedNetworkManager.CMBServiceConnection && m_CachedNetworkObject.Observers.Count - 1 == 0))
             {
                 return;
             }
 
-            bool isServerAuthoritative = OnIsServerAuthoritative();
+            bool isServerAuthoritative = IsServerAuthoritative();
             if (isServerAuthoritative && !IsServer)
             {
                 Debug.LogError($"Server authoritative {nameof(NetworkTransform)} can only be updated by the server!");
@@ -3206,13 +4461,7 @@ private void UpdateTransformState()
                 Debug.LogError($"Owner authoritative {nameof(NetworkTransform)} can only be updated by the owner!");
             }
             var customMessageManager = m_CachedNetworkManager.CustomMessagingManager;
-
-            var networkTransformMessage = new NetworkTransformMessage()
-            {
-                NetworkObjectId = NetworkObjectId,
-                NetworkBehaviourId = NetworkBehaviourId,
-                State = m_LocalAuthoritativeNetworkState
-            };
+            m_OutboundMessage.NetworkTransform = this;
 
             // Determine what network delivery method to use:
             // When to send reliable packets:
@@ -3223,7 +4472,7 @@ private void UpdateTransformState()
                 | m_LocalAuthoritativeNetworkState.UnreliableFrameSync | m_LocalAuthoritativeNetworkState.SynchronizeBaseHalfFloat
                 ? NetworkDelivery.ReliableSequenced : NetworkDelivery.UnreliableSequenced;
 
-            // Server-host always sends updates to all clients (but itself)
+            // Server-host-dahost always sends updates to all clients (but itself)
             if (IsServer)
             {
                 var clientCount = m_CachedNetworkManager.ConnectionManager.ConnectedClientsList.Count;
@@ -3238,18 +4487,71 @@ private void UpdateTransformState()
                     {
                         continue;
                     }
-                    NetworkManager.MessageManager.SendMessage(ref networkTransformMessage, networkDelivery, clientId);
+                    NetworkManager.MessageManager.SendMessage(ref m_OutboundMessage, networkDelivery, clientId);
                 }
             }
             else
             {
                 // Clients (owner authoritative) send messages to the server-host
-                NetworkManager.MessageManager.SendMessage(ref networkTransformMessage, networkDelivery, NetworkManager.ServerClientId);
+                NetworkManager.MessageManager.SendMessage(ref m_OutboundMessage, networkDelivery, NetworkManager.ServerClientId);
             }
+            m_LocalAuthoritativeNetworkState.LastSerializedSize = m_OutboundMessage.BytesWritten;
         }
+        #endregion
 
-        #region Network Tick Registration and Handling
+        #region NETWORK TICK REGISTRATOIN AND HANDLING
         private static Dictionary<NetworkManager, NetworkTransformTickRegistration> s_NetworkTickRegistration = new Dictionary<NetworkManager, NetworkTransformTickRegistration>();
+        /// <summary>
+        /// Adjusts the over-all tick offset (i.e. how many ticks ago) and how wide of a maximum delta time will be used for the
+        /// various <see cref="InterpolationTypes"/>.
+        /// </summary>
+        /// <remarks>
+        /// Note: You can adjust this value during runtime. Increasing this value will set non-authority instances that much further
+        /// behind the authority instance but will increase the number of state updates to be processed. Increasing this can be useful 
+        /// under higher latency conditions.<br />
+        /// The default value is 1 tick (plus the tick latency). When running on a local network, reducing this to 0 is recommended.<br />
+        /// <see cref="NetworkTimeSystem.TickLatency"/>
+        /// </remarks>
+        public static int InterpolationBufferTickOffset = 0;
+        internal static float GetTickLatency(NetworkManager networkManager)
+        {
+            if (networkManager.IsListening)
+            {
+                return (float)(networkManager.NetworkTimeSystem.TickLatency + InterpolationBufferTickOffset + networkManager.LocalTime.TickOffset);
+            }
+            return 0;
+        }
+
+        /// <summary>
+        /// Returns the number of ticks (fractional) a client is latent relative
+        /// to its current averaged RTT.
+        /// </summary>
+        /// <remarks>
+        /// Only valid on clients.
+        /// </remarks>
+        /// <returns>Returns the tick latency and local offset in seconds and as a float value.</returns>
+        public static float GetTickLatency()
+        {
+            return GetTickLatency(NetworkManager.Singleton);
+        }
+
+        internal static float GetTickLatencyInSeconds(NetworkManager networkManager)
+        {
+            if (networkManager.IsListening)
+            {
+                return (float)networkManager.LocalTime.TimeTicksAgo(networkManager.NetworkTimeSystem.TickLatency + InterpolationBufferTickOffset).Time;
+            }
+            return 0f;
+        }
+
+        /// <summary>
+        /// Returns the tick latency in seconds (typically fractional)
+        /// </summary>
+        /// <returns>Returns the current tick latency in seconds as a float value.</returns>
+        public static float GetTickLatencyInSeconds()
+        {
+            return GetTickLatencyInSeconds(NetworkManager.Singleton);
+        }
 
         private static void RemoveTickUpdate(NetworkManager networkManager)
         {
@@ -3295,12 +4597,11 @@ private void TickUpdate()
                 {
                     if (networkTransform.IsSpawned)
                     {
-                        networkTransform.NetworkTickSystem_Tick();
+                        networkTransform.OnNetworkTick();
                     }
                 }
                 m_LastTick = m_NetworkManager.ServerTime.Tick;
             }
-
             public NetworkTransformTickRegistration(NetworkManager networkManager)
             {
                 m_NetworkManager = networkManager;
@@ -3325,6 +4626,14 @@ internal void RegisterForTickSynchronization()
             m_NextTickSync = NetworkManager.ServerTime.Tick + (s_TickSynchPosition % (int)NetworkManager.NetworkConfig.TickRate);
         }
 
+        private static void RegisterNetworkManagerForTickUpdate(NetworkManager networkManager)
+        {
+            if (!s_NetworkTickRegistration.ContainsKey(networkManager))
+            {
+                s_NetworkTickRegistration.Add(networkManager, new NetworkTransformTickRegistration(networkManager));
+            }
+        }
+
         /// <summary>
         /// Will register the NetworkTransform instance for the single tick update entry point.
         /// If a NetworkTransformTickRegistration has not yet been registered for the NetworkManager
@@ -3333,10 +4642,12 @@ internal void RegisterForTickSynchronization()
         /// <param name="networkTransform"></param>
         private static void RegisterForTickUpdate(NetworkTransform networkTransform)
         {
-            if (!s_NetworkTickRegistration.ContainsKey(networkTransform.NetworkManager))
+
+            if (!networkTransform.NetworkManager.DistributedAuthorityMode && !s_NetworkTickRegistration.ContainsKey(networkTransform.NetworkManager))
             {
                 s_NetworkTickRegistration.Add(networkTransform.NetworkManager, new NetworkTransformTickRegistration(networkTransform.NetworkManager));
             }
+
             networkTransform.RegisterForTickSynchronization();
             s_NetworkTickRegistration[networkTransform.NetworkManager].NetworkTransforms.Add(networkTransform);
         }
@@ -3348,17 +4659,20 @@ private static void RegisterForTickUpdate(NetworkTransform networkTransform)
         /// <param name="networkTransform"></param>
         private static void DeregisterForTickUpdate(NetworkTransform networkTransform)
         {
+            if (networkTransform.NetworkManager == null)
+            {
+                return;
+            }
             if (s_NetworkTickRegistration.ContainsKey(networkTransform.NetworkManager))
             {
                 s_NetworkTickRegistration[networkTransform.NetworkManager].NetworkTransforms.Remove(networkTransform);
-                if (s_NetworkTickRegistration[networkTransform.NetworkManager].NetworkTransforms.Count == 0)
+                if (!networkTransform.NetworkManager.DistributedAuthorityMode && s_NetworkTickRegistration[networkTransform.NetworkManager].NetworkTransforms.Count == 0)
                 {
                     var registrationEntry = s_NetworkTickRegistration[networkTransform.NetworkManager];
                     registrationEntry.Remove();
                 }
             }
         }
-
         #endregion
     }
 
diff --git a/com.unity.netcode.gameobjects/Components/NetworkTransform.cs.meta b/com.unity.netcode.gameobjects/Runtime/Components/NetworkTransform.cs.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Components/NetworkTransform.cs.meta
rename to com.unity.netcode.gameobjects/Runtime/Components/NetworkTransform.cs.meta
diff --git a/com.unity.netcode.gameobjects/Components/QuaternionCompressor.cs b/com.unity.netcode.gameobjects/Runtime/Components/QuaternionCompressor.cs
similarity index 98%
rename from com.unity.netcode.gameobjects/Components/QuaternionCompressor.cs
rename to com.unity.netcode.gameobjects/Runtime/Components/QuaternionCompressor.cs
index 0cdeb13ed6..f4d9b25dd2 100644
--- a/com.unity.netcode.gameobjects/Components/QuaternionCompressor.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Components/QuaternionCompressor.cs
@@ -14,7 +14,7 @@ namespace Unity.Netcode
     /// M = 1.0f (which M * M would still yield 1.0f)
     /// w*w = M*M - (x*x + y*y + z*z) or Mathf.Sqrt(1.0f - (x*x + y*y + z*z))
     /// w = Math.Sqrt(1.0f - (x*x + y*y + z*z))
-    /// Using the largest the number avoids potential loss of precision in the smallest three values.
+    /// Using the largest number avoids potential loss of precision in the smallest three values.
     /// </remarks>
     public static class QuaternionCompressor
     {
diff --git a/com.unity.netcode.gameobjects/Components/QuaternionCompressor.cs.meta b/com.unity.netcode.gameobjects/Runtime/Components/QuaternionCompressor.cs.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Components/QuaternionCompressor.cs.meta
rename to com.unity.netcode.gameobjects/Runtime/Components/QuaternionCompressor.cs.meta
diff --git a/com.unity.netcode.gameobjects/Runtime/Components/RigidbodyContactEventManager.cs b/com.unity.netcode.gameobjects/Runtime/Components/RigidbodyContactEventManager.cs
new file mode 100644
index 0000000000..b2dcb94efe
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Components/RigidbodyContactEventManager.cs
@@ -0,0 +1,390 @@
+#if COM_UNITY_MODULES_PHYSICS
+using System.Collections.Generic;
+using Unity.Collections;
+using Unity.Jobs;
+using UnityEngine;
+
+namespace Unity.Netcode.Components
+{
+    /// <summary>
+    /// Information a <see cref="Rigidbody"/> returns to <see cref="RigidbodyContactEventManager"/> via <see cref="IContactEventHandlerWithInfo.GetContactEventHandlerInfo"/> <br />
+    /// if the <see cref="Rigidbody"/> registers itself with <see cref="IContactEventHandlerWithInfo"/> as opposed to <see cref="IContactEventHandler"/>.
+    /// </summary>
+    public struct ContactEventHandlerInfo
+    {
+        /// <summary>
+        /// When set to true, the <see cref="RigidbodyContactEventManager"/> will include non-Rigidbody based contact events.<br />
+        /// When the <see cref="RigidbodyContactEventManager"/> invokes the <see cref="IContactEventHandler.ContactEvent"/> it will return null in place <br />
+        /// of the collidingBody parameter if the contact event occurred with a collider that is not registered with the <see cref="RigidbodyContactEventManager"/>.
+        /// </summary>
+        public bool ProvideNonRigidBodyContactEvents;
+        /// <summary>
+        /// When set to true, the <see cref="RigidbodyContactEventManager"/> will prioritize invoking <see cref="IContactEventHandler.ContactEvent(ulong, Vector3, Rigidbody, Vector3, bool, Vector3)"/> <br /></br>
+        /// if it is the 2nd colliding body in the contact pair being processed. With distributed authority, setting this value to true when a <see cref="NetworkObject"/> is owned by the local client <br />
+        /// will assure <see cref="IContactEventHandler.ContactEvent(ulong, Vector3, Rigidbody, Vector3, bool, Vector3)"/> is only invoked on the authoritative side.
+        /// </summary>
+        public bool HasContactEventPriority;
+    }
+
+    /// <summary>
+    /// Default implementation required to register a <see cref="Rigidbody"/> with a <see cref="RigidbodyContactEventManager"/> instance.
+    /// </summary>
+    /// <remarks>
+    /// Recommended to implement this method on a <see cref="NetworkBehaviour"/> component
+    /// </remarks>
+    public interface IContactEventHandler
+    {
+        /// <summary>
+        /// Should return a <see cref="Rigidbody"/>.
+        /// </summary>
+        Rigidbody GetRigidbody();
+
+        /// <summary>
+        /// Invoked by the <see cref="RigidbodyContactEventManager"/> instance.
+        /// </summary>
+        /// <param name="eventId">A unique contact event identifier.</param>
+        /// <param name="averagedCollisionNormal">The average normal of the collision between two colliders.</param>
+        /// <param name="collidingBody">If not null, this will be a registered <see cref="Rigidbody"/> that was part of the collision contact event.</param>
+        /// <param name="contactPoint">The world space location of the contact event.</param>
+        /// <param name="hasCollisionStay">Will be set if this is a collision stay contact event (i.e. it is not the first contact event and continually has contact)</param>
+        /// <param name="averagedCollisionStayNormal">The average normal of the collision stay contact over time.</param>
+        void ContactEvent(ulong eventId, Vector3 averagedCollisionNormal, Rigidbody collidingBody, Vector3 contactPoint, bool hasCollisionStay = false, Vector3 averagedCollisionStayNormal = default);
+    }
+
+    /// <summary>
+    /// This is an extended version of <see cref="IContactEventHandler"/> and can be used to register a <see cref="Rigidbody"/> with a <see cref="RigidbodyContactEventManager"/> instance.<br />
+    /// This provides additional <see cref="ContactEventHandlerInfo"/> information to the <see cref="RigidbodyContactEventManager"/> for each set of contact events it is processing.
+    /// </summary>
+    public interface IContactEventHandlerWithInfo : IContactEventHandler
+    {
+        /// <summary>
+        /// Invoked by <see cref="RigidbodyContactEventManager"/> for each set of contact events it is processing (prior to processing).
+        /// </summary>
+        /// <returns><see cref="ContactEventHandlerInfo"/></returns>
+        ContactEventHandlerInfo GetContactEventHandlerInfo();
+    }
+
+    /// <summary>
+    /// Add this component to an in-scene placed GameObject to provide faster collision event processing between <see cref="Rigidbody"/> instances and optionally static colliders.
+    /// <see cref="IContactEventHandler"/><br />
+    /// <see cref="IContactEventHandlerWithInfo"/><br />
+    /// <see cref="ContactEventHandlerInfo"/><br />
+    /// </summary>
+    [AddComponentMenu("Netcode/Rigidbody Contact Event Manager")]
+    public class RigidbodyContactEventManager : MonoBehaviour
+    {
+        public static RigidbodyContactEventManager Instance { get; private set; }
+
+        private struct JobResultStruct
+        {
+            public bool HasCollisionStay;
+            public int ThisInstanceID;
+            public int OtherInstanceID;
+            public Vector3 AverageNormal;
+            public Vector3 AverageCollisionStayNormal;
+            public Vector3 ContactPoint;
+        }
+
+        private NativeArray<JobResultStruct> m_ResultsArray;
+        private int m_Count = 0;
+        private JobHandle m_JobHandle;
+
+        private readonly Dictionary<int, Rigidbody> m_RigidbodyMapping = new Dictionary<int, Rigidbody>();
+        private readonly Dictionary<int, IContactEventHandler> m_HandlerMapping = new Dictionary<int, IContactEventHandler>();
+        private readonly Dictionary<int, ContactEventHandlerInfo> m_HandlerInfo = new Dictionary<int, ContactEventHandlerInfo>();
+
+        private void OnEnable()
+        {
+            m_ResultsArray = new NativeArray<JobResultStruct>(16, Allocator.Persistent);
+            Physics.ContactEvent += Physics_ContactEvent;
+            if (Instance != null)
+            {
+                NetworkLog.LogError($"[Invalid][Multiple Instances] Found more than one instance of {nameof(RigidbodyContactEventManager)}: {name} and {Instance.name}");
+                NetworkLog.LogError($"[Disable][Additional Instance] Disabling {name} instance!");
+                gameObject.SetActive(false);
+                return;
+            }
+            Instance = this;
+        }
+
+        /// <summary>
+        /// Any <see cref="IContactEventHandler"/> implementation can register a <see cref="Rigidbody"/> to be handled by this <see cref="RigidbodyContactEventManager"/> instance.
+        /// </summary>
+        /// <remarks>
+        /// You should enable <see cref="Collider.providesContacts"/> for each <see cref="Collider"/> associated with the <see cref="Rigidbody"/> being registered.<br/>
+        /// You can enable this during run time or within the editor's inspector view.
+        /// </remarks>
+        /// <param name="contactEventHandler"><see cref="IContactEventHandler"/> or <see cref="IContactEventHandlerWithInfo"/></param>
+        /// <param name="register">true to register and false to remove from being registered</param>
+        public void RegisterHandler(IContactEventHandler contactEventHandler, bool register = true)
+        {
+            var rigidbody = contactEventHandler.GetRigidbody();
+            if (rigidbody == null)
+            {
+                return;
+            }
+            var instanceId = rigidbody.GetInstanceID();
+            if (register)
+            {
+                if (!m_RigidbodyMapping.ContainsKey(instanceId))
+                {
+                    m_RigidbodyMapping.Add(instanceId, rigidbody);
+                }
+
+                if (!m_HandlerMapping.ContainsKey(instanceId))
+                {
+                    m_HandlerMapping.Add(instanceId, contactEventHandler);
+                }
+
+                if (!m_HandlerInfo.ContainsKey(instanceId))
+                {
+                    var handlerInfo = new ContactEventHandlerInfo()
+                    {
+                        HasContactEventPriority = true,
+                        ProvideNonRigidBodyContactEvents = false,
+                    };
+                    var handlerWithInfo = contactEventHandler as IContactEventHandlerWithInfo;
+
+                    if (handlerWithInfo != null)
+                    {
+                        handlerInfo = handlerWithInfo.GetContactEventHandlerInfo();
+                    }
+                    m_HandlerInfo.Add(instanceId, handlerInfo);
+                }
+            }
+            else
+            {
+                m_RigidbodyMapping.Remove(instanceId);
+                m_HandlerMapping.Remove(instanceId);
+            }
+        }
+
+        private void OnDisable()
+        {
+            m_JobHandle.Complete();
+            m_ResultsArray.Dispose();
+
+            Physics.ContactEvent -= Physics_ContactEvent;
+
+            m_RigidbodyMapping.Clear();
+            Instance = null;
+        }
+
+        private bool m_HasCollisions;
+        private int m_CurrentCount = 0;
+
+        private void ProcessCollisions()
+        {
+            foreach (var contactEventHandler in m_HandlerMapping)
+            {
+                var handlerWithInfo = contactEventHandler.Value as IContactEventHandlerWithInfo;
+
+                if (handlerWithInfo != null)
+                {
+                    m_HandlerInfo[contactEventHandler.Key] = handlerWithInfo.GetContactEventHandlerInfo();
+                }
+                else
+                {
+                    var info = m_HandlerInfo[contactEventHandler.Key];
+                    info.HasContactEventPriority = !m_RigidbodyMapping[contactEventHandler.Key].isKinematic;
+                    m_HandlerInfo[contactEventHandler.Key] = info;
+                }
+            }
+
+            ContactEventHandlerInfo contactEventHandlerInfo0;
+            ContactEventHandlerInfo contactEventHandlerInfo1;
+
+            // Process all collisions
+            for (int i = 0; i < m_Count; i++)
+            {
+                var thisInstanceID = m_ResultsArray[i].ThisInstanceID;
+                var otherInstanceID = m_ResultsArray[i].OtherInstanceID;
+                var contactHandler0 = (IContactEventHandler)null;
+                var contactHandler1 = (IContactEventHandler)null;
+                var preferredContactHandler = (IContactEventHandler)null;
+                var preferredContactHandlerNonRigidbody = false;
+                var preferredRigidbody = (Rigidbody)null;
+                var otherContactHandler = (IContactEventHandler)null;
+                var otherRigidbody = (Rigidbody)null;
+
+                var otherContactHandlerNonRigidbody = false;
+
+                if (m_RigidbodyMapping.ContainsKey(thisInstanceID))
+                {
+                    contactHandler0 = m_HandlerMapping[thisInstanceID];
+                    contactEventHandlerInfo0 = m_HandlerInfo[thisInstanceID];
+                    if (contactEventHandlerInfo0.HasContactEventPriority)
+                    {
+                        preferredContactHandler = contactHandler0;
+                        preferredContactHandlerNonRigidbody = contactEventHandlerInfo0.ProvideNonRigidBodyContactEvents;
+                        preferredRigidbody = m_RigidbodyMapping[thisInstanceID];
+                    }
+                    else
+                    {
+                        otherContactHandler = contactHandler0;
+                        otherContactHandlerNonRigidbody = contactEventHandlerInfo0.ProvideNonRigidBodyContactEvents;
+                        otherRigidbody = m_RigidbodyMapping[thisInstanceID];
+                    }
+                }
+
+                if (m_RigidbodyMapping.ContainsKey(otherInstanceID))
+                {
+                    contactHandler1 = m_HandlerMapping[otherInstanceID];
+                    contactEventHandlerInfo1 = m_HandlerInfo[otherInstanceID];
+                    if (contactEventHandlerInfo1.HasContactEventPriority && preferredContactHandler == null)
+                    {
+                        preferredContactHandler = contactHandler1;
+                        preferredContactHandlerNonRigidbody = contactEventHandlerInfo1.ProvideNonRigidBodyContactEvents;
+                        preferredRigidbody = m_RigidbodyMapping[otherInstanceID];
+                    }
+                    else
+                    {
+                        otherContactHandler = contactHandler1;
+                        otherContactHandlerNonRigidbody = contactEventHandlerInfo1.ProvideNonRigidBodyContactEvents;
+                        otherRigidbody = m_RigidbodyMapping[otherInstanceID];
+                    }
+                }
+
+                if (preferredContactHandler == null && otherContactHandler != null)
+                {
+                    preferredContactHandler = otherContactHandler;
+                    preferredContactHandlerNonRigidbody = otherContactHandlerNonRigidbody;
+                    preferredRigidbody = otherRigidbody;
+                    otherContactHandler = null;
+                    otherContactHandlerNonRigidbody = false;
+                    otherRigidbody = null;
+                }
+
+                if (preferredContactHandler == null || (preferredContactHandler != null && otherContactHandler == null && !preferredContactHandlerNonRigidbody))
+                {
+                    continue;
+                }
+
+                if (m_ResultsArray[i].HasCollisionStay)
+                {
+                    preferredContactHandler.ContactEvent(m_EventId, m_ResultsArray[i].AverageNormal, otherRigidbody, m_ResultsArray[i].ContactPoint, m_ResultsArray[i].HasCollisionStay, m_ResultsArray[i].AverageCollisionStayNormal);
+                }
+                else
+                {
+                    preferredContactHandler.ContactEvent(m_EventId, m_ResultsArray[i].AverageNormal, otherRigidbody, m_ResultsArray[i].ContactPoint);
+                }
+            }
+        }
+
+        private void FixedUpdate()
+        {
+            // Only process new collisions
+            if (!m_HasCollisions && m_CurrentCount == 0)
+            {
+                return;
+            }
+
+            // This assures we won't process the same collision
+            // set after it has been processed.
+            if (m_HasCollisions)
+            {
+                m_CurrentCount = m_Count;
+                m_HasCollisions = false;
+                m_JobHandle.Complete();
+            }
+            ProcessCollisions();
+        }
+
+        private void LateUpdate()
+        {
+            m_CurrentCount = 0;
+        }
+
+        private ulong m_EventId;
+        private void Physics_ContactEvent(PhysicsScene scene, NativeArray<ContactPairHeader>.ReadOnly pairHeaders)
+        {
+            m_EventId++;
+            m_HasCollisions = true;
+            int n = pairHeaders.Length;
+            if (m_ResultsArray.Length < n)
+            {
+                m_ResultsArray.Dispose();
+                m_ResultsArray = new NativeArray<JobResultStruct>(Mathf.NextPowerOfTwo(n), Allocator.Persistent);
+            }
+            m_Count = n;
+            var job = new GetCollisionsJob()
+            {
+                PairedHeaders = pairHeaders,
+                ResultsArray = m_ResultsArray
+            };
+            m_JobHandle = job.Schedule(n, 256);
+        }
+
+        private struct GetCollisionsJob : IJobParallelFor
+        {
+            [ReadOnly]
+            public NativeArray<ContactPairHeader>.ReadOnly PairedHeaders;
+
+            public NativeArray<JobResultStruct> ResultsArray;
+
+            public void Execute(int index)
+            {
+                Vector3 averageNormal = Vector3.zero;
+                Vector3 averagePoint = Vector3.zero;
+                Vector3 averageCollisionStay = Vector3.zero;
+                int count = 0;
+                int collisionStaycount = 0;
+                int positionCount = 0;
+                for (int j = 0; j < PairedHeaders[index].pairCount; j++)
+                {
+                    ref readonly var pair = ref PairedHeaders[index].GetContactPair(j);
+
+                    if (pair.isCollisionExit)
+                    {
+                        continue;
+                    }
+
+                    for (int k = 0; k < pair.contactCount; k++)
+                    {
+                        ref readonly var contact = ref pair.GetContactPoint(k);
+                        averagePoint += contact.position;
+                        positionCount++;
+                        if (!pair.isCollisionStay)
+                        {
+                            averageNormal += contact.normal;
+                            count++;
+                        }
+                        else
+                        {
+                            averageCollisionStay += contact.normal;
+                            collisionStaycount++;
+                        }
+                    }
+                }
+
+                if (count != 0)
+                {
+                    averageNormal /= count;
+                }
+
+                if (collisionStaycount != 0)
+                {
+                    averageCollisionStay /= collisionStaycount;
+                }
+
+                if (positionCount != 0)
+                {
+                    averagePoint /= positionCount;
+                }
+
+                var result = new JobResultStruct()
+                {
+                    ThisInstanceID = PairedHeaders[index].bodyInstanceID,
+                    OtherInstanceID = PairedHeaders[index].otherBodyInstanceID,
+                    AverageNormal = averageNormal,
+                    HasCollisionStay = collisionStaycount != 0,
+                    AverageCollisionStayNormal = averageCollisionStay,
+                    ContactPoint = averagePoint
+                };
+
+                ResultsArray[index] = result;
+            }
+        }
+    }
+}
+#endif
diff --git a/com.unity.netcode.gameobjects/Runtime/Components/RigidbodyContactEventManager.cs.meta b/com.unity.netcode.gameobjects/Runtime/Components/RigidbodyContactEventManager.cs.meta
new file mode 100644
index 0000000000..c0f2a00237
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Components/RigidbodyContactEventManager.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 739e5cee846b6384988f9a47e4691836
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkConfig.cs b/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkConfig.cs
index 9b855ec5ba..741dc16670 100644
--- a/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkConfig.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkConfig.cs
@@ -13,6 +13,14 @@ namespace Unity.Netcode
     [Serializable]
     public class NetworkConfig
     {
+        // Clamp spawn time outs to prevent dropping messages during scene events
+        // Note: The legacy versions of NGO defaulted to 1s which was too low. As
+        // well, the SpawnTimeOut is now being clamped to within this recommended
+        // range both via UI and when NetworkManager is validated.
+        internal const float MinSpawnTimeout = 10.0f;
+        // Clamp spawn time outs to no more than 1 hour (really that is a bit high)
+        internal const float MaxSpawnTimeout = 3600.0f;
+
         /// <summary>
         /// The protocol version. Different versions doesn't talk to each other.
         /// </summary>
@@ -31,6 +39,9 @@ public class NetworkConfig
         [Tooltip("When set, NetworkManager will automatically create and spawn the assigned player prefab. This can be overridden by adding it to the NetworkPrefabs list and selecting override.")]
         public GameObject PlayerPrefab;
 
+        /// <summary>
+        /// The collection of network prefabs that can be spawned across the network
+        /// </summary>
         [SerializeField]
         public NetworkPrefabs Prefabs = new NetworkPrefabs();
 
@@ -129,9 +140,11 @@ public class NetworkConfig
         public int LoadSceneTimeOut = 120;
 
         /// <summary>
-        /// The amount of time a message should be buffered if the asset or object needed to process it doesn't exist yet. If the asset is not added/object is not spawned within this time, it will be dropped.
+        /// The amount of time a message will be held (deferred) if the destination NetworkObject needed to process the message doesn't exist yet. If the NetworkObject is not spawned within this time period, all deferred messages for that NetworkObject will be dropped.
         /// </summary>
-        [Tooltip("The amount of time a message should be buffered if the asset or object needed to process it doesn't exist yet. If the asset is not added/object is not spawned within this time, it will be dropped")]
+        [Tooltip("The amount of time a message will be held (deferred) if the destination NetworkObject needed to process the message doesn't exist yet. If the NetworkObject is not spawned within this time period, all deferred messages for that NetworkObject will be dropped.")]
+
+        [Range(MinSpawnTimeout, MaxSpawnTimeout)]
         public float SpawnTimeout = 10f;
 
         /// <summary>
@@ -149,10 +162,101 @@ public class NetworkConfig
         /// </summary>
         public const int RttWindowSize = 64; // number of slots to use for RTT computations (max number of in-flight packets)
 
+        /// <summary>
+        /// Determines whether to use the client-server or distributed authority network topology
+        /// </summary>
+        [Tooltip("Determines whether to use the client-server or distributed authority network topology.")]
+        public NetworkTopologyTypes NetworkTopology;
+
+        /// <summary>
+        /// Internal flag for Cloud Multiplayer Build service integration
+        /// </summary>
+        [HideInInspector]
+        public bool UseCMBService;
+
+        /// <summary>
+        /// When enabled (default), the player prefab will automatically be spawned client-side upon the client being approved and synchronized
+        /// </summary>
+        [Tooltip("When enabled (default), the player prefab will automatically be spawned (client-side) upon the client being approved and synchronized.")]
+        public bool AutoSpawnPlayerPrefabClientSide = true;
+
+#if UNITY_EDITOR
+        /// <summary>
+        /// Creates a copy of the current <see cref="NetworkConfig"/>
+        /// </summary>
+        /// <returns>a copy of this <see cref="NetworkConfig"/></returns>
+        internal NetworkConfig Copy()
+        {
+            var networkConfig = new NetworkConfig()
+            {
+                ProtocolVersion = ProtocolVersion,
+                NetworkTransport = NetworkTransport,
+                TickRate = TickRate,
+                ClientConnectionBufferTimeout = ClientConnectionBufferTimeout,
+                ConnectionApproval = ConnectionApproval,
+                EnableTimeResync = EnableTimeResync,
+                TimeResyncInterval = TimeResyncInterval,
+                EnsureNetworkVariableLengthSafety = EnsureNetworkVariableLengthSafety,
+                EnableSceneManagement = EnableSceneManagement,
+                ForceSamePrefabs = ForceSamePrefabs,
+                RecycleNetworkIds = RecycleNetworkIds,
+                NetworkIdRecycleDelay = NetworkIdRecycleDelay,
+                RpcHashSize = RpcHashSize,
+                LoadSceneTimeOut = LoadSceneTimeOut,
+                SpawnTimeout = SpawnTimeout,
+                EnableNetworkLogs = EnableNetworkLogs,
+                NetworkTopology = NetworkTopology,
+                UseCMBService = UseCMBService,
+                AutoSpawnPlayerPrefabClientSide = AutoSpawnPlayerPrefabClientSide,
+#if MULTIPLAYER_TOOLS
+                NetworkMessageMetrics = NetworkMessageMetrics,
+#endif
+                NetworkProfilingMetrics = NetworkProfilingMetrics,
+            };
+
+            return networkConfig;
+        }
+
+#endif
+
+
+#if MULTIPLAYER_TOOLS
+        /// <summary>
+        /// Controls whether network messaging metrics will be gathered. (defaults to true)
+        /// There is a slight performance cost to having this enabled, and can increase in processing time based on network message traffic.
+        /// </summary>
+        /// <remarks>
+        /// The Realtime Network Stats Monitoring tool requires this to be enabled.
+        /// </remarks>
+        [Tooltip("Enable (default) if you want to gather messaging metrics. Realtime Network Stats Monitor requires this to be enabled. Disabling this can improve performance in release builds.")]
+        public bool NetworkMessageMetrics = true;
+#endif
+        /// <summary>
+        /// When enabled (default, this enables network profiling information. This does come with a per message processing cost.
+        /// Network profiling information is automatically disabled in release builds.
+        /// </summary>
+        [Tooltip("Enable (default) if you want to profile network messages with development builds and defaults to being disabled in release builds. When disabled, network messaging profiling will be disabled in development builds.")]
+        public bool NetworkProfilingMetrics = true;
+
+        /// <summary>
+        /// Invoked by <see cref="NetworkManager"/> when it is validated.
+        /// </summary>
+        /// <remarks>
+        /// Used to check for potential legacy values that have already been serialized and/or
+        /// runtime modifications to a property outside of the recommended range.
+        /// For each property checked below, provide a brief description of the reason.
+        /// </remarks>
+        internal void OnValidate()
+        {
+            // Legacy NGO versions defaulted this value to 1 second that has since been determiend
+            // any range less than 10 seconds can lead to dropped messages during scene events.
+            SpawnTimeout = Mathf.Clamp(SpawnTimeout, MinSpawnTimeout, MaxSpawnTimeout);
+        }
+
         /// <summary>
         /// Returns a base64 encoded version of the configuration
         /// </summary>
-        /// <returns></returns>
+        /// <returns>base64 encoded string containing the serialized network configuration</returns>
         public string ToBase64()
         {
             NetworkConfig config = this;
@@ -219,8 +323,8 @@ internal void ClearConfigHash()
         /// <summary>
         /// Gets a SHA256 hash of parts of the NetworkConfig instance
         /// </summary>
-        /// <param name="cache"></param>
-        /// <returns></returns>
+        /// <param name="cache">When true, caches the computed hash value for future retrievals, when false, always recomputes the hash</param>
+        /// <returns>A 64-bit hash value representing the configuration state</returns>
         public ulong GetConfig(bool cache = true)
         {
             if (m_ConfigHash != null && cache)
@@ -238,8 +342,8 @@ public ulong GetConfig(bool cache = true)
                 {
                     var sortedDictionary = Prefabs.NetworkPrefabOverrideLinks.OrderBy(x => x.Key);
                     foreach (var sortedEntry in sortedDictionary)
-
                     {
+                        Debug.Log($"[NetworkConfig] - GetConfig - [{sortedEntry.Key}={sortedEntry.Value.Prefab}]");
                         writer.WriteValueSafe(sortedEntry.Key);
                     }
                 }
@@ -264,8 +368,11 @@ public ulong GetConfig(bool cache = true)
         /// <summary>
         /// Compares a SHA256 hash with the current NetworkConfig instances hash
         /// </summary>
-        /// <param name="hash"></param>
-        /// <returns></returns>
+        /// <param name="hash">The 64-bit hash value to compare against this configuration's hash</param>
+        /// <returns>
+        /// True if the hashes match, indicating compatible configurations.
+        /// False if the hashes differ, indicating potentially incompatible configurations.
+        /// </returns>
         public bool CompareConfig(ulong hash)
         {
             return hash == GetConfig();
diff --git a/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkPrefab.cs b/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkPrefab.cs
index 9cc2158cc1..c6f30d2835 100644
--- a/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkPrefab.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkPrefab.cs
@@ -57,6 +57,11 @@ public class NetworkPrefab
         /// </summary>
         public GameObject OverridingTargetPrefab;
 
+        /// <summary>
+        /// Compares this NetworkPrefab with another to determine equality
+        /// </summary>
+        /// <param name="other">The NetworkPrefab to compare against</param>
+        /// <returns>True if all fields match between the two NetworkPrefabs, false otherwise</returns>
         public bool Equals(NetworkPrefab other)
         {
             return Override == other.Override &&
@@ -66,6 +71,12 @@ public bool Equals(NetworkPrefab other)
                    OverridingTargetPrefab == other.OverridingTargetPrefab;
         }
 
+        /// <summary>
+        /// Gets the GlobalObjectIdHash of the source prefab based on the current override settings
+        /// </summary>
+        /// <value>The hash value identifying the source prefab</value>
+        /// <exception cref="InvalidOperationException">Thrown when required prefab references are missing or invalid</exception>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when Override has an invalid value</exception>
         public uint SourcePrefabGlobalObjectIdHash
         {
             get
@@ -98,6 +109,12 @@ public uint SourcePrefabGlobalObjectIdHash
             }
         }
 
+        /// <summary>
+        /// Gets the GlobalObjectIdHash of the target prefab when using prefab overrides
+        /// </summary>
+        /// <value>The hash value identifying the target prefab, or 0 if no override is set</value>
+        /// <exception cref="InvalidOperationException">Thrown when required prefab references are missing or invalid</exception>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when Override has an invalid value</exception>
         public uint TargetPrefabGlobalObjectIdHash
         {
             get
@@ -122,6 +139,11 @@ public uint TargetPrefabGlobalObjectIdHash
             }
         }
 
+        /// <summary>
+        /// Validates the NetworkPrefab configuration to ensure all required fields are properly set
+        /// </summary>
+        /// <param name="index">Optional index used for error reporting when validating lists of prefabs</param>
+        /// <returns>True if the NetworkPrefab is valid and ready for use, false otherwise</returns>
         public bool Validate(int index = -1)
         {
             NetworkObject networkObject;
@@ -224,6 +246,10 @@ public bool Validate(int index = -1)
             return true;
         }
 
+        /// <summary>
+        /// Returns a string representation of this NetworkPrefab's source and target hash values
+        /// </summary>
+        /// <returns>A string containing the source and target hash values</returns>
         public override string ToString()
         {
             return $"{{SourceHash: {SourceHashToOverride}, TargetHash: {TargetPrefabGlobalObjectIdHash}}}";
diff --git a/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkPrefabs.cs b/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkPrefabs.cs
index 42758f7e78..e438426758 100644
--- a/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkPrefabs.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkPrefabs.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using TrollKing.Core;
 using UnityEngine;
 
 namespace Unity.Netcode
@@ -13,6 +14,8 @@ namespace Unity.Netcode
     [Serializable]
     public class NetworkPrefabs
     {
+        private static readonly NetworkLogScope k_Log = new NetworkLogScope(nameof(NetworkPrefabs));
+
         /// <summary>
         /// Edit-time scripted object containing a list of NetworkPrefabs.
         /// </summary>
@@ -39,6 +42,9 @@ public class NetworkPrefabs
         [NonSerialized]
         public Dictionary<uint, uint> OverrideToNetworkPrefab = new Dictionary<uint, uint>();
 
+        /// <summary>
+        /// Gets the read-only list of all registered network prefabs
+        /// </summary>
         public IReadOnlyList<NetworkPrefab> Prefabs => m_Prefabs;
 
         [NonSerialized]
@@ -49,6 +55,7 @@ public class NetworkPrefabs
 
         private void AddTriggeredByNetworkPrefabList(NetworkPrefab networkPrefab)
         {
+            k_Log.Debug(() => $"NetworkPrefabs AddTriggeredByNetworkPrefabList [networkPrefab={networkPrefab}]");
             if (AddPrefabRegistration(networkPrefab))
             {
                 // Don't add this to m_RuntimeAddedPrefabs
@@ -59,9 +66,13 @@ private void AddTriggeredByNetworkPrefabList(NetworkPrefab networkPrefab)
 
         private void RemoveTriggeredByNetworkPrefabList(NetworkPrefab networkPrefab)
         {
+            k_Log.Debug(() => $"NetworkPrefabs RemoveTriggeredByNetworkPrefabList [networkPrefab={networkPrefab}]");
             m_Prefabs.Remove(networkPrefab);
         }
 
+        /// <summary>
+        /// Finalizer that ensures proper cleanup of network prefab resources
+        /// </summary>
         ~NetworkPrefabs()
         {
             Shutdown();
@@ -84,8 +95,10 @@ internal void Shutdown()
         /// Processes the <see cref="NetworkPrefabsList"/> if one is present for use during runtime execution,
         /// else processes <see cref="Prefabs"/>.
         /// </summary>
+        /// <param name="warnInvalid">When true, logs warnings about invalid prefabs that are removed during initialization</param>
         public void Initialize(bool warnInvalid = true)
         {
+            k_Log.Debug(() => $"NetworkPrefabs Initialize [warnInvalid={warnInvalid}]");
             m_Prefabs.Clear();
             foreach (var list in NetworkPrefabsLists)
             {
@@ -104,6 +117,8 @@ public void Initialize(bool warnInvalid = true)
                 {
                     foreach (var networkPrefab in list.PrefabList)
                     {
+                        var netObj = networkPrefab.Prefab.GetComponent<NetworkObject>();
+                        k_Log.Debug(() => $"NetworkPrefabs Add networkPrefab [networkPrefab={networkPrefab}] [prefab={networkPrefab.Prefab}] [prefabHash={netObj.PrefabIdHash}] [globalHash={netObj.GlobalObjectIdHash}]");
                         prefabs.Add(networkPrefab);
                     }
                 }
@@ -156,6 +171,8 @@ public void Initialize(bool warnInvalid = true)
         /// <summary>
         /// Add a new NetworkPrefab instance to the list
         /// </summary>
+        /// <param name="networkPrefab">The NetworkPrefab to add</param>
+        /// <returns>True if the prefab was successfully added, false if it was invalid or already registered</returns>
         /// <remarks>
         /// The framework does not synchronize this list between clients. Any runtime changes must be handled manually.
         ///
@@ -177,6 +194,7 @@ public bool Add(NetworkPrefab networkPrefab)
         /// <summary>
         /// Remove a NetworkPrefab instance from the list
         /// </summary>
+        /// <param name="prefab">The NetworkPrefab to remove</param>
         /// <remarks>
         /// The framework does not synchronize this list between clients. Any runtime changes must be handled manually.
         ///
@@ -199,6 +217,7 @@ public void Remove(NetworkPrefab prefab)
         /// <summary>
         /// Remove a NetworkPrefab instance with matching <see cref="NetworkPrefab.Prefab"/> from the list
         /// </summary>
+        /// <param name="prefab">The GameObject to match against for removal</param>
         /// <remarks>
         /// The framework does not synchronize this list between clients. Any runtime changes must be handled manually.
         ///
@@ -277,9 +296,19 @@ private bool AddPrefabRegistration(NetworkPrefab networkPrefab)
             {
                 return false;
             }
+
+            var netObj = networkPrefab.Prefab.GetComponent<NetworkObject>();
+            if (netObj)
+            {
+                k_Log.Debug(() => $"NetworkPrefabs AddPrefabRegistration [prefab={networkPrefab.Prefab.name}] [networkPrefab={networkPrefab}] [hash={netObj.PrefabIdHash}] [global={netObj.GlobalObjectIdHash}]");
+            }
+
+
+
             // Safeguard validation check since this method is called from outside of NetworkConfig and we can't control what's passed in.
             if (!networkPrefab.Validate())
             {
+                Debug.LogError($"NetworkPrefabs AddPrefabRegistration INVALID [networkPrefab={networkPrefab}]");
                 return false;
             }
 
@@ -292,7 +321,7 @@ private bool AddPrefabRegistration(NetworkPrefab networkPrefab)
                 var networkObject = networkPrefab.Prefab.GetComponent<NetworkObject>();
 
                 // This should never happen, but in the case it somehow does log an error and remove the duplicate entry
-                Debug.LogError($"{nameof(NetworkPrefab)} ({networkObject.name}) has a duplicate {nameof(NetworkObject.GlobalObjectIdHash)} source entry value of: {source}!");
+                Debug.LogError($"NetworkPrefabs {nameof(NetworkPrefab)} ({networkObject.name}) has a duplicate {nameof(NetworkObject.GlobalObjectIdHash)} source entry value of: {source}!");
                 return false;
             }
 
@@ -300,6 +329,7 @@ private bool AddPrefabRegistration(NetworkPrefab networkPrefab)
             if (networkPrefab.Override == NetworkPrefabOverride.None)
             {
                 NetworkPrefabOverrideLinks.Add(source, networkPrefab);
+                k_Log.Debug(() => $"NetworkPrefabs AddPrefabRegistration NetworkPrefabOverrideLinks [prefab={networkPrefab.Prefab.name}] [source={source}] [networkPrefab={networkPrefab}]");
                 return true;
             }
 
diff --git a/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkPrefabsList.cs b/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkPrefabsList.cs
index 1c4719120a..5003a2fe4e 100644
--- a/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkPrefabsList.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Configuration/NetworkPrefabsList.cs
@@ -38,7 +38,7 @@ public class NetworkPrefabsList : ScriptableObject
         /// Adds a prefab to the prefab list. Performing this here will apply the operation to all
         /// <see cref="NetworkManager"/>s that reference this list.
         /// </summary>
-        /// <param name="prefab"></param>
+        /// <param name="prefab">The NetworkPrefab to add to the shared list</param>
         public void Add(NetworkPrefab prefab)
         {
             List.Add(prefab);
@@ -49,7 +49,7 @@ public void Add(NetworkPrefab prefab)
         /// Removes a prefab from the prefab list. Performing this here will apply the operation to all
         /// <see cref="NetworkManager"/>s that reference this list.
         /// </summary>
-        /// <param name="prefab"></param>
+        /// <param name="prefab">The NetworkPrefab to remove from the shared list</param>
         public void Remove(NetworkPrefab prefab)
         {
             List.Remove(prefab);
diff --git a/com.unity.netcode.gameobjects/Runtime/Configuration/SessionConfig.cs b/com.unity.netcode.gameobjects/Runtime/Configuration/SessionConfig.cs
new file mode 100644
index 0000000000..9a4ed0a931
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Configuration/SessionConfig.cs
@@ -0,0 +1,59 @@
+namespace Unity.Netcode
+{
+    internal class SessionConfig
+    {
+        /// <summary>
+        /// The running list of session versions
+        /// </summary>
+        public const uint NoFeatureCompatibility = 0;
+        public const uint BypassFeatureCompatible = 1;
+        public const uint ServerDistributionCompatible = 2;
+        public const uint SessionStateToken = 3;
+
+        // The most current session version (!!!!set this when you increment!!!!!)
+        public static uint PackageSessionVersion => SessionStateToken;
+
+        internal uint SessionVersion;
+
+        public bool ServiceSideDistribution;
+
+
+        /// <summary>
+        /// Service to client
+        /// Set when the client receives a <see cref="ConnectionApprovedMessage"/>
+        /// </summary>
+        /// <param name="serviceConfig">the session's settings</param>
+        public SessionConfig(ServiceConfig serviceConfig)
+        {
+            SessionVersion = serviceConfig.SessionVersion;
+            ServiceSideDistribution = serviceConfig.ServerRedistribution;
+        }
+
+        /// <summary>
+        /// Can be used to directly set the version.
+        /// </summary>
+        /// <remarks>
+        /// If a client connects that does not support session configuration then
+        /// this will be invoked. The default values set in the constructor should
+        /// assume that no features are available.
+        /// Can also be used for mock/integration testing version handling.
+        /// </remarks>
+        /// <param name="version">version to set</param>
+        public SessionConfig(uint version)
+        {
+            SessionVersion = version;
+            ServiceSideDistribution = false;
+        }
+
+        /// <summary>
+        /// Client to Service
+        /// Default package constructor set when <see cref="NetworkManager.Initialize(bool)"/> is invoked.
+        /// </summary>
+        public SessionConfig()
+        {
+            // The current
+            SessionVersion = PackageSessionVersion;
+            ServiceSideDistribution = false;
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Runtime/Configuration/SessionConfig.cs.meta b/com.unity.netcode.gameobjects/Runtime/Configuration/SessionConfig.cs.meta
new file mode 100644
index 0000000000..bb361b9657
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Configuration/SessionConfig.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: e0512e5a3e1dc484bbbf98c03a574645
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Runtime/Connection/NetworkClient.cs b/com.unity.netcode.gameobjects/Runtime/Connection/NetworkClient.cs
index 370f651a8b..eefe269ca4 100644
--- a/com.unity.netcode.gameobjects/Runtime/Connection/NetworkClient.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Connection/NetworkClient.cs
@@ -1,7 +1,8 @@
-using System.Collections.Generic;
+using UnityEngine;
 
 namespace Unity.Netcode
 {
+
     /// <summary>
     /// A NetworkClient
     /// </summary>
@@ -33,6 +34,21 @@ public class NetworkClient
         /// </summary>
         internal bool IsApproved { get; set; }
 
+        /// <summary>
+        /// Defines the network topology type being used for the current network session
+        /// </summary>
+        public NetworkTopologyTypes NetworkTopologyType { get; internal set; }
+
+        /// <summary>
+        /// Indicates whether this client is running in Distributed Authority Host mode
+        /// </summary>
+        public bool DAHost { get; internal set; }
+
+        /// <summary>
+        /// Is true when the client has been assigned session ownership in distributed authority mode
+        /// </summary>
+        public bool IsSessionOwner { get; internal set; }
+
         /// <summary>
         /// The ClientId of the NetworkClient
         /// </summary>
@@ -44,27 +60,60 @@ public class NetworkClient
         public NetworkObject PlayerObject;
 
         /// <summary>
-        /// The list of NetworkObject's owned by this client instance
+        /// The NetworkObject's owned by this client instance
         /// </summary>
-        public List<NetworkObject> OwnedObjects => IsConnected ? SpawnManager.GetClientOwnedObjects(ClientId) : new List<NetworkObject>();
+        public NetworkObject[] OwnedObjects => IsConnected ? SpawnManager.GetClientOwnedObjects(ClientId) : new NetworkObject[] { };
 
         internal NetworkSpawnManager SpawnManager { get; private set; }
 
-        internal void SetRole(bool isServer, bool isClient, NetworkManager networkManager = null)
+        internal bool SetRole(bool isServer, bool isClient, NetworkManager networkManager = null)
         {
+            ResetClient(isServer, isClient);
+
             IsServer = isServer;
             IsClient = isClient;
-            if (!IsServer && !isClient)
+
+            if (networkManager != null)
+            {
+                SpawnManager = networkManager.SpawnManager;
+                NetworkTopologyType = networkManager.NetworkConfig.NetworkTopology;
+
+                if (NetworkTopologyType == NetworkTopologyTypes.DistributedAuthority)
+                {
+                    DAHost = IsClient && IsServer;
+
+                    // DANGO-TODO: We might allow a dedicated mock CMB server, but for now do not allow this
+                    if (!IsClient && IsServer)
+                    {
+                        Debug.LogError("You cannot start NetworkManager as a server when operating in distributed authority mode!");
+                        return false;
+                    }
+
+                    if (DAHost && networkManager.CMBServiceConnection)
+                    {
+                        Debug.LogError("You cannot start a host when connecting to a distributed authority CMB Service!");
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Only to be invoked when setting the role.
+        /// This resets the current NetworkClient's properties.
+        /// </summary>
+        private void ResetClient(bool isServer, bool isClient)
+        {
+            // If we are niether client nor server, then reset properties (i.e. client has no role)
+            if (!IsServer && !IsClient)
             {
                 PlayerObject = null;
                 ClientId = 0;
                 IsConnected = false;
                 IsApproved = false;
-            }
-
-            if (networkManager != null)
-            {
-                SpawnManager = networkManager.SpawnManager;
+                SpawnManager = null;
+                DAHost = false;
             }
         }
 
diff --git a/com.unity.netcode.gameobjects/Runtime/Connection/NetworkConnectionManager.cs b/com.unity.netcode.gameobjects/Runtime/Connection/NetworkConnectionManager.cs
index 270c33257a..dbdff3ca2b 100644
--- a/com.unity.netcode.gameobjects/Runtime/Connection/NetworkConnectionManager.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Connection/NetworkConnectionManager.cs
@@ -1,26 +1,68 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using System.Runtime.CompilerServices;
 using Unity.Collections;
 using Unity.Collections.LowLevel.Unsafe;
 using Unity.Profiling;
 using UnityEngine;
-using Object = UnityEngine.Object;
 
 namespace Unity.Netcode
 {
-
+    /// <summary>
+    /// The connection event type set within <see cref="ConnectionEventData"/> to signify the type of connection event notification received.
+    /// </summary>
+    /// <remarks>
+    /// <see cref="ConnectionEventData"/> is returned as a parameter of the <see cref="NetworkManager.OnConnectionEvent"/> event notification.
+    /// <see cref="ClientConnected"/> and <see cref="ClientDisconnected"/> event types occur on the client-side of the newly connected client and on the server-side. <br />
+    /// <see cref="PeerConnected"/> and <see cref="PeerDisconnected"/> event types occur on connected clients to notify that a new client (peer) has joined/connected.
+    /// </remarks>
     public enum ConnectionEvent
     {
+        /// <summary>
+        /// This event is set on the client-side of the newly connected client and on the server-side.<br />
+        /// </summary>
+        /// <remarks>
+        /// On the newly connected client side, the <see cref="ConnectionEventData.ClientId"/> will be the <see cref="NetworkManager.LocalClientId"/>.<br />
+        /// On the server side, the <see cref="ConnectionEventData.ClientId"/> will be the ID of the client that just connected.
+        /// </remarks>
         ClientConnected,
+        /// <summary>
+        /// This event is set on clients that are already connected to the session.
+        /// </summary>
+        /// <remarks>
+        /// The <see cref="ConnectionEventData.ClientId"/> will be the ID of the client that just connected.
+        /// </remarks>
         PeerConnected,
+        /// <summary>
+        /// This event is set on the client-side of the client that disconnected client and on the server-side.
+        /// </summary>
+        /// <remarks>
+        /// On the disconnected client side, the <see cref="ConnectionEventData.ClientId"/> will be the <see cref="NetworkManager.LocalClientId"/>.<br />
+        /// On the server side, this will be the ID of the client that disconnected.
+        /// </remarks>
         ClientDisconnected,
+        /// <summary>
+        /// This event is set on clients that are already connected to the session.
+        /// </summary>
+        /// <remarks>
+        /// The <see cref="ConnectionEventData.ClientId"/> will be the ID of the client that just disconnected.
+        /// </remarks>
         PeerDisconnected
     }
 
+    /// <summary>
+    /// Returned as a parameter of the <see cref="NetworkManager.OnConnectionEvent"/> event notification.
+    /// </summary>
+    /// <remarks>
+    /// See <see cref="ConnectionEvent"/> for more details on the types of connection events received.
+    /// </remarks>
     public struct ConnectionEventData
     {
+        /// <summary>
+        /// The type of connection event that occurred
+        /// </summary>
         public ConnectionEvent EventType;
 
         /// <summary>
@@ -104,6 +146,8 @@ internal void InvokeOnClientConnectedCallback(ulong clientId)
                     {
                         continue;
                     }
+
+                    // This assures if the server has not timed out prior to the client synchronizing that it doesn't exceed the allocated peer count.
                     if (peerClientIds.Length > idx)
                     {
                         peerClientIds[idx] = peerId;
@@ -368,6 +412,10 @@ internal void PollAndHandleNetworkEvents()
             {
                 networkEvent = NetworkManager.NetworkConfig.NetworkTransport.PollEvent(out ulong transportClientId, out ArraySegment<byte> payload, out float receiveTime);
                 HandleNetworkEvent(networkEvent, transportClientId, payload, receiveTime);
+                if (networkEvent == NetworkEvent.Disconnect || networkEvent == NetworkEvent.TransportFailure)
+                {
+                    break;
+                }
                 // Only do another iteration if: there are no more messages AND (there is no limit to max events or we have processed less than the maximum)
             } while (NetworkManager.IsListening && networkEvent != NetworkEvent.Nothing);
 
@@ -432,16 +480,17 @@ internal void ConnectEventHandler(ulong transportClientId)
             {
                 if (NetworkLog.CurrentLogLevel <= LogLevel.Developer)
                 {
-                    NetworkLog.LogInfo("Client Connected");
+                    var hostServer = NetworkManager.IsHost ? "Host" : "Server";
+                    NetworkLog.LogInfo($"[{hostServer}-Side] Transport connection established with pending Client-{clientId}.");
                 }
-
                 AddPendingClient(clientId);
             }
             else
             {
                 if (NetworkLog.CurrentLogLevel <= LogLevel.Developer)
                 {
-                    NetworkLog.LogInfo("Connected");
+                    var serverOrService = NetworkManager.DistributedAuthorityMode ? NetworkManager.CMBServiceConnection ? "service" : "DAHost" : "server";
+                    NetworkLog.LogInfo($"[Approval Pending][Client] Transport connection with {serverOrService} established! Awaiting connection approval...");
                 }
 
                 SendConnectionRequest();
@@ -520,15 +569,6 @@ internal void DisconnectEventHandler(ulong transportClientId)
                     NetworkManager.Shutdown(true);
                 }
             }
-
-            if (NetworkManager.IsServer)
-            {
-                MessageManager.ClientDisconnected(clientId);
-            }
-            else
-            {
-                MessageManager.ClientDisconnected(NetworkManager.ServerClientId);
-            }
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
             s_TransportDisconnect.End();
 #endif
@@ -565,6 +605,7 @@ private void SendConnectionRequest()
         {
             var message = new ConnectionRequestMessage
             {
+                DistributedAuthority = NetworkManager.DistributedAuthorityMode,
                 // Since only a remote client will send a connection request, we should always force the rebuilding of the NetworkConfig hash value
                 ConfigHash = NetworkManager.NetworkConfig.GetConfig(false),
                 ShouldSendConnectionData = NetworkManager.NetworkConfig.ConnectionApproval,
@@ -572,6 +613,13 @@ private void SendConnectionRequest()
                 MessageVersions = new NativeArray<MessageVersionData>(MessageManager.MessageHandlers.Length, Allocator.Temp)
             };
 
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                message.ClientConfig.SessionConfig = NetworkManager.SessionConfig;
+                message.ClientConfig.TickRate = NetworkManager.NetworkConfig.TickRate;
+                message.ClientConfig.EnableSceneManagement = NetworkManager.NetworkConfig.EnableSceneManagement;
+            }
+
             for (int index = 0; index < MessageManager.MessageHandlers.Length; index++)
             {
                 if (MessageManager.MessageTypes[index] != null)
@@ -720,6 +768,12 @@ internal void ProcessPendingApprovals()
             }
         }
 
+        /// <summary>
+        /// Adding this because message hooks cannot happen fast enough under certain scenarios
+        /// where the message is sent and responded to before the hook is in place.
+        /// </summary>
+        internal bool MockSkippingApproval;
+
         /// <summary>
         /// Server Side: Handles the approval of a client
         /// </summary>
@@ -731,15 +785,21 @@ internal void HandleConnectionApproval(ulong ownerClientId, NetworkManager.Conne
             LocalClient.IsApproved = response.Approved;
             if (response.Approved)
             {
+                if (NetworkLog.CurrentLogLevel <= LogLevel.Developer)
+                {
+                    NetworkLog.LogInfo($"[Server-Side] Pending Client-{ownerClientId} connection approved!");
+                }
                 // The client was approved, stop the server-side approval time out coroutine
                 RemovePendingClient(ownerClientId);
 
                 var client = AddClient(ownerClientId);
 
-                if (response.CreatePlayerObject && (response.PlayerPrefabHash.HasValue || NetworkManager.NetworkConfig.PlayerPrefab != null))
+                // Server-side spawning (only if there is a prefab hash or player prefab provided)
+                if (!NetworkManager.DistributedAuthorityMode && response.CreatePlayerObject && (response.PlayerPrefabHash.HasValue || NetworkManager.NetworkConfig.PlayerPrefab != null))
                 {
                     var playerObject = response.PlayerPrefabHash.HasValue ? NetworkManager.SpawnManager.GetNetworkObjectToSpawn(response.PlayerPrefabHash.Value, ownerClientId, response.Position ?? null, response.Rotation ?? null)
-                        : NetworkManager.SpawnManager.GetNetworkObjectToSpawn(NetworkManager.NetworkConfig.PlayerPrefab.GetComponent<NetworkObject>().GlobalObjectIdHash, ownerClientId, response.Position ?? null, response.Rotation ?? null);
+                    : NetworkManager.SpawnManager.GetNetworkObjectToSpawn(NetworkManager.NetworkConfig.PlayerPrefab.GetComponent<NetworkObject>().GlobalObjectIdHash, ownerClientId, response.Position ?? null, response.Rotation ?? null);
+
                     // Spawn the player NetworkObject locally
                     NetworkManager.SpawnManager.SpawnNetworkObjectLocally(
                         playerObject,
@@ -759,6 +819,7 @@ internal void HandleConnectionApproval(ulong ownerClientId, NetworkManager.Conne
                     {
                         OwnerClientId = ownerClientId,
                         NetworkTick = NetworkManager.LocalTime.Tick,
+                        IsDistributedAuthority = NetworkManager.DistributedAuthorityMode,
                         ConnectedClientIds = new NativeArray<ulong>(ConnectedClientIds.Count, Allocator.Temp)
                     };
 
@@ -792,10 +853,20 @@ internal void HandleConnectionApproval(ulong ownerClientId, NetworkManager.Conne
                             };
                         }
                     }
-
-                    SendMessage(ref message, NetworkDelivery.ReliableFragmentedSequenced, ownerClientId);
+                    if (!MockSkippingApproval)
+                    {
+                        SendMessage(ref message, NetworkDelivery.ReliableFragmentedSequenced, ownerClientId);
+                    }
+                    else
+                    {
+                        NetworkLog.LogInfo("Mocking server not responding with connection approved...");
+                    }
                     message.MessageVersions.Dispose();
                     message.ConnectedClientIds.Dispose();
+                    if (MockSkippingApproval)
+                    {
+                        return;
+                    }
 
                     // If scene management is disabled, then we are done and notify the local host-server the client is connected
                     if (!NetworkManager.NetworkConfig.EnableSceneManagement)
@@ -806,10 +877,19 @@ internal void HandleConnectionApproval(ulong ownerClientId, NetworkManager.Conne
                         {
                             InvokeOnPeerConnectedCallback(ownerClientId);
                         }
+                        NetworkManager.SpawnManager.DistributeNetworkObjects(ownerClientId);
+
                     }
                     else // Otherwise, let NetworkSceneManager handle the initial scene and NetworkObject synchronization
                     {
-                        NetworkManager.SceneManager.SynchronizeNetworkObjects(ownerClientId);
+                        if (NetworkManager.DistributedAuthorityMode && NetworkManager.LocalClient.IsSessionOwner)
+                        {
+                            NetworkManager.SceneManager.SynchronizeNetworkObjects(ownerClientId);
+                        }
+                        else if (!NetworkManager.DistributedAuthorityMode)
+                        {
+                            NetworkManager.SceneManager.SynchronizeNetworkObjects(ownerClientId);
+                        }
                     }
                 }
                 else // Server just adds itself as an observer to all spawned NetworkObjects
@@ -817,13 +897,30 @@ internal void HandleConnectionApproval(ulong ownerClientId, NetworkManager.Conne
                     LocalClient = client;
                     NetworkManager.SpawnManager.UpdateObservedNetworkObjects(ownerClientId);
                     LocalClient.IsConnected = true;
+                    // If running mock service, then set the instance as the default session owner
+                    if (NetworkManager.DistributedAuthorityMode && NetworkManager.DAHost)
+                    {
+                        NetworkManager.SetSessionOwner(NetworkManager.LocalClientId);
+                        NetworkManager.SceneManager.InitializeScenesLoaded();
+                    }
+
+                    if (NetworkManager.DistributedAuthorityMode && NetworkManager.AutoSpawnPlayerPrefabClientSide)
+                    {
+                        CreateAndSpawnPlayer(ownerClientId);
+                    }
                 }
 
+                // Exit early if no player object was spawned
                 if (!response.CreatePlayerObject || (response.PlayerPrefabHash == null && NetworkManager.NetworkConfig.PlayerPrefab == null))
                 {
                     return;
                 }
 
+                // Players are always spawned by their respective client, exit early. (DAHost mode anyway, CMB Service will never spawn player prefab)
+                if (NetworkManager.DistributedAuthorityMode)
+                {
+                    return;
+                }
                 // Separating this into a contained function call for potential further future separation of when this notification is sent.
                 ApprovedPlayerSpawn(ownerClientId, response.PlayerPrefabHash ?? NetworkManager.NetworkConfig.PlayerPrefab.GetComponent<NetworkObject>().GlobalObjectIdHash);
             }
@@ -838,11 +935,28 @@ internal void HandleConnectionApproval(ulong ownerClientId, NetworkManager.Conne
                     SendMessage(ref disconnectReason, NetworkDelivery.Reliable, ownerClientId);
                     MessageManager.ProcessSendQueues();
                 }
-
                 DisconnectRemoteClient(ownerClientId);
             }
         }
 
+        /// <summary>
+        /// Client-Side Spawning in distributed authority mode uses this to spawn the player.
+        /// </summary>
+        internal void CreateAndSpawnPlayer(ulong ownerId)
+        {
+            if (NetworkManager.DistributedAuthorityMode && NetworkManager.AutoSpawnPlayerPrefabClientSide)
+            {
+                var playerPrefab = NetworkManager.FetchLocalPlayerPrefabToSpawn();
+                if (playerPrefab != null)
+                {
+                    var globalObjectIdHash = playerPrefab.GetComponent<NetworkObject>().GlobalObjectIdHash;
+                    var networkObject = NetworkManager.SpawnManager.GetNetworkObjectToSpawn(globalObjectIdHash, ownerId, playerPrefab.transform.position, playerPrefab.transform.rotation);
+                    networkObject.IsSceneObject = false;
+                    networkObject.SpawnAsPlayerObject(ownerId, networkObject.DestroyWithScene);
+                }
+            }
+        }
+
         /// <summary>
         /// Spawns the newly approved player
         /// </summary>
@@ -862,8 +976,10 @@ internal void ApprovedPlayerSpawn(ulong clientId, uint playerPrefabHash)
 
                 var message = new CreateObjectMessage
                 {
-                    ObjectInfo = ConnectedClients[clientId].PlayerObject.GetMessageSceneObject(clientPair.Key)
+                    ObjectInfo = ConnectedClients[clientId].PlayerObject.GetMessageSceneObject(clientPair.Key),
+                    IncludesSerializedObject = true,
                 };
+
                 message.ObjectInfo.Hash = playerPrefabHash;
                 message.ObjectInfo.IsSceneObject = false;
                 message.ObjectInfo.HasParent = false;
@@ -881,25 +997,108 @@ internal void ApprovedPlayerSpawn(ulong clientId, uint playerPrefabHash)
         /// </summary>
         internal NetworkClient AddClient(ulong clientId)
         {
+            if (ConnectedClients.ContainsKey(clientId) && ConnectedClientIds.Contains(clientId) && ConnectedClientsList.Contains(ConnectedClients[clientId]))
+            {
+                return ConnectedClients[clientId];
+            }
+
             var networkClient = LocalClient;
 
-            networkClient = new NetworkClient();
+            // If this is not the local client then create a new one
+            if (clientId != NetworkManager.LocalClientId)
+            {
+                networkClient = new NetworkClient();
+            }
             networkClient.SetRole(clientId == NetworkManager.ServerClientId, isClient: true, NetworkManager);
             networkClient.ClientId = clientId;
+            if (!ConnectedClients.ContainsKey(clientId))
+            {
+                ConnectedClients.Add(clientId, networkClient);
+            }
+            if (!ConnectedClientsList.Contains(networkClient))
+            {
+                ConnectedClientsList.Add(networkClient);
+            }
+
+            if (NetworkManager.LocalClientId != clientId)
+            {
+                if ((!NetworkManager.DistributedAuthorityMode && NetworkManager.IsServer) ||
+                    (NetworkManager.DistributedAuthorityMode && NetworkManager.NetworkConfig.EnableSceneManagement && NetworkManager.DAHost && NetworkManager.LocalClient.IsSessionOwner))
+                {
+                    var message = new ClientConnectedMessage { ClientId = clientId };
+                    NetworkManager.MessageManager.SendMessage(ref message, NetworkDelivery.ReliableSequenced, ConnectedClientIds.Where((c) => c != NetworkManager.LocalClientId).ToArray());
+                }
+                else if (NetworkManager.DistributedAuthorityMode && NetworkManager.NetworkConfig.EnableSceneManagement && NetworkManager.DAHost && !NetworkManager.LocalClient.IsSessionOwner)
+                {
+                    var message = new ClientConnectedMessage
+                    {
+                        ShouldSynchronize = true,
+                        ClientId = clientId
+                    };
+                    NetworkManager.MessageManager.SendMessage(ref message, NetworkDelivery.ReliableSequenced, NetworkManager.CurrentSessionOwner);
+                }
+            }
+            if (!ConnectedClientIds.Contains(clientId))
+            {
+                ConnectedClientIds.Add(clientId);
+            }
+
+            var distributedAuthority = NetworkManager.DistributedAuthorityMode;
+
+            // If not using DA return early or if using DA and scene management is disabled then exit early Since we use NetworkShow to spawn
+            // objects on the newly connected client side.
+            if (!distributedAuthority || distributedAuthority && !NetworkManager.NetworkConfig.EnableSceneManagement)
+            {
+                return networkClient;
+            }
 
-            ConnectedClients.Add(clientId, networkClient);
-            ConnectedClientsList.Add(networkClient);
-            ConnectedClientIds.Add(clientId);
-            // Host should not send this message to itself
-            if (clientId != NetworkManager.ServerClientId)
+            var sessionOwnerId = NetworkManager.CurrentSessionOwner;
+            var isSessionOwner = NetworkManager.LocalClient.IsSessionOwner;
+            foreach (var networkObject in NetworkManager.SpawnManager.SpawnedObjectsList)
             {
-                var message = new ClientConnectedMessage { ClientId = clientId };
-                NetworkManager.MessageManager.SendMessage(ref message, NetworkDelivery.ReliableFragmentedSequenced, ConnectedClientIds);
+                if (networkObject.SpawnWithObservers)
+                {
+                    // Don't add the client to the observers if hidden from the session owner
+                    if (networkObject.IsOwner && distributedAuthority && !isSessionOwner && !networkObject.Observers.Contains(sessionOwnerId))
+                    {
+                        continue;
+                    }
+                    networkObject.Observers.Add(clientId);
+                }
             }
 
             return networkClient;
         }
 
+        /// <summary>
+        /// Invoked on clients when another client disconnects
+        /// </summary>
+        /// <param name="clientId">the client identifier to remove</param>
+        internal void RemoveClient(ulong clientId)
+        {
+            if (ConnectedClientIds.Contains(clientId))
+            {
+                ConnectedClientIds.Remove(clientId);
+            }
+            if (ConnectedClients.ContainsKey(clientId))
+            {
+                ConnectedClientsList.Remove(ConnectedClients[clientId]);
+            }
+
+            ConnectedClients.Remove(clientId);
+
+            foreach (var networkObject in NetworkManager.SpawnManager.SpawnedObjectsList)
+            {
+                networkObject.Observers.Remove(clientId);
+            }
+        }
+
+        /// <summary>
+        /// DANGO-TODO: Until we have the CMB Server end-to-end with all features verified working via integration tests,
+        /// I am keeping this debug toggle available. (NSS)
+        /// </summary>
+        internal bool EnableDistributeLogging;
+
         /// <summary>
         /// Server-Side:
         /// Invoked when a client is disconnected from a server-host
@@ -926,15 +1125,36 @@ internal void OnClientDisconnectFromServer(ulong clientId)
                 {
                     if (!playerObject.DontDestroyWithOwner)
                     {
-                        if (NetworkManager.PrefabHandler.ContainsHandler(ConnectedClients[clientId].PlayerObject.GlobalObjectIdHash))
+                        // If a player NetworkObject is being despawned, make sure to remove all children if they are marked to not be destroyed
+                        // with the owner.
+                        if (NetworkManager.DAHost)
                         {
-                            NetworkManager.PrefabHandler.HandleNetworkPrefabDestroy(ConnectedClients[clientId].PlayerObject);
+                            // Remove any children from the player object if they are not going to be destroyed with the owner
+                            var childNetworkObjects = playerObject.GetComponentsInChildren<NetworkObject>();
+                            foreach (var child in childNetworkObjects)
+                            {
+                                // TODO: We have always just removed all children, but we might think about changing this to preserve the nested child hierarchy.
+                                if (child.DontDestroyWithOwner && child.transform.transform.parent)
+                                {
+                                    // If we are here, then we are running in DAHost mode and have the authority to remove the child from its parent
+                                    child.AuthorityAppliedParenting = true;
+                                    child.TryRemoveParentCachedWorldPositionStays();
+                                }
+                            }
+                        }
+
+                        if (NetworkManager.PrefabHandler.ContainsHandler(playerObject.GlobalObjectIdHash))
+                        {
+                            // Despawn but don't destroy. DA Host will act like the service and send despawn notifications.
+                            NetworkManager.SpawnManager.DespawnObject(playerObject, false, NetworkManager.DistributedAuthorityMode);
+                            // Let the prefab handler determine if it will be destroyed
+                            NetworkManager.PrefabHandler.HandleNetworkPrefabDestroy(playerObject);
                         }
                         else if (playerObject.IsSpawned)
                         {
                             // Call despawn to assure NetworkBehaviour.OnNetworkDespawn is invoked on the server-side (when the client side disconnected).
                             // This prevents the issue (when just destroying the GameObject) where any NetworkBehaviour component(s) destroyed before the NetworkObject would not have OnNetworkDespawn invoked.
-                            NetworkManager.SpawnManager.DespawnObject(playerObject, true);
+                            NetworkManager.SpawnManager.DespawnObject(playerObject, true, NetworkManager.DistributedAuthorityMode);
                         }
                     }
                     else if (!NetworkManager.ShutdownInProgress)
@@ -944,36 +1164,134 @@ internal void OnClientDisconnectFromServer(ulong clientId)
                 }
 
                 // Get the NetworkObjects owned by the disconnected client
-                var clientOwnedObjects = NetworkManager.SpawnManager.GetClientOwnedObjects(clientId);
-                if (clientOwnedObjects == null)
-                {
-                    // This could happen if a client is never assigned a player object and is disconnected
-                    // Only log this in verbose/developer mode
-                    if (NetworkManager.LogLevel == LogLevel.Developer)
-                    {
-                        NetworkLog.LogWarning($"ClientID {clientId} disconnected with (0) zero owned objects!  Was a player prefab not assigned?");
-                    }
-                }
-                else
+                var clientOwnedObjects = NetworkManager.SpawnManager.SpawnedObjectsList.Where((c) => c.OwnerClientId == clientId).ToList();
+
+                // Handle changing ownership and prefab handlers
+                var clientCounter = 0;
+                var predictedClientCount = ConnectedClientsList.Count - 1;
+                var remainingClients = NetworkManager.DistributedAuthorityMode ? ConnectedClientsList.Where((c) => c.ClientId != clientId).ToList() : null;
+                for (int i = clientOwnedObjects.Count - 1; i >= 0; i--)
                 {
-                    // Handle changing ownership and prefab handlers
-                    for (int i = clientOwnedObjects.Count - 1; i >= 0; i--)
+                    var ownedObject = clientOwnedObjects[i];
+                    if (ownedObject)
                     {
-                        var ownedObject = clientOwnedObjects[i];
-                        if (ownedObject != null)
+                        // If destroying with owner, then always despawn and destroy (or defer destroying to prefab handler)
+                        // Handle an object with no observers other than the current disconnecting client as destroying with owner
+                        if (!ownedObject.DontDestroyWithOwner || ownedObject.Observers.Count == 0 || (ownedObject.Observers.Count == 1 && ownedObject.Observers.Contains(clientId)))
                         {
-                            if (!ownedObject.DontDestroyWithOwner)
+                            if (NetworkManager.PrefabHandler.ContainsHandler(ownedObject.GlobalObjectIdHash))
+                            {
+                                if (ownedObject.IsSpawned)
+                                {
+                                    // Don't destroy (prefab handler will determine this, but always notify
+                                    NetworkManager.SpawnManager.DespawnObject(ownedObject, false, true);
+                                }
+                                NetworkManager.PrefabHandler.HandleNetworkPrefabDestroy(ownedObject);
+                            }
+                            else
                             {
-                                if (NetworkManager.PrefabHandler.ContainsHandler(clientOwnedObjects[i].GlobalObjectIdHash))
+                                NetworkManager.SpawnManager.DespawnObject(ownedObject, true, true);
+                            }
+                        }
+                        else if (!NetworkManager.ShutdownInProgress)
+                        {
+                            // DANGO-TODO: We will want to match how the CMB service handles this. For now, we just try to evenly distribute
+                            // ownership.
+                            // NOTE: All of the below code only handles ownership transfer.
+                            // For client-server, we just remove the ownership.
+                            // For distributed authority, we need to change ownership based on parenting
+                            if (NetworkManager.DistributedAuthorityMode)
+                            {
+                                // Only NetworkObjects that have the OwnershipStatus.Distributable flag set and are not OwnershipSessionOwner are distributed.
+                                // If the object has a parent - skip it for now, it will be distributed when its root parent is distributed.
+                                if (!ownedObject.IsOwnershipDistributable || ownedObject.IsOwnershipSessionOwner || ownedObject.GetCachedParent())
+                                {
+                                    continue;
+                                }
+
+                                if (ownedObject.IsOwnershipLocked)
+                                {
+                                    ownedObject.SetOwnershipLock(false);
+                                }
+
+                                var targetOwner = NetworkManager.ServerClientId;
+                                // Cycle through the full count of clients to find
+                                // the next viable owner. If none are found, then
+                                // the DAHost defaults to the owner.
+                                for (int j = 0; j < remainingClients.Count; j++)
                                 {
-                                    NetworkManager.PrefabHandler.HandleNetworkPrefabDestroy(clientOwnedObjects[i]);
+                                    clientCounter++;
+                                    clientCounter = clientCounter % predictedClientCount;
+                                    if (ownedObject.Observers.Contains(remainingClients[clientCounter].ClientId))
+                                    {
+                                        targetOwner = remainingClients[clientCounter].ClientId;
+                                        break;
+                                    }
                                 }
-                                else
+                                if (EnableDistributeLogging)
                                 {
-                                    Object.Destroy(ownedObject.gameObject);
+                                    Debug.Log($"[Disconnected][Client-{clientId}][NetworkObjectId-{ownedObject.NetworkObjectId} Distributed to Client-{targetOwner}");
+                                }
+
+                                NetworkManager.SpawnManager.ChangeOwnership(ownedObject, targetOwner, true);
+
+                                // Ownership gets passed down to all children that have the same owner.
+                                var childNetworkObjects = ownedObject.GetComponentsInChildren<NetworkObject>();
+                                foreach (var childObject in childNetworkObjects)
+                                {
+                                    // We already changed ownership for this
+                                    if (childObject == ownedObject)
+                                    {
+                                        continue;
+                                    }
+
+                                    // Skip destroy with owner objects as they will be processed by the outer loop
+                                    if (!childObject.DontDestroyWithOwner || childObject.Observers.Count == 0 || (childObject.Observers.Count == 1 && childObject.Observers.Contains(clientId)))
+                                    {
+                                        continue;
+                                    }
+                                    // If the client owner disconnected, it is ok to unlock this at this point in time.
+                                    if (childObject.IsOwnershipLocked)
+                                    {
+                                        childObject.SetOwnershipLock(false);
+                                    }
+
+                                    // Ignore session owner marked objects
+                                    if (childObject.IsOwnershipSessionOwner)
+                                    {
+                                        continue;
+                                    }
+
+                                    // If the child's owner is not the client disconnected and the objects are marked with either distributable or transferable, then
+                                    // do not change ownership.
+                                    if (childObject.OwnerClientId != clientId && (childObject.IsOwnershipDistributable || childObject.IsOwnershipTransferable))
+                                    {
+                                        continue;
+                                    }
+
+                                    var childOwner = targetOwner;
+                                    if (!childObject.Observers.Contains(childOwner))
+                                    {
+                                        for (int j = 0; j < remainingClients.Count; j++)
+                                        {
+                                            clientCounter++;
+                                            clientCounter = clientCounter % predictedClientCount;
+                                            if (ownedObject.Observers.Contains(remainingClients[clientCounter].ClientId))
+                                            {
+                                                childOwner = remainingClients[clientCounter].ClientId;
+                                                break;
+                                            }
+                                        }
+                                    }
+
+                                    NetworkManager.SpawnManager.ChangeOwnership(childObject, childOwner, true);
+                                    if (EnableDistributeLogging)
+                                    {
+                                        Debug.Log($"[Disconnected][Client-{clientId}][Child of {ownedObject.NetworkObjectId}][NetworkObjectId-{ownedObject.NetworkObjectId} Distributed to Client-{targetOwner}");
+                                    }
                                 }
                             }
-                            else if (!NetworkManager.ShutdownInProgress)
+                            else
                             {
                                 ownedObject.RemoveOwnership();
                             }
@@ -981,6 +1299,7 @@ internal void OnClientDisconnectFromServer(ulong clientId)
                     }
                 }
 
+
                 // TODO: Could(should?) be replaced with more memory per client, by storing the visibility
                 foreach (var sobj in NetworkManager.SpawnManager.SpawnedObjectsList)
                 {
@@ -996,6 +1315,40 @@ internal void OnClientDisconnectFromServer(ulong clientId)
                 ConnectedClientIds.Remove(clientId);
                 var message = new ClientDisconnectedMessage { ClientId = clientId };
                 MessageManager?.SendMessage(ref message, NetworkDelivery.ReliableFragmentedSequenced, ConnectedClientIds);
+
+                // Used for testing/validation purposes only
+#if ENABLE_DAHOST_AUTOPROMOTE_SESSION_OWNER
+                if (NetworkManager.DistributedAuthorityMode && !NetworkManager.ShutdownInProgress && NetworkManager.IsListening)
+                {
+                    var newSessionOwner = NetworkManager.LocalClientId;
+                    if (ConnectedClientIds.Count > 1)
+                    {
+                        var lowestRTT = ulong.MaxValue;
+                        var unityTransport = NetworkManager.NetworkConfig.NetworkTransport as Transports.UTP.UnityTransport;
+
+                        foreach (var identifier in ConnectedClientIds)
+                        {
+                            if (identifier == NetworkManager.LocalClientId)
+                            {
+                                continue;
+                            }
+                            var rtt = unityTransport.GetCurrentRtt(identifier);
+                            if (rtt < lowestRTT)
+                            {
+                                newSessionOwner = identifier;
+                                lowestRTT = rtt;
+                            }
+                        }
+                    }
+
+                    var sessionOwnerMessage = new SessionOwnerMessage()
+                    {
+                        SessionOwner = newSessionOwner,
+                    };
+                    MessageManager?.SendMessage(ref sessionOwnerMessage, NetworkDelivery.ReliableFragmentedSequenced, ConnectedClientIds);
+                    NetworkManager.SetSessionOwner(newSessionOwner);
+                }
+#endif
             }
 
             // If the client ID transport map exists
@@ -1043,7 +1396,15 @@ internal void DisconnectClient(ulong clientId, string reason = null)
         {
             if (!LocalClient.IsServer)
             {
-                throw new NotServerException($"Only server can disconnect remote clients. Please use `{nameof(Shutdown)}()` instead.");
+                if (NetworkManager.NetworkConfig.NetworkTopology == NetworkTopologyTypes.ClientServer)
+                {
+                    throw new NotServerException($"Only server can disconnect remote clients. Please use `{nameof(Shutdown)}()` instead.");
+                }
+                else
+                {
+                    Debug.LogWarning($"Currently, clients cannot disconnect other clients from a distributed authority session. Please use `{nameof(Shutdown)}()` instead.");
+                    return;
+                }
             }
 
             if (clientId == NetworkManager.ServerClientId)
@@ -1262,8 +1623,8 @@ internal unsafe int SendMessage<T>(ref T message, NetworkDelivery delivery, in N
         internal int SendMessage<T>(ref T message, NetworkDelivery delivery, ulong clientId)
             where T : INetworkMessage
         {
-            // Prevent server sending to itself
-            if (LocalClient.IsServer && clientId == NetworkManager.ServerClientId)
+            // Prevent server sending to itself or if there is no MessageManager yet then exit early
+            if ((LocalClient.IsServer && clientId == NetworkManager.ServerClientId) || MessageManager == null)
             {
                 return 0;
             }
diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviour.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviour.cs
index 5e4ce503c0..7113917944 100644
--- a/com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviour.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviour.cs
@@ -6,8 +6,15 @@
 
 namespace Unity.Netcode
 {
+    /// <summary>
+    /// Exception thrown when an RPC (Remote Procedure Call) encounters an error during execution
+    /// </summary>
     public class RpcException : Exception
     {
+        /// <summary>
+        /// Initializes a new instance of the RpcException class with a specified error message
+        /// </summary>
+        /// <param name="message">The message that describes the error</param>
         public RpcException(string message) : base(message)
         {
 
@@ -15,10 +22,16 @@ public RpcException(string message) : base(message)
     }
 
     /// <summary>
-    /// The base class to override to write network code. Inherits MonoBehaviour
+    /// The base class to override to write network code. Inherits MonoBehaviour.
     /// </summary>
     public abstract class NetworkBehaviour : MonoBehaviour
     {
+#if UNITY_EDITOR
+        [HideInInspector]
+        [SerializeField]
+        internal bool ShowTopMostFoldoutHeaderGroup = true;
+#endif
+
 #pragma warning disable IDE1006 // disable naming rule violation check
 
         // RuntimeAccessModifiersILPP will make this `public`
@@ -69,6 +82,7 @@ internal FastBufferWriter __beginSendServerRpc(uint rpcMethodId, ServerRpcParams
         internal void __endSendServerRpc(ref FastBufferWriter bufferWriter, uint rpcMethodId, ServerRpcParams serverRpcParams, RpcDelivery rpcDelivery)
 #pragma warning restore IDE1006 // restore naming rule violation check
         {
+            var networkManager = NetworkManager;
             var serverRpcMessage = new ServerRpcMessage
             {
                 Metadata = new RpcMetadata
@@ -88,7 +102,7 @@ internal void __endSendServerRpc(ref FastBufferWriter bufferWriter, uint rpcMeth
                     networkDelivery = NetworkDelivery.ReliableFragmentedSequenced;
                     break;
                 case RpcDelivery.Unreliable:
-                    if (bufferWriter.Length > NetworkManager.MessageManager.NonFragmentedMessageMaxSize)
+                    if (bufferWriter.Length > networkManager.MessageManager.NonFragmentedMessageMaxSize)
                     {
                         throw new OverflowException("RPC parameters are too large for unreliable delivery.");
                     }
@@ -97,16 +111,16 @@ internal void __endSendServerRpc(ref FastBufferWriter bufferWriter, uint rpcMeth
             }
 
             var rpcWriteSize = 0;
-
-            // If we are a server/host then we just no op and send to ourself
-            if (IsHost || IsServer)
+            // Authority just no ops and sends to itself
+            // Client-Server: Only the server-host sends to self
+            if (IsServer)
             {
                 using var tempBuffer = new FastBufferReader(bufferWriter, Allocator.Temp);
                 var context = new NetworkContext
                 {
                     SenderId = NetworkManager.ServerClientId,
-                    Timestamp = NetworkManager.RealTimeProvider.RealTimeSinceStartup,
-                    SystemOwner = NetworkManager,
+                    Timestamp = networkManager.RealTimeProvider.RealTimeSinceStartup,
+                    SystemOwner = networkManager,
                     // header information isn't valid since it's not a real message.
                     // RpcMessage doesn't access this stuff so it's just left empty.
                     Header = new NetworkMessageHeader(),
@@ -149,6 +163,7 @@ internal FastBufferWriter __beginSendClientRpc(uint rpcMethodId, ClientRpcParams
         internal void __endSendClientRpc(ref FastBufferWriter bufferWriter, uint rpcMethodId, ClientRpcParams clientRpcParams, RpcDelivery rpcDelivery)
 #pragma warning restore IDE1006 // restore naming rule violation check
         {
+            var networkManager = NetworkManager;
             var clientRpcMessage = new ClientRpcMessage
             {
                 Metadata = new RpcMetadata
@@ -168,7 +183,7 @@ internal void __endSendClientRpc(ref FastBufferWriter bufferWriter, uint rpcMeth
                     networkDelivery = NetworkDelivery.ReliableFragmentedSequenced;
                     break;
                 case RpcDelivery.Unreliable:
-                    if (bufferWriter.Length > NetworkManager.MessageManager.NonFragmentedMessageMaxSize)
+                    if (bufferWriter.Length > networkManager.MessageManager.NonFragmentedMessageMaxSize)
                     {
                         throw new OverflowException("RPC parameters are too large for unreliable delivery.");
                     }
@@ -180,24 +195,22 @@ internal void __endSendClientRpc(ref FastBufferWriter bufferWriter, uint rpcMeth
 
             // We check to see if we need to shortcut for the case where we are the host/server and we can send a clientRPC
             // to ourself. Sadly we have to figure that out from the list of clientIds :(
-            bool shouldSendToHost = false;
+            bool shouldInvokeLocally = false;
             if (clientRpcParams.Send.TargetClientIds != null)
             {
                 foreach (var targetClientId in clientRpcParams.Send.TargetClientIds)
                 {
                     if (targetClientId == NetworkManager.ServerClientId)
                     {
-                        shouldSendToHost = true;
-                        break;
+                        shouldInvokeLocally = true;
+                        continue;
                     }
-
                     // Check to make sure we are sending to only observers, if not log an error.
-                    if (NetworkManager.LogLevel >= LogLevel.Error && !NetworkObject.Observers.Contains(targetClientId))
+                    if (networkManager.LogLevel >= LogLevel.Error && !NetworkObject.Observers.Contains(targetClientId))
                     {
                         NetworkLog.LogError(GenerateObserverErrorMessage(clientRpcParams, targetClientId));
                     }
                 }
-
                 rpcWriteSize = NetworkManager.ConnectionManager.SendMessage(ref clientRpcMessage, networkDelivery, in clientRpcParams.Send.TargetClientIds);
             }
             else if (clientRpcParams.Send.TargetClientIdsNativeArray != null)
@@ -206,17 +219,15 @@ internal void __endSendClientRpc(ref FastBufferWriter bufferWriter, uint rpcMeth
                 {
                     if (targetClientId == NetworkManager.ServerClientId)
                     {
-                        shouldSendToHost = true;
-                        break;
+                        shouldInvokeLocally = true;
+                        continue;
                     }
-
                     // Check to make sure we are sending to only observers, if not log an error.
-                    if (NetworkManager.LogLevel >= LogLevel.Error && !NetworkObject.Observers.Contains(targetClientId))
+                    if (networkManager.LogLevel >= LogLevel.Error && !NetworkObject.Observers.Contains(targetClientId))
                     {
                         NetworkLog.LogError(GenerateObserverErrorMessage(clientRpcParams, targetClientId));
                     }
                 }
-
                 rpcWriteSize = NetworkManager.ConnectionManager.SendMessage(ref clientRpcMessage, networkDelivery, clientRpcParams.Send.TargetClientIdsNativeArray.Value);
             }
             else
@@ -227,7 +238,7 @@ internal void __endSendClientRpc(ref FastBufferWriter bufferWriter, uint rpcMeth
                     // Skip over the host
                     if (IsHost && observerEnumerator.Current == NetworkManager.LocalClientId)
                     {
-                        shouldSendToHost = true;
+                        shouldInvokeLocally = true;
                         continue;
                     }
                     rpcWriteSize = NetworkManager.ConnectionManager.SendMessage(ref clientRpcMessage, networkDelivery, observerEnumerator.Current);
@@ -235,14 +246,14 @@ internal void __endSendClientRpc(ref FastBufferWriter bufferWriter, uint rpcMeth
             }
 
             // If we are a server/host then we just no op and send to ourself
-            if (shouldSendToHost)
+            if (shouldInvokeLocally)
             {
                 using var tempBuffer = new FastBufferReader(bufferWriter, Allocator.Temp);
                 var context = new NetworkContext
                 {
                     SenderId = NetworkManager.ServerClientId,
-                    Timestamp = NetworkManager.RealTimeProvider.RealTimeSinceStartup,
-                    SystemOwner = NetworkManager,
+                    Timestamp = networkManager.RealTimeProvider.RealTimeSinceStartup,
+                    SystemOwner = networkManager,
                     // header information isn't valid since it's not a real message.
                     // RpcMessage doesn't access this stuff so it's just left empty.
                     Header = new NetworkMessageHeader(),
@@ -261,7 +272,7 @@ internal void __endSendClientRpc(ref FastBufferWriter bufferWriter, uint rpcMeth
                 {
                     foreach (var targetClientId in clientRpcParams.Send.TargetClientIds)
                     {
-                        NetworkManager.NetworkMetrics.TrackRpcSent(
+                        networkManager.NetworkMetrics.TrackRpcSent(
                             targetClientId,
                             NetworkObject,
                             rpcMethodName,
@@ -273,7 +284,7 @@ internal void __endSendClientRpc(ref FastBufferWriter bufferWriter, uint rpcMeth
                 {
                     foreach (var targetClientId in clientRpcParams.Send.TargetClientIdsNativeArray)
                     {
-                        NetworkManager.NetworkMetrics.TrackRpcSent(
+                        networkManager.NetworkMetrics.TrackRpcSent(
                             targetClientId,
                             NetworkObject,
                             rpcMethodName,
@@ -286,7 +297,7 @@ internal void __endSendClientRpc(ref FastBufferWriter bufferWriter, uint rpcMeth
                     var observerEnumerator = NetworkObject.Observers.GetEnumerator();
                     while (observerEnumerator.MoveNext())
                     {
-                        NetworkManager.NetworkMetrics.TrackRpcSent(
+                        networkManager.NetworkMetrics.TrackRpcSent(
                             observerEnumerator.Current,
                             NetworkObject,
                             rpcMethodName,
@@ -372,6 +383,12 @@ internal void __endSendRpc(ref FastBufferWriter bufferWriter, uint rpcMethodId,
                     case SendTo.ClientsAndHost:
                         rpcParams.Send.Target = RpcTarget.ClientsAndHost;
                         break;
+                    case SendTo.Authority:
+                        rpcParams.Send.Target = RpcTarget.Authority;
+                        break;
+                    case SendTo.NotAuthority:
+                        rpcParams.Send.Target = RpcTarget.NotAuthority;
+                        break;
                     case SendTo.SpecifiedInParams:
                         throw new RpcException("This method requires a runtime-specified send target.");
                 }
@@ -406,8 +423,8 @@ internal string GenerateObserverErrorMessage(ClientRpcParams clientRpcParams, ul
         }
 
         /// <summary>
-        /// Gets the NetworkManager that owns this NetworkBehaviour instance
-        ///   See note around `NetworkObject` for how there is a chicken / egg problem when we are not initialized
+        /// Gets the NetworkManager that owns this NetworkBehaviour instance.
+        /// See `NetworkObject` note for how there is a chicken/egg problem when not initialized.
         /// </summary>
         public NetworkManager NetworkManager
         {
@@ -435,51 +452,78 @@ public NetworkManager NetworkManager
         /// <see cref="Unity.Netcode.RpcTarget.Not(NativeArray{ulong})"/>,
         /// <see cref="Unity.Netcode.RpcTarget.Not(NativeList{ulong})"/>,
         /// <see cref="Unity.Netcode.RpcTarget.Not(ulong[])"/>, and
-        /// <see cref="Unity.Netcode.RpcTarget.Not{T}(T)"/>
+        /// <see cref="Unity.Netcode.RpcTarget.Not{T}(T)"/>.
         /// </summary>
 #pragma warning restore IDE0001
         public RpcTarget RpcTarget => NetworkManager.RpcTarget;
 
         /// <summary>
-        /// If a NetworkObject is assigned, it will return whether or not this NetworkObject
-        /// is the local player object.  If no NetworkObject is assigned it will always return false.
+        /// If a NetworkObject is assigned, returns whether the NetworkObject
+        /// is the local player object. If no NetworkObject is assigned, returns false.
         /// </summary>
         public bool IsLocalPlayer { get; private set; }
 
         /// <summary>
-        /// Gets if the object is owned by the local player or if the object is the local player object
+        /// Gets whether the object is owned by the local player or if the object is the local player object.
         /// </summary>
         public bool IsOwner { get; internal set; }
 
         /// <summary>
-        /// Gets if we are executing as server
+        /// Gets whether executing as a server.
         /// </summary>
         public bool IsServer { get; private set; }
 
         /// <summary>
-        /// Gets if the server (local or remote) is a host - i.e., also a client
+        /// Determines if the local client has authority over the associated NetworkObject.
+        /// <list type="bullet">
+        /// <item>In client-server contexts: returns true if `IsServer` or `IsHost`.</item>
+        /// <item>In distributed authority contexts: returns true if `IsOwner`.</item>
+        /// </list>
+        /// </summary>
+        public bool HasAuthority { get; internal set; }
+
+        internal NetworkClient LocalClient { get; private set; }
+
+        /// <summary>
+        /// Gets whether the client is the distributed authority mode session owner.
+        /// </summary>
+        public bool IsSessionOwner
+        {
+            get
+            {
+                if (LocalClient == null)
+                {
+                    return false;
+                }
+
+                return LocalClient.IsSessionOwner;
+            }
+        }
+
+        /// <summary>
+        /// Gets whether the server (local or remote) is a host.
         /// </summary>
         public bool ServerIsHost { get; private set; }
 
         /// <summary>
-        /// Gets if we are executing as client
+        /// Gets whether executing as a client.
         /// </summary>
         public bool IsClient { get; private set; }
 
 
         /// <summary>
-        /// Gets if we are executing as Host, I.E Server and Client
+        /// Gets whether executing as a host (both server and client).
         /// </summary>
         public bool IsHost { get; private set; }
 
         /// <summary>
-        /// Gets Whether or not the object has a owner
+        /// Gets whether the object has an owner.
         /// </summary>
         public bool IsOwnedByServer { get; internal set; }
 
         /// <summary>
-        /// Used to determine if it is safe to access NetworkObject and NetworkManager from within a NetworkBehaviour component
-        /// Primarily useful when checking NetworkObject/NetworkManager properties within FixedUpate
+        /// Determines whether it's safe to access a NetworkObject and NetworkManager from within a NetworkBehaviour component.
+        /// Primarily useful when checking NetworkObject or NetworkManager properties within FixedUpate.
         /// </summary>
         public bool IsSpawned { get; internal set; }
 
@@ -492,14 +536,14 @@ internal bool IsBehaviourEditable()
                 m_NetworkObject.NetworkManager.IsServer;
         }
 
-        ///  TODO: this needs an overhaul.  It's expensive, it's ja little naive in how it looks for networkObject in
-        ///   its parent and worst, it creates a puzzle if you are a NetworkBehaviour wanting to see if you're live or not
-        ///   (e.g. editor code).  All you want to do is find out if NetworkManager is null, but to do that you
-        ///   need NetworkObject, but if you try and grab NetworkObject and NetworkManager isn't up you'll get
-        ///   the warning below.  This is why IsBehaviourEditable had to be created.  Matt was going to re-do
-        ///   how NetworkObject works but it was close to the release and too risky to change
+        //  TODO: this needs an overhaul.  It's expensive, it's ja little naive in how it looks for networkObject in
+        //  its parent and worst, it creates a puzzle if you are a NetworkBehaviour wanting to see if you're live or not
+        //  (e.g. editor code).  All you want to do is find out if NetworkManager is null, but to do that you
+        //  need NetworkObject, but if you try and grab NetworkObject and NetworkManager isn't up you'll get
+        //  the warning below.  This is why IsBehaviourEditable had to be created.  Matt was going to re-do
+        //  how NetworkObject works but it was close to the release and too risky to change
         /// <summary>
-        /// Gets the NetworkObject that owns this NetworkBehaviour instance
+        /// Gets the NetworkObject that owns this NetworkBehaviour instance.
         /// </summary>
         public NetworkObject NetworkObject
         {
@@ -538,19 +582,19 @@ public NetworkObject NetworkObject
         }
 
         /// <summary>
-        /// Gets whether or not this NetworkBehaviour instance has a NetworkObject owner.
+        /// Gets whether this NetworkBehaviour instance has a NetworkObject owner.
         /// </summary>
         public bool HasNetworkObject => NetworkObject != null;
 
         private NetworkObject m_NetworkObject = null;
 
         /// <summary>
-        /// Gets the NetworkId of the NetworkObject that owns this NetworkBehaviour
+        /// Gets the NetworkId of the NetworkObject that owns this NetworkBehaviour instance.
         /// </summary>
         public ulong NetworkObjectId { get; internal set; }
 
         /// <summary>
-        /// Gets NetworkId for this NetworkBehaviour from the owner NetworkObject
+        /// Gets NetworkId for this NetworkBehaviour from the owner NetworkObject.
         /// </summary>
         public ushort NetworkBehaviourId { get; internal set; }
 
@@ -560,7 +604,7 @@ public NetworkObject NetworkObject
         internal ushort NetworkBehaviourIdCache = 0;
 
         /// <summary>
-        /// Returns a the NetworkBehaviour with a given BehaviourId for the current NetworkObject
+        /// Returns the NetworkBehaviour with a given BehaviourId for the current NetworkObject.
         /// </summary>
         /// <param name="behaviourId">The behaviourId to return</param>
         /// <returns>Returns NetworkBehaviour with given behaviourId</returns>
@@ -570,7 +614,7 @@ protected NetworkBehaviour GetNetworkBehaviour(ushort behaviourId)
         }
 
         /// <summary>
-        /// Gets the ClientId that owns the NetworkObject
+        /// Gets the ClientId that owns this NetworkObject.
         /// </summary>
         public ulong OwnerClientId { get; internal set; }
 
@@ -581,30 +625,34 @@ protected NetworkBehaviour GetNetworkBehaviour(ushort behaviourId)
         /// </summary>
         internal void UpdateNetworkProperties()
         {
+            var networkObject = NetworkObject;
             // Set NetworkObject dependent properties
-            if (NetworkObject != null)
+            if (networkObject != null)
             {
+                var networkManager = NetworkManager;
                 // Set identification related properties
-                NetworkObjectId = NetworkObject.NetworkObjectId;
-                IsLocalPlayer = NetworkObject.IsLocalPlayer;
+                NetworkObjectId = networkObject.NetworkObjectId;
+                IsLocalPlayer = networkObject.IsLocalPlayer;
 
                 // This is "OK" because GetNetworkBehaviourOrderIndex uses the order of
                 // NetworkObject.ChildNetworkBehaviours which is set once when first
                 // accessed.
-                NetworkBehaviourId = NetworkObject.GetNetworkBehaviourOrderIndex(this);
+                NetworkBehaviourId = networkObject.GetNetworkBehaviourOrderIndex(this);
 
                 // Set ownership related properties
-                IsOwnedByServer = NetworkObject.IsOwnedByServer;
-                IsOwner = NetworkObject.IsOwner;
-                OwnerClientId = NetworkObject.OwnerClientId;
+                IsOwnedByServer = networkObject.IsOwnedByServer;
+                IsOwner = networkObject.IsOwner;
+                OwnerClientId = networkObject.OwnerClientId;
 
                 // Set NetworkManager dependent properties
-                if (NetworkManager != null)
+                if (networkManager != null)
                 {
-                    IsHost = NetworkManager.IsListening && NetworkManager.IsHost;
-                    IsClient = NetworkManager.IsListening && NetworkManager.IsClient;
-                    IsServer = NetworkManager.IsListening && NetworkManager.IsServer;
-                    ServerIsHost = NetworkManager.IsListening && NetworkManager.ServerIsHost;
+                    IsHost = networkManager.IsListening && networkManager.IsHost;
+                    IsClient = networkManager.IsListening && networkManager.IsClient;
+                    IsServer = networkManager.IsListening && networkManager.IsServer;
+                    LocalClient = networkManager.LocalClient;
+                    HasAuthority = networkObject.HasAuthority;
+                    ServerIsHost = networkManager.IsListening && networkManager.ServerIsHost;
                 }
             }
             else // Shouldn't happen, but if so then set the properties to their default value;
@@ -612,23 +660,35 @@ internal void UpdateNetworkProperties()
                 OwnerClientId = NetworkObjectId = default;
                 IsOwnedByServer = IsOwner = IsHost = IsClient = IsServer = ServerIsHost = default;
                 NetworkBehaviourId = default;
+                LocalClient = default;
+                HasAuthority = default;
             }
         }
 
         /// <summary>
-        /// Gets called after the <see cref="NetworkObject"/> is spawned. No NetworkBehaviours associated with the NetworkObject will have had <see cref="OnNetworkSpawn"/> invoked yet.
-        /// A reference to <see cref="NetworkManager"/> is passed in as a parameter to determine the context of execution (IsServer/IsClient)
+        /// Only for use in distributed authority mode.
+        /// Invoked only on the authority instance when a <see cref="NetworkObject"/> is deferring its despawn on non-authoritative instances.
         /// </summary>
         /// <remarks>
+        /// See also: <see cref="NetworkObject.DeferDespawn(int, bool)"/>
+        /// </remarks>
+        /// <param name="despawnTick">The future network tick that the <see cref="NetworkObject"/> will be despawned on non-authoritative instances</param>
+        public virtual void OnDeferringDespawn(int despawnTick) { }
+
+        /// <summary>
+        /// Gets called after the <see cref="NetworkObject"/> is spawned. No NetworkBehaviours associated with the NetworkObject will have had <see cref="OnNetworkSpawn"/> invoked yet.
+        /// A reference to <see cref="NetworkManager"/> is passed in as a parameter to determine the context of execution (`IsServer` or `IsClient`).
+        /// </summary>
         /// <param name="networkManager">a ref to the <see cref="NetworkManager"/> since this is not yet set on the <see cref="NetworkBehaviour"/></param>
+        /// <remarks>
         /// The <see cref="NetworkBehaviour"/> will not have anything assigned to it at this point in time.
-        /// Settings like ownership, NetworkBehaviourId, NetworkManager, and most other spawn related properties will not be set.
-        /// This can be used to handle things like initializing/instantiating a NetworkVariable or the like.
+        /// Settings like ownership, NetworkBehaviourId, NetworkManager, and most other spawn-related properties will not be set.
+        /// This can be used to handle things like initializing a NetworkVariable.
         /// </remarks>
         protected virtual void OnNetworkPreSpawn(ref NetworkManager networkManager) { }
 
         /// <summary>
-        /// Gets called when the <see cref="NetworkObject"/> gets spawned, message handlers are ready to be registered and the network is setup.
+        /// Gets called when the <see cref="NetworkObject"/> gets spawned, message handlers are ready to be registered, and the network is set up.
         /// </summary>
         public virtual void OnNetworkSpawn() { }
 
@@ -642,28 +702,38 @@ public virtual void OnNetworkSpawn() { }
         protected virtual void OnNetworkPostSpawn() { }
 
         /// <summary>
-        /// [Client-Side Only]
-        /// When a new client joins it is synchronized with all spawned NetworkObjects and scenes loaded for the session joined. At the end of the synchronization process, when all
+        /// Internal implementation of post-spawn functionality. Called after OnNetworkSpawn to handle internal post-spawn operations.
+        /// </summary>
+        protected internal virtual void InternalOnNetworkPostSpawn() { }
+
+        /// <summary>
+        /// This method is only available client-side.
+        /// When a new client joins it's synchronized with all spawned NetworkObjects and scenes loaded for the session joined. At the end of the synchronization process, when all
         /// <see cref="NetworkObject"/>s and scenes (if scene management is enabled) have finished synchronizing, all NetworkBehaviour components associated with spawned <see cref="NetworkObject"/>s
         /// will have this method invoked.
         /// </summary>
         /// <remarks>
-        /// This can be used to handle post synchronization actions where you might need to access a different NetworkObject and/or NetworkBehaviour not local to the current NetworkObject context.
+        /// This can be used to handle post-synchronization actions where you might need to access a different NetworkObject and/or NetworkBehaviour not local to the current NetworkObject context.
         /// This is only invoked on clients during a client-server network topology session.
         /// </remarks>
         protected virtual void OnNetworkSessionSynchronized() { }
 
         /// <summary>
-        /// [Client & Server Side]
-        /// When a scene is loaded an in-scene placed NetworkObjects are all spawned, this method is invoked on all of the newly spawned in-scene placed NetworkObjects.
+        /// Internal implementation of network session synchronization. Handles the internal processing of session synchronization events.
+        /// </summary>
+        protected internal virtual void InternalOnNetworkSessionSynchronized() { }
+
+        /// <summary>
+        /// When a scene is loaded and in-scene placed NetworkObjects are finished spawning, this method is invoked on all of the newly spawned in-scene placed NetworkObjects.
+        /// This method runs both client and server side.
         /// </summary>
         /// <remarks>
-        /// This can be used to handle post scene loaded actions for in-scene placed NetworkObjcts where you might need to access a different NetworkObject and/or NetworkBehaviour not local to the current NetworkObject context.
+        /// This method can be used to handle post-scene loaded actions for in-scene placed NetworkObjcts where you might need to access a different NetworkObject and/or NetworkBehaviour not local to the current NetworkObject context.
         /// </remarks>
         protected virtual void OnInSceneObjectsSpawned() { }
 
         /// <summary>
-        /// Gets called when the <see cref="NetworkObject"/> gets despawned. Is called both on the server and clients.
+        /// Gets called when the <see cref="NetworkObject"/> gets despawned. This method runs both client and server side.
         /// </summary>
         public virtual void OnNetworkDespawn() { }
 
@@ -698,7 +768,8 @@ internal void VisibleOnNetworkSpawn()
             }
 
             InitializeVariables();
-            if (IsServer)
+
+            if (NetworkObject.HasAuthority)
             {
                 // Since we just spawned the object and since user code might have modified their NetworkVariable, esp.
                 // NetworkList, we need to mark the object as free of updates.
@@ -711,6 +782,7 @@ internal void NetworkPostSpawn()
         {
             try
             {
+                InternalOnNetworkPostSpawn();
                 OnNetworkPostSpawn();
             }
             catch (Exception e)
@@ -723,6 +795,7 @@ internal void NetworkSessionSynchronized()
         {
             try
             {
+                InternalOnNetworkSessionSynchronized();
                 OnNetworkSessionSynchronized();
             }
             catch (Exception e)
@@ -755,22 +828,37 @@ internal void InternalOnNetworkDespawn()
             {
                 Debug.LogException(e);
             }
+
+            // Deinitialize all NetworkVariables in the event the associated
+            // NetworkObject is recylced (in-scene placed or pooled).
+            for (int i = 0; i < NetworkVariableFields.Count; i++)
+            {
+                NetworkVariableFields[i].Deinitialize();
+            }
         }
 
         /// <summary>
-        /// Invoked on both the server and the local client of the owner when <see cref="Netcode.NetworkObject"/> ownership is assigned.
+        /// In client-server contexts, this method is invoked on both the server and the local client of the owner when <see cref="Netcode.NetworkObject"/> ownership is assigned.
+        /// In distributed authority contexts, this method is invoked on all clients connected to the session.
         /// </summary>
         public virtual void OnGainedOwnership() { }
 
         internal void InternalOnGainedOwnership()
         {
             UpdateNetworkProperties();
+            // New owners need to assure any NetworkVariables they have write permissions
+            // to are updated so the previous and original values are aligned with the
+            // current value (primarily for collections).
+            if (OwnerClientId == NetworkManager.LocalClientId)
+            {
+                UpdateNetworkVariableOnOwnershipChanged();
+            }
             OnGainedOwnership();
         }
 
         /// <summary>
-        /// Invoked on all clients, override this method to be notified of any
-        /// ownership changes (even if the instance was niether the previous or
+        /// Invoked on all clients. Override this method to be notified of any
+        /// ownership changes (even if the instance was neither the previous or
         /// newly assigned current owner).
         /// </summary>
         /// <param name="previous">the previous owner</param>
@@ -786,8 +874,9 @@ internal void InternalOnOwnershipChanged(ulong previous, ulong current)
         }
 
         /// <summary>
-        /// Invoked on the local client when it loses ownership of the associated <see cref="Netcode.NetworkObject"/>.
-        /// This method is also invoked on the server when any client loses ownership.
+        /// In client-server contexts, this method is invoked on the local client when it loses ownership of the associated <see cref="Netcode.NetworkObject"/>
+        /// and on the server when any client loses ownership.
+        /// In distributed authority contexts, this method is invoked on all clients connected to the session.
         /// </summary>
         public virtual void OnLostOwnership() { }
 
@@ -798,11 +887,13 @@ internal void InternalOnLostOwnership()
         }
 
         /// <summary>
-        /// Gets called when the parent NetworkObject of this NetworkBehaviour's NetworkObject has changed
+        /// Gets called when the parent NetworkObject of this NetworkBehaviour's NetworkObject has changed.
         /// </summary>
         /// <param name="parentNetworkObject">the new <see cref="NetworkObject"/> parent</param>
         public virtual void OnNetworkObjectParentChanged(NetworkObject parentNetworkObject) { }
 
+        internal virtual void InternalOnNetworkObjectParentChanged(NetworkObject parentNetworkObject) { }
+
         private bool m_VarInit = false;
 
         private readonly List<HashSet<int>> m_DeliveryMappedNetworkVariableIndices = new List<HashSet<int>>();
@@ -847,10 +938,30 @@ internal void __nameNetworkVariable(NetworkVariableBase variable, string varName
             variable.Name = varName;
         }
 
+        /// <summary>
+        /// Does a first pass initialization for RPCs and NetworkVariables
+        /// If already initialized, then it just re-initializes the NetworkVariables.
+        /// </summary>
         internal void InitializeVariables()
         {
             if (m_VarInit)
             {
+                // If the primary initialization has already been done, then go ahead
+                // and re-initialize each NetworkVariable in the event it is an in-scene
+                // placed NetworkObject in an already loaded scene that has already been
+                // used within a network session =or= if this is a pooled NetworkObject
+                // that is being repurposed.
+                for (int i = 0; i < NetworkVariableFields.Count; i++)
+                {
+                    // If already initialized, then skip
+                    if (NetworkVariableFields[i].HasBeenInitialized)
+                    {
+                        continue;
+                    }
+                    NetworkVariableFields[i].Initialize(this);
+                }
+                // Exit early as we don't need to run through the rest of this initialization
+                // process
                 return;
             }
 
@@ -935,6 +1046,8 @@ internal void PostNetworkVariableWrite(bool forced = false)
                     }
                 }
             }
+
+            MarkVariablesDirty(false);
         }
 
         internal void PreVariableUpdate()
@@ -943,30 +1056,39 @@ internal void PreVariableUpdate()
             {
                 InitializeVariables();
             }
-            PreNetworkVariableWrite();
-        }
 
-        internal void VariableUpdate(ulong targetClientId)
-        {
-            NetworkVariableUpdate(targetClientId, NetworkBehaviourId);
+            PreNetworkVariableWrite();
         }
 
         internal readonly List<int> NetworkVariableIndexesToReset = new List<int>();
         internal readonly HashSet<int> NetworkVariableIndexesToResetSet = new HashSet<int>();
 
-        private void NetworkVariableUpdate(ulong targetClientId, int behaviourIndex)
+        /// <summary>
+        /// Determines if a NetworkVariable should have any changes to state sent out
+        /// </summary>
+        /// <param name="targetClientId">target to send the updates to</param>
+        /// <param name="forceSend">specific to change in ownership</param>
+        internal void NetworkVariableUpdate(ulong targetClientId, bool forceSend = false)
         {
-            if (!CouldHaveDirtyNetworkVariables())
+            if (!forceSend && !CouldHaveDirtyNetworkVariables())
             {
                 return;
             }
 
+            // Getting these ahead of time actually improves performance
+            var networkManager = NetworkManager;
+            var networkObject = NetworkObject;
+            var behaviourIndex = networkObject.GetNetworkBehaviourOrderIndex(this);
+            var messageManager = networkManager.MessageManager;
+            var connectionManager = networkManager.ConnectionManager;
+
             for (int j = 0; j < m_DeliveryMappedNetworkVariableIndices.Count; j++)
             {
+                var networkVariable = (NetworkVariableBase)null;
                 var shouldSend = false;
                 for (int k = 0; k < NetworkVariableFields.Count; k++)
                 {
-                    var networkVariable = NetworkVariableFields[k];
+                    networkVariable = NetworkVariableFields[k];
                     if (networkVariable.IsDirty() && networkVariable.CanClientRead(targetClientId))
                     {
                         if (networkVariable.CanSend())
@@ -976,38 +1098,57 @@ private void NetworkVariableUpdate(ulong targetClientId, int behaviourIndex)
                         break;
                     }
                 }
+                // All of this is just to prevent the DA Host from re-sending a NetworkVariable update it received from the client owner
+                // If this NetworkManager is running as a DAHost:
+                // - Only when the write permissions is owner (to pass existing integration tests running as DAHost)
+                // - If the target client ID is the owner and the owner is not the local NetworkManager instance
+                // - **Special** As long as ownership did not just change and we are sending the new owner any dirty/updated NetworkVariables
+                // Under these conditions we should not send to the client
+                if (shouldSend && networkManager.DAHost && networkVariable.WritePerm == NetworkVariableWritePermission.Owner &&
+                    networkObject.OwnerClientId == targetClientId && networkObject.OwnerClientId != networkManager.LocalClientId &&
+                    networkObject.PreviousOwnerId == networkObject.OwnerClientId)
+                {
+                    shouldSend = false;
+                }
 
-                if (shouldSend)
+                if (!shouldSend)
                 {
-                    var message = new NetworkVariableDeltaMessage
-                    {
-                        NetworkObjectId = NetworkObjectId,
-                        NetworkBehaviourIndex = NetworkObject.GetNetworkBehaviourOrderIndex(this),
-                        NetworkBehaviour = this,
-                        TargetClientId = targetClientId,
-                        DeliveryMappedNetworkVariableIndex = m_DeliveryMappedNetworkVariableIndices[j]
-                    };
-                    // TODO: Serialization is where the IsDirty flag gets changed.
-                    // Messages don't get sent from the server to itself, so if we're host and sending to ourselves,
-                    // we still have to actually serialize the message even though we're not sending it, otherwise
-                    // the dirty flag doesn't change properly. These two pieces should be decoupled at some point
-                    // so we don't have to do this serialization work if we're not going to use the result.
-                    if (IsServer && targetClientId == NetworkManager.ServerClientId)
-                    {
-                        var tmpWriter = new FastBufferWriter(NetworkManager.MessageManager.NonFragmentedMessageMaxSize, Allocator.Temp, NetworkManager.MessageManager.FragmentedMessageMaxSize);
-                        using (tmpWriter)
-                        {
-                            message.Serialize(tmpWriter, message.Version);
-                        }
-                    }
-                    else
+                    continue;
+                }
+                var message = new NetworkVariableDeltaMessage
+                {
+                    NetworkObjectId = NetworkObjectId,
+                    NetworkBehaviourIndex = behaviourIndex,
+                    NetworkBehaviour = this,
+                    TargetClientId = targetClientId,
+                    DeliveryMappedNetworkVariableIndex = m_DeliveryMappedNetworkVariableIndices[j],
+                    // By sending the network delivery we can forward messages immediately as opposed to processing them
+                    // at the end. While this will send updates to clients that cannot read, the handler will ignore anything
+                    // sent to a client that does not have read permissions.
+                    NetworkDelivery = m_DeliveryTypesForNetworkVariableGroups[j]
+                };
+                // TODO: Serialization is where the IsDirty flag gets changed.
+                // Messages don't get sent from the server to itself, so if we're host and sending to ourselves,
+                // we still have to actually serialize the message even though we're not sending it, otherwise
+                // the dirty flag doesn't change properly. These two pieces should be decoupled at some point
+                // so we don't have to do this serialization work if we're not going to use the result.
+                if (IsServer && targetClientId == NetworkManager.ServerClientId)
+                {
+                    var tmpWriter = new FastBufferWriter(messageManager.NonFragmentedMessageMaxSize, Allocator.Temp, messageManager.FragmentedMessageMaxSize);
+                    using (tmpWriter)
                     {
-                        NetworkManager.ConnectionManager.SendMessage(ref message, m_DeliveryTypesForNetworkVariableGroups[j], targetClientId);
+                        message.Serialize(tmpWriter, message.Version);
                     }
                 }
+                else
+                {
+                    connectionManager.SendMessage(ref message, m_DeliveryTypesForNetworkVariableGroups[j], targetClientId);
+                }
             }
         }
 
+        internal static bool LogSentVariableUpdateMessage;
+
         private bool CouldHaveDirtyNetworkVariables()
         {
             // TODO: There should be a better way by reading one dirty variable vs. 'n'
@@ -1029,6 +1170,26 @@ private bool CouldHaveDirtyNetworkVariables()
             return false;
         }
 
+        /// <summary>
+        /// Invoked on a new client to assure the previous and original values
+        /// are synchronized with the current known value.
+        /// </summary>
+        /// <remarks>
+        /// Primarily for collections to assure the previous value(s) is/are the
+        /// same as the current value(s) in order to not re-send already known entries.
+        /// </remarks>
+        internal void UpdateNetworkVariableOnOwnershipChanged()
+        {
+            for (int j = 0; j < NetworkVariableFields.Count; j++)
+            {
+                // Only invoke OnInitialize on NetworkVariables the owner can write to
+                if (NetworkVariableFields[j].CanClientWrite(OwnerClientId))
+                {
+                    NetworkVariableFields[j].OnInitialize();
+                }
+            }
+        }
+
         internal void MarkVariablesDirty(bool dirty)
         {
             for (int j = 0; j < NetworkVariableFields.Count; j++)
@@ -1037,6 +1198,26 @@ internal void MarkVariablesDirty(bool dirty)
             }
         }
 
+        /// <summary>
+        /// For owner read permissions, when changing ownership we need to do a full synchronization
+        /// of all NetworkVariables that are owner read permission based since the owner is the only
+        /// instance that knows what the most current values are.
+        /// </summary>
+        internal void MarkOwnerReadDirtyAndCheckOwnerWriteIsDirty()
+        {
+            for (int j = 0; j < NetworkVariableFields.Count; j++)
+            {
+                if (NetworkVariableFields[j].ReadPerm == NetworkVariableReadPermission.Owner)
+                {
+                    NetworkVariableFields[j].SetDirty(true);
+                }
+                if (NetworkVariableFields[j].WritePerm == NetworkVariableWritePermission.Owner)
+                {
+                    NetworkVariableFields[j].OnCheckIsDirtyState();
+                }
+            }
+        }
+
         /// <summary>
         /// Synchronizes by setting only the NetworkVariable field values that the client has permission to read.
         /// Note: This is only invoked when first synchronizing a NetworkBehaviour (i.e. late join or spawned NetworkObject)
@@ -1047,6 +1228,12 @@ internal void MarkVariablesDirty(bool dirty)
         /// </remarks>
         internal void WriteNetworkVariableData(FastBufferWriter writer, ulong targetClientId)
         {
+            // Create any values that require accessing the NetworkManager locally (it is expensive to access it in NetworkBehaviour)
+            var networkManager = NetworkManager;
+            var ensureLengthSafety = networkManager.NetworkConfig.EnsureNetworkVariableLengthSafety;
+
+
+            // Exit early if there are no NetworkVariables
             if (NetworkVariableFields.Count == 0)
             {
                 return;
@@ -1054,10 +1241,12 @@ internal void WriteNetworkVariableData(FastBufferWriter writer, ulong targetClie
 
             for (int j = 0; j < NetworkVariableFields.Count; j++)
             {
-
+                // Client-Server: Try to write values only for clients that have read permissions.
+                // Distributed Authority: All clients have read permissions, always try to write the value.
                 if (NetworkVariableFields[j].CanClientRead(targetClientId))
                 {
-                    if (NetworkManager.NetworkConfig.EnsureNetworkVariableLengthSafety)
+                    // Write additional NetworkVariable information when length safety is enabled or when in distributed authority mode
+                    if (ensureLengthSafety)
                     {
                         var writePos = writer.Position;
                         // Note: This value can't be packed because we don't know how large it will be in advance
@@ -1067,21 +1256,32 @@ internal void WriteNetworkVariableData(FastBufferWriter writer, ulong targetClie
                         // The way we do packing, any value > 63 in a ushort will use the full 2 bytes to represent.
                         writer.WriteValueSafe((ushort)0);
                         var startPos = writer.Position;
-                        NetworkVariableFields[j].WriteField(writer);
+                        // Write the NetworkVariable field value
+                        // WriteFieldSynchronization will write the current value only if there are no pending changes.
+                        // Otherwise, it will write the previous value if there are pending changes since the pending
+                        // changes will be sent shortly after the client's synchronization.
+                        NetworkVariableFields[j].WriteFieldSynchronization(writer);
                         var size = writer.Position - startPos;
                         writer.Seek(writePos);
+                        // Write the NetworkVariable field value size
                         writer.WriteValueSafe((ushort)size);
                         writer.Seek(startPos + size);
                     }
-                    else
+                    else // Client-Server Only: Should only ever be invoked when using a client-server NetworkTopology
                     {
-                        NetworkVariableFields[j].WriteField(writer);
+                        // Write the NetworkVariable field value
+                        // WriteFieldSynchronization will write the current value only if there are no pending changes.
+                        // Otherwise, it will write the previous value if there are pending changes since the pending
+                        // changes will be sent shortly after the client's synchronization.
+                        NetworkVariableFields[j].WriteFieldSynchronization(writer);
                     }
                 }
-                else // Only if EnsureNetworkVariableLengthSafety, otherwise just skip
-                if (NetworkManager.NetworkConfig.EnsureNetworkVariableLengthSafety)
+                else if (ensureLengthSafety)
                 {
-                    writer.WriteValueSafe((ushort)0);
+                    // Client-Server Only: If the client cannot read this field, then skip it but write a 0 for this NetworkVariable's position
+                    {
+                        writer.WriteValueSafe((ushort)0);
+                    }
                 }
             }
         }
@@ -1096,6 +1296,11 @@ internal void WriteNetworkVariableData(FastBufferWriter writer, ulong targetClie
         /// </remarks>
         internal void SetNetworkVariableData(FastBufferReader reader, ulong clientId)
         {
+            // Stack cache any values that requires accessing the NetworkManager (it is expensive to access it in NetworkBehaviour)
+            var networkManager = NetworkManager;
+            var ensureLengthSafety = networkManager.NetworkConfig.EnsureNetworkVariableLengthSafety;
+
+            // Exit early if nothing else to read
             if (NetworkVariableFields.Count == 0)
             {
                 return;
@@ -1105,30 +1310,46 @@ internal void SetNetworkVariableData(FastBufferReader reader, ulong clientId)
             {
                 var varSize = (ushort)0;
                 var readStartPos = 0;
-                if (NetworkManager.NetworkConfig.EnsureNetworkVariableLengthSafety)
+                // Client-Server: Clients that only have read permissions will try to read the value
+                // Distributed Authority: All clients have read permissions, always try to read the value
+                if (NetworkVariableFields[j].CanClientRead(clientId))
                 {
-                    reader.ReadValueSafe(out varSize);
-                    if (varSize == 0)
+                    if (ensureLengthSafety)
                     {
-                        continue;
+                        reader.ReadValueSafe(out varSize);
+                        if (varSize == 0)
+                        {
+                            Debug.LogError($"[{name}][NetworkObjectId: {NetworkObjectId}][NetworkBehaviourId: {NetworkBehaviourId}][{NetworkVariableFields[j].Name}] Expected non-zero size readable NetworkVariable! (Skipping)");
+                            continue;
+                        }
+                        readStartPos = reader.Position;
                     }
-                    readStartPos = reader.Position;
                 }
-                else // If the client cannot read this field, then skip it
-                if (!NetworkVariableFields[j].CanClientRead(clientId))
+                else // Client-Server Only: If the client cannot read this field, then skip it
                 {
+                    // If skipping and length safety, then fill in a 0 size for this one spot
+                    if (ensureLengthSafety)
+                    {
+                        reader.ReadValueSafe(out ushort size);
+                        if (size != 0)
+                        {
+                            Debug.LogError($"[{name}][NetworkObjectId: {NetworkObjectId}][NetworkBehaviourId: {NetworkBehaviourId}][{NetworkVariableFields[j].Name}] Expected zero size for non-readable NetworkVariable when EnsureNetworkVariableLengthSafety is enabled! (Skipping)");
+                        }
+                    }
                     continue;
                 }
 
+                // Read the NetworkVariable value
                 NetworkVariableFields[j].ReadField(reader);
 
-                if (NetworkManager.NetworkConfig.EnsureNetworkVariableLengthSafety)
+                // When EnsureNetworkVariableLengthSafety always do a bounds check
+                if (ensureLengthSafety)
                 {
                     if (reader.Position > (readStartPos + varSize))
                     {
                         if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
                         {
-                            NetworkLog.LogWarning($"Var data read too far. {reader.Position - (readStartPos + varSize)} bytes.");
+                            NetworkLog.LogWarning($"[{name}][NetworkObjectId: {NetworkObjectId}][NetworkBehaviourId: {NetworkBehaviourId}][{NetworkVariableFields[j].Name}] NetworkVariable data read too big. {reader.Position - (readStartPos + varSize)} bytes.");
                         }
 
                         reader.Seek(readStartPos + varSize);
@@ -1137,7 +1358,7 @@ internal void SetNetworkVariableData(FastBufferReader reader, ulong clientId)
                     {
                         if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
                         {
-                            NetworkLog.LogWarning($"Var data read too little. {(readStartPos + varSize) - reader.Position} bytes.");
+                            NetworkLog.LogWarning($"[{name}][NetworkObjectId: {NetworkObjectId}][NetworkBehaviourId: {NetworkBehaviourId}][{NetworkVariableFields[j].Name}] NetworkVariable data read too small. {(readStartPos + varSize) - reader.Position} bytes.");
                         }
 
                         reader.Seek(readStartPos + varSize);
@@ -1147,10 +1368,10 @@ internal void SetNetworkVariableData(FastBufferReader reader, ulong clientId)
         }
 
         /// <summary>
-        /// Gets the local instance of a object with a given NetworkId
+        /// Gets the local instance of a NetworkObject with a given NetworkId.
         /// </summary>
-        /// <param name="networkId"></param>
-        /// <returns></returns>
+        /// <param name="networkId">The unique network identifier of the NetworkObject to retrieve</param>
+        /// <returns>The NetworkObject instance if found, null if no object exists with the specified networkId</returns>
         protected NetworkObject GetNetworkObject(ulong networkId)
         {
             return NetworkManager.SpawnManager.SpawnedObjects.TryGetValue(networkId, out NetworkObject networkObject) ? networkObject : null;
@@ -1158,14 +1379,14 @@ protected NetworkObject GetNetworkObject(ulong networkId)
 
         /// <summary>
         /// Override this method if your derived NetworkBehaviour requires custom synchronization data.
-        /// Note: Use of this method is only for the initial client synchronization of NetworkBehaviours
+        /// Use of this method is only for the initial client synchronization of NetworkBehaviours
         /// and will increase the payload size for client synchronization and dynamically spawned
         /// <see cref="NetworkObject"/>s.
         /// </summary>
         /// <remarks>
-        /// When serializing (writing) this will be invoked during the client synchronization period and
+        /// When serializing (writing), this method is invoked during the client synchronization period and
         /// when spawning new NetworkObjects.
-        /// When deserializing (reading), this will be invoked prior to the NetworkBehaviour's associated
+        /// When deserializing (reading), this method is invoked prior to the NetworkBehaviour's associated
         /// NetworkObject being spawned.
         /// </remarks>
         /// <param name="serializer">The serializer to use to read and write the data.</param>
@@ -1173,12 +1394,16 @@ protected NetworkObject GetNetworkObject(ulong networkId)
         /// Either BufferSerializerReader or BufferSerializerWriter, depending whether the serializer
         /// is in read mode or write mode.
         /// </typeparam>
-        /// <param name="targetClientId">the relative client identifier being synchronized</param>
         protected virtual void OnSynchronize<T>(ref BufferSerializer<T> serializer) where T : IReaderWriter
         {
 
         }
 
+        /// <summary>
+        /// Called when network conditions require reanticipation of game state.
+        /// Override this method to handle adjustments needed when network latency changes.
+        /// </summary>
+        /// <param name="lastRoundTripTime">The most recent round trip time measurement in seconds</param>
         public virtual void OnReanticipate(double lastRoundTripTime)
         {
 
@@ -1188,10 +1413,10 @@ public virtual void OnReanticipate(double lastRoundTripTime)
         /// The relative client identifier targeted for the serialization of this <see cref="NetworkBehaviour"/> instance.
         /// </summary>
         /// <remarks>
-        /// This value will be set prior to <see cref="OnSynchronize{T}(ref BufferSerializer{T})"/> being invoked.
+        /// This value is set prior to <see cref="OnSynchronize{T}(ref BufferSerializer{T})"/> being invoked.
         /// For writing (server-side), this is useful to know which client will receive the serialized data.
         /// For reading (client-side), this will be the <see cref="NetworkManager.LocalClientId"/>.
-        /// When synchronization of this instance is complete, this value will be reset to 0
+        /// When synchronization of this instance is complete, this value is reset to 0.
         /// </remarks>
         protected ulong m_TargetIdBeingSynchronized { get; private set; }
 
@@ -1293,7 +1518,7 @@ internal bool Synchronize<T>(ref BufferSerializer<T> serializer, ulong targetCli
                 {
                     if (NetworkManager.LogLevel <= LogLevel.Normal)
                     {
-                        NetworkLog.LogWarning($"{name} read {totalBytesRead} bytes but was expected to read {expectedBytesToRead} bytes during synchronization deserialization! This {nameof(NetworkBehaviour)} is being skipped and will not be synchronized!");
+                        NetworkLog.LogWarning($"{name} read {totalBytesRead} bytes but was expected to read {expectedBytesToRead} bytes during synchronization deserialization! This {nameof(NetworkBehaviour)}({GetType().Name})is being skipped and will not be synchronized!");
                     }
                     synchronizationError = true;
                 }
@@ -1315,8 +1540,7 @@ internal bool Synchronize<T>(ref BufferSerializer<T> serializer, ulong targetCli
 
         /// <summary>
         /// Invoked when the <see cref="GameObject"/> the <see cref="NetworkBehaviour"/> is attached to is destroyed.
-        /// NOTE:  If you override this, you should invoke this base class version of this
-        /// <see cref="OnDestroy"/> method.
+        /// If you override this, you must always invoke the base class version of this <see cref="OnDestroy"/> method.
         /// </summary>
         public virtual void OnDestroy()
         {
diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviourUpdater.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviourUpdater.cs
index 67487ce0b6..b2623cb389 100644
--- a/com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviourUpdater.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviourUpdater.cs
@@ -19,10 +19,15 @@ public class NetworkBehaviourUpdater
 
         internal void AddForUpdate(NetworkObject networkObject)
         {
+            // Since this is a HashSet, we don't need to worry about duplicate entries
             m_PendingDirtyNetworkObjects.Add(networkObject);
         }
 
-        internal void NetworkBehaviourUpdate()
+        /// <summary>
+        /// Sends NetworkVariable deltas
+        /// </summary>
+        /// <param name="forceSend">internal only, when changing ownership we want to send this before the change in ownership message</param>
+        internal void NetworkBehaviourUpdate(bool forceSend = false)
         {
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
             m_NetworkBehaviourUpdate.Begin();
@@ -48,13 +53,12 @@ internal void NetworkBehaviourUpdate()
                         for (int i = 0; i < m_ConnectionManager.ConnectedClientsList.Count; i++)
                         {
                             var client = m_ConnectionManager.ConnectedClientsList[i];
-
-                            if (dirtyObj.IsNetworkVisibleTo(client.ClientId))
+                            if (m_NetworkManager.DistributedAuthorityMode || dirtyObj.IsNetworkVisibleTo(client.ClientId))
                             {
                                 // Sync just the variables for just the objects this client sees
                                 for (int k = 0; k < dirtyObj.ChildNetworkBehaviours.Count; k++)
                                 {
-                                    dirtyObj.ChildNetworkBehaviours[k].VariableUpdate(client.ClientId);
+                                    dirtyObj.ChildNetworkBehaviours[k].NetworkVariableUpdate(client.ClientId, forceSend);
                                 }
                             }
                         }
@@ -73,7 +77,7 @@ internal void NetworkBehaviourUpdate()
                             }
                             for (int k = 0; k < sobj.ChildNetworkBehaviours.Count; k++)
                             {
-                                sobj.ChildNetworkBehaviours[k].VariableUpdate(NetworkManager.ServerClientId);
+                                sobj.ChildNetworkBehaviours[k].NetworkVariableUpdate(NetworkManager.ServerClientId, forceSend);
                             }
                         }
                     }
@@ -86,19 +90,24 @@ internal void NetworkBehaviourUpdate()
                         var behaviour = dirtyObj.ChildNetworkBehaviours[k];
                         for (int i = 0; i < behaviour.NetworkVariableFields.Count; i++)
                         {
+                            // Set to true for NetworkVariable to ignore duplication of the
+                            // "internal original value" for collections support.
+                            behaviour.NetworkVariableFields[i].NetworkUpdaterCheck = true;
                             if (behaviour.NetworkVariableFields[i].IsDirty() &&
                                 !behaviour.NetworkVariableIndexesToResetSet.Contains(i))
                             {
                                 behaviour.NetworkVariableIndexesToResetSet.Add(i);
                                 behaviour.NetworkVariableIndexesToReset.Add(i);
                             }
+                            // Reset back to false when done
+                            behaviour.NetworkVariableFields[i].NetworkUpdaterCheck = false;
                         }
                     }
                 }
                 // Now, reset all the no-longer-dirty variables
                 foreach (var dirtyobj in m_DirtyNetworkObjects)
                 {
-                    dirtyobj.PostNetworkVariableWrite();
+                    dirtyobj.PostNetworkVariableWrite(forceSend);
                 }
                 m_DirtyNetworkObjects.Clear();
             }
@@ -130,6 +139,9 @@ private void NetworkBehaviourUpdater_Tick()
 
             // Then show any NetworkObjects queued to be made visible/shown
             m_NetworkManager.SpawnManager.HandleNetworkObjectShow();
+
+            // Handle object redistribution (DA + disabled scene management only)
+            m_NetworkManager.HandleRedistributionToClients();
         }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkLogScope.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkLogScope.cs
new file mode 100644
index 0000000000..458c21c899
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Core/NetworkLogScope.cs
@@ -0,0 +1,183 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace TrollKing.Core
+{
+    public enum NetworkLoggingLevel
+    {
+        Debug,
+        Info,
+        Warn,
+        Error,
+        Exception,
+        None
+    }
+
+    public class NetworkLogScope
+    {
+        private readonly string m_LoggerName;
+        private readonly NetworkLoggingLevel m_Level = NetworkLoggingLevel.Info;
+
+        public NetworkLogScope(string logName, NetworkLoggingLevel logLevel = NetworkLoggingLevel.Info)
+        {
+            m_LoggerName = logName;
+            m_Level = logLevel;
+        }
+
+        public NetworkLoggingLevel GetLevel()
+        {
+            return m_Level;
+        }
+
+        public void Log(Func<string> stringProvider, NetworkLoggingLevel logLevel = NetworkLoggingLevel.Info)
+        {
+            if (logLevel >= m_Level)
+            {
+                string logString = stringProvider.Invoke();
+                DateTime time = DateTime.Now;
+                var shortTime = time.ToString("T");
+
+                switch (logLevel)
+                {
+                    case NetworkLoggingLevel.Debug:
+                        UnityEngine.Debug.Log($"[{shortTime}][DEBUG][{m_LoggerName}] {logString}");
+                        break;
+                    case NetworkLoggingLevel.Info:
+                        UnityEngine.Debug.Log($"[{shortTime}][INFO][{m_LoggerName}] {logString}");
+                        break;
+                    case NetworkLoggingLevel.Warn:
+                        UnityEngine.Debug.LogWarning($"[{shortTime}][WARN][{m_LoggerName}] {logString}");
+                        break;
+                    case NetworkLoggingLevel.Error:
+                        UnityEngine.Debug.LogError($"[{shortTime}][ERROR][{m_LoggerName}] {logString}");
+                        break;
+                    case NetworkLoggingLevel.Exception:
+                        UnityEngine.Debug.LogError($"[{shortTime}][EXCEPTION][{m_LoggerName}] {logString}");
+                        break;
+                    default:
+                        throw new ArgumentOutOfRangeException(nameof(logLevel), logLevel, null);
+                }
+            }
+        }
+
+        public void Debug(Func<string> logString)
+        {
+            Log(logString, NetworkLoggingLevel.Debug);
+        }
+
+        public void Info(Func<string> logString)
+        {
+            Log(logString, NetworkLoggingLevel.Info);
+        }
+
+        public void Warning(Func<string> logString)
+        {
+            Log(logString, NetworkLoggingLevel.Warn);
+        }
+
+        public void LogWarning(Func<string> logString)
+        {
+            Log(logString, NetworkLoggingLevel.Warn);
+        }
+
+        public void Error(Func<string> logString)
+        {
+            Log(logString, NetworkLoggingLevel.Error);
+        }
+
+        public void LogError(Func<string> logString)
+        {
+            Log(logString, NetworkLoggingLevel.Error);
+        }
+
+        public void LogException(Exception e)
+        {
+            UnityEngine.Debug.LogException(e);
+        }
+
+        public void LogError(Exception e)
+        {
+            UnityEngine.Debug.LogError($"[{m_LoggerName}] {e}");
+            UnityEngine.Debug.LogException(e);
+        }
+    }
+
+    public static class NetworkGameObjectUtility
+    {
+        private static readonly NetworkLogScope Log = new NetworkLogScope(nameof(NetworkGameObjectUtility));
+
+        private static string NetworkGetScenePathRecursive(Transform go, string path)
+        {
+            if (go.parent == null)
+            {
+                return $"{go.gameObject.scene.name}:{go.name}:{path}";
+            }
+
+            return NetworkGetScenePathRecursive(go.parent, $"{go.name}:{path}");
+        }
+
+        // Depth first, we are going all the way down each leg
+        public static void NetworkGetAllHierarchyChildrenRecursive(this GameObject source, ref Queue<GameObject> queue)
+        {
+            if (source == null)
+            {
+                return;
+            }
+
+            int children = source.transform.childCount;
+            for (int i = 0; i < children; i++)
+            {
+                var child = source.transform.GetChild(i);
+                var go = child.gameObject;
+                Log.Debug(() => $"AddingHierarchyChild {go}");
+                queue.Enqueue(go);
+                NetworkGetAllHierarchyChildrenRecursive(go, ref queue);
+            }
+        }
+
+        public static Queue<GameObject> NetworkGetAllHierarchyChildren(this GameObject root)
+        {
+            var retVal = new Queue<GameObject>();
+            if (root == null)
+            {
+                return retVal;
+            }
+            Log.Debug(() => $"AddingHierarchyParent {root}");
+            retVal.Enqueue(root);
+            root.NetworkGetAllHierarchyChildrenRecursive(ref retVal);
+            return retVal;
+        }
+
+        public static string NetworkGetScenePath(this GameObject go)
+        {
+            return NetworkGetScenePath(go.transform);
+        }
+
+        public static string NetworkGetScenePath(this Transform go)
+        {
+            return NetworkGetScenePathRecursive(go, "");
+        }
+
+        public static string NetworkGetSceneName(this GameObject go)
+        {
+            return go.scene.name;
+        }
+
+        public static bool NetworkTryGetComponentInParent<T>(this GameObject go, out T comp)
+        {
+            var parent = go.transform;
+            while (parent != null && parent.parent != parent)
+            {
+                if (parent.TryGetComponent(out comp))
+                {
+                    return true;
+                }
+                parent = parent.parent;
+            }
+
+            comp = default;
+            return false;
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkLogScope.cs.meta b/com.unity.netcode.gameobjects/Runtime/Core/NetworkLogScope.cs.meta
new file mode 100644
index 0000000000..ea3fdf85eb
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Core/NetworkLogScope.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 3b83aae632414713b8843141e3cea71b
+timeCreated: 1695872236
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs
index f2581890df..4838aae9e1 100644
--- a/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs
@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
 using Unity.Collections;
+using System.Linq;
 using UnityEngine;
 #if UNITY_EDITOR
 using UnityEditor;
+using PackageInfo = UnityEditor.PackageManager.PackageInfo;
 #endif
 using UnityEngine.SceneManagement;
 using Debug = UnityEngine.Debug;
@@ -26,6 +28,13 @@ public class NetworkManager : MonoBehaviour, INetworkUpdateSystem
         /// </summary>
         public static event Action<NetworkManager> OnDestroying;
 
+
+#if UNITY_EDITOR
+        // Inspector view expand/collapse settings for this derived child class
+        [HideInInspector]
+        public bool NetworkManagerExpanded;
+#endif
+
         // TODO: Deprecate...
         // The following internal values are not used, but because ILPP makes them public in the assembly, they cannot
         // be removed thanks to our semver validation.
@@ -44,12 +53,283 @@ public class NetworkManager : MonoBehaviour, INetworkUpdateSystem
 
 #pragma warning restore IDE1006 // restore naming rule violation check
 
+#if DEVELOPMENT_BUILD || UNITY_EDITOR
+        private static List<Type> s_SerializedType = new List<Type>();
+        // This is used to control the serialized type not optimized messaging for integration test purposes
+        internal static bool DisableNotOptimizedSerializedType;
+        /// <summary>
+        /// Until all serialized types are optimized for the distributed authority network topology,
+        /// this will handle the notification to the user that the type being serialized is not yet
+        /// optimized but will only log the message once to prevent log spamming.
+        /// </summary>
+        internal static void LogSerializedTypeNotOptimized<T>()
+        {
+            if (DisableNotOptimizedSerializedType)
+            {
+                return;
+            }
+            var type = typeof(T);
+            if (!s_SerializedType.Contains(type))
+            {
+                s_SerializedType.Add(type);
+                if (NetworkLog.CurrentLogLevel <= LogLevel.Developer)
+                {
+                    Debug.LogWarning($"[{type.Name}] Serialized type has not been optimized for use with Distributed Authority!");
+                }
+            }
+        }
+#endif
+
+        internal SessionConfig SessionConfig;
+
+        /// <summary>
+        /// Used for internal testing purposes
+        /// </summary>
+        internal delegate SessionConfig OnGetSessionConfigHandler();
+        internal OnGetSessionConfigHandler OnGetSessionConfig;
+        private SessionConfig GetSessionConfig()
+        {
+            return OnGetSessionConfig != null ? OnGetSessionConfig.Invoke() : new SessionConfig();
+        }
+
+        internal static bool IsDistributedAuthority;
+
+        /// <summary>
+        /// Distributed Authority Mode
+        /// Returns true if the current session is running in distributed authority mode.
+        /// </summary>
+        public bool DistributedAuthorityMode { get; private set; }
+
+        /// <summary>
+        /// Distributed Authority Mode
+        /// Gets whether the NetworkManager is connected to a distributed authority state service.
+        /// <see cref="NetworkClient.DAHost"/> to determine if the instance is mocking the state service.
+        /// </summary>
+        public bool CMBServiceConnection
+        {
+            get
+            {
+                return NetworkConfig.UseCMBService;
+            }
+        }
+
+        /// <summary>
+        /// Distributed Authority Mode
+        /// When enabled, the player prefab will be automatically spawned on the newly connected client-side.
+        /// </summary>
+        /// <remarks>
+        /// Refer to <see cref="NetworkConfig.AutoSpawnPlayerPrefabClientSide"/> to enable/disable automatic spawning of the player prefab.
+        /// Alternately, override the <see cref="FetchLocalPlayerPrefabToSpawn"/> to control what prefab the player should spawn.
+        /// </remarks>
+        public bool AutoSpawnPlayerPrefabClientSide
+        {
+            get
+            {
+                return NetworkConfig.AutoSpawnPlayerPrefabClientSide;
+            }
+        }
+
+        /// <summary>
+        /// Distributed Authority Mode
+        /// Delegate definition for <see cref="FetchLocalPlayerPrefabToSpawn"/>
+        /// </summary>
+        /// <returns>Player Prefab <see cref="GameObject"/></returns>
+        public delegate GameObject OnFetchLocalPlayerPrefabToSpawnDelegateHandler();
+
+        /// <summary>
+        /// Distributed Authority Mode
+        /// When a callback is assigned, this provides control over what player prefab a client will be using.
+        /// This is invoked only when <see cref="NetworkConfig.AutoSpawnPlayerPrefabClientSide"/> is enabled.
+        /// </summary>
+        public OnFetchLocalPlayerPrefabToSpawnDelegateHandler OnFetchLocalPlayerPrefabToSpawn;
+
+        internal GameObject FetchLocalPlayerPrefabToSpawn()
+        {
+            if (!AutoSpawnPlayerPrefabClientSide)
+            {
+                Debug.LogError($"[{nameof(FetchLocalPlayerPrefabToSpawn)}] Invoked when {nameof(NetworkConfig.AutoSpawnPlayerPrefabClientSide)} was not set! Check call paths!");
+                return null;
+            }
+            if (OnFetchLocalPlayerPrefabToSpawn == null && NetworkConfig.PlayerPrefab == null)
+            {
+                return null;
+            }
+
+            if (OnFetchLocalPlayerPrefabToSpawn != null)
+            {
+                return OnFetchLocalPlayerPrefabToSpawn();
+            }
+            return NetworkConfig.PlayerPrefab;
+        }
+
+        /// <summary>
+        /// Distributed Authority Mode
+        /// Gets whether the current NetworkManager is running as a mock distributed authority state service (DAHost)
+        /// </summary>
+        public bool DAHost
+        {
+            get
+            {
+                return LocalClient.DAHost;
+            }
+        }
+
+        // DANGO-TODO: Determine if this needs to be removed once the service handles object distribution
+        internal List<ulong> ClientsToRedistribute = new List<ulong>();
+        internal bool RedistributeToClients;
+
+        /// <summary>
+        /// Handles object redistribution when scene management is disabled.
+        /// <see cref="NetworkBehaviourUpdater.NetworkBehaviourUpdater_Tick"/>
+        /// DANGO-TODO: Determine if this needs to be removed once the service handles object distribution
+        /// </summary>
+        internal void HandleRedistributionToClients()
+        {
+            if (!DistributedAuthorityMode || !RedistributeToClients || NetworkConfig.EnableSceneManagement || ShutdownInProgress)
+            {
+                return;
+            }
+
+            foreach (var clientId in ClientsToRedistribute)
+            {
+                SpawnManager.DistributeNetworkObjects(clientId);
+            }
+            RedistributeToClients = false;
+            ClientsToRedistribute.Clear();
+        }
+
+
+        internal List<NetworkObject> DeferredDespawnObjects = new List<NetworkObject>();
+
+        /// <summary>
+        /// Gets the client identifier of the current session owner in distributed authority mode
+        /// </summary>
+        public ulong CurrentSessionOwner { get; internal set; }
+
+        /// <summary>
+        /// Delegate declaration for <see cref="OnSessionOwnerPromoted"/>
+        /// </summary>
+        /// <param name="sessionOwnerPromoted">the new session owner client identifier</param>
+        public delegate void OnSessionOwnerPromotedDelegateHandler(ulong sessionOwnerPromoted);
+
+        /// <summary>
+        /// Network Topology: Distributed Authority
+        /// When a new session owner is promoted, this event is triggered on all connected clients
+        /// </summary>
+        public event OnSessionOwnerPromotedDelegateHandler OnSessionOwnerPromoted;
+
+        internal void SetSessionOwner(ulong sessionOwner)
+        {
+            var previousSessionOwner = CurrentSessionOwner;
+            CurrentSessionOwner = sessionOwner;
+            LocalClient.IsSessionOwner = LocalClientId == sessionOwner;
+            if (LocalClient.IsSessionOwner)
+            {
+                foreach (var networkObjectEntry in SpawnManager.SpawnedObjects)
+                {
+                    var networkObject = networkObjectEntry.Value;
+                    if (networkObject.IsOwnershipSessionOwner && networkObject.OwnerClientId != LocalClientId)
+                    {
+                        SpawnManager.ChangeOwnership(networkObject, LocalClientId, true);
+                    }
+                }
+            }
+
+            OnSessionOwnerPromoted?.Invoke(sessionOwner);
+        }
+
+        internal void PromoteSessionOwner(ulong clientId)
+        {
+            if (!DistributedAuthorityMode)
+            {
+                NetworkLog.LogErrorServer($"[SceneManagement][NotDA] Invoking promote session owner while not in distributed authority mode!");
+                return;
+            }
+            if (!DAHost)
+            {
+                NetworkLog.LogErrorServer($"[SceneManagement][NotDAHost] Client is attempting to promote another client as the session owner!");
+                return;
+            }
+            SetSessionOwner(clientId);
+            var sessionOwnerMessage = new SessionOwnerMessage()
+            {
+                SessionOwner = clientId,
+            };
+            var clients = ConnectionManager.ConnectedClientIds.Where(c => c != LocalClientId).ToArray();
+            foreach (var targetClient in clients)
+            {
+                ConnectionManager.SendMessage(ref sessionOwnerMessage, NetworkDelivery.ReliableSequenced, targetClient);
+            }
+        }
+
+        internal Dictionary<ulong, NetworkObject> NetworkTransformUpdate = new Dictionary<ulong, NetworkObject>();
+#if COM_UNITY_MODULES_PHYSICS
+        internal Dictionary<ulong, NetworkObject> NetworkTransformFixedUpdate = new Dictionary<ulong, NetworkObject>();
+#endif
+
+        internal void NetworkTransformRegistration(NetworkObject networkObject, bool onUpdate = true, bool register = true)
+        {
+            if (onUpdate)
+            {
+                if (register)
+                {
+                    if (!NetworkTransformUpdate.ContainsKey(networkObject.NetworkObjectId))
+                    {
+                        NetworkTransformUpdate.Add(networkObject.NetworkObjectId, networkObject);
+                    }
+                }
+                else
+                {
+                    NetworkTransformUpdate.Remove(networkObject.NetworkObjectId);
+                }
+            }
+#if COM_UNITY_MODULES_PHYSICS
+            else
+            {
+                if (register)
+                {
+                    if (!NetworkTransformFixedUpdate.ContainsKey(networkObject.NetworkObjectId))
+                    {
+                        NetworkTransformFixedUpdate.Add(networkObject.NetworkObjectId, networkObject);
+                    }
+                }
+                else
+                {
+                    NetworkTransformFixedUpdate.Remove(networkObject.NetworkObjectId);
+                }
+            }
+#endif
+        }
+
+        private void UpdateTopology()
+        {
+            var transportTopology = IsListening ? NetworkConfig.NetworkTransport.CurrentTopology() : NetworkConfig.NetworkTopology;
+            if (transportTopology != NetworkConfig.NetworkTopology)
+            {
+                NetworkLog.LogErrorServer($"[Topology Mismatch] Transport detected an issue with the topology ({transportTopology} | {NetworkConfig.NetworkTopology}) usage or setting! Disconnecting from session.");
+                Shutdown();
+            }
+            else
+            {
+                IsDistributedAuthority = DistributedAuthorityMode = transportTopology == NetworkTopologyTypes.DistributedAuthority;
+            }
+        }
+
+        /// <summary>
+        /// Processes network-related updates for a specific update stage in the frame
+        /// </summary>
+        /// <param name="updateStage">The current network update stage being processed</param>
         public void NetworkUpdate(NetworkUpdateStage updateStage)
         {
             switch (updateStage)
             {
                 case NetworkUpdateStage.EarlyUpdate:
                     {
+                        UpdateTopology();
+
+                        // Handle processing any new connections or transport events
+                        NetworkConfig.NetworkTransport.EarlyUpdate();
+
                         ConnectionManager.ProcessPendingApprovals();
                         ConnectionManager.PollAndHandleNetworkEvents();
 
@@ -57,25 +337,98 @@ public void NetworkUpdate(NetworkUpdateStage updateStage)
 
                         AnticipationSystem.SetupForUpdate();
                         MessageManager.ProcessIncomingMessageQueue();
-                        MessageManager.CleanupDisconnectedClients();
 
+                        MessageManager.CleanupDisconnectedClients();
                         AnticipationSystem.ProcessReanticipation();
+#if COM_UNITY_MODULES_PHYSICS
+                        foreach (var networkObjectEntry in NetworkTransformFixedUpdate)
+                        {
+                            // if not active or not spawned then skip
+                            if (!networkObjectEntry.Value.gameObject.activeInHierarchy || !networkObjectEntry.Value.IsSpawned)
+                            {
+                                continue;
+                            }
+
+                            foreach (var networkTransformEntry in networkObjectEntry.Value.NetworkTransforms)
+                            {
+                                // only update if enabled
+                                if (networkTransformEntry.enabled)
+                                {
+                                    networkTransformEntry.ResetFixedTimeDelta();
+                                }
+                            }
+                        }
+#endif
                     }
                     break;
+#if COM_UNITY_MODULES_PHYSICS
+                case NetworkUpdateStage.FixedUpdate:
+                    {
+                        foreach (var networkObjectEntry in NetworkTransformFixedUpdate)
+                        {
+                            // if not active or not spawned then skip
+                            if (!networkObjectEntry.Value.gameObject.activeInHierarchy || !networkObjectEntry.Value.IsSpawned)
+                            {
+                                continue;
+                            }
+
+                            foreach (var networkTransformEntry in networkObjectEntry.Value.NetworkTransforms)
+                            {
+                                // only update if enabled
+                                if (networkTransformEntry.enabled)
+                                {
+                                    networkTransformEntry.OnFixedUpdate();
+                                }
+                            }
+                        }
+                    }
+                    break;
+#endif
                 case NetworkUpdateStage.PreUpdate:
                     {
                         NetworkTimeSystem.UpdateTime();
                         AnticipationSystem.Update();
                     }
                     break;
-                case NetworkUpdateStage.PostScriptLateUpdate:
+                case NetworkUpdateStage.PreLateUpdate:
+                    {
+                        // Non-physics based non-authority NetworkTransforms update their states after all other components
+                        foreach (var networkObjectEntry in NetworkTransformUpdate)
+                        {
+                            // if not active or not spawned then skip
+                            if (!networkObjectEntry.Value.gameObject.activeInHierarchy || !networkObjectEntry.Value.IsSpawned)
+                            {
+                                continue;
+                            }
 
-                    AnticipationSystem.Sync();
-                    AnticipationSystem.SetupForRender();
+                            foreach (var networkTransformEntry in networkObjectEntry.Value.NetworkTransforms)
+                            {
+                                // only update if enabled
+                                if (networkTransformEntry.enabled)
+                                {
+                                    networkTransformEntry.OnUpdate();
+                                }
+                            }
+                        }
+                    }
+                    break;
+                case NetworkUpdateStage.PostScriptLateUpdate:
+                    {
+                        AnticipationSystem.Sync();
+                        AnticipationSystem.SetupForRender();
+                    }
                     break;
-
                 case NetworkUpdateStage.PostLateUpdate:
                     {
+                        // Handle deferred despawning
+                        if (DistributedAuthorityMode)
+                        {
+                            SpawnManager.DeferredDespawnUpdate(ServerTime);
+                        }
+
+                        // Update any NetworkObject's registered to notify of scene migration changes.
+                        SpawnManager.UpdateNetworkObjectSceneChanges();
+
                         // This should be invoked just prior to the MessageManager processes its outbound queue.
                         SceneManager.CheckForAndSendNetworkObjectSceneChanged();
 
@@ -85,6 +438,9 @@ public void NetworkUpdate(NetworkUpdateStage updateStage)
                         // Metrics update needs to be driven by NetworkConnectionManager's update to assure metrics are dispatched after the send queue is processed.
                         MetricsManager.UpdateMetrics();
 
+                        // Handle sending any pending transport messages
+                        NetworkConfig.NetworkTransport.PostLateUpdate();
+
                         // TODO: Determine a better way to handle this
                         NetworkObject.VerifyParentingStatus();
 
@@ -191,17 +547,17 @@ public ulong LocalClientId
         }
 
         /// <summary>
-        /// Gets a dictionary of connected clients and their clientId keys. This is only accessible on the server.
+        /// Gets a dictionary of connected clients and their clientId keys.
         /// </summary>
-        public IReadOnlyDictionary<ulong, NetworkClient> ConnectedClients => IsServer ? ConnectionManager.ConnectedClients : throw new NotServerException($"{nameof(ConnectionManager.ConnectedClients)} should only be accessed on server.");
+        public IReadOnlyDictionary<ulong, NetworkClient> ConnectedClients => ConnectionManager.ConnectedClients;
 
         /// <summary>
-        /// Gets a list of connected clients. This is only accessible on the server.
+        /// Gets a list of connected clients.
         /// </summary>
-        public IReadOnlyList<NetworkClient> ConnectedClientsList => IsServer ? ConnectionManager.ConnectedClientsList : throw new NotServerException($"{nameof(ConnectionManager.ConnectedClientsList)} should only be accessed on server.");
+        public IReadOnlyList<NetworkClient> ConnectedClientsList => ConnectionManager.ConnectedClientsList;
 
         /// <summary>
-        /// Gets a list of just the IDs of all connected clients. This is only accessible on the server.
+        /// Gets a list of just the IDs of all connected clients.
         /// </summary>
         public IReadOnlyList<ulong> ConnectedClientsIds => ConnectionManager.ConnectedClientIds;
 
@@ -294,6 +650,10 @@ public event Action OnTransportFailure
             remove => ConnectionManager.OnTransportFailure -= value;
         }
 
+        /// <summary>
+        /// Delegate for handling network state reanticipation events
+        /// </summary>
+        /// <param name="lastRoundTripTime">The most recent round-trip time measurement in seconds between client and server</param>
         public delegate void ReanticipateDelegate(double lastRoundTripTime);
 
         /// <summary>
@@ -473,22 +833,25 @@ public struct ConnectionApprovalRequest
         public event Action OnServerStarted = null;
 
         /// <summary>
-        /// The callback to invoke once the local client is ready.
+        /// The callback to invoke once the local client is ready
         /// </summary>
         public event Action OnClientStarted = null;
 
+        /// <summary>
+        /// Subscribe to this event to get notifications before a <see cref="NetworkManager"/> instance is being destroyed.
+        /// This is useful if you want to use the state of anything the NetworkManager cleans up during its shutdown.
+        /// </summary>
+        public event Action OnPreShutdown = null;
+
         /// <summary>
         /// This callback is invoked once the local server is stopped.
         /// </summary>
-        /// <remarks>The bool parameter will be set to true when stopping a host instance and false when stopping a server instance.</remarks>
-        /// <param name="arg1">The first parameter of this event will be set to <see cref="true"/> when stopping a host instance and <see cref="false"/> when stopping a server instance.</param>
         public event Action<bool> OnServerStopped = null;
 
         /// <summary>
-        /// The callback to invoke once the local client stops.
+        /// The callback to invoke once the local client stops
         /// </summary>
-        /// <remarks>The bool parameter will be set to true when stopping a host client and false when stopping a standard client instance.</remarks>
-        /// <param name="arg1">The first parameter of this event will be set to <see cref="true"/> when stopping the host client and <see cref="false"/> when stopping a standard client instance.</param>
+        /// <remarks>The parameter states whether the client was running in host mode</remarks>
         public event Action<bool> OnClientStopped = null;
 
         /// <summary>
@@ -583,99 +946,6 @@ internal T Value
 
         internal Override<ushort> PortOverride;
 
-#if UNITY_EDITOR
-        internal static INetworkManagerHelper NetworkManagerHelper;
-
-        /// <summary>
-        /// Interface for NetworkManagerHelper
-        /// </summary>
-        internal interface INetworkManagerHelper
-        {
-            bool NotifyUserOfNestedNetworkManager(NetworkManager networkManager, bool ignoreNetworkManagerCache = false, bool editorTest = false);
-            void CheckAndNotifyUserNetworkObjectRemoved(NetworkManager networkManager, bool editorTest = false);
-        }
-
-        internal delegate void ResetNetworkManagerDelegate(NetworkManager manager);
-
-        internal static ResetNetworkManagerDelegate OnNetworkManagerReset;
-
-        private void Reset()
-        {
-            OnNetworkManagerReset?.Invoke(this);
-        }
-
-        internal void OnValidate()
-        {
-            if (NetworkConfig == null)
-            {
-                return; // May occur when the component is added
-            }
-
-            if (GetComponentInChildren<NetworkObject>() != null)
-            {
-                if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
-                {
-                    NetworkLog.LogWarning($"{nameof(NetworkManager)} cannot be a {nameof(NetworkObject)}.");
-                }
-            }
-
-            var activeScene = UnityEngine.SceneManagement.SceneManager.GetActiveScene();
-
-            // If the scene is not dirty or the asset database is currently updating then we can skip updating the NetworkPrefab information
-            if (!activeScene.isDirty || EditorApplication.isUpdating)
-            {
-                return;
-            }
-
-            // During OnValidate we will always clear out NetworkPrefabOverrideLinks and rebuild it
-            NetworkConfig.Prefabs.NetworkPrefabOverrideLinks.Clear();
-
-            var prefabs = NetworkConfig.Prefabs.Prefabs;
-            // Check network prefabs and assign to dictionary for quick look up
-            for (int i = 0; i < prefabs.Count; i++)
-            {
-                var networkPrefab = prefabs[i];
-                var networkPrefabGo = networkPrefab?.Prefab;
-                if (networkPrefabGo == null)
-                {
-                    continue;
-                }
-
-                var networkObject = networkPrefabGo.GetComponent<NetworkObject>();
-                if (networkObject == null)
-                {
-                    if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
-                    {
-                        NetworkLog.LogError($"Cannot register {NetworkPrefabHandler.PrefabDebugHelper(networkPrefab)}, it does not have a {nameof(NetworkObject)} component at its root");
-                    }
-
-                    continue;
-                }
-
-                {
-                    var childNetworkObjects = new List<NetworkObject>();
-                    networkPrefabGo.GetComponentsInChildren(true, childNetworkObjects);
-                    if (childNetworkObjects.Count > 1) // total count = 1 root NetworkObject + n child NetworkObjects
-                    {
-                        if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
-                        {
-                            NetworkLog.LogWarning($"{NetworkPrefabHandler.PrefabDebugHelper(networkPrefab)} has child {nameof(NetworkObject)}(s) but they will not be spawned across the network (unsupported {nameof(NetworkPrefab)} setup)");
-                        }
-                    }
-                }
-            }
-        }
-
-        private void ModeChanged(PlayModeStateChange change)
-        {
-            if (IsListening && change == PlayModeStateChange.ExitingPlayMode)
-            {
-                // Make sure we are not holding onto anything in case domain reload is disabled
-                ShutdownInternal();
-            }
-        }
-#endif
-
         /// <summary>
         /// Determines if the NetworkManager's GameObject is parented under another GameObject and
         /// notifies the user that this is not allowed for the NetworkManager.
@@ -757,14 +1027,14 @@ private void OnEnable()
         /// <summary>
         /// <see cref="NetworkPrefabHandler.AddNetworkPrefab(GameObject)"/>
         /// </summary>
-        /// <param name="prefab"></param>
-        /// <exception cref="Exception"></exception>
+        /// <param name="prefab">The GameObject prefab to register for network spawning</param>
+        /// <exception cref="Exception">Thrown when the prefab is invalid or already registered</exception>
         public void AddNetworkPrefab(GameObject prefab) => PrefabHandler.AddNetworkPrefab(prefab);
 
         /// <summary>
         /// <see cref="NetworkPrefabHandler.RemoveNetworkPrefab(GameObject)"/>
         /// </summary>
-        /// <param name="prefab"></param>
+        /// <param name="prefab">The GameObject prefab to unregister from network spawning</param>
         public void RemoveNetworkPrefab(GameObject prefab) => PrefabHandler.RemoveNetworkPrefab(prefab);
 
         /// <summary>
@@ -776,7 +1046,6 @@ private void OnEnable()
         /// and thus should be large enough to ensure it can hold each message type.
         /// This value defaults to 1296.
         /// </summary>
-        /// <param name="size"></param>
         public int MaximumTransmissionUnitSize
         {
             set => MessageManager.NonFragmentedMessageMaxSize = value & ~7; // Round down to nearest word aligned size
@@ -788,8 +1057,8 @@ public int MaximumTransmissionUnitSize
         /// This determines the maximum size of a message batch that can be sent to that client.
         /// If not set for any given client, <see cref="MaximumTransmissionUnitSize"/> will be used instead.
         /// </summary>
-        /// <param name="clientId"></param>
-        /// <param name="size"></param>
+        /// <param name="clientId">The unique identifier of the client peer</param>
+        /// <param name="size">The MTU size in bytes for this specific peer</param>
         public void SetPeerMTU(ulong clientId, int size)
         {
             MessageManager.PeerMTUSizes[clientId] = size;
@@ -799,8 +1068,8 @@ public void SetPeerMTU(ulong clientId, int size)
         /// Queries the current MTU size for a client.
         /// If no MTU has been set for that client, will return <see cref="MaximumTransmissionUnitSize"/>
         /// </summary>
-        /// <param name="clientId"></param>
-        /// <returns></returns>
+        /// <param name="clientId">he unique identifier of the client peer</param>
+        /// <returns>The MTU size in bytes for the specified peer. If no custom MTU has been set for this peer, returns the global <see cref="MaximumTransmissionUnitSize"/> value.</returns>
         public int GetPeerMTU(ulong clientId)
         {
             if (MessageManager.PeerMTUSizes.TryGetValue(clientId, out var ret))
@@ -815,15 +1084,34 @@ public int GetPeerMTU(ulong clientId)
         /// Sets the maximum size of a message (or message batch) passed through the transport with the ReliableFragmented delivery.
         /// Warning: setting this value too low may result in the SDK becoming non-functional with projects that have a large number of NetworkBehaviours or NetworkVariables, as the SDK relies on the transport's ability to fragment some messages when they grow beyond the MTU size.
         /// </summary>
-        /// <param name="size"></param>
         public int MaximumFragmentedMessageSize
         {
             set => MessageManager.FragmentedMessageMaxSize = value;
             get => MessageManager.FragmentedMessageMaxSize;
         }
 
-        internal void Initialize(bool server)
+        public virtual void Initialize(bool server)
         {
+#if DEVELOPMENT_BUILD || UNITY_EDITOR
+            if (!DisableNotOptimizedSerializedType)
+            {
+                s_SerializedType.Clear();
+            }
+#endif
+
+#if COM_UNITY_MODULES_PHYSICS
+            NetworkTransformFixedUpdate.Clear();
+#endif
+            NetworkTransformUpdate.Clear();
+
+            UpdateTopology();
+
+            // Always create a default session config when starting a NetworkManager instance
+            if (DistributedAuthorityMode)
+            {
+                SessionConfig = GetSessionConfig();
+            }
+
             // Make sure the ServerShutdownState is reset when initializing
             if (server)
             {
@@ -856,8 +1144,12 @@ internal void Initialize(bool server)
             }
 
             this.RegisterNetworkUpdate(NetworkUpdateStage.EarlyUpdate);
+#if COM_UNITY_MODULES_PHYSICS
+            this.RegisterNetworkUpdate(NetworkUpdateStage.FixedUpdate);
+#endif
             this.RegisterNetworkUpdate(NetworkUpdateStage.PreUpdate);
             this.RegisterNetworkUpdate(NetworkUpdateStage.PostScriptLateUpdate);
+            this.RegisterNetworkUpdate(NetworkUpdateStage.PreLateUpdate);
             this.RegisterNetworkUpdate(NetworkUpdateStage.PostLateUpdate);
 
             // ComponentFactory needs to set its defaults next
@@ -873,11 +1165,17 @@ internal void Initialize(bool server)
                 MessageManager.Hook(new NetworkManagerHooks(this));
 
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
-                MessageManager.Hook(new ProfilingHooks());
+                if (NetworkConfig.NetworkProfilingMetrics)
+                {
+                    MessageManager.Hook(new ProfilingHooks());
+                }
 #endif
 
 #if MULTIPLAYER_TOOLS
-                MessageManager.Hook(new MetricHooks(this));
+                if (NetworkConfig.NetworkMessageMetrics)
+                {
+                    MessageManager.Hook(new MetricHooks(this));
+                }
 #endif
 
                 // Assures there is a server message queue available
@@ -908,6 +1206,9 @@ internal void Initialize(bool server)
 
             NetworkConfig.InitializePrefabs();
             PrefabHandler.RegisterPlayerPrefab();
+#if UNITY_EDITOR
+            BeginNetworkSession();
+#endif
         }
 
         private enum StartType
@@ -976,7 +1277,10 @@ public bool StartServer()
                 return false;
             }
 
-            ConnectionManager.LocalClient.SetRole(true, false, this);
+            if (!ConnectionManager.LocalClient.SetRole(true, false, this))
+            {
+                return false;
+            }
             ConnectionManager.LocalClient.ClientId = ServerClientId;
 
             Initialize(true);
@@ -989,6 +1293,8 @@ public bool StartServer()
                 {
                     SpawnManager.ServerSpawnSceneObjectsOnStartSweep();
 
+                    // Notify the server that everything should be synchronized/spawned at this time.
+                    SpawnManager.NotifyNetworkObjectsSynchronized();
                     OnServerStarted?.Invoke();
                     ConnectionManager.LocalClient.IsApproved = true;
                     return true;
@@ -1022,7 +1328,10 @@ public bool StartClient()
                 return false;
             }
 
-            ConnectionManager.LocalClient.SetRole(false, true, this);
+            if (!ConnectionManager.LocalClient.SetRole(false, true, this))
+            {
+                return false;
+            }
 
             Initialize(false);
 
@@ -1065,7 +1374,11 @@ public bool StartHost()
                 return false;
             }
 
-            ConnectionManager.LocalClient.SetRole(true, true, this);
+            if (!ConnectionManager.LocalClient.SetRole(true, true, this))
+            {
+                return false;
+            }
+
             Initialize(true);
             try
             {
@@ -1121,13 +1434,17 @@ private void HostServerInitialize()
                 var response = new ConnectionApprovalResponse
                 {
                     Approved = true,
-                    CreatePlayerObject = NetworkConfig.PlayerPrefab != null
+                    // Distributed authority always returns true since the client side handles spawning (whether automatically or manually)
+                    CreatePlayerObject = DistributedAuthorityMode || NetworkConfig.PlayerPrefab != null,
                 };
                 ConnectionManager.HandleConnectionApproval(ServerClientId, response);
             }
 
             SpawnManager.ServerSpawnSceneObjectsOnStartSweep();
 
+            // Notify the host that everything should be synchronized/spawned at this time.
+            SpawnManager.NotifyNetworkObjectsSynchronized();
+
             OnServerStarted?.Invoke();
             OnClientStarted?.Invoke();
 
@@ -1191,15 +1508,22 @@ private void OnSceneUnloaded(Scene scene)
 
         internal void ShutdownInternal()
         {
+#if UNITY_EDITOR
+            EndNetworkSession();
+#endif
+
             if (NetworkLog.CurrentLogLevel <= LogLevel.Developer)
             {
                 NetworkLog.LogInfo(nameof(ShutdownInternal));
             }
 
+            OnPreShutdown?.Invoke();
+
             this.UnregisterAllNetworkUpdates();
 
             // Everything is shutdown in the order of their dependencies
             DeferredMessageManager?.CleanupAllTriggers();
+            CustomMessagingManager = null;
 
             RpcTarget?.Dispose();
             RpcTarget = null;
@@ -1210,8 +1534,6 @@ internal void ShutdownInternal()
             // Shutdown connection manager last which shuts down transport
             ConnectionManager.Shutdown();
 
-            CustomMessagingManager = null;
-
             if (MessageManager != null)
             {
                 MessageManager.Dispose();
@@ -1271,6 +1593,7 @@ internal void ShutdownInternal()
             NetworkTickSystem = null;
         }
 
+
         // Ensures that the NetworkManager is cleaned up before OnDestroy is run on NetworkObjects and NetworkBehaviours when quitting the application.
         private void OnApplicationQuit()
         {
@@ -1328,5 +1651,211 @@ private void ParseCommandLineOptions()
             ParseArg(k_OverridePortArg, ref PortOverride);
 #endif
         }
+
+#if UNITY_EDITOR
+        internal static INetworkManagerHelper NetworkManagerHelper;
+
+        /// <summary>
+        /// Interface for NetworkManagerHelper
+        /// </summary>
+        internal interface INetworkManagerHelper
+        {
+            bool NotifyUserOfNestedNetworkManager(NetworkManager networkManager, bool ignoreNetworkManagerCache = false, bool editorTest = false);
+
+            void CheckAndNotifyUserNetworkObjectRemoved(NetworkManager networkManager, bool editorTest = false);
+
+            internal NetcodeAnalytics Analytics();
+        }
+
+        internal abstract class NetcodeAnalytics
+        {
+            internal abstract void ModeChanged(PlayModeStateChange playModeState, NetworkManager networkManager);
+
+            internal abstract void SessionStarted(NetworkManager networkManager);
+
+            internal abstract void SessionStopped(NetworkManager networkManager);
+
+            internal abstract void OnOneTimeSetup();
+
+            internal abstract void OnOneTimeTearDown();
+        }
+
+        internal delegate void ResetNetworkManagerDelegate(NetworkManager manager);
+
+        internal static ResetNetworkManagerDelegate OnNetworkManagerReset;
+
+        private void Reset()
+        {
+            OnNetworkManagerReset?.Invoke(this);
+        }
+
+        /// <summary>
+        /// Invoked when validating the <see cref="NetworkManager"/> component.
+        /// </summary>
+        protected virtual void OnValidateComponent()
+        {
+
+        }
+
+        private PackageInfo GetPackageInfo(string packageName)
+        {
+            return AssetDatabase.FindAssets("package").Select(AssetDatabase.GUIDToAssetPath).Where(x => AssetDatabase.LoadAssetAtPath<TextAsset>(x) != null).Select(PackageInfo.FindForAssetPath).Where(x => x != null).First(x => x.name == packageName);
+        }
+
+        internal void OnValidate()
+        {
+            if (NetworkConfig == null)
+            {
+                return; // May occur when the component is added
+            }
+
+            // Do a validation pass on NetworkConfig properties
+            NetworkConfig.OnValidate();
+
+            if (GetComponentInChildren<NetworkObject>() != null)
+            {
+                if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
+                {
+                    NetworkLog.LogWarning($"{nameof(NetworkManager)} cannot be a {nameof(NetworkObject)}.");
+                }
+            }
+
+            var activeScene = UnityEngine.SceneManagement.SceneManager.GetActiveScene();
+
+            // If the scene is not dirty or the asset database is currently updating then we can skip updating the NetworkPrefab information
+            if (!activeScene.isDirty || EditorApplication.isUpdating)
+            {
+                return;
+            }
+
+            // During OnValidate we will always clear out NetworkPrefabOverrideLinks and rebuild it
+            NetworkConfig.Prefabs.NetworkPrefabOverrideLinks.Clear();
+
+            var prefabs = NetworkConfig.Prefabs.Prefabs;
+            // Check network prefabs and assign to dictionary for quick look up
+            for (int i = 0; i < prefabs.Count; i++)
+            {
+                var networkPrefab = prefabs[i];
+                var networkPrefabGo = networkPrefab?.Prefab;
+                if (networkPrefabGo == null)
+                {
+                    continue;
+                }
+
+                var networkObject = networkPrefabGo.GetComponent<NetworkObject>();
+                if (networkObject == null)
+                {
+                    if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
+                    {
+                        NetworkLog.LogError($"Cannot register {NetworkPrefabHandler.PrefabDebugHelper(networkPrefab)}, it does not have a {nameof(NetworkObject)} component at its root");
+                    }
+
+                    continue;
+                }
+
+                {
+                    var childNetworkObjects = new List<NetworkObject>();
+                    networkPrefabGo.GetComponentsInChildren(true, childNetworkObjects);
+                    if (childNetworkObjects.Count > 1) // total count = 1 root NetworkObject + n child NetworkObjects
+                    {
+                        if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
+                        {
+                            NetworkLog.LogWarning($"{NetworkPrefabHandler.PrefabDebugHelper(networkPrefab)} has child {nameof(NetworkObject)}(s) but they will not be spawned across the network (unsupported {nameof(NetworkPrefab)} setup)");
+                        }
+                    }
+                }
+            }
+
+            try
+            {
+                OnValidateComponent();
+            }
+            catch (Exception ex)
+            {
+                Debug.LogException(ex);
+            }
+        }
+
+        internal void ModeChanged(PlayModeStateChange playModeState)
+        {
+            if (playModeState == PlayModeStateChange.ExitingPlayMode)
+            {
+                if (IsListening)
+                {
+                    OnApplicationQuit();
+                }
+            }
+            try
+            {
+                NetworkManagerHelper?.Analytics()?.ModeChanged(playModeState, this);
+            }
+            catch (Exception ex)
+            {
+                Debug.LogException(ex);
+            }
+
+        }
+
+        /// <summary>
+        /// Invoked when NetworkManager is started.
+        /// </summary>
+        private void BeginNetworkSession()
+        {
+            try
+            {
+                NetworkManagerHelper?.Analytics()?.SessionStarted(this);
+            }
+            catch (Exception ex)
+            {
+                Debug.LogException(ex);
+            }
+        }
+
+        /// <summary>
+        /// Invoked when NetworkManager is stopped or upon exiting play mode.
+        /// </summary>
+        private void EndNetworkSession()
+        {
+            try
+            {
+                NetworkManagerHelper?.Analytics()?.SessionStopped(this);
+            }
+            catch (Exception ex)
+            {
+                Debug.LogException(ex);
+            }
+        }
+#endif
+
+#if UNITY_INCLUDE_TESTS
+        /// <summary>
+        /// Used for integration tests
+        /// </summary>
+        internal static void OnOneTimeSetup()
+        {
+#if UNITY_EDITOR
+            try
+            {
+                NetworkManagerHelper?.Analytics()?.OnOneTimeSetup();
+            }
+            catch { }
+#endif
+        }
+
+        /// <summary>
+        /// Used for integration tests
+        /// </summary>
+        internal static void OnOneTimeTearDown()
+        {
+#if UNITY_EDITOR
+            try
+            {
+                NetworkManagerHelper?.Analytics()?.OnOneTimeTearDown();
+            }
+            catch { }
+#endif
+        }
+#endif
+
     }
 }
diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs
index 9dcfcfd51f..502ffefcb6 100644
--- a/com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Core/NetworkObject.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Runtime.CompilerServices;
+using Unity.Netcode.Components;
 #if UNITY_EDITOR
 using UnityEditor;
 #if UNITY_2021_2_OR_NEWER
@@ -13,6 +15,7 @@
 using UnityEngine.SceneManagement;
 
 
+
 namespace Unity.Netcode
 {
     /// <summary>
@@ -27,232 +30,1090 @@ public sealed class NetworkObject : MonoBehaviour
         internal uint GlobalObjectIdHash;
 
         /// <summary>
-        /// Used to track the source GlobalObjectIdHash value of the associated network prefab.
-        /// When an override exists or it is in-scene placed, GlobalObjectIdHash and PrefabGlobalObjectIdHash
-        /// will be different. The PrefabGlobalObjectIdHash value is what is used when sending a <see cref="CreateObjectMessage"/>.
+        /// Used to track the source GlobalObjectIdHash value of the associated network prefab.
+        /// When an override exists or it is in-scene placed, GlobalObjectIdHash and PrefabGlobalObjectIdHash
+        /// will be different. The PrefabGlobalObjectIdHash value is what is used when sending a <see cref="CreateObjectMessage"/>.
+        /// </summary>
+        internal uint PrefabGlobalObjectIdHash;
+
+        /// <summary>
+        /// This is the source prefab of an in-scene placed NetworkObject. This is not set for in-scene
+        /// placd NetworkObjects that are not prefab instances, dynamically spawned prefab instances,
+        /// or for network prefab assets.
+        /// </summary>
+        [HideInInspector]
+        [SerializeField]
+        internal uint InScenePlacedSourceGlobalObjectIdHash;
+
+        /// <summary>
+        /// Gets the Prefab Hash Id of this object if the object is registerd as a prefab otherwise it returns 0
+        /// </summary>
+        [HideInInspector]
+        public uint PrefabIdHash
+        {
+            get
+            {
+                return GlobalObjectIdHash;
+            }
+        }
+
+        /// <summary>
+        /// All <see cref="NetworkTransform"/> component instances associated with a <see cref="NetworkObject"/> component instance.
+        /// </summary>
+        /// <remarks>
+        /// When parented, all child <see cref="NetworkTransform"/> component instances under a <see cref="NetworkObject"/> component instance that do not have
+        /// another <see cref="NetworkObject"/> component instance will be associated with the initial component instance. This list does not contain any parented
+        /// children <see cref="NetworkObject"/> instances with one or more <see cref="NetworkTransform"/> component instance(s).
+        /// </remarks>
+        public List<NetworkTransform> NetworkTransforms { get; private set; }
+
+
+#if COM_UNITY_MODULES_PHYSICS
+        /// <summary>
+        /// All <see cref="NetworkRigidbodyBase"></see> component instances associated with a <see cref="NetworkObject"/> component instance.
+        /// NOTE: This is only available if a physics package is included. If not, then this will not be available!
+        /// </summary>
+        /// <remarks>
+        /// When parented, all child <see cref="NetworkRigidbodyBase"/> component instances under a <see cref="NetworkObject"/> component instance that do not have
+        /// another <see cref="NetworkObject"/> component instance will be associated with the initial component instance. This list does not contain any parented
+        /// child <see cref="NetworkObject"/> instances with one or more <see cref="NetworkTransform"/> component instance(s).
+        /// </remarks>
+        public List<NetworkRigidbodyBase> NetworkRigidbodies { get; private set; }
+#endif
+        /// <summary>
+        /// The current parent <see cref="NetworkObject"/> component instance to this <see cref="NetworkObject"/> component instance. When there is no parent then
+        /// this will be <see cref="null"/>.
+        /// </summary>
+        public NetworkObject CurrentParent { get; private set; }
+
+#if UNITY_EDITOR
+        private const string k_GlobalIdTemplate = "GlobalObjectId_V1-{0}-{1}-{2}-{3}";
+
+        /// <summary>
+        /// Object Types <see href="https://docs.unity3d.com/ScriptReference/GlobalObjectId.html"/>
+        /// Parameter 0 of <see cref="k_GlobalIdTemplate"/>
+        /// </summary>
+        // 0 = Null (when considered a null object type we can ignore)
+        // 1 = Imported Asset
+        // 2 = Scene Object
+        // 3 = Source Asset.
+        private const int k_NullObjectType = 0;
+        private const int k_ImportedAssetObjectType = 1;
+        private const int k_SceneObjectType = 2;
+        private const int k_SourceAssetObjectType = 3;
+
+        // Used to track any InContext or InIsolation prefab being edited.
+        private static PrefabStage s_PrefabStage;
+        // The network prefab asset that the edit mode scene has created an instance of (s_PrefabInstance).
+        private static NetworkObject s_PrefabAsset;
+        // The InContext or InIsolation edit mode network prefab scene instance of the prefab asset (s_PrefabAsset).
+        private static NetworkObject s_PrefabInstance;
+
+        private static bool s_DebugPrefabIdGeneration;
+
+
+        [ContextMenu("Refresh In-Scene Prefab Instances")]
+        internal void RefreshAllPrefabInstances()
+        {
+            var instanceGlobalId = GlobalObjectId.GetGlobalObjectIdSlow(this);
+            // Assign the currently selected instance to be updated
+            NetworkObjectRefreshTool.PrefabNetworkObject = this;
+            if (!PrefabUtility.IsPartOfAnyPrefab(this) || instanceGlobalId.identifierType != k_ImportedAssetObjectType)
+            {
+                EditorUtility.DisplayDialog("Network Prefab Assets Only", "This action can only be performed on a network prefab asset.", "Ok");
+                return;
+            }
+
+            // Handle updating the currently active scene
+            NetworkObjectRefreshTool.ProcessActiveScene();
+
+            // Refresh all build settings scenes
+            var activeScene = SceneManager.GetActiveScene();
+            foreach (var editorScene in EditorBuildSettings.scenes)
+            {
+                // skip disabled scenes and the currently active scene
+                if (!editorScene.enabled || activeScene.path == editorScene.path)
+                {
+                    continue;
+                }
+                // Add the scene to be processed
+                NetworkObjectRefreshTool.ProcessScene(editorScene.path, true);
+            }
+
+            // Process all added scenes
+            NetworkObjectRefreshTool.ProcessScenes();
+        }
+
+        /// <summary>
+        /// Register for <see cref="PrefabStage"/> opened and closing event notifications.
+        /// </summary>
+        [InitializeOnLoadMethod]
+        private static void OnApplicationStart()
+        {
+            PrefabStage.prefabStageOpened -= PrefabStageOpened;
+            PrefabStage.prefabStageOpened += PrefabStageOpened;
+            PrefabStage.prefabStageClosing -= PrefabStageClosing;
+            PrefabStage.prefabStageClosing += PrefabStageClosing;
+        }
+
+        private static void PrefabStageClosing(PrefabStage prefabStage)
+        {
+            // If domain reloading is enabled, then this will be null when we return from playmode.
+            if (s_PrefabStage == null)
+            {
+                // Determine if we have a network prefab opened in edit mode or not.
+                CheckPrefabStage(prefabStage);
+            }
+
+            s_PrefabStage = null;
+            s_PrefabInstance = null;
+            s_PrefabAsset = null;
+        }
+
+        private static void PrefabStageOpened(PrefabStage prefabStage)
+        {
+            // Determine if we have a network prefab opened in edit mode or not.
+            CheckPrefabStage(prefabStage);
+        }
+
+        /// <summary>
+        /// Determines if we have opened a network prefab in edit mode (InContext or InIsolation)
+        /// </summary>
+        /// <remarks>
+        /// InContext: Typically means a are in prefab edit mode for an in-scene placed network prefab instance.
+        /// (currently no such thing as a network prefab with nested network prefab instances)
+        ///
+        /// InIsolation: Typically means we are in prefb edit mode for a prefab asset.
+        /// </remarks>
+        /// <param name="prefabStage"></param>
+        private static void CheckPrefabStage(PrefabStage prefabStage)
+        {
+            s_PrefabStage = prefabStage;
+            s_PrefabInstance = prefabStage.prefabContentsRoot?.GetComponent<NetworkObject>();
+            if (s_PrefabInstance)
+            {
+                // We acquire the source prefab that the prefab edit mode scene instance was instantiated from differently for InContext than InSolation.
+                if (s_PrefabStage.mode == PrefabStage.Mode.InContext && s_PrefabStage.openedFromInstanceRoot != null)
+                {
+                    // This is needed to handle the scenario where a user completely loads a new scene while in an InContext prefab edit mode.
+                    try
+                    {
+                        s_PrefabAsset = s_PrefabStage.openedFromInstanceRoot?.GetComponent<NetworkObject>();
+                    }
+                    catch
+                    {
+                        s_PrefabAsset = null;
+                    }
+                }
+                else
+                {
+                    // When editing in InIsolation mode, load the original prefab asset from the provided path.
+                    s_PrefabAsset = AssetDatabase.LoadAssetAtPath<NetworkObject>(s_PrefabStage.assetPath);
+                }
+
+                if (s_PrefabInstance.GlobalObjectIdHash != s_PrefabAsset.GlobalObjectIdHash)
+                {
+                    s_PrefabInstance.GlobalObjectIdHash = s_PrefabAsset.GlobalObjectIdHash;
+                    // For InContext mode, we don't want to record these modifications (the in-scene GlobalObjectIdHash is serialized with the scene).
+                    if (s_PrefabStage.mode == PrefabStage.Mode.InIsolation)
+                    {
+                        PrefabUtility.RecordPrefabInstancePropertyModifications(s_PrefabAsset);
+                    }
+                }
+            }
+            else
+            {
+                s_PrefabStage = null;
+                s_PrefabInstance = null;
+                s_PrefabAsset = null;
+            }
+        }
+
+        /// <summary>
+        /// GlobalObjectIdHash values are generated during validation.
+        /// </summary>
+        internal void OnValidate()
+        {
+            // Always exit early if we are in prefab edit mode and this instance is the
+            // prefab instance within the InContext or InIsolation edit scene.
+            if (s_PrefabInstance == this)
+            {
+                return;
+            }
+
+            // Do not regenerate GlobalObjectIdHash for NetworkPrefabs while Editor is in play mode.
+            if (EditorApplication.isPlaying && !string.IsNullOrEmpty(gameObject.scene.name))
+            {
+                return;
+            }
+
+            // Do not regenerate GlobalObjectIdHash if Editor is transitioning into or out of play mode.
+            if (!EditorApplication.isPlaying && EditorApplication.isPlayingOrWillChangePlaymode)
+            {
+                return;
+            }
+
+            // Get a global object identifier for this network prefab.
+            var globalId = GlobalObjectId.GetGlobalObjectIdSlow(this);
+
+            // if the identifier type is 0, then don't update the GlobalObjectIdHash.
+            if (globalId.identifierType == k_NullObjectType)
+            {
+                return;
+            }
+
+            var oldValue = GlobalObjectIdHash;
+            GlobalObjectIdHash = globalId.ToString().Hash32();
+
+            // Always check for in-scene placed to assure any previous version scene assets with in-scene place NetworkObjects gets updated.
+            CheckForInScenePlaced();
+
+            // If the GlobalObjectIdHash value changed, then mark the asset dirty.
+            if (GlobalObjectIdHash != oldValue)
+            {
+                // Check if this is an in-scnee placed NetworkObject (Special Case for In-Scene Placed).
+                if (IsSceneObject.HasValue && IsSceneObject.Value)
+                {
+                    // Sanity check to make sure this is a scene placed object.
+                    if (globalId.identifierType != k_SceneObjectType)
+                    {
+                        // This should never happen, but in the event it does throw and error.
+                        Debug.LogError($"[{gameObject.name}] is detected as an in-scene placed object but its identifier is of type {globalId.identifierType}! **Report this error**");
+                    }
+
+                    // If this is a prefab instance, then we want to mark it as having been updated in order for the udpated GlobalObjectIdHash value to be saved.
+                    if (PrefabUtility.IsPartOfAnyPrefab(this))
+                    {
+                        // We must invoke this in order for the modifications to get saved with the scene (does not mark scene as dirty).
+                        PrefabUtility.RecordPrefabInstancePropertyModifications(this);
+                    }
+                }
+                else // Otherwise, this is a standard network prefab asset so we just mark it dirty for the AssetDatabase to update it.
+                {
+                    EditorUtility.SetDirty(this);
+                }
+            }
+        }
+
+        /// <summary>
+        /// This checks to see if this NetworkObject is an in-scene placed prefab instance. If so it will
+        /// automatically find the source prefab asset's GlobalObjectIdHash value, assign it to
+        /// InScenePlacedSourceGlobalObjectIdHash and mark this as being in-scene placed.
+        /// </summary>
+        /// <remarks>
+        /// This NetworkObject is considered an in-scene placed prefab asset instance if it is:
+        /// - Part of a prefab
+        /// - Within a valid scene that is part of the scenes in build list
+        /// (In-scene defined NetworkObjects that are not part of a prefab instance are excluded.)
+        /// </remarks>
+        private void CheckForInScenePlaced()
+        {
+            if (gameObject.scene.IsValid() && gameObject.scene.isLoaded && gameObject.scene.buildIndex >= 0)
+            {
+                if (PrefabUtility.IsPartOfAnyPrefab(this))
+                {
+                    var prefab = PrefabUtility.GetCorrespondingObjectFromSource(gameObject);
+                    var assetPath = AssetDatabase.GetAssetPath(prefab);
+                    var sourceAsset = AssetDatabase.LoadAssetAtPath<NetworkObject>(assetPath);
+                    if (sourceAsset != null && sourceAsset.GlobalObjectIdHash != 0 && InScenePlacedSourceGlobalObjectIdHash != sourceAsset.GlobalObjectIdHash)
+                    {
+                        InScenePlacedSourceGlobalObjectIdHash = sourceAsset.GlobalObjectIdHash;
+                        EditorUtility.SetDirty(this);
+                    }
+                }
+                IsSceneObject = true;
+
+                // Default scene migration synchronization to false for in-scene placed NetworkObjects
+                SceneMigrationSynchronization = false;
+
+                // Root In-scene placed NetworkObjects have to either have the SessionOwner or Distributable permission flag set.
+                if (transform.parent == null)
+                {
+                    if (!Ownership.HasFlag(OwnershipStatus.SessionOwner) && !Ownership.HasFlag(OwnershipStatus.Distributable))
+                    {
+                        Ownership |= OwnershipStatus.Distributable;
+                    }
+                }
+            }
+        }
+#endif // UNITY_EDITOR
+
+        internal bool HasParentNetworkObject(Transform transform)
+        {
+            if (transform.parent != null)
+            {
+                var networkObject = transform.parent.GetComponent<NetworkObject>();
+                if (networkObject != null && networkObject != this)
+                {
+                    return true;
+                }
+
+                if (transform.parent.parent != null)
+                {
+                    return HasParentNetworkObject(transform.parent);
+                }
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Gets the NetworkManager that owns this NetworkObject instance
+        /// </summary>
+        public NetworkManager NetworkManager => NetworkManagerOwner ? NetworkManagerOwner : NetworkManager.Singleton;
+
+        /// <summary>
+        /// Useful to know if we should or should not send a message
+        /// </summary>
+        internal bool HasRemoteObservers => !(Observers.Count() == 0 || (Observers.Contains(NetworkManager.LocalClientId) && Observers.Count() == 1));
+
+        /// <summary>
+        /// Distributed Authority Mode Only
+        /// When set, NetworkObjects despawned remotely will be delayed until the tick count specified is reached on all non-owner instances.
+        /// It will still despawn immediately on the owner-local side.
+        /// </summary>
+        [HideInInspector]
+        public int DeferredDespawnTick;
+
+        /// <summary>
+        /// Distributed Authority Mode Only
+        /// The delegate handler declaration for <see cref="OnDeferedDespawnComplete"/>.
+        /// </summary>
+        /// <returns>true (despawn) or false (do not despawn)</returns>
+        public delegate bool OnDeferedDespawnCompleteDelegateHandler();
+
+        /// <summary>
+        /// If assigned, this callback will be invoked each frame update to determine if a <see cref="NetworkObject"/> that has had its despawn deferred
+        /// should despawn. Use this callback to handle scenarios where you might have additional changes in state that could vindicate despawning earlier
+        /// than the deferred despawn targeted future network tick.
+        /// </summary>
+        public OnDeferedDespawnCompleteDelegateHandler OnDeferredDespawnComplete;
+
+        /// <summary>
+        /// Distributed Authority Mode Only
+        /// When invoked by the authority of the <see cref="NetworkObject"/>, this will locally despawn the <see cref="NetworkObject"/> while
+        /// sending a delayed despawn to all non-authority instances. The tick offset + the authority's current known network tick (ServerTime.Tick)
+        /// is when non-authority instances will despawn this <see cref="NetworkObject"/> instance.
+        /// </summary>
+        /// <param name="tickOffset">The number of ticks from the authority's currently known <see cref="NetworkManager.ServerTime.Tick"/> to delay the despawn.</param>
+        /// <param name="destroy">Defaults to true, determines whether the <see cref="NetworkObject"/> will be destroyed.</param>
+        public void DeferDespawn(int tickOffset, bool destroy = true)
+        {
+            if (!NetworkManager.DistributedAuthorityMode)
+            {
+                NetworkLog.LogError($"This method is only available in distributed authority mode.");
+                return;
+            }
+
+            if (!IsSpawned)
+            {
+                NetworkLog.LogError($"Cannot defer despawning {name} because it is not spawned!");
+                return;
+            }
+
+            if (!HasAuthority)
+            {
+                NetworkLog.LogError($"Only the authority can invoke {nameof(DeferDespawn)} and local Client-{NetworkManager.LocalClientId} is not the authority of {name}!");
+                return;
+            }
+
+            // Apply the relative tick offset for when this NetworkObject should be despawned on
+            // non-authoritative instances.
+            DeferredDespawnTick = NetworkManager.ServerTime.Tick + tickOffset;
+
+            var connectionManager = NetworkManager.ConnectionManager;
+
+            for (int i = 0; i < ChildNetworkBehaviours.Count; i++)
+            {
+                ChildNetworkBehaviours[i].PreVariableUpdate();
+                // Notify all NetworkBehaviours that the authority is performing a deferred despawn.
+                // This is when user script would update NetworkVariable states that might be needed
+                // for the deferred despawn sequence on non-authoritative instances.
+                ChildNetworkBehaviours[i].OnDeferringDespawn(DeferredDespawnTick);
+            }
+
+            // DAHost handles sending updates to all clients
+            if (NetworkManager.DAHost)
+            {
+                for (int i = 0; i < connectionManager.ConnectedClientsList.Count; i++)
+                {
+                    var client = connectionManager.ConnectedClientsList[i];
+                    if (IsNetworkVisibleTo(client.ClientId))
+                    {
+                        // Sync just the variables for just the objects this client sees
+                        for (int k = 0; k < ChildNetworkBehaviours.Count; k++)
+                        {
+                            ChildNetworkBehaviours[k].NetworkVariableUpdate(client.ClientId);
+                        }
+                    }
+                }
+            }
+            else // Clients just send their deltas to the service or DAHost
+            {
+                for (int k = 0; k < ChildNetworkBehaviours.Count; k++)
+                {
+                    ChildNetworkBehaviours[k].NetworkVariableUpdate(NetworkManager.ServerClientId);
+                }
+            }
+
+            // Now despawn the local authority instance
+            Despawn(destroy);
+        }
+
+        /// <summary>
+        /// When enabled, NetworkObject ownership is distributed amongst clients.
+        /// To set <see cref="OwnershipStatus.Distributable"/> during runtime, use <see cref="SetOwnershipStatus(OwnershipStatus, bool, OwnershipLockActions)"/>
+        /// </summary>
+        /// <remarks>
+        /// Scenarios of interest:
+        /// - If the <see cref="NetworkObject"/> is locked and the current owner is still connected, then it will not be redistributed upon a new client joining.
+        /// - If the <see cref="NetworkObject"/> has an ownership request in progress, then it will not be redistributed upon a new client joining.
+        /// - If the <see cref="NetworkObject"/> is locked but the owner is not longer connected, then it will be redistributed.
+        /// - If the <see cref="NetworkObject"/> has an ownership request in progress but the target client is no longer connected, then it will be redistributed.
+        /// </remarks>
+        public bool IsOwnershipDistributable => Ownership.HasFlag(OwnershipStatus.Distributable);
+
+        /// <summary>
+        /// When true, the <see cref="NetworkObject"/> can only be owned by the current Session Owner.
+        /// To set <see cref="OwnershipStatus.SessionOwner"/> during runtime, use  <see cref="ChangeOwnership(ulong)"/> to ensure the session owner owns the object.
+        /// Once the session owner owns the object, then use <see cref="SetOwnershipStatus(OwnershipStatus, bool, OwnershipLockActions)"/>.
+        /// </summary>
+        public bool IsOwnershipSessionOwner => Ownership.HasFlag(OwnershipStatus.SessionOwner);
+
+        /// <summary>
+        /// Returns true if the <see cref="NetworkObject"/> is has ownership locked.
+        /// When locked, the <see cref="NetworkObject"/> cannot be redistributed nor can it be transferred by another client.
+        /// To toggle the ownership loked status during runtime, use <see cref="SetOwnershipLock(bool)"/>.
+        /// </summary>
+        public bool IsOwnershipLocked => ((OwnershipStatusExtended)Ownership).HasFlag(OwnershipStatusExtended.Locked);
+
+        /// <summary>
+        /// When true, the <see cref="NetworkObject"/>'s ownership can be acquired by any non-owner client.
+        /// To set <see cref="OwnershipStatus.Transferable"/> during runtime, use <see cref="SetOwnershipStatus(OwnershipStatus, bool, OwnershipLockActions)"/>.
+        /// </summary>
+        public bool IsOwnershipTransferable => Ownership.HasFlag(OwnershipStatus.Transferable);
+
+        /// <summary>
+        /// When true, the <see cref="NetworkObject"/>'s ownership can be acquired through non-owner client requesting ownership.
+        /// To set <see cref="OwnershipStatus.Transferable"/> during runtime, use <see cref="SetOwnershipStatus(OwnershipStatus, bool, OwnershipLockActions)"/>
+        /// To request ownership, use <see cref="RequestOwnership"/>.
+        /// </summary>
+        public bool IsOwnershipRequestRequired => Ownership.HasFlag(OwnershipStatus.RequestRequired);
+
+        /// <summary>
+        /// When true, the <see cref="NetworkObject"/>'s ownership cannot be acquired because an ownership request is underway.
+        /// In order for this status to be applied, the the <see cref="NetworkObject"/> must have the <see cref="OwnershipStatus.RequestRequired"/>
+        /// flag set and a non-owner client must have sent a request via <see cref="RequestOwnership"/>.
+        /// </summary>
+        public bool IsRequestInProgress => ((OwnershipStatusExtended)Ownership).HasFlag(OwnershipStatusExtended.Requested);
+
+        /// <summary>
+        /// Determines whether a NetworkObject can be distributed to other clients during
+        /// a <see cref="NetworkTopologyTypes.DistributedAuthority"/> session.
+        /// </summary>
+#if !MULTIPLAYER_SERVICES_SDK_INSTALLED
+        [HideInInspector]
+#endif
+        [SerializeField]
+        internal OwnershipStatus Ownership = OwnershipStatus.Distributable;
+
+        /// <summary>
+        /// Ownership status flags:
+        /// <see cref="None"/>: If nothing is set, then ownership is considered "static" and cannot be redistributed, requested, or transferred (i.e. a Player would have this).
+        /// <see cref="Distributable"/>: When set, this instance will be automatically redistributed when a client joins (if not locked or no request is pending) or leaves.
+        /// <see cref="Transferable"/>: When set, a non-owner can obtain ownership immediately (without requesting and as long as it is not locked).
+        /// <see cref="RequestRequired"/>: When set, a non-owner must request ownership from the owner (will always get locked once ownership is transferred).
+        /// <see cref="SessionOwner"/>: When set, only the current session owner may have ownership over this object.
+        /// <see cref="All"/>: Used within the inspector view only. When selected it will set the Distributable, Transferable, and RequestRequired flags or if those flags are already set it will select the SessionOwner flag by itself.
+        /// </summary>
+        // Ranges from 1 to 8 bits
+        [Flags]
+        public enum OwnershipStatus
+        {
+            /// <summary>
+            ///  When set, this instance will have no permissions (i.e. cannot distribute, transfer, etc).
+            /// </summary>
+            None = 0,
+
+            /// <summary>
+            ///  When set, this instance will be automatically redistributed when a client joins (if not locked or no request is pending) or leaves.
+            /// </summary>
+            Distributable = 1 << 0,
+
+            /// <summary>
+            /// When set, a non-owner can obtain ownership immediately (without requesting and as long as it is not locked).
+            /// </summary>
+            Transferable = 1 << 1,
+
+            /// <summary>
+            /// When set, a non-owner must request ownership from the owner (will always get locked once ownership is transferred).
+            /// </summary>
+            RequestRequired = 1 << 2,
+
+            /// <summary>
+            /// When set, only the current session owner may have ownership over this object.
+            /// </summary>
+            SessionOwner = 1 << 3,
+
+            /// <summary>
+            /// Used within the inspector view only. When selected it will set the Distributable, Transferable, and RequestRequired flags or if those flags are already set it will select the SessionOwner flag by itself.
+            /// </summary>
+            All = ~0,
+        }
+
+        /// <summary>
+        /// Intentionally internal
+        /// </summary>
+        // Ranges from 9 to 16 bits
+        [Flags]
+        internal enum OwnershipStatusExtended
+        {
+            // When locked and CanRequest is set, a non-owner can request ownership. If the owner responds by removing the Locked status, then ownership is transferred.
+            // If the owner responds by removing the Requested status only, then ownership is denied.
+            Requested = (1 << 8),
+            Locked = (1 << 9),
+        }
+
+        internal bool HasExtendedOwnershipStatus(OwnershipStatusExtended extended)
+        {
+            var extendedOwnership = (OwnershipStatusExtended)Ownership;
+            return extendedOwnership.HasFlag(extended);
+        }
+
+        internal void AddOwnershipExtended(OwnershipStatusExtended extended)
+        {
+            var extendedOwnership = (OwnershipStatusExtended)Ownership;
+            extendedOwnership |= extended;
+            Ownership = (OwnershipStatus)extendedOwnership;
+        }
+
+        internal void RemoveOwnershipExtended(OwnershipStatusExtended extended)
+        {
+            var extendedOwnership = (OwnershipStatusExtended)Ownership;
+            extendedOwnership &= ~extended;
+            Ownership = (OwnershipStatus)extendedOwnership;
+        }
+
+        /// <summary>
+        /// Distributed Authority Only
+        /// Locks ownership of a NetworkObject by the current owner.
+        /// </summary>
+        /// <param name="lockOwnership">defaults to lock (true) or unlock (false)</param>
+        /// <returns>true or false depending upon lock operation's success</returns>
+        public bool SetOwnershipLock(bool lockOwnership = true)
+        {
+            // If we are not in distributed autority mode, then exit early
+            if (!NetworkManager.DistributedAuthorityMode)
+            {
+                Debug.LogError($"[Feature Not Allowed In Client-Server Mode] Ownership flags are a distributed authority feature only!");
+                return false;
+            }
+
+            // If we don't have authority exit early
+            if (!HasAuthority)
+            {
+                NetworkLog.LogWarningServer($"[Attempted Lock Without Authority] Client-{NetworkManager.LocalClientId} is trying to lock ownership but does not have authority!");
+                return false;
+            }
+
+            // If we don't have the Transferable flag set and it is not a player object, then it is the same as having a static lock on ownership
+            if (!(IsOwnershipTransferable || IsPlayerObject) || IsOwnershipSessionOwner)
+            {
+                NetworkLog.LogWarning($"Trying to add or remove ownership lock on [{name}] which does not have the {nameof(OwnershipStatus.Transferable)} flag set!");
+                return false;
+            }
+
+            // If we are locking and are already locked or we are unlocking and are already unlocked exit early and return true
+            if (!(IsOwnershipLocked ^ lockOwnership))
+            {
+                return true;
+            }
+
+            if (lockOwnership)
+            {
+                AddOwnershipExtended(OwnershipStatusExtended.Locked);
+            }
+            else
+            {
+                RemoveOwnershipExtended(OwnershipStatusExtended.Locked);
+            }
+
+            SendOwnershipStatusUpdate();
+
+            return true;
+        }
+
+        /// <summary>
+        /// In the event of an immediate (local instance) failure to change ownership, the following ownership
+        /// permission failure status codes will be returned via <see cref="OnOwnershipPermissionsFailure"/>.
+        /// <see cref="Locked"/>: The <see cref="NetworkObject"/> is locked and ownership cannot be acquired.
+        /// <see cref="RequestRequired"/>: The <see cref="NetworkObject"/> requires an ownership request via <see cref="RequestOwnership"/>.
+        /// <see cref="RequestInProgress"/>: The <see cref="NetworkObject"/> is already processing an ownership request and ownership cannot be acquired at this time.
+        /// <see cref="NotTransferrable"/>: The <see cref="NetworkObject"/> does not have the <see cref="OwnershipStatus.Transferable"/> flag set and ownership cannot be acquired.
+        /// <see cref="SessionOwnerOnly"/>: The <see cref="NetworkObject"/> has the  <see cref="OwnershipStatus.SessionOwner"/> flag set and ownership cannot be acquired.
+        /// </summary>
+        public enum OwnershipPermissionsFailureStatus
+        {
+            /// <summary>
+            /// The NetworkObject is locked and ownership cannot be acquired
+            /// </summary>
+            Locked,
+
+            /// <summary>
+            /// The NetworkObject requires an ownership request via RequestOwnership
+            /// </summary>
+            RequestRequired,
+
+            /// <summary>
+            /// The NetworkObject is already processing an ownership request and ownership cannot be acquired at this time
+            /// </summary>
+            RequestInProgress,
+
+            /// <summary>
+            /// The NetworkObject does not have the OwnershipStatus.Transferable flag set and ownership cannot be acquired
+            /// </summary>
+            NotTransferrable,
+
+            /// <summary>
+            /// The NetworkObject has the OwnershipStatus.SessionOwner flag set and ownership cannot be acquired
+            /// </summary>
+            SessionOwnerOnly
+        }
+
+        /// <summary>
+        /// <see cref="OnOwnershipPermissionsFailure"/>
+        /// </summary>
+        /// <param name="changeOwnershipFailure">The status indicating why the ownership change failed</param>
+        public delegate void OnOwnershipPermissionsFailureDelegateHandler(OwnershipPermissionsFailureStatus changeOwnershipFailure);
+
+        /// <summary>
+        /// If there is any callback assigned or subscriptions to this handler, then upon any ownership permissions failure that occurs during
+        /// the invocation of <see cref="ChangeOwnership(ulong)"/> will trigger this notification containing an <see cref="OwnershipPermissionsFailureStatus"/>.
+        /// </summary>
+        public OnOwnershipPermissionsFailureDelegateHandler OnOwnershipPermissionsFailure;
+
+        /// <summary>
+        /// Returned by <see cref="RequestOwnership"/> to signify w
+        /// <see cref="RequestSent"/>: The request for ownership was sent (does not mean it will be granted, but the request was sent).
+        /// <see cref="AlreadyOwner"/>: The current client is already the owner (no need to request ownership).
+        /// <see cref="RequestRequiredNotSet"/>: The <see cref="OwnershipStatus.RequestRequired"/> flag is not set on this <see cref="NetworkObject"/>
+        /// <see cref="Locked"/>: The current owner has locked ownership which means requests are not available at this time.
+        /// <see cref="RequestInProgress"/>: There is already a known request in progress. You can scan for ownership changes and try upon
+        /// <see cref="SessionOwnerOnly"/>: This object is marked as SessionOwnerOnly and therefore cannot be requested
+        /// a change in ownership or just try again after a specific period of time or no longer attempt to request ownership.
+        /// </summary>
+        public enum OwnershipRequestStatus
+        {
+            /// <summary>
+            /// The request for ownership was sent (does not mean it will be granted, but the request was sent)
+            /// </summary>
+            RequestSent,
+
+            /// <summary>
+            /// The current client is already the owner (no need to request ownership)
+            /// </summary>
+            AlreadyOwner,
+
+            /// <summary>
+            /// The OwnershipStatus.RequestRequired flag is not set on this NetworkObject
+            /// </summary>
+            RequestRequiredNotSet,
+
+            /// <summary>
+            /// The current owner has locked ownership which means requests are not available at this time
+            /// </summary>
+            Locked,
+
+            /// <summary>
+            /// There is already a known request in progress. You can scan for ownership changes and try again
+            /// after a specific period of time or no longer attempt to request ownership
+            /// </summary>
+            RequestInProgress,
+
+            /// <summary>
+            /// This object is marked as SessionOwnerOnly and therefore cannot be requested
+            /// </summary>
+            SessionOwnerOnly,
+        }
+
+        /// <summary>
+        /// Invoke this from a non-authority client to request ownership.
+        /// </summary>
+        /// <remarks>
+        /// The <see cref="OwnershipRequestStatus"/> results of requesting ownership:
+        /// <see cref="OwnershipRequestStatus.RequestSent"/>: The request for ownership was sent (does not mean it will be granted, but the request was sent).
+        /// <see cref="OwnershipRequestStatus.AlreadyOwner"/>: The current client is already the owner (no need to request ownership).
+        /// <see cref="OwnershipRequestStatus.RequestRequiredNotSet"/>: The <see cref="OwnershipStatus.RequestRequired"/> flag is not set on this <see cref="NetworkObject"/>
+        /// <see cref="OwnershipRequestStatus.Locked"/>: The current owner has locked ownership which means requests are not available at this time.
+        /// <see cref="OwnershipRequestStatus.RequestInProgress"/>: There is already a known request in progress. You can scan for ownership changes and try upon
+        /// <see cref="OwnershipRequestStatus.SessionOwnerOnly"/>: This object can only belong the the session owner and so cannot be requested
+        /// a change in ownership or just try again after a specific period of time or no longer attempt to request ownership.
+        /// </remarks>
+        /// <returns><see cref="OwnershipRequestStatus"/></returns>
+        public OwnershipRequestStatus RequestOwnership()
+        {
+            // Exit early the local client is already the owner
+            if (OwnerClientId == NetworkManager.LocalClientId)
+            {
+                return OwnershipRequestStatus.AlreadyOwner;
+            }
+
+            // Exit early if it doesn't have the RequestRequired flag
+            if (!IsOwnershipRequestRequired)
+            {
+                return OwnershipRequestStatus.RequestRequiredNotSet;
+            }
+
+            // Exit early if it is locked
+            if (IsOwnershipLocked)
+            {
+                return OwnershipRequestStatus.Locked;
+            }
+
+            // Exit early if there is already a request in progress
+            if (IsRequestInProgress)
+            {
+                return OwnershipRequestStatus.RequestInProgress;
+            }
+
+            // Exit early if it has the SessionOwner flag
+            if (IsOwnershipSessionOwner)
+            {
+                return OwnershipRequestStatus.SessionOwnerOnly;
+            }
+
+            // Otherwise, send the request ownership message
+            var changeOwnership = new ChangeOwnershipMessage
+            {
+                NetworkObjectId = NetworkObjectId,
+                OwnerClientId = OwnerClientId,
+                ClientIdCount = 1,
+                RequestClientId = NetworkManager.LocalClientId,
+                ClientIds = new ulong[1] { OwnerClientId },
+                DistributedAuthorityMode = true,
+                RequestOwnership = true,
+                OwnershipFlags = (ushort)Ownership,
+            };
+
+            var sendTarget = NetworkManager.DAHost ? OwnerClientId : NetworkManager.ServerClientId;
+            NetworkManager.ConnectionManager.SendMessage(ref changeOwnership, NetworkDelivery.Reliable, sendTarget);
+
+            return OwnershipRequestStatus.RequestSent;
+        }
+
+        /// <summary>
+        /// The delegate handler declaration used by <see cref="OnOwnershipRequested"/>.
+        /// </summary>
+        /// <param name="clientRequesting">The ClientId of the client requesting ownership</param>
+        /// <returns>True to approve the ownership request, false to deny the request and prevent ownership transfer</returns>
+        public delegate bool OnOwnershipRequestedDelegateHandler(ulong clientRequesting);
+
+        /// <summary>
+        /// The <see cref="OnOwnershipRequestedDelegateHandler"/> callback that can be used
+        /// to control when ownership can be transferred to a non-authority client.
+        /// </summary>
+        /// <remarks>
+        /// Requesting ownership requires the <see cref="Ownership"/> flags to have the <see cref="OwnershipStatus.RequestRequired"/> flag set.
+        /// </remarks>
+        public OnOwnershipRequestedDelegateHandler OnOwnershipRequested;
+
+        /// <summary>
+        /// Invoked by ChangeOwnershipMessage
+        /// </summary>
+        /// <param name="clientRequestingOwnership">the client requesting ownership</param>
+        internal void OwnershipRequest(ulong clientRequestingOwnership)
+        {
+            var response = OwnershipRequestResponseStatus.Approved;
+
+            // Do a last check to make sure this NetworkObject can be requested
+            // CMB-DANGO-TODO: We could help optimize this process and check the below flags on the service side.
+            // It wouldn't cover the scenario were an update was in-bound to the service from the owner, but it would
+            // handle the case where something had already changed and the service was already "aware" of the change.
+            if (IsOwnershipLocked)
+            {
+                response = OwnershipRequestResponseStatus.Locked;
+            }
+            else if (IsRequestInProgress)
+            {
+                response = OwnershipRequestResponseStatus.RequestInProgress;
+            }
+            else if (!(IsOwnershipRequestRequired || IsOwnershipTransferable) || IsOwnershipSessionOwner)
+            {
+                response = OwnershipRequestResponseStatus.CannotRequest;
+            }
+
+            // Finally, check to see if OnOwnershipRequested is registered and if user script is allowing
+            // this transfer of ownership
+            if (OnOwnershipRequested != null && !OnOwnershipRequested.Invoke(clientRequestingOwnership))
+            {
+                response = OwnershipRequestResponseStatus.Denied;
+            }
+
+            // If we made it here and the response is still approved, then change ownership
+            if (response == OwnershipRequestResponseStatus.Approved)
+            {
+                // When requested and approved, the owner immediately sets the Requested flag **prior to**
+                // changing the ownership. This prevents race conditions from happening.
+                // Until the ownership change has propagated out, requests can still flow through this owner,
+                // but by that time this owner's instance will have the extended Requested flag and will
+                // respond to any additional ownership request with OwnershipRequestResponseStatus.RequestInProgress.
+                AddOwnershipExtended(OwnershipStatusExtended.Requested);
+
+                // This action is always authorized as long as the client still has authority.
+                // We need to pass in that this is a request approval ownership change.
+                NetworkManager.SpawnManager.ChangeOwnership(this, clientRequestingOwnership, HasAuthority, true);
+            }
+            else
+            {
+                // Otherwise, send back the reason why the ownership request was denied for the clientRequestingOwnership
+                /// Notes:
+                /// We always apply the <see cref="NetworkManager.LocalClientId"/> as opposed to <see cref="OwnerClientId"/> to the
+                /// <see cref="ChangeOwnershipMessage.OwnerClientId"/> value as ownership could have changed and the denied requests
+                /// targeting this instance are because there is a request pending.
+                /// DANGO-TODO: What happens if the client requesting disconnects prior to responding with the update in request pending?
+                var changeOwnership = new ChangeOwnershipMessage
+                {
+                    NetworkObjectId = NetworkObjectId,
+                    OwnerClientId = NetworkManager.LocalClientId, // Always use the local clientId (see above notes)
+                    RequestClientId = clientRequestingOwnership,
+                    DistributedAuthorityMode = true,
+                    RequestDenied = true,
+                    OwnershipRequestResponseStatus = (byte)response,
+                    OwnershipFlags = (ushort)Ownership,
+                };
+
+                var sendTarget = NetworkManager.DAHost ? clientRequestingOwnership : NetworkManager.ServerClientId;
+                NetworkManager.ConnectionManager.SendMessage(ref changeOwnership, NetworkDelivery.Reliable, sendTarget);
+            }
+        }
+
+        /// <summary>
+        /// What is returned via <see cref="OnOwnershipRequestResponse"/> after an ownership request has been sent via <see cref="RequestOwnership"/>
+        /// </summary>
+        public enum OwnershipRequestResponseStatus
+        {
+            /// <summary>
+            /// The ownership request was approved and the requesting client has gained ownership on the local instance
+            /// </summary>
+            Approved,
+
+            /// <summary>
+            /// The ownership request was denied because the object became locked after the request was sent
+            /// </summary>
+            Locked,
+
+            /// <summary>
+            /// The ownership request was denied because another request was already in progress when this request was received
+            /// </summary>
+            RequestInProgress,
+
+            /// <summary>
+            /// The ownership request was denied because the RequestRequired status changed while the request was in flight
+            /// </summary>
+            CannotRequest,
+
+            /// <summary>
+            /// The ownership request was denied by the authority instance (<see cref="OnOwnershipRequested"/> returned false)
+            /// </summary>
+            Denied,
+        }
+
+        /// <summary>
+        /// The delegate handler declaration used by <see cref="OnOwnershipRequestResponse"/>.
         /// </summary>
-        internal uint PrefabGlobalObjectIdHash;
+        /// <param name="ownershipRequestResponse">The status indicating whether the ownership request was approved or the reason for denial</param>
+        public delegate void OnOwnershipRequestResponseDelegateHandler(OwnershipRequestResponseStatus ownershipRequestResponse);
 
         /// <summary>
-        /// This is the source prefab of an in-scene placed NetworkObject. This is not set for in-scene 
-        /// placd NetworkObjects that are not prefab instances, dynamically spawned prefab instances,
-        /// or for network prefab assets.
+        /// The <see cref="OnOwnershipRequestedDelegateHandler"/> callback that can be used
+        /// to control when ownership can be transferred to a non-authority client.
         /// </summary>
-        [HideInInspector]
-        [SerializeField]
-        internal uint InScenePlacedSourceGlobalObjectIdHash;
+        /// <remarks>
+        /// Requesting ownership requires the <see cref="Ownership"/> flags to have the <see cref="OwnershipStatus.RequestRequired"/> flag set.
+        /// </remarks>
+        public OnOwnershipRequestResponseDelegateHandler OnOwnershipRequestResponse;
 
         /// <summary>
-        /// Gets the Prefab Hash Id of this object if the object is registerd as a prefab otherwise it returns 0
+        /// Invoked when a request is denied
         /// </summary>
-        [HideInInspector]
-        public uint PrefabIdHash
+        internal void OwnershipRequestResponse(OwnershipRequestResponseStatus ownershipRequestResponse)
         {
-            get
-            {
-                return GlobalObjectIdHash;
-            }
+            OnOwnershipRequestResponse?.Invoke(ownershipRequestResponse);
         }
 
-#if UNITY_EDITOR
-        private const string k_GlobalIdTemplate = "GlobalObjectId_V1-{0}-{1}-{2}-{3}";
-
         /// <summary>
-        /// Object Types <see href="https://docs.unity3d.com/ScriptReference/GlobalObjectId.html"/>
-        /// Parameter 0 of <see cref="k_GlobalIdTemplate"/>
+        /// When passed as a parameter in <see cref="SetOwnershipStatus"/>, the following additional locking actions will occur:
+        /// - <see cref="None"/>: (default) No locking action
+        /// - <see cref="SetAndLock"/>: Will set the passed in flags and then lock the <see cref="NetworkObject"/>
+        /// - <see cref="SetAndUnlock"/>: Will set the passed in flags and then unlock the <see cref="NetworkObject"/>
         /// </summary>
-        // 0 = Null (when considered a null object type we can ignore)
-        // 1 = Imported Asset
-        // 2 = Scene Object
-        // 3 = Source Asset.
-        private const int k_NullObjectType = 0;
-        private const int k_ImportedAssetObjectType = 1;
-        private const int k_SceneObjectType = 2;
-        private const int k_SourceAssetObjectType = 3;
-
-        [ContextMenu("Refresh In-Scene Prefab Instances")]
-        internal void RefreshAllPrefabInstances()
+        public enum OwnershipLockActions
         {
-            var instanceGlobalId = GlobalObjectId.GetGlobalObjectIdSlow(this);
-            NetworkObjectRefreshTool.PrefabNetworkObject = this;
-            if (!PrefabUtility.IsPartOfAnyPrefab(this) || instanceGlobalId.identifierType != k_ImportedAssetObjectType)
-            {
-                EditorUtility.DisplayDialog("Network Prefab Assets Only", "This action can only be performed on a network prefab asset.", "Ok");
-                return;
-            }
-
-            // Handle updating the currently active scene
-            NetworkObjectRefreshTool.ProcessActiveScene();
+            /// <summary>
+            /// No additional locking action will be performed
+            /// </summary>
+            None,
 
-            // Refresh all build settings scenes
-            var activeScene = SceneManager.GetActiveScene();
-            foreach (var editorScene in EditorBuildSettings.scenes)
-            {
-                // skip disabled scenes and the currently active scene
-                if (!editorScene.enabled || activeScene.path == editorScene.path)
-                {
-                    continue;
-                }
-                // Add the scene to be processed
-                NetworkObjectRefreshTool.ProcessScene(editorScene.path, true);
-            }
+            /// <summary>
+            /// Sets the specified ownership flags and then locks the NetworkObject
+            /// </summary>
+            SetAndLock,
 
-            // Process all added scenes
-            NetworkObjectRefreshTool.ProcessScenes();
+            /// <summary>
+            /// Sets the specified ownership flags and then unlocks the NetworkObject
+            /// </summary>
+            SetAndUnlock
         }
 
-        internal void OnValidate()
+        /// <summary>
+        /// Adds an <see cref="OwnershipStatus"/> flag to the <see cref="Ownership"/> flags
+        /// </summary>
+        /// <param name="status">flag(s) to update</param>
+        /// <param name="clearAndSet">defaults to false, but when true will clear the permissions and then set the permissions flags</param>
+        /// <param name="lockAction">defaults to <see cref="OwnershipLockActions.None"/>, but when set it to anther action type it will either lock or unlock ownership after setting the flags</param>
+        /// <returns>true (applied)/false (not applied)</returns>
+        /// <remarks>
+        /// If it returns false, then this means the flag(s) you are attempting to
+        /// set were already set on the <see cref="NetworkObject"/> instance.
+        /// If it returns true, then the flags were set and an ownership update message
+        /// was sent to all observers of the <see cref="NetworkObject"/> instance.
+        /// </remarks>
+        public bool SetOwnershipStatus(OwnershipStatus status, bool clearAndSet = false, OwnershipLockActions lockAction = OwnershipLockActions.None)
         {
-            // do NOT regenerate GlobalObjectIdHash for NetworkPrefabs while Editor is in PlayMode
-            if (EditorApplication.isPlaying && !string.IsNullOrEmpty(gameObject.scene.name))
+            if (status.HasFlag(OwnershipStatus.SessionOwner) && !NetworkManager.LocalClient.IsSessionOwner)
             {
-                return;
+                NetworkLog.LogWarning("Only the session owner is allowed to set the ownership status to session owner only.");
+                return false;
             }
 
-            // do NOT regenerate GlobalObjectIdHash if Editor is transitioning into or out of PlayMode
-            if (!EditorApplication.isPlaying && EditorApplication.isPlayingOrWillChangePlaymode)
+            // If it already has the flag do nothing
+            if (!clearAndSet && Ownership.HasFlag(status))
             {
-                return;
+                return false;
             }
 
-            // Get a global object identifier for this network prefab
-            var globalId = GetGlobalId();
-
-
-            // if the identifier type is 0, then don't update the GlobalObjectIdHash
-            if (globalId.identifierType == k_NullObjectType)
+            if (clearAndSet || status == OwnershipStatus.None)
             {
-                return;
+                Ownership = OwnershipStatus.None;
             }
 
-            var oldValue = GlobalObjectIdHash;
-            GlobalObjectIdHash = globalId.ToString().Hash32();
-
-            // If the GlobalObjectIdHash value changed, then mark the asset dirty
-            if (GlobalObjectIdHash != oldValue)
+            if (status.HasFlag(OwnershipStatus.SessionOwner))
             {
-                // Check if this is an in-scnee placed NetworkObject (Special Case for In-Scene Placed)
-                if (!IsEditingPrefab() && gameObject.scene.name != null && gameObject.scene.name != gameObject.name)
-                {
-                    // Sanity check to make sure this is a scene placed object
-                    if (globalId.identifierType != k_SceneObjectType)
-                    {
-                        // This should never happen, but in the event it does throw and error
-                        Debug.LogError($"[{gameObject.name}] is detected as an in-scene placed object but its identifier is of type {globalId.identifierType}! **Report this error**");
-                    }
+                Ownership = OwnershipStatus.SessionOwner;
+            }
+            else if (Ownership.HasFlag(OwnershipStatus.SessionOwner))
+            {
+                NetworkLog.LogWarning("No other ownership statuses may be set while SessionOwner is set.");
+                return false;
+            }
+            else
+            {
+                // Faster to just OR a None status than to check
+                // if it is !None before "OR'ing".
+                Ownership |= status;
 
-                    // If this is a prefab instance
-                    if (PrefabUtility.IsPartOfAnyPrefab(this))
-                    {
-                        // We must invoke this in order for the modifications to get saved with the scene (does not mark scene as dirty)
-                        PrefabUtility.RecordPrefabInstancePropertyModifications(this);
-                    }
-                }
-                else // Otherwise, this is a standard network prefab asset so we just mark it dirty for the AssetDatabase to update it
+                if (lockAction != OwnershipLockActions.None)
                 {
-                    EditorUtility.SetDirty(this);
+                    SetOwnershipLock(lockAction == OwnershipLockActions.SetAndLock);
                 }
             }
 
-            // Always check for in-scene placed to assure any previous version scene assets with in-scene place NetworkObjects gets updated
-            CheckForInScenePlaced();
-        }
-
-        private bool IsEditingPrefab()
-        {
-            // Check if we are directly editing the prefab
-            var stage = PrefabStageUtility.GetPrefabStage(gameObject);
+            SendOwnershipStatusUpdate();
 
-            // if we are not editing the prefab directly (or a sub-prefab), then return the object identifier
-            if (stage == null || stage.assetPath == null)
-            {
-                return false;
-            }
             return true;
         }
 
         /// <summary>
-        /// This checks to see if this NetworkObject is an in-scene placed prefab instance. If so it will 
-        /// automatically find the source prefab asset's GlobalObjectIdHash value, assign it to 
-        /// InScenePlacedSourceGlobalObjectIdHash and mark this as being in-scene placed.
+        /// Use this method to remove one or more ownership flags from the NetworkObject.
+        /// If you want to clear and then set, use <see cref="SetOwnershipStatus"/>.
         /// </summary>
+        /// <param name="status">the flag(s) to remove</param>
+        /// <returns>true/false</returns>
         /// <remarks>
-        /// This NetworkObject is considered an in-scene placed prefab asset instance if it is:
-        /// - Part of a prefab
-        /// - Not being directly edited
-        /// - Within a valid scene that is part of the scenes in build list
-        /// (In-scene defined NetworkObjects that are not part of a prefab instance are excluded.)
+        /// If it returns false, then this means the flag(s) you are attempting to
+        /// remove were not already set on the <see cref="NetworkObject"/> instance.
+        /// If it returns true, then the flags were removed and an ownership update message
+        /// was sent to all observers of the <see cref="NetworkObject"/> instance.
         /// </remarks>
-        private void CheckForInScenePlaced()
+        public bool RemoveOwnershipStatus(OwnershipStatus status)
         {
-            if (PrefabUtility.IsPartOfAnyPrefab(this) && !IsEditingPrefab() && gameObject.scene.IsValid() && gameObject.scene.isLoaded && gameObject.scene.buildIndex >= 0)
+            // If it doesn't have the ownership flag or we are trying to remove the None permission, then return false
+            if (!Ownership.HasFlag(status) || status == OwnershipStatus.None)
             {
-                var prefab = PrefabUtility.GetCorrespondingObjectFromSource(gameObject);
-                var assetPath = AssetDatabase.GetAssetPath(prefab);
-                var sourceAsset = AssetDatabase.LoadAssetAtPath<NetworkObject>(assetPath);
-                if (sourceAsset != null && sourceAsset.GlobalObjectIdHash != 0 && InScenePlacedSourceGlobalObjectIdHash != sourceAsset.GlobalObjectIdHash)
-                {
-                    InScenePlacedSourceGlobalObjectIdHash = sourceAsset.GlobalObjectIdHash;
-                    EditorUtility.SetDirty(this);
-                }
-                IsSceneObject = true;
+                return false;
             }
-        }
 
-        private GlobalObjectId GetGlobalId()
-        {
-            var instanceGlobalId = GlobalObjectId.GetGlobalObjectIdSlow(this);
+            Ownership &= ~status;
 
-            // If not editing a prefab, then just use the generated id
-            if (!IsEditingPrefab())
-            {
-                return instanceGlobalId;
-            }
+            SendOwnershipStatusUpdate();
+
+            return true;
+        }
 
-            // If the asset doesn't exist at the given path, then return the object identifier
-            var prefabStageAssetPath = PrefabStageUtility.GetPrefabStage(gameObject).assetPath;
-            // If (for some reason) the asset path is null return the generated id
-            if (prefabStageAssetPath == null)
+        /// <summary>
+        /// Sends an update ownership status to all non-owner clients
+        /// </summary>
+        internal void SendOwnershipStatusUpdate()
+        {
+            // If there are no remote observers, then exit early
+            if (!HasRemoteObservers)
             {
-                return instanceGlobalId;
+                return;
             }
 
-            var theAsset = AssetDatabase.LoadAssetAtPath<NetworkObject>(prefabStageAssetPath);
-            // If there is no asset at that path (for some odd/edge case reason), return the generated id
-            if (theAsset == null)
+            var changeOwnership = new ChangeOwnershipMessage
             {
-                return instanceGlobalId;
-            }
+                NetworkObjectId = NetworkObjectId,
+                OwnerClientId = OwnerClientId,
+                DistributedAuthorityMode = true,
+                OwnershipFlagsUpdate = true,
+                OwnershipFlags = (ushort)Ownership,
+            };
 
-            // If we can't get the asset GUID and/or the file identifier, then return the object identifier
-            if (!AssetDatabase.TryGetGUIDAndLocalFileIdentifier(theAsset, out var guid, out long localFileId))
+            if (NetworkManager.DAHost)
             {
-                return instanceGlobalId;
+                foreach (var clientId in Observers)
+                {
+                    if (clientId == NetworkManager.LocalClientId)
+                    {
+                        continue;
+                    }
+                    NetworkManager.ConnectionManager.SendMessage(ref changeOwnership, NetworkDelivery.Reliable, clientId);
+                }
             }
-
-            // Note: If we reached this point, then we are most likely opening a prefab to edit.
-            // The instanceGlobalId will be constructed as if it is a scene object, however when it
-            // is serialized its value will be treated as a file asset (the "why" to the below code).
-
-            // Construct an imported asset identifier with the type being a source asset object type
-            var prefabGlobalIdText = string.Format(k_GlobalIdTemplate, k_SourceAssetObjectType, guid, (ulong)localFileId, 0);
-
-            // If we can't parse the result log an error and return the instanceGlobalId
-            if (!GlobalObjectId.TryParse(prefabGlobalIdText, out var prefabGlobalId))
+            else
             {
-                Debug.LogError($"[GlobalObjectId Gen] Failed to parse ({prefabGlobalIdText}) returning default ({instanceGlobalId})! ** Please Report This Error **");
-                return instanceGlobalId;
+                changeOwnership.ClientIdCount = Observers.Count();
+                changeOwnership.ClientIds = Observers.ToArray();
+                NetworkManager.ConnectionManager.SendMessage(ref changeOwnership, NetworkDelivery.Reliable, NetworkManager.ServerClientId);
             }
+        }
 
-            // Otherwise, return the constructed identifier for the source prefab asset
-            return prefabGlobalId;
+        /// <summary>
+        /// Use this method to determine if a <see cref="NetworkObject"/> has one or more ownership flags set.
+        /// </summary>
+        /// <param name="status">one or more <see cref="OwnershipStatus"/> flags</param>
+        /// <returns>true if the flag(s) are set and false if the flag or any one of the flags are not set</returns>
+        public bool HasOwnershipStatus(OwnershipStatus status)
+        {
+            return Ownership.HasFlag(status);
         }
-#endif // UNITY_EDITOR
 
         /// <summary>
-        /// Gets the NetworkManager that owns this NetworkObject instance
+        /// This property can be used in client-server or distributed authority modes to determine if the local instance has authority.
+        /// When in client-server mode, the server will always have authority over the NetworkObject and associated NetworkBehaviours.
+        /// When in distributed authority mode, the owner is always the authority.
         /// </summary>
-        public NetworkManager NetworkManager => NetworkManagerOwner ?? NetworkManager.Singleton;
+        /// <remarks>
+        /// When in client-server mode, authority should is not considered the same as ownership.
+        /// </remarks>
+        public bool HasAuthority => InternalHasAuthority();
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private bool InternalHasAuthority()
+        {
+            var networkManager = NetworkManager;
+            return networkManager.DistributedAuthorityMode ? OwnerClientId == networkManager.LocalClientId : networkManager.IsServer;
+        }
 
         /// <summary>
         /// The NetworkManager that owns this NetworkObject.
@@ -272,9 +1133,12 @@ private GlobalObjectId GetGlobalId()
         /// </summary>
         public ulong OwnerClientId { get; internal set; }
 
+        internal ulong PreviousOwnerId;
+
         /// <summary>
         /// If true, the object will always be replicated as root on clients and the parent will be ignored.
         /// </summary>
+        [Tooltip("If enabled (default disabled), instances of this NetworkObject will ignore any parent(s) it might have and replicate on clients as the root being its parent.")]
         public bool AlwaysReplicateAsRoot;
 
         /// <summary>
@@ -292,6 +1156,8 @@ private GlobalObjectId GetGlobalId()
         /// bandwidth cost. This can also be useful for UI elements that have
         /// a predetermined fixed position.
         /// </remarks>
+        [Tooltip("If enabled (default enabled), newly joining clients will be synchronized with the transform of the associated GameObject this component is attached to. Typical use case" +
+            " scenario would be for managment objects or in-scene placed objects that don't move and already have their transform settings applied within the scene information.")]
         public bool SynchronizeTransform = true;
 
         /// <summary>
@@ -319,6 +1185,16 @@ private GlobalObjectId GetGlobalId()
         /// </summary>
         public bool? IsSceneObject { get; internal set; }
 
+        //DANGOEXP TODO: Determine if we want to keep this
+        /// <summary>
+        /// Sets whether this NetworkObject was instantiated as part of a scene
+        /// </summary>
+        /// <param name="isSceneObject">When true, marks this as a scene-instantiated object; when false, marks it as runtime-instantiated</param>
+        public void SetSceneObjectStatus(bool isSceneObject = false)
+        {
+            IsSceneObject = isSceneObject;
+        }
+
         /// <summary>
         /// Gets whether or not the object should be automatically removed when the scene is unloaded.
         /// </summary>
@@ -343,6 +1219,7 @@ private GlobalObjectId GetGlobalId()
         /// To synchronize clients of a <see cref="NetworkObject"/>'s scene being changed via <see cref="SceneManager.MoveGameObjectToScene(GameObject, Scene)"/>,
         /// make sure <see cref="SceneMigrationSynchronization"/> is enabled (it is by default).
         /// </remarks>
+        [Tooltip("When enabled (default disabled), spawned instances of this NetworkObject will automatically migrate to any newly assigned active scene.")]
         public bool ActiveSceneSynchronization;
 
         /// <summary>
@@ -361,6 +1238,7 @@ private GlobalObjectId GetGlobalId()
         /// is <see cref="true"/> and <see cref="ActiveSceneSynchronization"/> is <see cref="false"/> and the scene is not the currently
         /// active scene, then the <see cref="NetworkObject"/> will be destroyed.
         /// </remarks>
+        [Tooltip("When enabled (default enabled), dynamically spawned instances of this NetworkObject's migration to a different scene will automatically be synchonize amongst clients.")]
         public bool SceneMigrationSynchronization = true;
 
         /// <summary>
@@ -376,13 +1254,14 @@ private GlobalObjectId GetGlobalId()
         /// <summary>
         /// When set to false, the NetworkObject will be spawned with no observers initially (other than the server)
         /// </summary>
-        [Tooltip("When false, the NetworkObject will spawn with no observers initially. (default is true)")]
+        [Tooltip("When disabled (default enabled), the NetworkObject will spawn with no observers. You control object visibility using NetworkShow. This applies to newly joining clients as well.")]
         public bool SpawnWithObservers = true;
 
         /// <summary>
         /// Delegate type for checking visibility
         /// </summary>
         /// <param name="clientId">The clientId to check visibility for</param>
+        /// <returns>True if the object should be visible to the specified client, false otherwise</returns>
         public delegate bool VisibilityDelegate(ulong clientId);
 
         /// <summary>
@@ -394,6 +1273,7 @@ private GlobalObjectId GetGlobalId()
         /// Delegate type for checking spawn options
         /// </summary>
         /// <param name="clientId">The clientId to check spawn options for</param>
+        /// <returns>True if the object should be spawned for the specified client, false otherwise</returns>
         public delegate bool SpawnDelegate(ulong clientId);
 
         /// <summary>
@@ -405,13 +1285,35 @@ private GlobalObjectId GetGlobalId()
         /// Whether or not to destroy this object if it's owner is destroyed.
         /// If true, the objects ownership will be given to the server.
         /// </summary>
+        [Tooltip("When enabled (default disabled), instances of this NetworkObject will not be destroyed if the owning client disconnects.")]
         public bool DontDestroyWithOwner;
 
         /// <summary>
         /// Whether or not to enable automatic NetworkObject parent synchronization.
         /// </summary>
+        [Tooltip("When disabled (default enabled), NetworkObject parenting will not be automatically synchronized. This is typically used when you want to implement your own custom parenting solution.")]
         public bool AutoObjectParentSync = true;
 
+        /// <summary>
+        /// Determines if the owner will apply transform values sent by the parenting message.
+        /// </summary>
+        /// <remarks>
+        /// When enabled, the resultant parenting transform changes sent by the authority will be applied on all instances. <br />
+        /// When disabled, the resultant parenting transform changes sent by the authority will not be applied on the owner's instance. <br />
+        /// When disabled, all non-owner instances will still be synchronized by the authority's transform values when parented.
+        /// When using a <see cref="NetworkTopologyTypes.ClientServer"/> network topology and an owner authoritative motion model, disabling this can help smooth parenting transitions.
+        /// When using a <see cref="NetworkTopologyTypes.DistributedAuthority"/> network topology this will have no impact on the owner's instance since only the authority/owner can parent.
+        /// </remarks>
+        [Tooltip("When disabled (default enabled), the owner will not apply a server or host's transform properties when parenting changes. Primarily useful for client-server network topology configurations.")]
+        public bool SyncOwnerTransformWhenParented = true;
+
+        /// <summary>
+        /// Client-Server specific, when enabled an owner of a NetworkObject can parent locally as opposed to requiring the owner to notify the server it would like to be parented.
+        /// This behavior is always true when using a distributed authority network topology and does not require it to be set.
+        /// </summary>
+        [Tooltip("When enabled (default disabled), owner's can parent a NetworkObject locally without having to send an RPC to the server or host. Only pertinent when using client-server network topology configurations.")]
+        public bool AllowOwnerToParent;
+
         internal readonly HashSet<ulong> Observers = new HashSet<ulong>();
 
 #if MULTIPLAYER_TOOLS
@@ -446,6 +1348,7 @@ public HashSet<ulong>.Enumerator GetObservers()
         /// </summary>
         /// <param name="clientId">The clientId of the client</param>
         /// <returns>True if the client knows about the object</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public bool IsNetworkVisibleTo(ulong clientId)
         {
             if (!IsSpawned)
@@ -507,13 +1410,6 @@ internal int GetSceneOriginHandle()
             return SceneOriginHandle != 0 ? SceneOriginHandle : gameObject.scene.handle;
         }
 
-        private void Awake()
-        {
-            m_ChildNetworkBehaviours = null;
-            SetCachedParent(transform.parent);
-            SceneOrigin = gameObject.scene;
-        }
-
         /// <summary>
         /// Makes the previously hidden <see cref="NetworkObject"/> "netcode visible" to the targeted client.
         /// </summary>
@@ -535,14 +1431,29 @@ public void NetworkShow(ulong clientId)
                 throw new SpawnStateException("Object is not spawned");
             }
 
-            if (!NetworkManager.IsServer)
+            if (!HasAuthority)
             {
-                throw new NotServerException("Only server can change visibility");
+                if (NetworkManager.DistributedAuthorityMode)
+                {
+                    throw new NotServerException($"Only the owner-authority can change visibility when distributed authority mode is enabled!");
+                }
+                else
+                {
+                    throw new NotServerException("Only the authority can change visibility");
+                }
             }
 
             if (Observers.Contains(clientId))
             {
-                throw new VisibilityChangeException("The object is already visible");
+                if (NetworkManager.DistributedAuthorityMode)
+                {
+                    Debug.LogError($"The object {name} is already visible to Client-{clientId}!");
+                    return;
+                }
+                else
+                {
+                    throw new NotServerException("Only server can change visibility");
+                }
             }
 
             if (CheckObjectVisibility != null && !CheckObjectVisibility(clientId))
@@ -577,19 +1488,42 @@ public static void NetworkShow(List<NetworkObject> networkObjects, ulong clientI
         {
             if (networkObjects == null || networkObjects.Count == 0)
             {
-                throw new ArgumentNullException("At least one " + nameof(NetworkObject) + " has to be provided");
-            }
-
-            NetworkManager networkManager = networkObjects[0].NetworkManager;
-
-            if (!networkManager.IsServer)
-            {
-                throw new NotServerException("Only server can change visibility");
+                NetworkLog.LogErrorServer($"At least one {nameof(NetworkObject)} has to be provided when showing a list of {nameof(NetworkObject)}s!");
+                return;
             }
 
             // Do the safety loop first to prevent putting the netcode in an invalid state.
             for (int i = 0; i < networkObjects.Count; i++)
             {
+                var networkObject = networkObjects[i];
+                var networkManager = networkObject.NetworkManager;
+
+                if (networkManager.DistributedAuthorityMode && clientId == networkObject.OwnerClientId)
+                {
+                    NetworkLog.LogErrorServer($"Cannot hide an object from the owner when distributed authority mode is enabled! (Skipping {networkObject.gameObject.name})");
+                }
+                else if (!networkManager.DistributedAuthorityMode && clientId == NetworkManager.ServerClientId)
+                {
+                    NetworkLog.LogErrorServer("Cannot hide an object from the server!");
+                    continue;
+                }
+
+                // Distributed authority mode adjustments to log a network error and continue when trying to show a NetworkObject
+                // that the local instance does not own
+                if (!networkObjects[i].HasAuthority)
+                {
+                    if (networkObjects[i].NetworkManager.DistributedAuthorityMode)
+                    {
+                        // It will log locally and to the "master-host".
+                        NetworkLog.LogErrorServer("Only the owner-authority can change visibility when distributed authority mode is enabled!");
+                        continue;
+                    }
+                    else
+                    {
+                        throw new NotServerException("Only server can change visibility");
+                    }
+                }
+
                 if (!networkObjects[i].IsSpawned)
                 {
                     throw new SpawnStateException("Object is not spawned");
@@ -633,31 +1567,68 @@ public void NetworkHide(ulong clientId)
                 throw new SpawnStateException("Object is not spawned");
             }
 
-            if (!NetworkManager.IsServer)
-            {
-                throw new NotServerException("Only server can change visibility");
-            }
-
-            if (clientId == NetworkManager.ServerClientId)
+            if (!HasAuthority && !NetworkManager.DAHost)
             {
-                throw new VisibilityChangeException("Cannot hide an object from the server");
+                if (NetworkManager.DistributedAuthorityMode)
+                {
+                    throw new NotServerException($"Only the owner-authority can change visibility when distributed authority mode is enabled!");
+                }
+                else
+                {
+                    throw new NotServerException("Only the authority can change visibility");
+                }
             }
 
             if (!NetworkManager.SpawnManager.RemoveObjectFromShowingTo(this, clientId))
             {
                 if (!Observers.Contains(clientId))
                 {
-                    throw new VisibilityChangeException("The object is already hidden");
+                    if (NetworkManager.LogLevel <= LogLevel.Developer)
+                    {
+                        Debug.LogWarning($"{name} is already hidden from Client-{clientId}! (ignoring)");
+                        return;
+                    }
                 }
                 Observers.Remove(clientId);
 
                 var message = new DestroyObjectMessage
                 {
                     NetworkObjectId = NetworkObjectId,
-                    DestroyGameObject = !IsSceneObject.Value
+                    DestroyGameObject = !IsSceneObject.Value,
+                    IsDistributedAuthority = NetworkManager.DistributedAuthorityMode,
+                    IsTargetedDestroy = NetworkManager.DistributedAuthorityMode,
+                    TargetClientId = clientId, // Just always populate this value whether we write it or not
+                    DeferredDespawnTick = DeferredDespawnTick,
                 };
-                // Send destroy call
-                var size = NetworkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableSequenced, clientId);
+
+                var size = 0;
+                if (NetworkManager.DistributedAuthorityMode)
+                {
+                    if (!NetworkManager.DAHost)
+                    {
+                        // Send destroy call to service or DAHost
+                        size = NetworkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableSequenced, NetworkManager.ServerClientId);
+                    }
+                    else // DAHost mocking service
+                    {
+                        // Send destroy call
+                        size = NetworkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableSequenced, clientId);
+                        // Broadcast the destroy to all clients so they can update their observers list
+                        foreach (var client in NetworkManager.ConnectedClientsIds)
+                        {
+                            if (client == clientId || client == NetworkManager.LocalClientId)
+                            {
+                                continue;
+                            }
+                            size += NetworkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableSequenced, client);
+                        }
+                    }
+                }
+                else
+                {
+                    // Send destroy call
+                    size = NetworkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableSequenced, clientId);
+                }
                 NetworkManager.NetworkMetrics.TrackObjectDestroySent(clientId, this, size);
             }
         }
@@ -681,24 +1652,43 @@ public static void NetworkHide(List<NetworkObject> networkObjects, ulong clientI
         {
             if (networkObjects == null || networkObjects.Count == 0)
             {
-                throw new ArgumentNullException("At least one " + nameof(NetworkObject) + " has to be provided");
+                NetworkLog.LogErrorServer($"At least one {nameof(NetworkObject)} has to be provided when hiding a list of {nameof(NetworkObject)}s!");
+                return;
             }
 
-            var networkManager = networkObjects[0].NetworkManager;
-
-            if (!networkManager.IsServer)
+            // Do the safety loop first to prevent putting the netcode in an invalid state.
+            for (int i = 0; i < networkObjects.Count; i++)
             {
-                throw new NotServerException("Only server can change visibility");
-            }
+                var networkObject = networkObjects[i];
+                var networkManager = networkObject.NetworkManager;
 
-            if (clientId == NetworkManager.ServerClientId)
-            {
-                throw new VisibilityChangeException("Cannot hide an object from the server");
-            }
+                if (networkManager.DistributedAuthorityMode && clientId == networkObject.OwnerClientId)
+                {
+                    NetworkLog.LogErrorServer($"Cannot hide an object from the owner when distributed authority mode is enabled! (Skipping {networkObject.gameObject.name})");
+                }
+                else if (!networkManager.DistributedAuthorityMode && clientId == NetworkManager.ServerClientId)
+                {
+                    NetworkLog.LogErrorServer("Cannot hide an object from the server!");
+                    continue;
+                }
+
+                // Distributed authority mode adjustments to log a network error and continue when trying to show a NetworkObject
+                // that the local instance does not own
+                if (!networkObjects[i].HasAuthority)
+                {
+                    if (networkObjects[i].NetworkManager.DistributedAuthorityMode)
+                    {
+                        // It will log locally and to the "master-host".
+                        NetworkLog.LogErrorServer($"Only the owner-authority can change hide a {nameof(NetworkObject)} when distributed authority mode is enabled!");
+                        continue;
+                    }
+                    else
+                    {
+                        throw new NotServerException("Only server can change visibility!");
+                    }
+                }
 
-            // Do the safety loop first to prevent putting the netcode in an invalid state.
-            for (int i = 0; i < networkObjects.Count; i++)
-            {
+                // CLIENT SPAWNING TODO: Log error and continue as opposed to throwing an exception
                 if (!networkObjects[i].IsSpawned)
                 {
                     throw new SpawnStateException("Object is not spawned");
@@ -729,9 +1719,15 @@ private void OnDestroy()
                 return;
             }
 
-            if (NetworkManager.IsListening && !NetworkManager.IsServer && IsSpawned &&
+            // Authority is the server (client-server) and the owner or DAHost (distributed authority) when destroying a NetworkObject
+            var isAuthority = HasAuthority || NetworkManager.DAHost;
+
+            if (NetworkManager.IsListening && !isAuthority && IsSpawned &&
                 (IsSceneObject == null || (IsSceneObject.Value != true)))
             {
+                // If we destroyed a GameObject with a NetworkObject component on the non-authority side, handle cleaning up the SceneMigrationSynchronization.
+                NetworkManager.SpawnManager?.RemoveNetworkObjectFromSceneChangedUpdates(this);
+
                 // Clients should not despawn NetworkObjects while connected to a session, but we don't want to destroy the current call stack
                 // if this happens. Instead, we should just generate a network log error and exit early (as long as we are not shutting down).
                 if (!NetworkManager.ShutdownInProgress)
@@ -739,13 +1735,23 @@ private void OnDestroy()
                     // Since we still have a session connection, log locally and on the server to inform user of this issue.
                     if (NetworkManager.LogLevel <= LogLevel.Error)
                     {
-                        NetworkLog.LogErrorServer($"[Invalid Destroy][{gameObject.name}][NetworkObjectId:{NetworkObjectId}] Destroy a spawned {nameof(NetworkObject)} on a non-host client is not valid. Call {nameof(Destroy)} or {nameof(Despawn)} on the server/host instead.");
+                        if (NetworkManager.DistributedAuthorityMode)
+                        {
+                            NetworkLog.LogError($"[Invalid Destroy][{gameObject.name}][NetworkObjectId:{NetworkObjectId}] Destroy a spawned {nameof(NetworkObject)} on a non-owner client is not valid during a distributed authority session. Call {nameof(Destroy)} or {nameof(Despawn)} on the client-owner instead.");
+                        }
+                        else
+                        {
+                            NetworkLog.LogErrorServer($"[Invalid Destroy][{gameObject.name}][NetworkObjectId:{NetworkObjectId}] Destroy a spawned {nameof(NetworkObject)} on a non-host client is not valid. Call {nameof(Destroy)} or {nameof(Despawn)} on the server/host instead.");
+                        }
                     }
                     return;
                 }
                 // Otherwise, clients can despawn NetworkObjects while shutting down and should not generate any messages when this happens
             }
 
+            // Always attempt to remove from scene changed updates
+            NetworkManager.SpawnManager?.RemoveNetworkObjectFromSceneChangedUpdates(this);
+
             if (NetworkManager.SpawnManager != null && NetworkManager.SpawnManager.SpawnedObjects.TryGetValue(NetworkObjectId, out var networkObject))
             {
                 if (this == networkObject)
@@ -758,25 +1764,91 @@ private void OnDestroy()
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal void SpawnInternal(bool destroyWithScene, ulong ownerClientId, bool playerObject)
         {
+            if (NetworkManagerOwner == null)
+            {
+                NetworkManagerOwner = NetworkManager.Singleton;
+            }
             if (!NetworkManager.IsListening)
             {
                 throw new NotListeningException($"{nameof(NetworkManager)} is not listening, start a server or host before spawning objects");
             }
 
-            if (!NetworkManager.IsServer)
+            if ((!NetworkManager.IsServer && !NetworkManager.DistributedAuthorityMode) || (NetworkManager.DistributedAuthorityMode && !NetworkManager.LocalClient.IsSessionOwner && NetworkManager.LocalClientId != ownerClientId))
             {
-                throw new NotServerException($"Only server can spawn {nameof(NetworkObject)}s");
+                if (NetworkManager.DistributedAuthorityMode)
+                {
+                    throw new NotServerException($"When distributed authority mode is enabled, you can only spawn NetworkObjects that belong to the local instance! Local instance id {NetworkManager.LocalClientId} is not the same as the assigned owner id: {ownerClientId}!");
+                }
+                else
+                {
+                    throw new NotServerException($"Only server can spawn {nameof(NetworkObject)}s");
+                }
+            }
+
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                if (NetworkManager.LocalClient == null || !NetworkManager.IsConnectedClient || !NetworkManager.ConnectionManager.LocalClient.IsApproved)
+                {
+                    Debug.LogError($"Cannot spawn {name} until the client is fully connected to the session!");
+                    return;
+                }
+                if (NetworkManager.NetworkConfig.EnableSceneManagement)
+                {
+                    if (!NetworkManager.SceneManager.ClientSceneHandleToServerSceneHandle.ContainsKey(gameObject.scene.handle))
+                    {
+                        // Most likely this issue is due to an integration test
+                        if (NetworkManager.LogLevel <= LogLevel.Developer)
+                        {
+                            NetworkLog.LogWarning($"Failed to find scene handle {gameObject.scene.handle} for {gameObject.name}!");
+                        }
+                        // Just use the existing handle
+                        NetworkSceneHandle = gameObject.scene.handle;
+                    }
+                    else
+                    {
+                        NetworkSceneHandle = NetworkManager.SceneManager.ClientSceneHandleToServerSceneHandle[gameObject.scene.handle];
+                    }
+                }
+                if (DontDestroyWithOwner && !IsOwnershipDistributable)
+                {
+                    //Ownership |= OwnershipStatus.Distributable;
+                    // DANGO-TODO: Review over don't destroy with owner being set but DistributeOwnership not being set
+                    if (NetworkManager.LogLevel == LogLevel.Developer)
+                    {
+                        NetworkLog.LogWarning("DANGO-TODO: Review over don't destroy with owner being set but DistributeOwnership not being set. For now, if the NetworkObject does not destroy with the owner it will set ownership to SessionOwner.");
+                    }
+                }
             }
 
             NetworkManager.SpawnManager.SpawnNetworkObjectLocally(this, NetworkManager.SpawnManager.GetNetworkObjectId(), IsSceneObject.HasValue && IsSceneObject.Value, playerObject, ownerClientId, destroyWithScene);
 
-            for (int i = 0; i < NetworkManager.ConnectedClientsList.Count; i++)
+            if ((NetworkManager.DistributedAuthorityMode && NetworkManager.DAHost) || (!NetworkManager.DistributedAuthorityMode && NetworkManager.IsServer))
+            {
+                for (int i = 0; i < NetworkManager.ConnectedClientsList.Count; i++)
+                {
+                    if (NetworkManager.ConnectedClientsList[i].ClientId == NetworkManager.ServerClientId)
+                    {
+                        continue;
+                    }
+                    if (Observers.Contains(NetworkManager.ConnectedClientsList[i].ClientId))
+                    {
+                        NetworkManager.SpawnManager.SendSpawnCallForObject(NetworkManager.ConnectedClientsList[i].ClientId, this);
+                    }
+                }
+            }
+            else if (NetworkManager.DistributedAuthorityMode && !NetworkManager.DAHost)
             {
-                if (Observers.Contains(NetworkManager.ConnectedClientsList[i].ClientId))
+                // If spawning with observers or if not spawning with observers but the observer count is greater than 1 (i.e. owner/authority creating),
+                // then we want to send a spawn notification.
+                if (SpawnWithObservers || !SpawnWithObservers && Observers.Count > 1)
                 {
-                    NetworkManager.SpawnManager.SendSpawnCallForObject(NetworkManager.ConnectedClientsList[i].ClientId, this);
+                    NetworkManager.SpawnManager.SendSpawnCallForObject(NetworkManager.ServerClientId, this);
                 }
             }
+            else
+            {
+                NetworkLog.LogWarningServer($"Ran into unknown conditional check during spawn when determining distributed authority mode or not");
+            }
         }
 
         /// <summary>
@@ -829,26 +1901,28 @@ public NetworkObject InstantiateAndSpawn(NetworkManager networkManager, ulong ow
                 return null;
             }
 
-            if (!networkManager.IsServer)
+            ownerClientId = networkManager.DistributedAuthorityMode ? networkManager.LocalClientId : ownerClientId;
+            // We only need to check for authority when running in client-server mode
+            if (!networkManager.IsServer && !networkManager.DistributedAuthorityMode)
             {
                 Debug.LogError(NetworkSpawnManager.InstantiateAndSpawnErrors[NetworkSpawnManager.InstantiateAndSpawnErrorTypes.NotAuthority]);
                 return null;
             }
 
-            if (NetworkManager.ShutdownInProgress)
+            if (networkManager.ShutdownInProgress)
             {
                 Debug.LogWarning(NetworkSpawnManager.InstantiateAndSpawnErrors[NetworkSpawnManager.InstantiateAndSpawnErrorTypes.InvokedWhenShuttingDown]);
                 return null;
             }
 
             // Verify it is actually a valid prefab
-            if (!NetworkManager.NetworkConfig.Prefabs.Contains(gameObject))
+            if (!networkManager.NetworkConfig.Prefabs.Contains(gameObject))
             {
                 Debug.LogError(NetworkSpawnManager.InstantiateAndSpawnErrors[NetworkSpawnManager.InstantiateAndSpawnErrorTypes.NotRegisteredNetworkPrefab]);
                 return null;
             }
 
-            return NetworkManager.SpawnManager.InstantiateAndSpawnNoParameterChecks(this, ownerClientId, destroyWithScene, isPlayerObject, forceOverride, position, rotation);
+            return networkManager.SpawnManager.InstantiateAndSpawnNoParameterChecks(this, ownerClientId, destroyWithScene, isPlayerObject, forceOverride, position, rotation);
         }
 
         /// <summary>
@@ -857,7 +1931,8 @@ public NetworkObject InstantiateAndSpawn(NetworkManager networkManager, ulong ow
         /// <param name="destroyWithScene">Should the object be destroyed when the scene is changed</param>
         public void Spawn(bool destroyWithScene = false)
         {
-            SpawnInternal(destroyWithScene, NetworkManager.ServerClientId, false);
+            var clientId = NetworkManager.DistributedAuthorityMode ? NetworkManager.LocalClientId : NetworkManager.ServerClientId;
+            SpawnInternal(destroyWithScene, clientId, false);
         }
 
         /// <summary>
@@ -904,17 +1979,21 @@ public void RemoveOwnership()
         /// <param name="newOwnerClientId">The new owner clientId</param>
         public void ChangeOwnership(ulong newOwnerClientId)
         {
-            NetworkManager.SpawnManager.ChangeOwnership(this, newOwnerClientId);
+            NetworkManager.SpawnManager.ChangeOwnership(this, newOwnerClientId, HasAuthority);
         }
 
         internal void InvokeBehaviourOnLostOwnership()
         {
-            // Server already handles this earlier, hosts should ignore, all clients should update
+            // Always update the ownership table in distributed authority mode
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                NetworkManager.SpawnManager.UpdateOwnershipTable(this, OwnerClientId, true);
+            }
+            else // Server already handles this earlier, hosts should ignore and only client owners should update
             if (!NetworkManager.IsServer)
             {
                 NetworkManager.SpawnManager.UpdateOwnershipTable(this, OwnerClientId, true);
             }
-
             for (int i = 0; i < ChildNetworkBehaviours.Count; i++)
             {
                 ChildNetworkBehaviours[i].InternalOnLostOwnership();
@@ -923,7 +2002,12 @@ internal void InvokeBehaviourOnLostOwnership()
 
         internal void InvokeBehaviourOnGainedOwnership()
         {
-            // Server already handles this earlier, hosts should ignore and only client owners should update
+            // Always update the ownership table in distributed authority mode
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                NetworkManager.SpawnManager.UpdateOwnershipTable(this, OwnerClientId);
+            }
+            else // Server already handles this earlier, hosts should ignore and only client owners should update
             if (!NetworkManager.IsServer && NetworkManager.LocalClientId == OwnerClientId)
             {
                 NetworkManager.SpawnManager.UpdateOwnershipTable(this, OwnerClientId);
@@ -961,6 +2045,9 @@ internal void InvokeBehaviourOnNetworkObjectParentChanged(NetworkObject parentNe
         {
             for (int i = 0; i < ChildNetworkBehaviours.Count; i++)
             {
+                // Invoke internal notification
+                ChildNetworkBehaviours[i].InternalOnNetworkObjectParentChanged(parentNetworkObject);
+                // Invoke public notification
                 ChildNetworkBehaviours[i].OnNetworkObjectParentChanged(parentNetworkObject);
             }
         }
@@ -969,6 +2056,13 @@ internal void InvokeBehaviourOnNetworkObjectParentChanged(NetworkObject parentNe
         private Transform m_CachedParent; // What is our last set parent Transform reference?
         private bool m_CachedWorldPositionStays = true; // Used to preserve the world position stays parameter passed in TrySetParent
 
+        /// <summary>
+        /// With distributed authority, we need to have a way to determine if the parenting action is authorized.
+        /// This is set when handling an incoming ParentSyncMessage and when running as a DAHost and a client has disconnected.
+        /// </summary>
+        internal bool AuthorityAppliedParenting = false;
+
+
         /// <summary>
         /// Returns the last known cached WorldPositionStays value for this NetworkObject
         /// </summary>
@@ -987,6 +2081,7 @@ public bool WorldPositionStays()
 
         internal void SetCachedParent(Transform parentTransform)
         {
+            AuthorityAppliedParenting = false;
             m_CachedParent = parentTransform;
         }
 
@@ -1048,7 +2143,7 @@ public bool TrySetParent(GameObject parent, bool worldPositionStays = true)
         /// </summary>
         internal bool TryRemoveParentCachedWorldPositionStays()
         {
-            return TrySetParent((NetworkObject)null, m_CachedWorldPositionStays);
+            return InternalTrySetParent(null, m_CachedWorldPositionStays);
         }
 
         /// <summary>
@@ -1058,7 +2153,7 @@ internal bool TryRemoveParentCachedWorldPositionStays()
         /// This is a more convenient way to remove the parent without  having to cast the null value to either <see cref="GameObject"/> or <see cref="NetworkObject"/>
         /// </remarks>
         /// <param name="worldPositionStays">If true, the parent-relative position, scale and rotation are modified such that the object keeps the same world space position, rotation and scale as before.</param>
-        /// <returns></returns>
+        /// <returns>True if the parent was successfully removed, false if the operation failed or the object was already parentless</returns>
         public bool TryRemoveParent(bool worldPositionStays = true)
         {
             return TrySetParent((NetworkObject)null, worldPositionStays);
@@ -1082,18 +2177,29 @@ public bool TrySetParent(NetworkObject parent, bool worldPositionStays = true)
                 return false;
             }
 
-            if (!NetworkManager.IsServer && !NetworkManager.ShutdownInProgress)
+            // DANGO-TODO: Do we want to worry about ownership permissions here?
+            // It wouldn't make sense to not allow parenting, but keeping this note here as a reminder.
+            var isAuthority = HasAuthority || (AllowOwnerToParent && IsOwner);
+
+            // If we don't have authority and we are not shutting down, then don't allow any parenting.
+            // If we are shutting down and don't have authority then allow it.
+            if (!isAuthority && !NetworkManager.ShutdownInProgress)
             {
                 return false;
             }
 
-            // If the parent is not null fail only if either of the two is true:
-            // - This instance is spawned and the parent is not.
-            // - This instance is not spawned and the parent is.
-            // Basically, don't allow parenting when either the child or parent is not spawned.
-            // Caveat: if the parent is null then we can allow parenting whether the instance is or is not spawned.
-            if (parent != null && (IsSpawned ^ parent.IsSpawned))
+            return InternalTrySetParent(parent, worldPositionStays);
+        }
+
+        internal bool InternalTrySetParent(NetworkObject parent, bool worldPositionStays = true)
+        {
+            if (parent != null && (IsSpawned ^ parent.IsSpawned) && NetworkManager != null && !NetworkManager.ShutdownInProgress)
             {
+                if (NetworkManager.LogLevel <= LogLevel.Developer)
+                {
+                    var nameOfNotSpawnedObject = IsSpawned ? $" the parent ({parent.name})" : $"the child ({name})";
+                    NetworkLog.LogWarning($"Parenting failed because {nameOfNotSpawnedObject} is not spawned!");
+                }
                 return false;
             }
 
@@ -1101,10 +2207,12 @@ public bool TrySetParent(NetworkObject parent, bool worldPositionStays = true)
 
             if (parent == null)
             {
+                CurrentParent = null;
                 transform.SetParent(null, worldPositionStays);
             }
             else
             {
+                CurrentParent = parent;
                 transform.SetParent(parent.transform, worldPositionStays);
             }
 
@@ -1113,7 +2221,7 @@ public bool TrySetParent(NetworkObject parent, bool worldPositionStays = true)
 
         private void OnTransformParentChanged()
         {
-            if (!AutoObjectParentSync)
+            if (!AutoObjectParentSync || NetworkManager.ShutdownInProgress)
             {
                 return;
             }
@@ -1125,36 +2233,50 @@ private void OnTransformParentChanged()
 
             if (NetworkManager == null || !NetworkManager.IsListening)
             {
+                // DANGO-TODO: Review as to whether we want to provide a better way to handle changing parenting of objects when the
+                // object is not spawned. Really, we shouldn't care about these types of changes.
+                if (NetworkManager.DistributedAuthorityMode && m_CachedParent != null && transform.parent == null)
+                {
+                    m_CachedParent = null;
+                    return;
+                }
                 transform.parent = m_CachedParent;
                 Debug.LogException(new NotListeningException($"{nameof(NetworkManager)} is not listening, start a server or host before reparenting"));
                 return;
             }
+            var isAuthority = false;
+            // With distributed authority, we need to track "valid authoritative" parenting changes.
+            // So, either the authority or AuthorityAppliedParenting is considered a "valid parenting change".
+            isAuthority = HasAuthority || AuthorityAppliedParenting || (AllowOwnerToParent && IsOwner);
+            var distributedAuthority = NetworkManager.DistributedAuthorityMode;
 
-            if (!NetworkManager.IsServer)
+            // If we do not have authority and we are spawned
+            if (!isAuthority && IsSpawned)
             {
-                // Log exception if we are a client and not shutting down.
-                if (!NetworkManager.ShutdownInProgress)
+
+                // If the cached parent has not already been set and we are in distributed authority mode, then log an exception and exit early as a non-authority instance
+                // is trying to set the parent.
+                if (distributedAuthority)
                 {
                     transform.parent = m_CachedParent;
-                    Debug.LogException(new NotServerException($"Only the server can reparent {nameof(NetworkObject)}s"));
+                    NetworkLog.LogError($"[Not Owner] Only the owner-authority of child {gameObject.name}'s {nameof(NetworkObject)} component can reparent it!");
                 }
-                else // Otherwise, if we are removing a parent then go ahead and allow parenting to occur
-                if (transform.parent == null)
+                else
                 {
-                    m_LatestParent = null;
-                    m_CachedParent = null;
-                    InvokeBehaviourOnNetworkObjectParentChanged(null);
+                    transform.parent = m_CachedParent;
+                    Debug.LogException(new NotServerException($"Only the server can reparent {nameof(NetworkObject)}s"));
                 }
                 return;
             }
-            else // Otherwise, on the serer side if this instance is not spawned...
+
             if (!IsSpawned)
             {
-                // ,,,and we are removing the parent, then go ahead and allow parenting to occur
+                AuthorityAppliedParenting = false;
+                // and we are removing the parent, then go ahead and allow parenting to occur
                 if (transform.parent == null)
                 {
                     m_LatestParent = null;
-                    m_CachedParent = null;
+                    SetCachedParent(null);
                     InvokeBehaviourOnNetworkObjectParentChanged(null);
                 }
                 else
@@ -1171,13 +2293,14 @@ private void OnTransformParentChanged()
                 if (!transform.parent.TryGetComponent<NetworkObject>(out var parentObject))
                 {
                     transform.parent = m_CachedParent;
+                    AuthorityAppliedParenting = false;
                     Debug.LogException(new InvalidParentException($"Invalid parenting, {nameof(NetworkObject)} moved under a non-{nameof(NetworkObject)} parent"));
                     return;
                 }
-
-                if (!parentObject.IsSpawned)
+                else if (!parentObject.IsSpawned)
                 {
                     transform.parent = m_CachedParent;
+                    AuthorityAppliedParenting = false;
                     Debug.LogException(new SpawnStateException($"{nameof(NetworkObject)} can only be reparented under another spawned {nameof(NetworkObject)}"));
                     return;
                 }
@@ -1190,6 +2313,8 @@ private void OnTransformParentChanged()
                 removeParent = m_CachedParent != null;
             }
 
+            // This can be reset within ApplyNetworkParenting
+            var authorityApplied = AuthorityAppliedParenting;
             ApplyNetworkParenting(removeParent);
 
             var message = new ParentSyncMessage
@@ -1198,6 +2323,7 @@ private void OnTransformParentChanged()
                 IsLatestParentSet = m_LatestParent != null && m_LatestParent.HasValue,
                 LatestParent = m_LatestParent,
                 RemoveParent = removeParent,
+                AuthorityApplied = authorityApplied,
                 WorldPositionStays = m_CachedWorldPositionStays,
                 Position = m_CachedWorldPositionStays ? transform.position : transform.localPosition,
                 Rotation = m_CachedWorldPositionStays ? transform.rotation : transform.localRotation,
@@ -1212,20 +2338,48 @@ private void OnTransformParentChanged()
                 m_CachedWorldPositionStays = true;
             }
 
-            unsafe
+            // If we are connected to a CMB service or we are running a mock CMB service then send to the "server" identifier
+            if (distributedAuthority || (!distributedAuthority && AllowOwnerToParent && IsOwner && !NetworkManager.IsServer))
             {
-                var maxCount = NetworkManager.ConnectedClientsIds.Count;
-                ulong* clientIds = stackalloc ulong[maxCount];
-                int idx = 0;
-                foreach (var clientId in NetworkManager.ConnectedClientsIds)
+                if (!NetworkManager.DAHost)
                 {
-                    if (Observers.Contains(clientId))
+                    NetworkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableSequenced, 0);
+                    return;
+                }
+                else
+                {
+                    foreach (var clientId in NetworkManager.ConnectedClientsIds)
                     {
-                        clientIds[idx++] = clientId;
+                        if (clientId == NetworkManager.ServerClientId)
+                        {
+                            continue;
+                        }
+                        NetworkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableSequenced, clientId);
                     }
                 }
-
-                NetworkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableSequenced, clientIds, idx);
+            }
+            else
+            {
+                // Otherwise we are running in client-server =or= this has to be a DAHost instance.
+                // Send to all connected clients.
+                unsafe
+                {
+                    var maxCount = NetworkManager.ConnectedClientsIds.Count;
+                    ulong* clientIds = stackalloc ulong[maxCount];
+                    int idx = 0;
+                    foreach (var clientId in NetworkManager.ConnectedClientsIds)
+                    {
+                        if (clientId == NetworkManager.ServerClientId)
+                        {
+                            continue;
+                        }
+                        if (Observers.Contains(clientId))
+                        {
+                            clientIds[idx++] = clientId;
+                        }
+                    }
+                    NetworkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableSequenced, clientIds, idx);
+                }
             }
         }
 
@@ -1239,7 +2393,7 @@ private void OnTransformParentChanged()
         // we call CheckOrphanChildren() method and quickly iterate over OrphanChildren set and see if we can reparent/adopt one.
         internal static HashSet<NetworkObject> OrphanChildren = new HashSet<NetworkObject>();
 
-        internal bool ApplyNetworkParenting(bool removeParent = false, bool ignoreNotSpawned = false, bool orphanedChildPass = false)
+        internal bool ApplyNetworkParenting(bool removeParent = false, bool ignoreNotSpawned = false, bool orphanedChildPass = false, bool enableNotification = true)
         {
             if (!AutoObjectParentSync)
             {
@@ -1292,7 +2446,7 @@ internal bool ApplyNetworkParenting(bool removeParent = false, bool ignoreNotSpa
                     SetNetworkParenting(parentNetworkObject.NetworkObjectId, false);
 
                     // Set the cached parent
-                    m_CachedParent = parentNetworkObject.transform;
+                    SetCachedParent(parentNetworkObject.transform);
 
                     return true;
                 }
@@ -1306,13 +2460,16 @@ internal bool ApplyNetworkParenting(bool removeParent = false, bool ignoreNotSpa
             // or a parent was removed prior to the client connecting (i.e. in-scene placed NetworkObjects)
             if (removeParent || !m_LatestParent.HasValue)
             {
-                m_CachedParent = null;
+                SetCachedParent(null);
                 // We must use Transform.SetParent when taking WorldPositionStays into
                 // consideration, otherwise just setting transform.parent = null defaults
                 // to WorldPositionStays which can cause scaling issues if the parent's
                 // scale is not the default (Vetctor3.one) value.
                 transform.SetParent(null, m_CachedWorldPositionStays);
-                InvokeBehaviourOnNetworkObjectParentChanged(null);
+                if (enableNotification)
+                {
+                    InvokeBehaviourOnNetworkObjectParentChanged(null);
+                }
                 return true;
             }
 
@@ -1335,10 +2492,12 @@ internal bool ApplyNetworkParenting(bool removeParent = false, bool ignoreNotSpa
                     return false;
                 }
             }
-
-            m_CachedParent = parentObject.transform;
+            SetCachedParent(parentObject.transform);
             transform.SetParent(parentObject.transform, m_CachedWorldPositionStays);
-            InvokeBehaviourOnNetworkObjectParentChanged(parentObject);
+            if (enableNotification)
+            {
+                InvokeBehaviourOnNetworkObjectParentChanged(parentObject);
+            }
             return true;
         }
 
@@ -1428,11 +2587,10 @@ internal void InternalInSceneNetworkObjectsSpawned()
             }
         }
 
-
-
         internal void InvokeBehaviourNetworkDespawn()
         {
             NetworkManager.SpawnManager.UpdateOwnershipTable(this, OwnerClientId, true);
+            NetworkManager.SpawnManager.RemoveNetworkObjectFromSceneChangedUpdates(this);
 
             for (int i = 0; i < ChildNetworkBehaviours.Count; i++)
             {
@@ -1458,6 +2616,27 @@ internal List<NetworkBehaviour> ChildNetworkBehaviours
                     if (networkBehaviours[i].NetworkObject == this)
                     {
                         m_ChildNetworkBehaviours.Add(networkBehaviours[i]);
+                        var type = networkBehaviours[i].GetType();
+                        if (type == typeof(NetworkTransform) || type.IsInstanceOfType(typeof(NetworkTransform)) || type.IsSubclassOf(typeof(NetworkTransform)))
+                        {
+                            if (NetworkTransforms == null)
+                            {
+                                NetworkTransforms = new List<NetworkTransform>();
+                            }
+                            var networkTransform = networkBehaviours[i] as NetworkTransform;
+                            networkTransform.IsNested = i != 0 && networkTransform.gameObject != gameObject;
+                            NetworkTransforms.Add(networkTransform);
+                        }
+#if COM_UNITY_MODULES_PHYSICS
+                        else if (type.IsSubclassOf(typeof(NetworkRigidbodyBase)))
+                        {
+                            if (NetworkRigidbodies == null)
+                            {
+                                NetworkRigidbodies = new List<NetworkRigidbodyBase>();
+                            }
+                            NetworkRigidbodies.Add(networkBehaviours[i] as NetworkRigidbodyBase);
+                        }
+#endif
                     }
                 }
 
@@ -1467,6 +2646,14 @@ internal List<NetworkBehaviour> ChildNetworkBehaviours
 
         internal void WriteNetworkVariableData(FastBufferWriter writer, ulong targetClientId)
         {
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                writer.WriteValueSafe((ushort)ChildNetworkBehaviours.Count);
+                if (ChildNetworkBehaviours.Count == 0)
+                {
+                    return;
+                }
+            }
             for (int i = 0; i < ChildNetworkBehaviours.Count; i++)
             {
                 var behavior = ChildNetworkBehaviours[i];
@@ -1484,6 +2671,41 @@ internal void MarkVariablesDirty(bool dirty)
             }
         }
 
+        /// <summary>
+        /// Used when changing ownership, this will mark any owner read permission base NetworkVariables as dirty
+        /// and will check if any owner write permission NetworkVariables are dirty (primarily for collections) so
+        /// the new owner will get a full state update prior to changing ownership.
+        /// </summary>
+        /// <remarks>
+        /// We have to pass in the original owner and previous owner to "reset" back to the current state of this
+        /// NetworkObject in order to preserve the same ownership change flow. By the time this is invoked, the
+        /// new and previous owner ids have already been set.
+        /// </remarks>
+        /// <param name="originalOwnerId">the owner prior to beginning the change in ownership change.</param>
+        /// <param name="originalPreviousOwnerId">the previous owner prior to beginning the change in ownership change.</param>
+        internal void SynchronizeOwnerNetworkVariables(ulong originalOwnerId, ulong originalPreviousOwnerId)
+        {
+            var currentOwnerId = OwnerClientId;
+            OwnerClientId = originalOwnerId;
+            PreviousOwnerId = originalPreviousOwnerId;
+            for (int i = 0; i < ChildNetworkBehaviours.Count; i++)
+            {
+                ChildNetworkBehaviours[i].MarkOwnerReadDirtyAndCheckOwnerWriteIsDirty();
+            }
+
+            // Now set the new owner and previous owner identifiers back to their original new values
+            // before we run the NetworkBehaviourUpdate. For owner read only permissions this order of
+            // operations is **particularly important** as we need to first (above) mark things as dirty
+            // from the context of the original owner and then second (below) we need to send the messages
+            // which requires the new owner to be set for owner read permission NetworkVariables.
+            OwnerClientId = currentOwnerId;
+            PreviousOwnerId = originalOwnerId;
+
+            // Force send a state update for all owner read NetworkVariables  and any currently dirty
+            // owner write NetworkVariables.
+            NetworkManager.BehaviourUpdater.NetworkBehaviourUpdate(true);
+        }
+
         // NGO currently guarantees that the client will receive spawn data for all objects in one network tick.
         //  Children may arrive before their parents; when they do they are stored in OrphanedChildren and then
         //  resolved when their parents arrived.  Because we don't send a partial list of spawns (yet), something
@@ -1509,17 +2731,37 @@ internal static void VerifyParentingStatus()
         /// <summary>
         /// Only invoked during first synchronization of a NetworkObject (late join or newly spawned)
         /// </summary>
-        internal void SetNetworkVariableData(FastBufferReader reader, ulong clientId)
+        internal bool SetNetworkVariableData(FastBufferReader reader, ulong clientId)
         {
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                var readerPosition = reader.Position;
+                reader.ReadValueSafe(out ushort behaviourCount);
+                if (behaviourCount != ChildNetworkBehaviours.Count)
+                {
+                    Debug.LogError($"[{name}] Network Behavior Count Mismatch! [In: {behaviourCount} vs Local: {ChildNetworkBehaviours.Count}][StartReaderPos: {readerPosition}] CurrentReaderPos: {reader.Position}]");
+                    return false;
+                }
+            }
+
             for (int i = 0; i < ChildNetworkBehaviours.Count; i++)
             {
                 var behaviour = ChildNetworkBehaviours[i];
                 behaviour.InitializeVariables();
                 behaviour.SetNetworkVariableData(reader, clientId);
             }
+            return true;
         }
 
-        internal ushort GetNetworkBehaviourOrderIndex(NetworkBehaviour instance)
+        /// <summary>
+        /// Gets the order index of a NetworkBehaviour instance within the ChildNetworkBehaviours collection
+        /// </summary>
+        /// <param name="instance">The NetworkBehaviour instance to find the index for</param>
+        /// <returns>
+        /// The index of the NetworkBehaviour in the ChildNetworkBehaviours collection.
+        /// Returns 0 if the instance is not found.
+        /// </returns>
+        public ushort GetNetworkBehaviourOrderIndex(NetworkBehaviour instance)
         {
             // read the cached index, and verify it first
             if (instance.NetworkBehaviourIdCache < ChildNetworkBehaviours.Count)
@@ -1546,7 +2788,7 @@ internal ushort GetNetworkBehaviourOrderIndex(NetworkBehaviour instance)
             return 0;
         }
 
-        public NetworkBehaviour GetNetworkBehaviourAtOrderIndex(ushort index)
+        internal NetworkBehaviour GetNetworkBehaviourAtOrderIndex(ushort index)
         {
             if (index >= ChildNetworkBehaviours.Count)
             {
@@ -1574,10 +2816,11 @@ public NetworkBehaviour GetNetworkBehaviourAtOrderIndex(ushort index)
 
         internal struct SceneObject
         {
-            private byte m_BitField;
+            private ushort m_BitField;
             public uint Hash;
             public ulong NetworkObjectId;
             public ulong OwnerClientId;
+            public ushort OwnershipFlags;
 
             public bool IsPlayerObject
             {
@@ -1624,6 +2867,34 @@ public bool DestroyWithScene
                 set => ByteUtility.SetBit(ref m_BitField, 6, value);
             }
 
+            public bool DontDestroyWithOwner
+            {
+                get => ByteUtility.GetBit(m_BitField, 7);
+                set => ByteUtility.SetBit(ref m_BitField, 7, value);
+            }
+
+            public bool HasOwnershipFlags
+            {
+                get => ByteUtility.GetBit(m_BitField, 8);
+                set => ByteUtility.SetBit(ref m_BitField, 8, value);
+            }
+
+            public bool SyncObservers
+            {
+                get => ByteUtility.GetBit(m_BitField, 9);
+                set => ByteUtility.SetBit(ref m_BitField, 9, value);
+            }
+
+            public bool SpawnWithObservers
+            {
+                get => ByteUtility.GetBit(m_BitField, 10);
+                set => ByteUtility.SetBit(ref m_BitField, 10, value);
+            }
+
+            // When handling the initial synchronization of NetworkObjects,
+            // this will be populated with the known observers.
+            public ulong[] Observers;
+
             //If(Metadata.HasParent)
             public ulong ParentObjectId;
 
@@ -1650,6 +2921,11 @@ public struct TransformData : INetworkSerializeByMemcpy
 
             public void Serialize(FastBufferWriter writer)
             {
+                if (OwnerObject.NetworkManager.DistributedAuthorityMode)
+                {
+                    HasOwnershipFlags = true;
+                    SpawnWithObservers = OwnerObject.SpawnWithObservers;
+                }
                 writer.WriteValueSafe(m_BitField);
                 writer.WriteValueSafe(Hash);
                 BytePacker.WriteValueBitPacked(writer, NetworkObjectId);
@@ -1664,6 +2940,20 @@ public void Serialize(FastBufferWriter writer)
                     }
                 }
 
+                if (HasOwnershipFlags)
+                {
+                    writer.WriteValueSafe(OwnershipFlags);
+                }
+
+                if (SyncObservers)
+                {
+                    BytePacker.WriteValuePacked(writer, Observers.Length);
+                    foreach (var observer in Observers)
+                    {
+                        BytePacker.WriteValuePacked(writer, observer);
+                    }
+                }
+
                 var writeSize = 0;
                 writeSize += HasTransform ? FastBufferWriter.GetWriteSize<TransformData>() : 0;
                 writeSize += FastBufferWriter.GetWriteSize<int>();
@@ -1680,7 +2970,14 @@ public void Serialize(FastBufferWriter writer)
 
                 // The NetworkSceneHandle is the server-side relative
                 // scene handle that the NetworkObject resides in.
-                writer.WriteValue(OwnerObject.GetSceneOriginHandle());
+                if (OwnerObject.NetworkManager.DistributedAuthorityMode)
+                {
+                    writer.WriteValue(OwnerObject.NetworkSceneHandle);
+                }
+                else
+                {
+                    writer.WriteValue(OwnerObject.GetSceneOriginHandle());
+                }
 
                 // Synchronize NetworkVariables and NetworkBehaviours
                 var bufferSerializer = new BufferSerializer<BufferSerializerWriter>(new BufferSerializerWriter(writer));
@@ -1704,6 +3001,24 @@ public void Deserialize(FastBufferReader reader)
                     }
                 }
 
+                if (HasOwnershipFlags)
+                {
+                    reader.ReadValueSafe(out OwnershipFlags);
+                }
+
+                if (SyncObservers)
+                {
+                    var observerCount = 0;
+                    var observerId = (ulong)0;
+                    ByteUnpacker.ReadValuePacked(reader, out observerCount);
+                    Observers = new ulong[observerCount];
+                    for (int i = 0; i < observerCount; i++)
+                    {
+                        ByteUnpacker.ReadValuePacked(reader, out observerId);
+                        Observers[i] = observerId;
+                    }
+                }
+
                 var readSize = 0;
                 readSize += HasTransform ? FastBufferWriter.GetWriteSize<TransformData>() : 0;
                 readSize += FastBufferWriter.GetWriteSize<int>();
@@ -1725,11 +3040,11 @@ public void Deserialize(FastBufferReader reader)
             }
         }
 
-        internal void PostNetworkVariableWrite()
+        internal void PostNetworkVariableWrite(bool forced = false)
         {
             for (int k = 0; k < ChildNetworkBehaviours.Count; k++)
             {
-                ChildNetworkBehaviours[k].PostNetworkVariableWrite();
+                ChildNetworkBehaviours[k].PostNetworkVariableWrite(forced);
             }
         }
 
@@ -1783,67 +3098,78 @@ internal void SynchronizeNetworkBehaviours<T>(ref BufferSerializer<T> serializer
             }
             else
             {
+                var seekToEndOfSynchData = 0;
                 var reader = serializer.GetFastBufferReader();
+                try
+                {
+                    reader.ReadValueSafe(out ushort sizeOfSynchronizationData);
+                    seekToEndOfSynchData = reader.Position + sizeOfSynchronizationData;
+                    // Apply the network variable synchronization data
+                    if (!SetNetworkVariableData(reader, targetClientId))
+                    {
+                        reader.Seek(seekToEndOfSynchData);
+                        return;
+                    }
+
+                    // Read the number of NetworkBehaviours to synchronize
+                    reader.ReadValueSafe(out byte numberSynchronized);
 
-                reader.ReadValueSafe(out ushort sizeOfSynchronizationData);
-                var seekToEndOfSynchData = reader.Position + sizeOfSynchronizationData;
-                // Apply the network variable synchronization data
-                SetNetworkVariableData(reader, targetClientId);
-                // Read the number of NetworkBehaviours to synchronize
-                reader.ReadValueSafe(out byte numberSynchronized);
-                var networkBehaviourId = (ushort)0;
+                    var networkBehaviourId = (ushort)0;
+
+                    // If a NetworkBehaviour writes synchronization data, it will first
+                    // write its NetworkBehaviourId so when deserializing the client-side
+                    // can find the right NetworkBehaviour to deserialize the synchronization data.
+                    for (int i = 0; i < numberSynchronized; i++)
+                    {
+                        reader.ReadValueSafe(out networkBehaviourId);
+                        var networkBehaviour = GetNetworkBehaviourAtOrderIndex(networkBehaviourId);
+                        networkBehaviour.Synchronize(ref serializer, targetClientId);
+                    }
 
-                // If a NetworkBehaviour writes synchronization data, it will first
-                // write its NetworkBehaviourId so when deserializing the client-side
-                // can find the right NetworkBehaviour to deserialize the synchronization data.
-                for (int i = 0; i < numberSynchronized; i++)
+                    if (seekToEndOfSynchData != reader.Position)
+                    {
+                        Debug.LogWarning($"[Size mismatch] Expected: {seekToEndOfSynchData} Currently At: {reader.Position}!");
+                    }
+                }
+                catch
                 {
-                    serializer.SerializeValue(ref networkBehaviourId);
-                    var networkBehaviour = GetNetworkBehaviourAtOrderIndex(networkBehaviourId);
-                    networkBehaviour.Synchronize(ref serializer, targetClientId);
+                    reader.Seek(seekToEndOfSynchData);
                 }
             }
         }
 
-        internal SceneObject GetMessageSceneObject(ulong targetClientId)
+        internal SceneObject GetMessageSceneObject(ulong targetClientId = NetworkManager.ServerClientId, bool syncObservers = false)
         {
             var obj = new SceneObject
             {
+                HasParent = transform.parent != null,
+                WorldPositionStays = m_CachedWorldPositionStays,
                 NetworkObjectId = NetworkObjectId,
                 OwnerClientId = OwnerClientId,
                 IsPlayerObject = IsPlayerObject,
                 IsSceneObject = IsSceneObject ?? true,
                 DestroyWithScene = DestroyWithScene,
-                Hash = HostCheckForGlobalObjectIdHashOverride(),
+                DontDestroyWithOwner = DontDestroyWithOwner,
+                HasOwnershipFlags = NetworkManager.DistributedAuthorityMode,
+                OwnershipFlags = (ushort)Ownership,
+                SyncObservers = syncObservers,
+                Observers = syncObservers ? Observers.ToArray() : null,
+                NetworkSceneHandle = NetworkSceneHandle,
+                Hash = CheckForGlobalObjectIdHashOverride(),
                 OwnerObject = this,
                 TargetClientId = targetClientId
             };
 
-            NetworkObject parentNetworkObject = null;
-
-            if (!AlwaysReplicateAsRoot && transform.parent != null)
+            // Handle Parenting
+            if (!AlwaysReplicateAsRoot && obj.HasParent)
             {
-                parentNetworkObject = transform.parent.GetComponent<NetworkObject>();
-                // In-scene placed NetworkObjects parented under GameObjects with no NetworkObject
-                // should set the has parent flag and preserve the world position stays value
-                if (parentNetworkObject == null && obj.IsSceneObject)
-                {
-                    obj.HasParent = true;
-                    obj.WorldPositionStays = m_CachedWorldPositionStays;
-                }
-            }
+                var parentNetworkObject = transform.parent.GetComponent<NetworkObject>();
 
-            if (parentNetworkObject != null)
-            {
-                obj.HasParent = true;
-                obj.ParentObjectId = parentNetworkObject.NetworkObjectId;
-                obj.WorldPositionStays = m_CachedWorldPositionStays;
-                var latestParent = GetNetworkParenting();
-                var isLatestParentSet = latestParent != null && latestParent.HasValue;
-                obj.IsLatestParentSet = isLatestParentSet;
-                if (isLatestParentSet)
+                if (parentNetworkObject)
                 {
-                    obj.LatestParent = latestParent.Value;
+                    obj.ParentObjectId = parentNetworkObject.NetworkObjectId;
+                    obj.LatestParent = GetNetworkParenting();
+                    obj.IsLatestParentSet = obj.LatestParent != null && obj.LatestParent.HasValue;
                 }
             }
 
@@ -1856,12 +3182,6 @@ internal SceneObject GetMessageSceneObject(ulong targetClientId)
                 var syncRotationPositionLocalSpaceRelative = obj.HasParent && !m_CachedWorldPositionStays;
                 var syncScaleLocalSpaceRelative = obj.HasParent && !m_CachedWorldPositionStays;
 
-                // Always synchronize in-scene placed object's scale using local space
-                if (obj.IsSceneObject)
-                {
-                    syncScaleLocalSpaceRelative = obj.HasParent;
-                }
-
                 // If auto object synchronization is turned off
                 if (!AutoObjectParentSync)
                 {
@@ -1888,7 +3208,6 @@ internal SceneObject GetMessageSceneObject(ulong targetClientId)
                     Scale = syncScaleLocalSpaceRelative ? transform.localScale : transform.lossyScale,
                 };
             }
-
             return obj;
         }
 
@@ -1899,8 +3218,9 @@ internal SceneObject GetMessageSceneObject(ulong targetClientId)
         /// <param name="sceneObject">Deserialized scene object data</param>
         /// <param name="reader">FastBufferReader for the NetworkVariable data</param>
         /// <param name="networkManager">NetworkManager instance</param>
-        /// <returns>optional to use NetworkObject deserialized</returns>
-        internal static NetworkObject AddSceneObject(in SceneObject sceneObject, FastBufferReader reader, NetworkManager networkManager)
+        /// <param name="invokedByMessage">will be true if invoked by CreateObjectMessage</param>
+        /// <returns>The deserialized NetworkObject or null if deserialization failed</returns>
+        internal static NetworkObject AddSceneObject(in SceneObject sceneObject, FastBufferReader reader, NetworkManager networkManager, bool invokedByMessage = false)
         {
             //Attempt to create a local NetworkObject
             var networkObject = networkManager.SpawnManager.CreateLocalNetworkObject(sceneObject);
@@ -1939,9 +3259,72 @@ internal static NetworkObject AddSceneObject(in SceneObject sceneObject, FastBuf
             var bufferSerializer = new BufferSerializer<BufferSerializerReader>(new BufferSerializerReader(reader));
             networkObject.SynchronizeNetworkBehaviours(ref bufferSerializer, networkManager.LocalClientId);
 
+            // If we are an in-scene placed NetworkObject and we originally had a parent but when synchronized we are
+            // being told we do not have a parent, then we want to clear the latest parent so it is not automatically
+            // "re-parented" to the original parent. This can happen if not unloading the scene and the parenting of
+            // the in-scene placed Networkobject changes several times over different sessions.
+            if (sceneObject.IsSceneObject && !sceneObject.HasParent && networkObject.m_LatestParent.HasValue)
+            {
+                networkObject.m_LatestParent = null;
+            }
+
             // Spawn the NetworkObject
             networkManager.SpawnManager.SpawnNetworkObjectLocally(networkObject, sceneObject, sceneObject.DestroyWithScene);
 
+            if (sceneObject.SyncObservers)
+            {
+                foreach (var observer in sceneObject.Observers)
+                {
+                    networkObject.Observers.Add(observer);
+                }
+            }
+
+            if (networkManager.DistributedAuthorityMode)
+            {
+                networkObject.SpawnWithObservers = sceneObject.SpawnWithObservers;
+            }
+
+            // If this was not invoked by a message handler, we are in distributed authority mode, and we are spawning with observers or
+            // we are an observer (in case SpawnWithObservers is false)
+            if (networkManager.DistributedAuthorityMode && (!invokedByMessage || networkObject.IsPlayerObject) &&
+                (networkObject.SpawnWithObservers || networkObject.Observers.Contains(networkManager.LocalClientId)))
+            {
+                if (networkManager.LocalClient != null && networkManager.LocalClient.PlayerObject != null)
+                {
+                    var playerObject = networkManager.LocalClient.PlayerObject;
+                    if (networkObject.IsPlayerObject)
+                    {
+                        // If it is another player, then make sure the local player is aware of the player
+                        playerObject.Observers.Add(networkObject.OwnerClientId);
+                    }
+
+                    // Assure the local player has observability
+                    networkObject.Observers.Add(playerObject.OwnerClientId);
+
+                    // If it is a player object, then add it to all known spawned NetworkObjects that spawn with observers
+                    if (networkObject.IsPlayerObject)
+                    {
+                        foreach (var netObject in networkManager.SpawnManager.SpawnedObjects)
+                        {
+                            if (netObject.Value.SpawnWithObservers)
+                            {
+                                netObject.Value.Observers.Add(networkObject.OwnerClientId);
+                            }
+                        }
+                    }
+
+                    // Only add all other players as observers if we are spawning with observers,
+                    // otherwise user controls via NetworkShow.
+                    if (networkObject.SpawnWithObservers)
+                    {
+                        // Add all known players to the observers list if they don't already exist
+                        foreach (var player in networkManager.SpawnManager.PlayerObjects)
+                        {
+                            networkObject.Observers.Add(player.OwnerClientId);
+                        }
+                    }
+                }
+            }
             return networkObject;
         }
 
@@ -1996,22 +3379,37 @@ private void CurrentlyActiveSceneChanged(Scene current, Scene next)
         internal void SceneChangedUpdate(Scene scene, bool notify = false)
         {
             // Avoiding edge case scenarios, if no NetworkSceneManager exit early
-            if (NetworkManager.SceneManager == null)
+            if (NetworkManager.SceneManager == null || !IsSpawned)
             {
                 return;
             }
 
+            if (NetworkManager.SceneManager.IsSceneEventInProgress())
+            {
+                return;
+            }
+
+            var isAuthority = HasAuthority;
             SceneOriginHandle = scene.handle;
-            // Clients need to update the NetworkSceneHandle
-            if (!NetworkManager.IsServer && NetworkManager.SceneManager.ClientSceneHandleToServerSceneHandle.ContainsKey(SceneOriginHandle))
+
+            // non-authority needs to update the NetworkSceneHandle
+            if (!isAuthority && NetworkManager.SceneManager.ClientSceneHandleToServerSceneHandle.ContainsKey(SceneOriginHandle))
             {
                 NetworkSceneHandle = NetworkManager.SceneManager.ClientSceneHandleToServerSceneHandle[SceneOriginHandle];
             }
-            else if (NetworkManager.IsServer)
+            else if (isAuthority)
             {
-                // Since the server is the source of truth for the NetworkSceneHandle,
+                // Since the authority is the source of truth for the NetworkSceneHandle,
                 // the NetworkSceneHandle is the same as the SceneOriginHandle.
-                NetworkSceneHandle = SceneOriginHandle;
+                if (NetworkManager.DistributedAuthorityMode)
+                {
+                    NetworkSceneHandle = NetworkManager.SceneManager.ClientSceneHandleToServerSceneHandle[SceneOriginHandle];
+                }
+                else
+                {
+                    NetworkSceneHandle = SceneOriginHandle;
+                }
+
             }
             else // Otherwise, the client did not find the client to server scene handle
             if (NetworkManager.LogLevel == LogLevel.Developer)
@@ -2026,13 +3424,24 @@ internal void SceneChangedUpdate(Scene scene, bool notify = false)
             }
             OnMigratedToNewScene?.Invoke();
 
-            // Only the server side will notify clients of non-parented NetworkObject scene changes
-            if (NetworkManager.IsServer && notify && transform.parent == null)
+            // Only the authority side will notify clients of non-parented NetworkObject scene changes
+            if (isAuthority && notify && transform.parent == null)
             {
                 NetworkManager.SceneManager.NotifyNetworkObjectSceneChanged(this);
             }
         }
 
+        private void Awake()
+        {
+            m_ChildNetworkBehaviours = null;
+            NetworkTransforms?.Clear();
+#if COM_UNITY_MODULES_PHYSICS
+            NetworkRigidbodies?.Clear();
+#endif
+            SetCachedParent(transform.parent);
+            SceneOrigin = gameObject.scene;
+        }
+
         /// <summary>
         /// Update
         /// Detects if a NetworkObject's scene has changed for both server and client instances
@@ -2044,31 +3453,37 @@ internal void SceneChangedUpdate(Scene scene, bool notify = false)
         /// to add this same functionality to in-scene placed NetworkObjects until we have a way to generate
         /// per-NetworkObject-instance unique GlobalObjectIdHash values for in-scene placed NetworkObjects.
         /// </remarks>
-        private void Update()
+        internal bool UpdateForSceneChanges()
         {
             // Early exit if SceneMigrationSynchronization is disabled, there is no NetworkManager assigned,
             // the NetworkManager is shutting down, the NetworkObject is not spawned, it is an in-scene placed
             // NetworkObject, or the GameObject's current scene handle is the same as the SceneOriginHandle
-            if (!SceneMigrationSynchronization || NetworkManager == null || NetworkManager.ShutdownInProgress || !IsSpawned
-                || IsSceneObject != false || gameObject.scene.handle == SceneOriginHandle)
+            if (!SceneMigrationSynchronization || !IsSpawned || NetworkManager == null || NetworkManager.ShutdownInProgress ||
+                !NetworkManager.NetworkConfig.EnableSceneManagement || IsSceneObject != false || !gameObject)
             {
-                return;
+                // Stop checking for a scene migration
+                return false;
+            }
+            else if (gameObject.scene.handle != SceneOriginHandle)
+            {
+                // If the scene handle has changed, then update and send notification
+                SceneChangedUpdate(gameObject.scene, true);
             }
 
-            // Otherwise, this has to be a dynamically spawned NetworkObject that has been
-            // migrated to a new scene.
-            SceneChangedUpdate(gameObject.scene, true);
+            // Return true (continue checking for scene migration)
+            return true;
         }
 
         /// <summary>
-        /// Only applies to Host mode.
+        /// Client-Server: Only applies to spawn authority (i.e. Server)
+        /// Distributed Authority: Applies to all clients since they all have spawn authority.
         /// Will return the registered source NetworkPrefab's GlobalObjectIdHash if one exists.
         /// Server and Clients will always return the NetworkObject's GlobalObjectIdHash.
         /// </summary>
-        /// <returns></returns>
-        internal uint HostCheckForGlobalObjectIdHashOverride()
+        /// <returns>appropriate hash value</returns>
+        internal uint CheckForGlobalObjectIdHashOverride()
         {
-            if (NetworkManager.IsServer)
+            if (NetworkManager.IsServer || NetworkManager.DistributedAuthorityMode)
             {
                 if (NetworkManager.PrefabHandler.ContainsHandler(this))
                 {
@@ -2115,7 +3530,7 @@ internal void OnNetworkBehaviourDestroyed(NetworkBehaviour networkBehaviour)
         {
             if (networkBehaviour.IsSpawned && IsSpawned)
             {
-                if (NetworkManager.LogLevel == LogLevel.Developer)
+                if (NetworkManager?.LogLevel == LogLevel.Developer)
                 {
                     NetworkLog.LogWarning($"{nameof(NetworkBehaviour)}-{networkBehaviour.name} is being destroyed while {nameof(NetworkObject)}-{name} is still spawned! (could break state synchronization)");
                 }
diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkObjectRefreshTool.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkObjectRefreshTool.cs
index 63d48e914d..5309377475 100644
--- a/com.unity.netcode.gameobjects/Runtime/Core/NetworkObjectRefreshTool.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Core/NetworkObjectRefreshTool.cs
@@ -11,7 +11,7 @@
 namespace Unity.Netcode
 {
     /// <summary>
-    /// This is a helper tool to update all in-scene placed instances of a prefab that 
+    /// This is a helper tool to update all in-scene placed instances of a prefab that
     /// originally did not have a NetworkObject component but one was added to the prefab
     /// later.
     /// </summary>
diff --git a/com.unity.netcode.gameobjects/Runtime/Core/NetworkUpdateLoop.cs b/com.unity.netcode.gameobjects/Runtime/Core/NetworkUpdateLoop.cs
index 3b44715d68..ea1f8856b2 100644
--- a/com.unity.netcode.gameobjects/Runtime/Core/NetworkUpdateLoop.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Core/NetworkUpdateLoop.cs
@@ -75,12 +75,24 @@ public static class NetworkUpdateLoop
         private static Dictionary<NetworkUpdateStage, INetworkUpdateSystem[]> s_UpdateSystem_Arrays;
         private const int k_UpdateSystem_InitialArrayCapacity = 1024;
 
+        private static NetworkUpdateStage[] _CACHED_ENUM = null;
+
+        public static NetworkUpdateStage[] GetNetworkUpdateStageEnumValues()
+        {
+            if (_CACHED_ENUM == null)
+            {
+                _CACHED_ENUM = (NetworkUpdateStage[])Enum.GetValues(typeof(NetworkUpdateStage));
+            }
+
+            return _CACHED_ENUM;
+        }
+
         static NetworkUpdateLoop()
         {
             s_UpdateSystem_Sets = new Dictionary<NetworkUpdateStage, HashSet<INetworkUpdateSystem>>();
             s_UpdateSystem_Arrays = new Dictionary<NetworkUpdateStage, INetworkUpdateSystem[]>();
 
-            foreach (NetworkUpdateStage updateStage in Enum.GetValues(typeof(NetworkUpdateStage)))
+            foreach (NetworkUpdateStage updateStage in GetNetworkUpdateStageEnumValues())
             {
                 s_UpdateSystem_Sets.Add(updateStage, new HashSet<INetworkUpdateSystem>());
                 s_UpdateSystem_Arrays.Add(updateStage, new INetworkUpdateSystem[k_UpdateSystem_InitialArrayCapacity]);
@@ -93,7 +105,7 @@ static NetworkUpdateLoop()
         /// <param name="updateSystem">The <see cref="INetworkUpdateSystem"/> implementation to register for all network updates</param>
         public static void RegisterAllNetworkUpdates(this INetworkUpdateSystem updateSystem)
         {
-            foreach (NetworkUpdateStage updateStage in Enum.GetValues(typeof(NetworkUpdateStage)))
+            foreach (NetworkUpdateStage updateStage in GetNetworkUpdateStageEnumValues())
             {
                 RegisterNetworkUpdate(updateSystem, updateStage);
             }
@@ -137,7 +149,7 @@ public static void RegisterNetworkUpdate(this INetworkUpdateSystem updateSystem,
         /// <param name="updateSystem">The <see cref="INetworkUpdateSystem"/> implementation to deregister from all network updates</param>
         public static void UnregisterAllNetworkUpdates(this INetworkUpdateSystem updateSystem)
         {
-            foreach (NetworkUpdateStage updateStage in Enum.GetValues(typeof(NetworkUpdateStage)))
+            foreach (NetworkUpdateStage updateStage in GetNetworkUpdateStageEnumValues())
             {
                 UnregisterNetworkUpdate(updateSystem, updateStage);
             }
diff --git a/com.unity.netcode.gameobjects/Runtime/Exceptions/InvalidParentException.cs b/com.unity.netcode.gameobjects/Runtime/Exceptions/InvalidParentException.cs
index c7ecbaa4d4..1be7048208 100644
--- a/com.unity.netcode.gameobjects/Runtime/Exceptions/InvalidParentException.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Exceptions/InvalidParentException.cs
@@ -12,13 +12,13 @@ public class InvalidParentException : Exception
         /// </summary>
         public InvalidParentException() { }
 
-        /// <inheritdoc/>
-        /// <param name="message"></param>
+        /// <inheritdoc cref="Exception(string)"/>
+        /// <param name="message">The message that describes the invalid parent operation</param>
         public InvalidParentException(string message) : base(message) { }
 
-        /// <inheritdoc/>
-        /// <param name="message"></param>
-        /// <param name="innerException"></param>
+        /// <inheritdoc cref="Exception(string, Exception)"/>
+        /// <param name="message">The message that describes the invalid parent operation</param>
+        /// <param name="innerException">The exception that caused the current exception</param>
         public InvalidParentException(string message, Exception innerException) : base(message, innerException) { }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Runtime/Logging/NetworkLog.cs b/com.unity.netcode.gameobjects/Runtime/Logging/NetworkLog.cs
index c8160f0370..cd29c6a651 100644
--- a/com.unity.netcode.gameobjects/Runtime/Logging/NetworkLog.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Logging/NetworkLog.cs
@@ -39,6 +39,12 @@ public static class NetworkLog
         /// <param name="message">The message to log</param>
         public static void LogInfoServer(string message) => LogServer(message, LogType.Info);
 
+        /// <summary>
+        /// Logs an info log locally and on the session owner if possible.
+        /// </summary>
+        /// <param name="message">The message to log</param>
+        public static void LogInfoSessionOwner(string message) => LogServer(message, LogType.Info);
+
         /// <summary>
         /// Logs a warning log locally and on the server if possible.
         /// </summary>
@@ -58,7 +64,8 @@ private static void LogServer(string message, LogType logType)
             var networkManager = NetworkManagerOverride ??= NetworkManager.Singleton;
             // Get the sender of the local log
             ulong localId = networkManager?.LocalClientId ?? 0;
-            bool isServer = networkManager?.IsServer ?? true;
+            bool isServer = networkManager && networkManager.DistributedAuthorityMode ? networkManager.LocalClient.IsSessionOwner :
+                networkManager && !networkManager.DistributedAuthorityMode ? networkManager.IsServer : true;
             switch (logType)
             {
                 case LogType.Info:
@@ -98,7 +105,8 @@ private static void LogServer(string message, LogType logType)
                 var networkMessage = new ServerLogMessage
                 {
                     LogType = logType,
-                    Message = message
+                    Message = message,
+                    SenderId = localId
                 };
                 var size = networkManager.ConnectionManager.SendMessage(ref networkMessage, NetworkDelivery.ReliableFragmentedSequenced, NetworkManager.ServerClientId);
 
@@ -106,9 +114,19 @@ private static void LogServer(string message, LogType logType)
             }
         }
 
-        internal static void LogInfoServerLocal(string message, ulong sender) => Debug.Log($"[Netcode-Server Sender={sender}] {message}");
-        internal static void LogWarningServerLocal(string message, ulong sender) => Debug.LogWarning($"[Netcode-Server Sender={sender}] {message}");
-        internal static void LogErrorServerLocal(string message, ulong sender) => Debug.LogError($"[Netcode-Server Sender={sender}] {message}");
+        private static string Header()
+        {
+            var networkManager = NetworkManagerOverride ??= NetworkManager.Singleton;
+            if (networkManager.DistributedAuthorityMode)
+            {
+                return "Session-Owner";
+            }
+            return "Netcode-Server";
+        }
+
+        internal static void LogInfoServerLocal(string message, ulong sender) => Debug.Log($"[{Header()} Sender={sender}] {message}");
+        internal static void LogWarningServerLocal(string message, ulong sender) => Debug.LogWarning($"[{Header()} Sender={sender}] {message}");
+        internal static void LogErrorServerLocal(string message, ulong sender) => Debug.LogError($"[{Header()} Sender={sender}] {message}");
 
         internal enum LogType : byte
         {
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/CustomMessageManager.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/CustomMessageManager.cs
index 98c344fa19..815e38d35c 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/CustomMessageManager.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/CustomMessageManager.cs
@@ -63,14 +63,36 @@ public void SendUnnamedMessageToAll(FastBufferWriter messageBuffer, NetworkDeliv
         /// <param name="networkDelivery">The delivery type (QoS) to send data with</param>
         public void SendUnnamedMessage(IReadOnlyList<ulong> clientIds, FastBufferWriter messageBuffer, NetworkDelivery networkDelivery = NetworkDelivery.ReliableSequenced)
         {
-            if (!m_NetworkManager.IsServer)
+            if (clientIds == null)
             {
-                throw new InvalidOperationException("Can not send unnamed messages to multiple users as a client");
+                throw new ArgumentNullException(nameof(clientIds), "You must pass in a valid clientId List!");
             }
 
-            if (clientIds == null)
+            if (!m_NetworkManager.DistributedAuthorityMode && !m_NetworkManager.IsServer)
             {
-                throw new ArgumentNullException(nameof(clientIds), "You must pass in a valid clientId List");
+                if (clientIds.Count > 1 || (clientIds.Count == 1 && clientIds[0] != NetworkManager.ServerClientId))
+                {
+                    Debug.LogError("Clients cannot send unnamed messages to other clients!");
+                    return;
+                }
+                else if (clientIds.Count == 1)
+                {
+                    SendUnnamedMessage(clientIds[0], messageBuffer, networkDelivery);
+                }
+            }
+            else if (m_NetworkManager.DistributedAuthorityMode && !m_NetworkManager.DAHost)
+            {
+                if (clientIds.Count > 1)
+                {
+                    Debug.LogError("Sending an unnamed message to multiple clients is not yet supported in distributed authority.");
+                    return;
+                }
+            }
+
+            if (clientIds.Count == 0)
+            {
+                Debug.LogError($"{nameof(clientIds)} is empty! No clients to send to.");
+                return;
             }
 
             ValidateMessageSize(messageBuffer, networkDelivery, isNamed: false);
@@ -139,6 +161,8 @@ public void SendUnnamedMessage(ulong clientId, FastBufferWriter messageBuffer, N
         /// <summary>
         /// Delegate used to handle named messages
         /// </summary>
+        /// <param name="senderClientId">The client identifier of the message sender</param>
+        /// <param name="messagePayload">The buffer containing the message data to be read</param>
         public delegate void HandleNamedMessageDelegate(ulong senderClientId, FastBufferReader messagePayload);
 
         private Dictionary<ulong, HandleNamedMessageDelegate> m_NamedMessageHandlers32 = new Dictionary<ulong, HandleNamedMessageDelegate>();
@@ -156,18 +180,14 @@ internal void InvokeNamedMessage(ulong hash, ulong sender, FastBufferReader read
                 // We dont know what size to use. Try every (more collision prone)
                 if (m_NamedMessageHandlers32.TryGetValue(hash, out HandleNamedMessageDelegate messageHandler32))
                 {
-                    // handler can remove itself, cache the name for metrics
-                    string messageName = m_MessageHandlerNameLookup32[hash];
                     messageHandler32(sender, reader);
-                    m_NetworkManager.NetworkMetrics.TrackNamedMessageReceived(sender, messageName, bytesCount);
+                    m_NetworkManager.NetworkMetrics.TrackNamedMessageReceived(sender, m_MessageHandlerNameLookup32[hash], bytesCount);
                 }
 
                 if (m_NamedMessageHandlers64.TryGetValue(hash, out HandleNamedMessageDelegate messageHandler64))
                 {
-                    // handler can remove itself, cache the name for metrics
-                    string messageName = m_MessageHandlerNameLookup64[hash];
                     messageHandler64(sender, reader);
-                    m_NetworkManager.NetworkMetrics.TrackNamedMessageReceived(sender, messageName, bytesCount);
+                    m_NetworkManager.NetworkMetrics.TrackNamedMessageReceived(sender, m_MessageHandlerNameLookup64[hash], bytesCount);
                 }
             }
             else
@@ -178,19 +198,15 @@ internal void InvokeNamedMessage(ulong hash, ulong sender, FastBufferReader read
                     case HashSize.VarIntFourBytes:
                         if (m_NamedMessageHandlers32.TryGetValue(hash, out HandleNamedMessageDelegate messageHandler32))
                         {
-                            // handler can remove itself, cache the name for metrics
-                            string messageName = m_MessageHandlerNameLookup32[hash];
                             messageHandler32(sender, reader);
-                            m_NetworkManager.NetworkMetrics.TrackNamedMessageReceived(sender, messageName, bytesCount);
+                            m_NetworkManager.NetworkMetrics.TrackNamedMessageReceived(sender, m_MessageHandlerNameLookup32[hash], bytesCount);
                         }
                         break;
                     case HashSize.VarIntEightBytes:
                         if (m_NamedMessageHandlers64.TryGetValue(hash, out HandleNamedMessageDelegate messageHandler64))
                         {
-                            // handler can remove itself, cache the name for metrics
-                            string messageName = m_MessageHandlerNameLookup64[hash];
                             messageHandler64(sender, reader);
-                            m_NetworkManager.NetworkMetrics.TrackNamedMessageReceived(sender, messageName, bytesCount);
+                            m_NetworkManager.NetworkMetrics.TrackNamedMessageReceived(sender, m_MessageHandlerNameLookup64[hash], bytesCount);
                         }
                         break;
                 }
@@ -215,6 +231,14 @@ public void RegisterNamedMessageHandler(string name, HandleNamedMessageDelegate
             var hash32 = XXHash.Hash32(name);
             var hash64 = XXHash.Hash64(name);
 
+            if (m_NetworkManager.LogLevel <= LogLevel.Developer)
+            {
+                if (m_MessageHandlerNameLookup32.ContainsKey(hash32) || m_MessageHandlerNameLookup64.ContainsKey(hash64))
+                {
+                    Debug.LogWarning($"Registering {name} named message over existing registration! Your previous registration's callback is being overwritten!");
+                }
+            }
+
             m_NamedMessageHandlers32[hash32] = callback;
             m_NamedMessageHandlers64[hash64] = callback;
 
@@ -317,14 +341,37 @@ public void SendNamedMessage(string messageName, ulong clientId, FastBufferWrite
         /// <param name="networkDelivery">The delivery type (QoS) to send data with</param>
         public void SendNamedMessage(string messageName, IReadOnlyList<ulong> clientIds, FastBufferWriter messageStream, NetworkDelivery networkDelivery = NetworkDelivery.ReliableSequenced)
         {
-            if (!m_NetworkManager.IsServer)
+            if (clientIds == null)
             {
-                throw new InvalidOperationException("Can not send unnamed messages to multiple users as a client");
+                throw new ArgumentNullException(nameof(clientIds), "Client list is null! You must pass in a valid clientId list to send a named message.");
             }
 
-            if (clientIds == null)
+            if (!m_NetworkManager.DistributedAuthorityMode && !m_NetworkManager.IsServer)
             {
-                throw new ArgumentNullException(nameof(clientIds), "You must pass in a valid clientId List");
+                if (clientIds.Count > 1 || (clientIds.Count == 1 && clientIds[0] != NetworkManager.ServerClientId))
+                {
+                    Debug.LogError("Clients cannot send named messages to other clients!");
+                    return;
+                }
+                else if (clientIds.Count == 1)
+                {
+                    SendNamedMessage(messageName, clientIds[0], messageStream, networkDelivery);
+                    return;
+                }
+            }
+            else if (m_NetworkManager.DistributedAuthorityMode && !m_NetworkManager.DAHost)
+            {
+                if (clientIds.Count > 1)
+                {
+                    Debug.LogError("Sending a named message to multiple clients is not yet supported in distributed authority.");
+                    return;
+                }
+            }
+
+            if (clientIds.Count == 0)
+            {
+                Debug.LogError($"{nameof(clientIds)} is empty! No clients to send the named message {messageName} to!");
+                return;
             }
 
             ValidateMessageSize(messageStream, networkDelivery, isNamed: true);
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/DeferredMessageManager.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/DeferredMessageManager.cs
index 728f0a7f64..f05d000fec 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/DeferredMessageManager.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/DeferredMessageManager.cs
@@ -15,6 +15,7 @@ protected struct TriggerData
         }
         protected struct TriggerInfo
         {
+            public string MessageType;
             public float Expiry;
             public NativeList<TriggerData> TriggerData;
         }
@@ -36,7 +37,7 @@ internal DeferredMessageManager(NetworkManager networkManager)
         /// There is a one second maximum lifetime of triggers to avoid memory leaks. After one second has passed
         /// without the requested object ID being spawned, the triggers for it are automatically deleted.
         /// </summary>
-        public virtual unsafe void DeferMessage(IDeferredNetworkMessageManager.TriggerType trigger, ulong key, FastBufferReader reader, ref NetworkContext context)
+        public virtual unsafe void DeferMessage(IDeferredNetworkMessageManager.TriggerType trigger, ulong key, FastBufferReader reader, ref NetworkContext context, string messageType)
         {
             if (!m_Triggers.TryGetValue(trigger, out var triggers))
             {
@@ -48,6 +49,7 @@ public virtual unsafe void DeferMessage(IDeferredNetworkMessageManager.TriggerTy
             {
                 triggerInfo = new TriggerInfo
                 {
+                    MessageType = messageType,
                     Expiry = m_NetworkManager.RealTimeProvider.RealTimeSinceStartup + m_NetworkManager.NetworkConfig.SpawnTimeout,
                     TriggerData = new NativeList<TriggerData>(Allocator.Persistent)
                 };
@@ -90,11 +92,29 @@ public virtual unsafe void CleanupStaleTriggers()
             }
         }
 
+        /// <summary>
+        /// Used for testing purposes
+        /// </summary>
+        internal static bool IncludeMessageType = true;
+
+        private string GetWarningMessage(IDeferredNetworkMessageManager.TriggerType triggerType, ulong key, TriggerInfo triggerInfo, float spawnTimeout)
+        {
+            if (IncludeMessageType)
+            {
+                return $"[Deferred {triggerType}] Messages were received for a trigger of type {triggerInfo.MessageType} associated with id ({key}), but the {nameof(NetworkObject)} was not received within the timeout period {spawnTimeout} second(s).";
+            }
+            else
+            {
+                return $"Deferred messages were received for a trigger of type {triggerType} associated with id ({key}), but the {nameof(NetworkObject)} was not received within the timeout period {spawnTimeout} second(s).";
+            }
+        }
+
         protected virtual void PurgeTrigger(IDeferredNetworkMessageManager.TriggerType triggerType, ulong key, TriggerInfo triggerInfo)
         {
-            if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
+            var logLevel = m_NetworkManager.DistributedAuthorityMode ? LogLevel.Developer : LogLevel.Normal;
+            if (NetworkLog.CurrentLogLevel <= logLevel)
             {
-                NetworkLog.LogWarning($"Deferred messages were received for a trigger of type {triggerType} with key {key}, but that trigger was not received within within {m_NetworkManager.NetworkConfig.SpawnTimeout} second(s).");
+                NetworkLog.LogWarning(GetWarningMessage(triggerType, key, triggerInfo, m_NetworkManager.NetworkConfig.SpawnTimeout));
             }
 
             foreach (var data in triggerInfo.TriggerData)
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/GenerateSerializationForGenericParameterAttribute.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/GenerateSerializationForGenericParameterAttribute.cs
index 6b26e5306f..c8d4cedf45 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/GenerateSerializationForGenericParameterAttribute.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/GenerateSerializationForGenericParameterAttribute.cs
@@ -19,12 +19,12 @@ namespace Unity.Netcode
     /// <br/>
     /// The parameter is indicated by index (and is 0-indexed); for example:
     /// <br/>
-    /// <code>
+    /// <c>
     /// [SerializesGenericParameter(1)]
     /// public class MyClass&lt;TTypeOne, TTypeTwo&gt;
     /// {
     /// }
-    /// </code>
+    /// </c>
     /// <br/>
     /// This tells the code generation for <see cref="NetworkVariableSerialization{T}"/> to generate
     /// serialized code for <b>TTypeTwo</b> (generic parameter 1).
@@ -38,32 +38,32 @@ namespace Unity.Netcode
     /// <br/>
     /// This attribute is properly inherited by subclasses. For example:
     /// <br/>
-    /// <code>
+    /// <c>
     /// [SerializesGenericParameter(0)]
     /// public class MyClass&lt;T&gt;
     /// {
     /// }
-    /// <br/>
+    ///
     /// public class MySubclass1 : MyClass&lt;Foo&gt;
     /// {
     /// }
-    /// <br/>
+    ///
     /// public class MySubclass2&lt;T&gt; : MyClass&lt;T&gt;
     /// {
     /// }
-    /// <br/>
+    ///
     /// [SerializesGenericParameter(1)]
     /// public class MySubclass3&lt;TTypeOne, TTypeTwo&gt; : MyClass&lt;TTypeOne&gt;
     /// {
     /// }
-    /// <br/>
+    ///
     /// public class MyBehaviour : NetworkBehaviour
     /// {
     ///     public MySubclass1 TheValue;
     ///     public MySubclass2&lt;Bar&gt; TheValue;
     ///     public MySubclass3&lt;Baz, Qux&gt; TheValue;
     /// }
-    /// </code>
+    /// </c>
     /// <br/>
     /// The above code will trigger generation of serialization code for <b>Foo</b> (passed directly to the
     /// base class), <b>Bar</b> (passed indirectly to the base class), <b>Baz</b> (passed indirectly to the base class),
@@ -74,6 +74,10 @@ public class GenerateSerializationForGenericParameterAttribute : Attribute
     {
         internal int ParameterIndex;
 
+        /// <summary>
+        /// Initializes a new instance of the attribute
+        /// </summary>
+        /// <param name="parameterIndex">The zero-based index of the generic parameter that should be serialized</param>
         public GenerateSerializationForGenericParameterAttribute(int parameterIndex)
         {
             ParameterIndex = parameterIndex;
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/GenerateSerializationForTypeAttribute.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/GenerateSerializationForTypeAttribute.cs
index 81e55c00df..5bfff33864 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/GenerateSerializationForTypeAttribute.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/GenerateSerializationForTypeAttribute.cs
@@ -18,6 +18,10 @@ public class GenerateSerializationForTypeAttribute : Attribute
     {
         internal Type Type;
 
+        /// <summary>
+        /// Initializes a new instance of the attribute
+        /// </summary>
+        /// <param name="type">The type that should have serialization code generated for it</param>
         public GenerateSerializationForTypeAttribute(Type type)
         {
             Type = type;
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/IDeferredNetworkMessageManager.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/IDeferredNetworkMessageManager.cs
index 0a9ec917f3..0f55de95c2 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/IDeferredNetworkMessageManager.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/IDeferredNetworkMessageManager.cs
@@ -1,3 +1,4 @@
+
 namespace Unity.Netcode
 {
     internal interface IDeferredNetworkMessageManager
@@ -17,7 +18,7 @@ internal enum TriggerType
         /// There is a one second maximum lifetime of triggers to avoid memory leaks. After one second has passed
         /// without the requested object ID being spawned, the triggers for it are automatically deleted.
         /// </summary>
-        void DeferMessage(TriggerType trigger, ulong key, FastBufferReader reader, ref NetworkContext context);
+        void DeferMessage(TriggerType trigger, ulong key, FastBufferReader reader, ref NetworkContext context, string messageType = null);
 
         /// <summary>
         /// Cleans up any trigger that's existed for more than a second.
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/ILPPMessageProvider.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/ILPPMessageProvider.cs
index 4424550e9a..4e697acc0d 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/ILPPMessageProvider.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/ILPPMessageProvider.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 #if UNITY_EDITOR
 using UnityEditor;
@@ -12,9 +13,121 @@ internal struct ILPPMessageProvider : INetworkMessageProvider
         internal static readonly List<NetworkMessageManager.MessageWithHandler> __network_message_types = new List<NetworkMessageManager.MessageWithHandler>();
 #pragma warning restore IDE1006 // restore naming rule violation check
 
+        /// <summary>
+        /// Enum representing the different types of messages that can be sent over the network.
+        /// The values cannot be changed, as they are used to serialize and deserialize messages.
+        /// Adding new messages should be done by adding new values to the end of the enum
+        /// using the next free value.
+        /// </summary>
+        /// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+        /// Add any new Message types to this table at the END with incremented index value
+        /// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+        internal enum NetworkMessageTypes : uint
+        {
+            ConnectionApproved = 0,
+            ConnectionRequest = 1,
+            ChangeOwnership = 2,
+            ClientConnected = 3,
+            ClientDisconnected = 4,
+            ClientRpc = 5,
+            CreateObject = 6,
+            DestroyObject = 7,
+            DisconnectReason = 8,
+            ForwardClientRpc = 9,
+            ForwardServerRpc = 10,
+            NamedMessage = 11,
+            NetworkTransformMessage = 12,
+            NetworkVariableDelta = 13,
+            ParentSync = 14,
+            Proxy = 15,
+            Rpc = 16,
+            SceneEvent = 17,
+            ServerLog = 18,
+            ServerRpc = 19,
+            SessionOwner = 20,
+            TimeSync = 21,
+            Unnamed = 22,
+            AnticipationCounterSyncPingMessage = 23,
+            AnticipationCounterSyncPongMessage = 24,
+        }
+
+
+        // Enable this for integration tests that need no message types defined
+        internal static bool IntegrationTestNoMessages;
+
         public List<NetworkMessageManager.MessageWithHandler> GetMessages()
         {
-            return __network_message_types;
+            // return no message types when defined for integration tests
+            if (IntegrationTestNoMessages)
+            {
+                return new List<NetworkMessageManager.MessageWithHandler>();
+            }
+            var messageTypeCount = Enum.GetValues(typeof(NetworkMessageTypes)).Length;
+            // Assure the allowed types count is the same as our NetworkMessageType enum count
+            if (__network_message_types.Count != messageTypeCount)
+            {
+                throw new Exception($"Allowed types is not equal to the number of message type indices! Allowed Count: {__network_message_types.Count} | Index Count: {messageTypeCount}");
+            }
+
+            // Populate with blanks to be replaced later
+            var adjustedMessageTypes = new List<NetworkMessageManager.MessageWithHandler>();
+            var blank = new NetworkMessageManager.MessageWithHandler();
+            for (int i = 0; i < messageTypeCount; i++)
+            {
+                adjustedMessageTypes.Add(blank);
+            }
+
+            // Create a type to enum index lookup table
+            // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+            // Add new Message types to this table paired with its new NetworkMessageTypes enum
+            // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+            var messageTypes = new Dictionary<Type, NetworkMessageTypes>
+            {
+                { typeof(ConnectionApprovedMessage), NetworkMessageTypes.ConnectionApproved }, // This MUST be first
+                { typeof(ConnectionRequestMessage), NetworkMessageTypes.ConnectionRequest }, // This MUST be second
+                { typeof(ChangeOwnershipMessage), NetworkMessageTypes.ChangeOwnership },
+                { typeof(ClientConnectedMessage), NetworkMessageTypes.ClientConnected },
+                { typeof(ClientDisconnectedMessage), NetworkMessageTypes.ClientDisconnected },
+                { typeof(ClientRpcMessage), NetworkMessageTypes.ClientRpc },
+                { typeof(CreateObjectMessage), NetworkMessageTypes.CreateObject },
+                { typeof(DestroyObjectMessage), NetworkMessageTypes.DestroyObject },
+                { typeof(DisconnectReasonMessage), NetworkMessageTypes.DisconnectReason },
+                { typeof(ForwardClientRpcMessage), NetworkMessageTypes.ForwardClientRpc },
+                { typeof(ForwardServerRpcMessage), NetworkMessageTypes.ForwardServerRpc },
+                { typeof(NamedMessage), NetworkMessageTypes.NamedMessage },
+                { typeof(NetworkTransformMessage), NetworkMessageTypes.NetworkTransformMessage },
+                { typeof(NetworkVariableDeltaMessage), NetworkMessageTypes.NetworkVariableDelta },
+                { typeof(ParentSyncMessage), NetworkMessageTypes.ParentSync },
+                { typeof(ProxyMessage), NetworkMessageTypes.Proxy },
+                { typeof(RpcMessage), NetworkMessageTypes.Rpc },
+                { typeof(SceneEventMessage), NetworkMessageTypes.SceneEvent },
+                { typeof(ServerLogMessage), NetworkMessageTypes.ServerLog },
+                { typeof(ServerRpcMessage), NetworkMessageTypes.ServerRpc },
+                { typeof(TimeSyncMessage), NetworkMessageTypes.TimeSync },
+                { typeof(UnnamedMessage), NetworkMessageTypes.Unnamed },
+                { typeof(SessionOwnerMessage), NetworkMessageTypes.SessionOwner },
+                { typeof(AnticipationCounterSyncPingMessage), NetworkMessageTypes.AnticipationCounterSyncPingMessage},
+                { typeof(AnticipationCounterSyncPongMessage), NetworkMessageTypes.AnticipationCounterSyncPongMessage},
+            };
+
+            // Assure the type to lookup table count and NetworkMessageType enum count matches (i.e. to catch human error when adding new messages)
+            if (messageTypes.Count != messageTypeCount)
+            {
+                throw new Exception($"Message type to Message type index count mistmatch! Table Count: {messageTypes.Count} | Index Count: {messageTypeCount}");
+            }
+
+            // Now order the allowed types list based on the order of the NetworkMessageType enum
+            foreach (var messageHandler in __network_message_types)
+            {
+                if (!messageTypes.ContainsKey(messageHandler.MessageType))
+                {
+                    throw new Exception($"Missing message type from lookup table: {messageHandler.MessageType}");
+                }
+                adjustedMessageTypes[(int)messageTypes[messageHandler.MessageType]] = messageHandler;
+            }
+
+            // return the NetworkMessageType enum ordered list
+            return adjustedMessageTypes;
         }
 
 #if UNITY_EDITOR
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/AnticipationCounterSync.cs.meta b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/AnticipationCounterSync.cs.meta
deleted file mode 100644
index 93d99ab5b7..0000000000
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/AnticipationCounterSync.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: db5034828a9741ce9bc8ec9a64d5a5b6
-timeCreated: 1706042908
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/AnticipationCounterSync.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/AnticipationCounterSyncPingMessage.cs
similarity index 100%
rename from com.unity.netcode.gameobjects/Runtime/Messaging/Messages/AnticipationCounterSync.cs
rename to com.unity.netcode.gameobjects/Runtime/Messaging/Messages/AnticipationCounterSyncPingMessage.cs
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/AnticipationCounterSyncPingMessage.cs.meta b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/AnticipationCounterSyncPingMessage.cs.meta
new file mode 100644
index 0000000000..f4abc895fc
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/AnticipationCounterSyncPingMessage.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: b7d5c92979ad7e646a078aaf058b53a9
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ChangeOwnershipMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ChangeOwnershipMessage.cs
index b0d1ca7c4d..9b980d2430 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ChangeOwnershipMessage.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ChangeOwnershipMessage.cs
@@ -1,16 +1,153 @@
+
 namespace Unity.Netcode
 {
     internal struct ChangeOwnershipMessage : INetworkMessage, INetworkSerializeByMemcpy
     {
         public int Version => 0;
 
+        private const string k_Name = "ChangeOwnershipMessage";
+
         public ulong NetworkObjectId;
         public ulong OwnerClientId;
+        // SERVICE NOTES:
+        // When forwarding the message to clients on the CMB Service side,
+        // you can set the ClientIdCount to 0 and skip writing the ClientIds.
+        // See the NetworkObjet.OwnershipRequest for more potential service side additions
+
+        /// <summary>
+        /// When requesting, RequestClientId is the requestor.
+        /// When approving, RequestClientId is the owner that approved.
+        /// When responding (only for denied), RequestClientId is the requestor
+        /// </summary>
+        internal ulong RequestClientId;
+        internal int ClientIdCount;
+        internal ulong[] ClientIds;
+        internal bool DistributedAuthorityMode;
+        internal ushort OwnershipFlags;
+        internal byte OwnershipRequestResponseStatus;
+        private byte m_OwnershipMessageTypeFlags;
+
+        private const byte k_OwnershipChanging = 0x01;
+        private const byte k_OwnershipFlagsUpdate = 0x02;
+        private const byte k_RequestOwnership = 0x04;
+        private const byte k_RequestApproved = 0x08;
+        private const byte k_RequestDenied = 0x10;
+
+        // If no flags are set, then ownership is changing
+        internal bool OwnershipIsChanging
+        {
+            get
+            {
+                return GetFlag(k_OwnershipChanging);
+            }
+
+            set
+            {
+                SetFlag(value, k_OwnershipChanging);
+            }
+        }
+
+        internal bool OwnershipFlagsUpdate
+        {
+            get
+            {
+                return GetFlag(k_OwnershipFlagsUpdate);
+            }
+
+            set
+            {
+                SetFlag(value, k_OwnershipFlagsUpdate);
+            }
+        }
+
+        internal bool RequestOwnership
+        {
+            get
+            {
+                return GetFlag(k_RequestOwnership);
+            }
+
+            set
+            {
+                SetFlag(value, k_RequestOwnership);
+            }
+        }
+
+        internal bool RequestApproved
+        {
+            get
+            {
+                return GetFlag(k_RequestApproved);
+            }
+
+            set
+            {
+                SetFlag(value, k_RequestApproved);
+            }
+        }
+
+        internal bool RequestDenied
+        {
+            get
+            {
+                return GetFlag(k_RequestDenied);
+            }
+
+            set
+            {
+                SetFlag(value, k_RequestDenied);
+            }
+        }
+
+        private bool GetFlag(int flag)
+        {
+            return (m_OwnershipMessageTypeFlags & flag) != 0;
+        }
+
+        private void SetFlag(bool set, byte flag)
+        {
+            if (set) { m_OwnershipMessageTypeFlags = (byte)(m_OwnershipMessageTypeFlags | flag); }
+            else { m_OwnershipMessageTypeFlags = (byte)(m_OwnershipMessageTypeFlags & ~flag); }
+        }
 
         public void Serialize(FastBufferWriter writer, int targetVersion)
         {
             BytePacker.WriteValueBitPacked(writer, NetworkObjectId);
             BytePacker.WriteValueBitPacked(writer, OwnerClientId);
+            if (DistributedAuthorityMode)
+            {
+                BytePacker.WriteValueBitPacked(writer, ClientIdCount);
+                if (ClientIdCount > 0)
+                {
+                    if (ClientIdCount != ClientIds.Length)
+                    {
+                        throw new System.Exception($"[{nameof(ChangeOwnershipMessage)}] ClientIdCount is {ClientIdCount} but the ClientIds length is {ClientIds.Length}!");
+                    }
+                    foreach (var clientId in ClientIds)
+                    {
+                        BytePacker.WriteValueBitPacked(writer, clientId);
+                    }
+                }
+
+                writer.WriteValueSafe(m_OwnershipMessageTypeFlags);
+                if (OwnershipFlagsUpdate || OwnershipIsChanging)
+                {
+                    writer.WriteValueSafe(OwnershipFlags);
+                }
+
+                // When requesting, it is the requestor
+                // When approving, it is the owner that approved
+                // When denied, it is the requestor
+                if (RequestOwnership || RequestApproved || RequestDenied)
+                {
+                    writer.WriteValueSafe(RequestClientId);
+
+                    if (RequestDenied)
+                    {
+                        writer.WriteValueSafe(OwnershipRequestResponseStatus);
+                    }
+                }
+            }
         }
 
         public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int receivedMessageVersion)
@@ -22,46 +159,253 @@ public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int
             }
             ByteUnpacker.ReadValueBitPacked(reader, out NetworkObjectId);
             ByteUnpacker.ReadValueBitPacked(reader, out OwnerClientId);
-            if (!networkManager.SpawnManager.SpawnedObjects.ContainsKey(NetworkObjectId))
+
+            if (networkManager.DistributedAuthorityMode)
             {
-                networkManager.DeferredMessageManager.DeferMessage(IDeferredNetworkMessageManager.TriggerType.OnSpawn, NetworkObjectId, reader, ref context);
-                return false;
+                ByteUnpacker.ReadValueBitPacked(reader, out ClientIdCount);
+                if (ClientIdCount > 0)
+                {
+                    ClientIds = new ulong[ClientIdCount];
+                    var clientId = (ulong)0;
+                    for (int i = 0; i < ClientIdCount; i++)
+                    {
+                        ByteUnpacker.ReadValueBitPacked(reader, out clientId);
+                        ClientIds[i] = clientId;
+                    }
+                }
+
+                reader.ReadValueSafe(out m_OwnershipMessageTypeFlags);
+                if (OwnershipFlagsUpdate || OwnershipIsChanging)
+                {
+                    reader.ReadValueSafe(out OwnershipFlags);
+                }
+
+                // When requesting, it is the requestor
+                // When approving, it is the owner that approved
+                // When denied, it is the requestor
+                if (RequestOwnership || RequestApproved || RequestDenied)
+                {
+                    reader.ReadValueSafe(out RequestClientId);
+
+                    if (RequestDenied)
+                    {
+                        reader.ReadValueSafe(out OwnershipRequestResponseStatus);
+                    }
+                }
             }
 
+            // If we are not a DAHost instance and the NetworkObject does not exist then defer it as it very likely is not spawned yet.
+            // Otherwise if we are the DAHost and it does not exist then we want to forward this message because when the NetworkObject
+            // is made visible again, the ownership flags and owner information will be synchronized with the DAHost by the current
+            // authority of the NetworkObject in question.
+            if (!networkManager.DAHost && !networkManager.SpawnManager.SpawnedObjects.ContainsKey(NetworkObjectId))
+            {
+                networkManager.DeferredMessageManager.DeferMessage(IDeferredNetworkMessageManager.TriggerType.OnSpawn, NetworkObjectId, reader, ref context, k_Name);
+                return false;
+            }
             return true;
         }
 
         public void Handle(ref NetworkContext context)
         {
             var networkManager = (NetworkManager)context.SystemOwner;
+
+            // If we are the DAHost then forward this message
+            if (networkManager.DAHost)
+            {
+                var clientList = ClientIdCount > 0 ? ClientIds : networkManager.ConnectedClientsIds;
+
+                var message = new ChangeOwnershipMessage()
+                {
+                    NetworkObjectId = NetworkObjectId,
+                    OwnerClientId = OwnerClientId,
+                    DistributedAuthorityMode = true,
+                    OwnershipFlags = OwnershipFlags,
+                    RequestClientId = RequestClientId,
+                    ClientIdCount = 0,
+                    m_OwnershipMessageTypeFlags = m_OwnershipMessageTypeFlags,
+                };
+
+                if (RequestDenied)
+                {
+                    // If the local DAHost's client is not the target, then forward to the target
+                    if (RequestClientId != networkManager.LocalClientId)
+                    {
+                        message.OwnershipRequestResponseStatus = OwnershipRequestResponseStatus;
+                        networkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.Reliable, RequestClientId);
+                        // We don't want the local DAHost's client to process this message, so exit early
+                        return;
+                    }
+                }
+                else if (RequestOwnership)
+                {
+                    // If the DAHost client is not authority, just forward the message to the authority
+                    if (OwnerClientId != networkManager.LocalClientId)
+                    {
+                        networkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.Reliable, OwnerClientId);
+                        // We don't want the local DAHost's client to process this message, so exit early
+                        return;
+                    }
+                    // Otherwise, fall through and process the request.
+                }
+                else
+                {
+                    foreach (var clientId in clientList)
+                    {
+                        if (clientId == networkManager.LocalClientId)
+                        {
+                            continue;
+                        }
+
+                        // If ownership is changing and this is not an ownership request approval then ignore the SenderId
+                        if (OwnershipIsChanging && !RequestApproved && context.SenderId == clientId)
+                        {
+                            continue;
+                        }
+
+                        // If it is just updating flags then ignore sending to the owner
+                        // If it is a request or approving request, then ignore the RequestClientId
+                        if ((OwnershipFlagsUpdate && clientId == OwnerClientId) || ((RequestOwnership || RequestApproved) && clientId == RequestClientId))
+                        {
+                            continue;
+                        }
+                        networkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.Reliable, clientId);
+                    }
+                }
+                // If the NetworkObject is not visible to the DAHost client, then exit early
+                if (!networkManager.SpawnManager.SpawnedObjects.ContainsKey(NetworkObjectId))
+                {
+                    return;
+                }
+            }
+
+            // If ownership is changing, then run through the ownershipd changed sequence
+            // Note: There is some extended ownership script at the bottom of HandleOwnershipChange
+            // If not in distributed authority mode, then always go straight to HandleOwnershipChange
+            if (OwnershipIsChanging || !networkManager.DistributedAuthorityMode)
+            {
+                HandleOwnershipChange(ref context);
+            }
+            else if (networkManager.DistributedAuthorityMode)
+            {
+                // Otherwise, we handle and extended ownership update
+                HandleExtendedOwnershipUpdate(ref context);
+            }
+        }
+
+        /// <summary>
+        /// Handle the extended distributed authority ownership updates
+        /// </summary>
+        /// <param name="context"></param>
+        private void HandleExtendedOwnershipUpdate(ref NetworkContext context)
+        {
+            var networkManager = (NetworkManager)context.SystemOwner;
+
+            // Handle the extended ownership message types
             var networkObject = networkManager.SpawnManager.SpawnedObjects[NetworkObjectId];
-            var originalOwner = networkObject.OwnerClientId;
 
+            if (OwnershipFlagsUpdate)
+            {
+                // Just update the ownership flags
+                networkObject.Ownership = (NetworkObject.OwnershipStatus)OwnershipFlags;
+            }
+            else if (RequestOwnership)
+            {
+                // Requesting ownership, if allowed it will automatically send the ownership change message
+                networkObject.OwnershipRequest(RequestClientId);
+            }
+            else if (RequestDenied)
+            {
+                networkObject.OwnershipRequestResponse((NetworkObject.OwnershipRequestResponseStatus)OwnershipRequestResponseStatus);
+            }
+        }
+
+        /// <summary>
+        /// Handle the traditional change in ownership message type logic
+        /// </summary>
+        /// <param name="context"></param>
+        private void HandleOwnershipChange(ref NetworkContext context)
+        {
+            var networkManager = (NetworkManager)context.SystemOwner;
+            var networkObject = networkManager.SpawnManager.SpawnedObjects[NetworkObjectId];
+
+            // Sanity check that we are not sending duplicated change ownership messages
+            if (networkObject.OwnerClientId == OwnerClientId)
+            {
+                // Log error and then ignore the message
+                UnityEngine.Debug.LogError($"Client-{context.SenderId} ({RequestClientId}) sent unnecessary ownership changed message for {NetworkObjectId}.");
+                return;
+            }
+
+            var originalOwner = networkObject.OwnerClientId;
             networkObject.OwnerClientId = OwnerClientId;
 
-            // We are current owner.
-            if (originalOwner == networkManager.LocalClientId)
+            if (networkManager.DistributedAuthorityMode)
             {
-                networkObject.InvokeBehaviourOnLostOwnership();
+                networkObject.Ownership = (NetworkObject.OwnershipStatus)OwnershipFlags;
             }
 
-            // We are new owner.
-            if (OwnerClientId == networkManager.LocalClientId)
+            // We are current owner (client-server) or running in distributed authority mode
+            if (originalOwner == networkManager.LocalClientId || networkManager.DistributedAuthorityMode)
             {
-                networkObject.InvokeBehaviourOnGainedOwnership();
+                networkObject.InvokeBehaviourOnLostOwnership();
             }
 
-            // For all other clients that are neither the former or current owner, update the behaviours' properties
-            if (OwnerClientId != networkManager.LocalClientId && originalOwner != networkManager.LocalClientId)
+            // If in distributed authority mode
+            if (networkManager.DistributedAuthorityMode)
             {
+                // Always update the network properties in distributed authority mode
                 for (int i = 0; i < networkObject.ChildNetworkBehaviours.Count; i++)
                 {
                     networkObject.ChildNetworkBehaviours[i].UpdateNetworkProperties();
                 }
             }
+            else // Otherwise update properties like we would in client-server
+            {
+                // For all other clients that are neither the former or current owner, update the behaviours' properties
+                if (OwnerClientId != networkManager.LocalClientId && originalOwner != networkManager.LocalClientId)
+                {
+                    for (int i = 0; i < networkObject.ChildNetworkBehaviours.Count; i++)
+                    {
+                        networkObject.ChildNetworkBehaviours[i].UpdateNetworkProperties();
+                    }
+                }
+            }
+
+            // We are new owner or (client-server) or running in distributed authority mode
+            if (OwnerClientId == networkManager.LocalClientId || networkManager.DistributedAuthorityMode)
+            {
+                networkObject.InvokeBehaviourOnGainedOwnership();
+            }
+
+
+            if (originalOwner == networkManager.LocalClientId && !networkManager.DistributedAuthorityMode)
+            {
+                // Fully synchronize NetworkVariables with either read or write ownership permissions. 
+                networkObject.SynchronizeOwnerNetworkVariables(originalOwner, networkObject.PreviousOwnerId);
+            }
 
+            // Always invoke ownership change notifications
             networkObject.InvokeOwnershipChanged(originalOwner, OwnerClientId);
 
+            // If this change was requested, then notify that the request was approved (doing this last so all ownership
+            // changes have already been applied if the callback is invoked)
+            if (networkManager.DistributedAuthorityMode && networkManager.LocalClientId == OwnerClientId)
+            {
+                if (RequestApproved)
+                {
+                    networkObject.OwnershipRequestResponse(NetworkObject.OwnershipRequestResponseStatus.Approved);
+                }
+
+                // If the NetworkObject changed ownership and the Requested flag was set (i.e. it was an ownership request),
+                // then the new owner granted ownership removes the Requested flag and sends out an ownership status update.
+                if (networkObject.HasExtendedOwnershipStatus(NetworkObject.OwnershipStatusExtended.Requested))
+                {
+                    networkObject.RemoveOwnershipExtended(NetworkObject.OwnershipStatusExtended.Requested);
+                    networkObject.SendOwnershipStatusUpdate();
+                }
+            }
+
             networkManager.NetworkMetrics.TrackOwnershipChangeReceived(context.SenderId, networkObject, context.MessageSize);
         }
     }
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ClientConnectedMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ClientConnectedMessage.cs
index 92ed2eb298..2d01389cd0 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ClientConnectedMessage.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ClientConnectedMessage.cs
@@ -6,9 +6,13 @@ internal struct ClientConnectedMessage : INetworkMessage, INetworkSerializeByMem
 
         public ulong ClientId;
 
+        public bool ShouldSynchronize;
+
+
         public void Serialize(FastBufferWriter writer, int targetVersion)
         {
             BytePacker.WriteValueBitPacked(writer, ClientId);
+            writer.WriteValueSafe(ShouldSynchronize);
         }
 
         public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int receivedMessageVersion)
@@ -19,17 +23,60 @@ public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int
                 return false;
             }
             ByteUnpacker.ReadValueBitPacked(reader, out ClientId);
+            reader.ReadValueSafe(out ShouldSynchronize);
+
             return true;
         }
 
         public void Handle(ref NetworkContext context)
         {
             var networkManager = (NetworkManager)context.SystemOwner;
-            networkManager.ConnectionManager.ConnectedClientIds.Add(ClientId);
+            if (ShouldSynchronize && networkManager.NetworkConfig.EnableSceneManagement && networkManager.DistributedAuthorityMode && networkManager.LocalClient.IsSessionOwner)
+            {
+                networkManager.SceneManager.SynchronizeNetworkObjects(ClientId);
+            }
+            else
+            {
+                // All modes support adding NetworkClients
+                networkManager.ConnectionManager.AddClient(ClientId);
+            }
+            if (!networkManager.ConnectionManager.ConnectedClientIds.Contains(ClientId))
+            {
+                networkManager.ConnectionManager.ConnectedClientIds.Add(ClientId);
+            }
             if (networkManager.IsConnectedClient)
             {
                 networkManager.ConnectionManager.InvokeOnPeerConnectedCallback(ClientId);
             }
+
+            // DANGO-TODO: Remove the session owner object distribution check once the service handles object distribution
+            if (networkManager.DistributedAuthorityMode && networkManager.CMBServiceConnection && !networkManager.NetworkConfig.EnableSceneManagement)
+            {
+                // Don't redistribute for the local instance
+                if (ClientId != networkManager.LocalClientId)
+                {
+                    // Synchronize the client with spawned objects (relative to each client)
+                    networkManager.SpawnManager.SynchronizeObjectsToNewlyJoinedClient(ClientId);
+
+                    // Keeping for reference in case the above doesn't resolve for hidden objects (theoretically it should)
+                    // Show any NetworkObjects that are:
+                    // - Hidden from the session owner
+                    // - Owned by this client
+                    // - Has NetworkObject.SpawnWithObservers set to true (the default)
+                    //if (!networkManager.LocalClient.IsSessionOwner)
+                    //{
+                    //    networkManager.SpawnManager.ShowHiddenObjectsToNewlyJoinedClient(ClientId);
+                    //}
+
+                    /// We defer redistribution to happen after NetworkShow has been invoked
+                    /// <see cref="NetworkBehaviourUpdater.NetworkBehaviourUpdater_Tick"/>
+                    /// DANGO-TODO: Determine if this needs to be removed once the service handles object distribution
+                    networkManager.RedistributeToClients = true;
+                    networkManager.ClientsToRedistribute.Add(ClientId);
+
+                    // TODO: We need a client synchronized message or something like that here
+                }
+            }
         }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ClientDisconnectedMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ClientDisconnectedMessage.cs
index 9d306cbb56..6cf0e413f0 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ClientDisconnectedMessage.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ClientDisconnectedMessage.cs
@@ -25,6 +25,8 @@ public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int
         public void Handle(ref NetworkContext context)
         {
             var networkManager = (NetworkManager)context.SystemOwner;
+            // All modes support removing NetworkClients
+            networkManager.ConnectionManager.RemoveClient(ClientId);
             networkManager.ConnectionManager.ConnectedClientIds.Remove(ClientId);
             if (networkManager.IsConnectedClient)
             {
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ConnectionApprovedMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ConnectionApprovedMessage.cs
index 35c02d2e02..ab46a4465f 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ConnectionApprovedMessage.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ConnectionApprovedMessage.cs
@@ -3,13 +3,73 @@
 
 namespace Unity.Netcode
 {
+    internal struct ServiceConfig : INetworkSerializable
+    {
+        public uint SessionVersion;
+        public bool IsRestoredSession;
+        public ulong CurrentSessionOwner;
+        public bool ServerRedistribution;
+        public ulong SessionStateToken;
+
+        public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReaderWriter
+        {
+            if (serializer.IsWriter)
+            {
+                BytePacker.WriteValueBitPacked(serializer.GetFastBufferWriter(), SessionVersion);
+                serializer.SerializeValue(ref IsRestoredSession);
+                BytePacker.WriteValueBitPacked(serializer.GetFastBufferWriter(), CurrentSessionOwner);
+
+                if (SessionVersion >= SessionConfig.ServerDistributionCompatible)
+                {
+                    serializer.SerializeValue(ref ServerRedistribution);
+                }
+
+                if (SessionVersion >= SessionConfig.SessionStateToken)
+                {
+                    serializer.SerializeValue(ref SessionStateToken);
+                }
+            }
+            else
+            {
+                ByteUnpacker.ReadValueBitPacked(serializer.GetFastBufferReader(), out SessionVersion);
+                serializer.SerializeValue(ref IsRestoredSession);
+                ByteUnpacker.ReadValueBitPacked(serializer.GetFastBufferReader(), out CurrentSessionOwner);
+
+                if (SessionVersion >= SessionConfig.ServerDistributionCompatible)
+                {
+                    serializer.SerializeValue(ref ServerRedistribution);
+                }
+                else
+                {
+                    ServerRedistribution = false;
+                }
+
+                if (SessionVersion >= SessionConfig.SessionStateToken)
+                {
+                    serializer.SerializeValue(ref SessionStateToken);
+                }
+                else
+                {
+                    SessionStateToken = 0;
+                }
+            }
+        }
+    }
+
     internal struct ConnectionApprovedMessage : INetworkMessage
     {
+        private const int k_AddCMBServiceConfig = 2;
         private const int k_VersionAddClientIds = 1;
-        public int Version => k_VersionAddClientIds;
+        public int Version => k_AddCMBServiceConfig;
 
         public ulong OwnerClientId;
         public int NetworkTick;
+        // The cloud state service should set this if we are restoring a session
+        public ServiceConfig ServiceConfig;
+        public bool IsRestoredSession;
+        public ulong CurrentSessionOwner;
+        // Not serialized
+        public bool IsDistributedAuthority;
 
         // Not serialized, held as references to serialize NetworkVariable data
         public HashSet<NetworkObject> SpawnedObjectsList;
@@ -20,6 +80,32 @@ internal struct ConnectionApprovedMessage : INetworkMessage
 
         public NativeArray<ulong> ConnectedClientIds;
 
+        private int m_ReceiveMessageVersion;
+
+        private ulong GetSessionOwner()
+        {
+            if (m_ReceiveMessageVersion >= k_AddCMBServiceConfig)
+            {
+                return ServiceConfig.CurrentSessionOwner;
+            }
+            else
+            {
+                return CurrentSessionOwner;
+            }
+        }
+
+        private bool GetIsSessionRestor()
+        {
+            if (m_ReceiveMessageVersion >= k_AddCMBServiceConfig)
+            {
+                return ServiceConfig.IsRestoredSession;
+            }
+            else
+            {
+                return IsRestoredSession;
+            }
+        }
+
         public void Serialize(FastBufferWriter writer, int targetVersion)
         {
             // ============================================================
@@ -38,6 +124,20 @@ public void Serialize(FastBufferWriter writer, int targetVersion)
 
             BytePacker.WriteValueBitPacked(writer, OwnerClientId);
             BytePacker.WriteValueBitPacked(writer, NetworkTick);
+            if (IsDistributedAuthority)
+            {
+                if (targetVersion >= k_AddCMBServiceConfig)
+                {
+                    ServiceConfig.IsRestoredSession = false;
+                    ServiceConfig.CurrentSessionOwner = CurrentSessionOwner;
+                    writer.WriteNetworkSerializable(ServiceConfig);
+                }
+                else
+                {
+                    writer.WriteValueSafe(IsRestoredSession);
+                    BytePacker.WriteValueBitPacked(writer, CurrentSessionOwner);
+                }
+            }
 
             if (targetVersion >= k_VersionAddClientIds)
             {
@@ -59,7 +159,8 @@ public void Serialize(FastBufferWriter writer, int targetVersion)
                     if (sobj.SpawnWithObservers && (sobj.CheckObjectVisibility == null || sobj.CheckObjectVisibility(OwnerClientId)))
                     {
                         sobj.Observers.Add(OwnerClientId);
-                        var sceneObject = sobj.GetMessageSceneObject(OwnerClientId);
+                        // In distributed authority mode, we send the currently known observers of each NetworkObject to the client being synchronized.
+                        var sceneObject = sobj.GetMessageSceneObject(OwnerClientId, IsDistributedAuthority);
                         sceneObject.Serialize(writer);
                         ++sceneObjectCount;
                     }
@@ -111,9 +212,23 @@ public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int
             // ============================================================
             // END FORBIDDEN SEGMENT
             // ============================================================
-
+            m_ReceiveMessageVersion = receivedMessageVersion;
             ByteUnpacker.ReadValueBitPacked(reader, out OwnerClientId);
             ByteUnpacker.ReadValueBitPacked(reader, out NetworkTick);
+            if (networkManager.DistributedAuthorityMode)
+            {
+                if (receivedMessageVersion >= k_AddCMBServiceConfig)
+                {
+                    reader.ReadNetworkSerializable(out ServiceConfig);
+                    networkManager.SessionConfig = new SessionConfig(ServiceConfig);
+                }
+                else
+                {
+                    reader.ReadValueSafe(out IsRestoredSession);
+                    ByteUnpacker.ReadValueBitPacked(reader, out CurrentSessionOwner);
+                    networkManager.SessionConfig = new SessionConfig(SessionConfig.NoFeatureCompatibility);
+                }
+            }
 
             if (receivedMessageVersion >= k_VersionAddClientIds)
             {
@@ -131,10 +246,23 @@ public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int
         public void Handle(ref NetworkContext context)
         {
             var networkManager = (NetworkManager)context.SystemOwner;
+            if (NetworkLog.CurrentLogLevel <= LogLevel.Developer)
+            {
+                NetworkLog.LogInfo($"[Client-{OwnerClientId}] Connection approved! Synchronizing...");
+            }
             networkManager.LocalClientId = OwnerClientId;
             networkManager.MessageManager.SetLocalClientId(networkManager.LocalClientId);
             networkManager.NetworkMetrics.SetConnectionId(networkManager.LocalClientId);
 
+            if (networkManager.DistributedAuthorityMode)
+            {
+                networkManager.SetSessionOwner(GetSessionOwner());
+                if (networkManager.LocalClient.IsSessionOwner && networkManager.NetworkConfig.EnableSceneManagement)
+                {
+                    networkManager.SceneManager.InitializeScenesLoaded();
+                }
+            }
+
             var time = new NetworkTime(networkManager.NetworkTickSystem.TickRate, NetworkTick);
             networkManager.NetworkTimeSystem.Reset(time.Time, 0.15f); // Start with a constant RTT of 150 until we receive values from the transport.
             networkManager.NetworkTickSystem.Reset(networkManager.NetworkTimeSystem.LocalTime, networkManager.NetworkTimeSystem.ServerTime);
@@ -148,13 +276,33 @@ public void Handle(ref NetworkContext context)
             networkManager.ConnectionManager.ConnectedClientIds.Clear();
             foreach (var clientId in ConnectedClientIds)
             {
-                networkManager.ConnectionManager.ConnectedClientIds.Add(clientId);
+                if (!networkManager.ConnectionManager.ConnectedClientIds.Contains(clientId))
+                {
+                    networkManager.ConnectionManager.AddClient(clientId);
+                }
             }
 
             // Only if scene management is disabled do we handle NetworkObject synchronization at this point
             if (!networkManager.NetworkConfig.EnableSceneManagement)
             {
-                networkManager.SpawnManager.DestroySceneObjects();
+                /// Mark the client being connected before running through the spawning synchronization so we
+                /// can assure that if a user attempts to spawn something when an already spawned NetworkObject
+                /// is spawned (during the initial synchronization just below) it will not error out complaining
+                /// about the player not being connected.
+                /// The check for this is done within <see cref="NetworkObject.SpawnInternal(bool, ulong, bool)"/>
+                networkManager.IsConnectedClient = true;
+
+                // DANGO-TODO: This is a temporary fix for no DA CMB scene event handling.
+                // We will either use this same concept or provide some way for the CMB state plugin to handle it.
+                if (networkManager.DistributedAuthorityMode && networkManager.LocalClient.IsSessionOwner)
+                {
+                    networkManager.SpawnManager.ServerSpawnSceneObjectsOnStartSweep();
+                }
+                else
+                {
+                    networkManager.SpawnManager.DestroySceneObjects();
+                }
+
                 m_ReceivedSceneObjectData.ReadValueSafe(out uint sceneObjectCount);
 
                 // Deserializing NetworkVariable data is deferred from Receive() to Handle to avoid needing
@@ -166,18 +314,57 @@ public void Handle(ref NetworkContext context)
                     NetworkObject.AddSceneObject(sceneObject, m_ReceivedSceneObjectData, networkManager);
                 }
 
-                // Mark the client being connected
-                networkManager.IsConnectedClient = true;
+                if (networkManager.AutoSpawnPlayerPrefabClientSide)
+                {
+                    networkManager.ConnectionManager.CreateAndSpawnPlayer(OwnerClientId);
+                }
+
+                if (NetworkLog.CurrentLogLevel <= LogLevel.Developer)
+                {
+                    NetworkLog.LogInfo($"[Client-{OwnerClientId}][Scene Management Disabled] Synchronization complete!");
+                }
                 // When scene management is disabled we notify after everything is synchronized
-                networkManager.ConnectionManager.InvokeOnClientConnectedCallback(context.SenderId);
+                networkManager.ConnectionManager.InvokeOnClientConnectedCallback(OwnerClientId);
 
                 // For convenience, notify all NetworkBehaviours that synchronization is complete.
-                foreach (var networkObject in networkManager.SpawnManager.SpawnedObjectsList)
+                networkManager.SpawnManager.NotifyNetworkObjectsSynchronized();
+            }
+            else
+            {
+                if (networkManager.DistributedAuthorityMode && networkManager.CMBServiceConnection && networkManager.LocalClient.IsSessionOwner && networkManager.NetworkConfig.EnableSceneManagement)
                 {
-                    networkObject.InternalNetworkSessionSynchronized();
+                    // Mark the client being connected
+                    networkManager.IsConnectedClient = networkManager.ConnectionManager.LocalClient.IsApproved;
+
+                    networkManager.SceneManager.IsRestoringSession = GetIsSessionRestor();
+
+                    if (!networkManager.SceneManager.IsRestoringSession)
+                    {
+                        // Synchronize the service with the initial session owner's loaded scenes and spawned objects
+                        networkManager.SceneManager.SynchronizeNetworkObjects(NetworkManager.ServerClientId, true);
+
+                        // Spawn any in-scene placed NetworkObjects
+                        networkManager.SpawnManager.ServerSpawnSceneObjectsOnStartSweep();
+
+                        // Spawn the local player of the session owner
+                        if (networkManager.AutoSpawnPlayerPrefabClientSide)
+                        {
+                            networkManager.ConnectionManager.CreateAndSpawnPlayer(OwnerClientId);
+                        }
+
+                        // Synchronize the service with the initial session owner's loaded scenes and spawned objects
+                        networkManager.SceneManager.SynchronizeNetworkObjects(NetworkManager.ServerClientId, true);
+
+                        // With scene management enabled and since the session owner doesn't send a scene event synchronize to itself,
+                        // we need to notify the session owner that everything should be synchronized/spawned at this time.
+                        networkManager.SpawnManager.NotifyNetworkObjectsSynchronized();
+
+                        // When scene management is enabled and since the session owner is synchronizing the service (i.e. acting like  host),
+                        // we need to locallyh invoke the OnClientConnected callback at this point in time.
+                        networkManager.ConnectionManager.InvokeOnClientConnectedCallback(OwnerClientId);
+                    }
                 }
             }
-
             ConnectedClientIds.Dispose();
         }
     }
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ConnectionRequestMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ConnectionRequestMessage.cs
index 8d558bf202..465ec4648d 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ConnectionRequestMessage.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ConnectionRequestMessage.cs
@@ -2,11 +2,52 @@
 
 namespace Unity.Netcode
 {
+    /// <summary>
+    /// Only used when connecting to the distributed authority service
+    /// </summary>
+    internal struct ClientConfig : INetworkSerializable
+    {
+        public SessionConfig SessionConfig;
+        public int SessionVersion => (int)SessionConfig.SessionVersion;
+        public uint TickRate;
+        public bool EnableSceneManagement;
+
+        // Only gets deserialized but should never be used unless testing
+        public int RemoteClientSessionVersion;
+
+        public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReaderWriter
+        {
+            // Clients always write
+            if (serializer.IsWriter)
+            {
+                var writer = serializer.GetFastBufferWriter();
+                BytePacker.WriteValueBitPacked(writer, SessionVersion);
+                BytePacker.WriteValueBitPacked(writer, TickRate);
+                writer.WriteValueSafe(EnableSceneManagement);
+            }
+            else
+            {
+                var reader = serializer.GetFastBufferReader();
+                ByteUnpacker.ReadValueBitPacked(reader, out RemoteClientSessionVersion);
+                ByteUnpacker.ReadValueBitPacked(reader, out TickRate);
+                reader.ReadValueSafe(out EnableSceneManagement);
+            }
+        }
+    }
+
     internal struct ConnectionRequestMessage : INetworkMessage
     {
-        public int Version => 0;
+        internal const string InvalidSessionVersionMessage = "The client version is not compatible with the session version.";
+
+        // This version update is unidirectional (client to service) and version
+        // handling occurs on the service side. This serialized data is never sent
+        // to a host or server.
+        private const int k_SendClientConfigToService = 1;
+        public int Version => k_SendClientConfigToService;
 
         public ulong ConfigHash;
+        public bool DistributedAuthority;
+        public ClientConfig ClientConfig;
 
         public byte[] ConnectionData;
 
@@ -30,6 +71,11 @@ public void Serialize(FastBufferWriter writer, int targetVersion)
             // END FORBIDDEN SEGMENT
             // ============================================================
 
+            if (DistributedAuthority)
+            {
+                writer.WriteNetworkSerializable(ClientConfig);
+            }
+
             if (ShouldSendConnectionData)
             {
                 writer.WriteValueSafe(ConfigHash);
@@ -73,6 +119,11 @@ public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int
             // END FORBIDDEN SEGMENT
             // ============================================================
 
+            if (networkManager.DAHost)
+            {
+                reader.ReadNetworkSerializable(out ClientConfig);
+            }
+
             if (networkManager.NetworkConfig.ConnectionApproval)
             {
                 if (!reader.TryBeginRead(FastBufferWriter.GetWriteSize(ConfigHash) + FastBufferWriter.GetWriteSize<int>()))
@@ -92,7 +143,7 @@ public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int
                 {
                     if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
                     {
-                        NetworkLog.LogWarning($"{nameof(NetworkConfig)} mismatch. The configuration between the server and client does not match");
+                        NetworkLog.LogWarning($"{nameof(NetworkConfig)} mismatch. IncomingHash=[{ConfigHash}] OurHash=[{networkManager.NetworkConfig.GetConfig()}] The configuration between the server and client does not match");
                     }
 
                     networkManager.DisconnectClient(context.SenderId);
@@ -135,6 +186,17 @@ public void Handle(ref NetworkContext context)
             var networkManager = (NetworkManager)context.SystemOwner;
             var senderId = context.SenderId;
 
+            // DAHost mocking the service logic to disconnect clients trying to connect with a lower session version
+            if (networkManager.DAHost)
+            {
+                if (ClientConfig.RemoteClientSessionVersion < networkManager.SessionConfig.SessionVersion)
+                {
+                    //Disconnect with reason
+                    networkManager.ConnectionManager.DisconnectClient(senderId, InvalidSessionVersionMessage);
+                    return;
+                }
+            }
+
             if (networkManager.ConnectionManager.PendingClients.TryGetValue(senderId, out PendingClient client))
             {
                 // Set to pending approval to prevent future connection requests from being approved
@@ -151,7 +213,7 @@ public void Handle(ref NetworkContext context)
                 var response = new NetworkManager.ConnectionApprovalResponse
                 {
                     Approved = true,
-                    CreatePlayerObject = networkManager.NetworkConfig.PlayerPrefab != null
+                    CreatePlayerObject = networkManager.DistributedAuthorityMode && networkManager.AutoSpawnPlayerPrefabClientSide ? false : networkManager.NetworkConfig.PlayerPrefab != null
                 };
                 networkManager.ConnectionManager.HandleConnectionApproval(senderId, response);
             }
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/CreateObjectMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/CreateObjectMessage.cs
index 809b7c92f4..02f4263e9d 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/CreateObjectMessage.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/CreateObjectMessage.cs
@@ -1,16 +1,120 @@
+using System.Linq;
 using System.Runtime.CompilerServices;
+
 namespace Unity.Netcode
 {
     internal struct CreateObjectMessage : INetworkMessage
     {
         public int Version => 0;
 
+        private const string k_Name = "CreateObjectMessage";
+
         public NetworkObject.SceneObject ObjectInfo;
         private FastBufferReader m_ReceivedNetworkVariableData;
 
+        // DA - NGO CMB SERVICE NOTES:
+        // The ObserverIds and ExistingObserverIds will only be populated if k_UpdateObservers is set
+        // ObserverIds is the full list of observers (see below)
+        internal ulong[] ObserverIds;
+
+        // While this does consume a bit more bandwidth, this is only sent by the authority/owner
+        // and can be used to determine which clients should receive the ObjectInfo serialized data.
+        // All other already existing observers just need to receive the NewObserverIds and the
+        // NetworkObjectId
+        internal ulong[] NewObserverIds;
+
+        // If !IncludesSerializedObject then the NetworkObjectId will be serialized.
+        // This happens when we are just sending an update to the observers list
+        // to clients that already have the NetworkObject spawned
+        internal ulong NetworkObjectId;
+
+        private const byte k_IncludesSerializedObject = 0x01;
+        private const byte k_UpdateObservers = 0x02;
+        private const byte k_UpdateNewObservers = 0x04;
+
+
+        private byte m_CreateObjectMessageTypeFlags;
+
+        internal bool IncludesSerializedObject
+        {
+            get
+            {
+                return GetFlag(k_IncludesSerializedObject);
+            }
+
+            set
+            {
+                SetFlag(value, k_IncludesSerializedObject);
+            }
+        }
+
+        internal bool UpdateObservers
+        {
+            get
+            {
+                return GetFlag(k_UpdateObservers);
+            }
+
+            set
+            {
+                SetFlag(value, k_UpdateObservers);
+            }
+        }
+
+        internal bool UpdateNewObservers
+        {
+            get
+            {
+                return GetFlag(k_UpdateNewObservers);
+            }
+
+            set
+            {
+                SetFlag(value, k_UpdateNewObservers);
+            }
+        }
+
+        private bool GetFlag(int flag)
+        {
+            return (m_CreateObjectMessageTypeFlags & flag) != 0;
+        }
+
+        private void SetFlag(bool set, byte flag)
+        {
+            if (set) { m_CreateObjectMessageTypeFlags = (byte)(m_CreateObjectMessageTypeFlags | flag); }
+            else { m_CreateObjectMessageTypeFlags = (byte)(m_CreateObjectMessageTypeFlags & ~flag); }
+        }
+
         public void Serialize(FastBufferWriter writer, int targetVersion)
         {
-            ObjectInfo.Serialize(writer);
+            writer.WriteValueSafe(m_CreateObjectMessageTypeFlags);
+
+            if (UpdateObservers)
+            {
+                BytePacker.WriteValuePacked(writer, ObserverIds.Length);
+                foreach (var clientId in ObserverIds)
+                {
+                    BytePacker.WriteValuePacked(writer, clientId);
+                }
+            }
+
+            if (UpdateNewObservers)
+            {
+                BytePacker.WriteValuePacked(writer, NewObserverIds.Length);
+                foreach (var clientId in NewObserverIds)
+                {
+                    BytePacker.WriteValuePacked(writer, clientId);
+                }
+            }
+
+            if (IncludesSerializedObject)
+            {
+                ObjectInfo.Serialize(writer);
+            }
+            else
+            {
+                BytePacker.WriteValuePacked(writer, NetworkObjectId);
+            }
         }
 
         public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int receivedMessageVersion)
@@ -21,10 +125,45 @@ public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int
                 return false;
             }
 
-            ObjectInfo.Deserialize(reader);
+            reader.ReadValueSafe(out m_CreateObjectMessageTypeFlags);
+            if (UpdateObservers)
+            {
+                var length = 0;
+                ByteUnpacker.ReadValuePacked(reader, out length);
+                ObserverIds = new ulong[length];
+                var clientId = (ulong)0;
+                for (int i = 0; i < length; i++)
+                {
+                    ByteUnpacker.ReadValuePacked(reader, out clientId);
+                    ObserverIds[i] = clientId;
+                }
+            }
+
+            if (UpdateNewObservers)
+            {
+                var length = 0;
+                ByteUnpacker.ReadValuePacked(reader, out length);
+                NewObserverIds = new ulong[length];
+                var clientId = (ulong)0;
+                for (int i = 0; i < length; i++)
+                {
+                    ByteUnpacker.ReadValuePacked(reader, out clientId);
+                    NewObserverIds[i] = clientId;
+                }
+            }
+
+            if (IncludesSerializedObject)
+            {
+                ObjectInfo.Deserialize(reader);
+            }
+            else
+            {
+                ByteUnpacker.ReadValuePacked(reader, out NetworkObjectId);
+            }
+
             if (!networkManager.NetworkConfig.ForceSamePrefabs && !networkManager.SpawnManager.HasPrefab(ObjectInfo))
             {
-                networkManager.DeferredMessageManager.DeferMessage(IDeferredNetworkMessageManager.TriggerType.OnAddPrefab, ObjectInfo.Hash, reader, ref context);
+                networkManager.DeferredMessageManager.DeferMessage(IDeferredNetworkMessageManager.TriggerType.OnAddPrefab, ObjectInfo.Hash, reader, ref context, k_Name);
                 return false;
             }
             m_ReceivedNetworkVariableData = reader;
@@ -38,21 +177,130 @@ public void Handle(ref NetworkContext context)
             // If a client receives a create object message and it is still synchronizing, then defer the object creation until it has finished synchronizing
             if (networkManager.SceneManager.ShouldDeferCreateObject())
             {
-                networkManager.SceneManager.DeferCreateObject(context.SenderId, context.MessageSize, ObjectInfo, m_ReceivedNetworkVariableData);
+                networkManager.SceneManager.DeferCreateObject(context.SenderId, context.MessageSize, ObjectInfo, m_ReceivedNetworkVariableData, ObserverIds, NewObserverIds);
             }
             else
             {
-                CreateObject(ref networkManager, context.SenderId, context.MessageSize, ObjectInfo, m_ReceivedNetworkVariableData);
+                if (networkManager.DistributedAuthorityMode && !IncludesSerializedObject && UpdateObservers)
+                {
+                    ObjectInfo = new NetworkObject.SceneObject()
+                    {
+                        NetworkObjectId = NetworkObjectId,
+                    };
+                }
+                CreateObject(ref networkManager, context.SenderId, context.MessageSize, ObjectInfo, m_ReceivedNetworkVariableData, ObserverIds, NewObserverIds);
             }
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal static void CreateObject(ref NetworkManager networkManager, ulong senderId, uint messageSize, NetworkObject.SceneObject sceneObject, FastBufferReader networkVariableData)
+        internal static void CreateObject(ref NetworkManager networkManager, ref NetworkSceneManager.DeferredObjectCreation deferredObjectCreation)
+        {
+            var senderId = deferredObjectCreation.SenderId;
+            var observerIds = deferredObjectCreation.ObserverIds;
+            var newObserverIds = deferredObjectCreation.NewObserverIds;
+            var messageSize = deferredObjectCreation.MessageSize;
+            var sceneObject = deferredObjectCreation.SceneObject;
+            var networkVariableData = deferredObjectCreation.FastBufferReader;
+            CreateObject(ref networkManager, senderId, messageSize, sceneObject, networkVariableData, observerIds, newObserverIds);
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal static void CreateObject(ref NetworkManager networkManager, ulong senderId, uint messageSize, NetworkObject.SceneObject sceneObject, FastBufferReader networkVariableData, ulong[] observerIds, ulong[] newObserverIds)
         {
+            var networkObject = (NetworkObject)null;
             try
             {
-                var networkObject = NetworkObject.AddSceneObject(sceneObject, networkVariableData, networkManager);
-                networkManager.NetworkMetrics.TrackObjectSpawnReceived(senderId, networkObject, messageSize);
+                if (!networkManager.DistributedAuthorityMode)
+                {
+                    networkObject = NetworkObject.AddSceneObject(sceneObject, networkVariableData, networkManager);
+                }
+                else
+                {
+                    var hasObserverIdList = observerIds != null && observerIds.Length > 0;
+                    var hasNewObserverIdList = newObserverIds != null && newObserverIds.Length > 0;
+                    // Depending upon visibility of the NetworkObject and the client in question, it could be that
+                    // this client already has visibility of this NetworkObject
+                    if (networkManager.SpawnManager.SpawnedObjects.ContainsKey(sceneObject.NetworkObjectId))
+                    {
+                        // If so, then just get the local instance
+                        networkObject = networkManager.SpawnManager.SpawnedObjects[sceneObject.NetworkObjectId];
+
+                        // This should not happen, logging error just in case
+                        if (hasNewObserverIdList && newObserverIds.Contains(networkManager.LocalClientId))
+                        {
+                            NetworkLog.LogErrorServer($"[{nameof(CreateObjectMessage)}][Duplicate-Broadcast] Detected duplicated object creation for {sceneObject.NetworkObjectId}!");
+                        }
+                        else // Trap to make sure the owner is not receiving any messages it sent
+                        if (networkManager.CMBServiceConnection && networkManager.LocalClientId == networkObject.OwnerClientId)
+                        {
+                            NetworkLog.LogWarning($"[{nameof(CreateObjectMessage)}][Client-{networkManager.LocalClientId}][Duplicate-CreateObjectMessage][Client Is Owner] Detected duplicated object creation for {networkObject.name}-{sceneObject.NetworkObjectId}!");
+                        }
+                    }
+                    else
+                    {
+                        networkObject = NetworkObject.AddSceneObject(sceneObject, networkVariableData, networkManager, true);
+                    }
+
+                    // DA - NGO CMB SERVICE NOTES:
+                    // It is possible for two clients to connect at the exact same time which, due to client-side spawning, can cause each client
+                    // to miss their spawns. For now, all player NetworkObject spawns will always be visible to all known connected clients
+                    var clientList = hasObserverIdList && !networkObject.IsPlayerObject ? observerIds : networkManager.ConnectedClientsIds;
+
+                    // Update the observers for this instance
+                    foreach (var clientId in clientList)
+                    {
+                        networkObject.Observers.Add(clientId);
+                    }
+
+                    // Mock CMB Service and forward to all clients
+                    if (networkManager.DAHost)
+                    {
+                        // DA - NGO CMB SERVICE NOTES:
+                        // (*** See above notes fist ***)
+                        // If it is a player object freshly spawning and one or more clients all connect at the exact same time (i.e. received on effectively
+                        // the same frame), then we need to check the observers list to make sure all players are visible upon first spawning. At a later date,
+                        // for area of interest we will need to have some form of follow up "observer update" message to cull out players not within each
+                        // player's AOI.
+                        if (networkObject.IsPlayerObject && hasNewObserverIdList && clientList.Count != observerIds.Length)
+                        {
+                            // For same-frame newly spawned players that might not be aware of all other players, update the player's observer
+                            // list.
+                            observerIds = clientList.ToArray();
+                        }
+
+                        var createObjectMessage = new CreateObjectMessage()
+                        {
+                            ObjectInfo = sceneObject,
+                            m_ReceivedNetworkVariableData = networkVariableData,
+                            ObserverIds = hasObserverIdList ? observerIds : null,
+                            NetworkObjectId = networkObject.NetworkObjectId,
+                            IncludesSerializedObject = true,
+                        };
+                        foreach (var clientId in clientList)
+                        {
+                            // DA - NGO CMB SERVICE NOTES:
+                            // If the authority did not specify the list of clients and the client is not an observer or we are the owner/originator
+                            // or we are the DAHost, then we skip sending the message.
+                            if ((!hasObserverIdList && (!networkObject.Observers.Contains(clientId)) ||
+                                clientId == networkObject.OwnerClientId || clientId == NetworkManager.ServerClientId))
+                            {
+                                continue;
+                            }
+
+                            // DA - NGO CMB SERVICE NOTES:
+                            // If this included a list of new observers and the targeted clientId is one of the observers, then send the serialized data.
+                            // Otherwise, the targeted clientId has already has visibility (i.e. it is already spawned) and so just send the updated
+                            // observers list to that client's instance.
+                            createObjectMessage.IncludesSerializedObject = hasNewObserverIdList && newObserverIds.Contains(clientId);
+
+                            networkManager.SpawnManager.SendSpawnCallForObject(clientId, networkObject);
+                        }
+                    }
+                }
+                if (networkObject != null)
+                {
+                    networkManager.NetworkMetrics.TrackObjectSpawnReceived(senderId, networkObject, messageSize);
+                }
             }
             catch (System.Exception ex)
             {
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/DestroyObjectMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/DestroyObjectMessage.cs
index b02b42c8e5..f519a11827 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/DestroyObjectMessage.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/DestroyObjectMessage.cs
@@ -1,16 +1,84 @@
+using System.Linq;
+using System.Runtime.CompilerServices;
+
 namespace Unity.Netcode
 {
     internal struct DestroyObjectMessage : INetworkMessage, INetworkSerializeByMemcpy
     {
-        public int Version => 0;
+        private const int k_OptimizeDestroyObjectMessage = 1;
+        public int Version => k_OptimizeDestroyObjectMessage;
+
+        private const string k_Name = "DestroyObjectMessage";
 
         public ulong NetworkObjectId;
+
+        /// <summary>
+        /// Used to communicate whether to destroy the associated game object.
+        /// Should be false if the object is InScenePlaced and true otherwise
+        /// </summary>
         public bool DestroyGameObject;
+        private byte m_DestroyFlags;
+
+        internal int DeferredDespawnTick;
+        // Temporary until we make this a list
+        internal ulong TargetClientId;
+
+        internal bool IsDistributedAuthority;
+
+        private const byte k_ClientTargetedDestroy = 0x01;
+        private const byte k_DeferredDespawn = 0x02;
+
+        internal bool IsTargetedDestroy
+        {
+            get => GetFlag(k_ClientTargetedDestroy);
+
+            set => SetFlag(value, k_ClientTargetedDestroy);
+        }
+
+        private bool IsDeferredDespawn
+        {
+            get => GetFlag(k_DeferredDespawn);
+
+            set => SetFlag(value, k_DeferredDespawn);
+        }
+
+        private bool GetFlag(int flag)
+        {
+            return (m_DestroyFlags & flag) != 0;
+        }
+
+        private void SetFlag(bool set, byte flag)
+        {
+            if (set) { m_DestroyFlags = (byte)(m_DestroyFlags | flag); }
+            else { m_DestroyFlags = (byte)(m_DestroyFlags & ~flag); }
+        }
 
         public void Serialize(FastBufferWriter writer, int targetVersion)
         {
+            // Set deferred despawn flag
+            IsDeferredDespawn = DeferredDespawnTick > 0;
+
             BytePacker.WriteValueBitPacked(writer, NetworkObjectId);
-            writer.WriteValueSafe(DestroyGameObject);
+
+            if (IsDistributedAuthority)
+            {
+                writer.WriteByteSafe(m_DestroyFlags);
+
+                if (IsTargetedDestroy)
+                {
+                    BytePacker.WriteValueBitPacked(writer, TargetClientId);
+                }
+
+                if (targetVersion < k_OptimizeDestroyObjectMessage || IsDeferredDespawn)
+                {
+                    BytePacker.WriteValueBitPacked(writer, DeferredDespawnTick);
+                }
+            }
+
+            if (targetVersion < k_OptimizeDestroyObjectMessage)
+            {
+                writer.WriteValueSafe(DestroyGameObject);
+            }
         }
 
         public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int receivedMessageVersion)
@@ -22,12 +90,34 @@ public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int
             }
 
             ByteUnpacker.ReadValueBitPacked(reader, out NetworkObjectId);
-            reader.ReadValueSafe(out DestroyGameObject);
+            if (networkManager.DistributedAuthorityMode)
+            {
+                reader.ReadByteSafe(out m_DestroyFlags);
+                if (IsTargetedDestroy)
+                {
+                    ByteUnpacker.ReadValueBitPacked(reader, out TargetClientId);
+                }
+
+                if (receivedMessageVersion < k_OptimizeDestroyObjectMessage || IsDeferredDespawn)
+                {
+                    ByteUnpacker.ReadValueBitPacked(reader, out DeferredDespawnTick);
+                }
+            }
 
-            if (!networkManager.SpawnManager.SpawnedObjects.TryGetValue(NetworkObjectId, out var networkObject))
+            if (receivedMessageVersion < k_OptimizeDestroyObjectMessage)
             {
-                networkManager.DeferredMessageManager.DeferMessage(IDeferredNetworkMessageManager.TriggerType.OnSpawn, NetworkObjectId, reader, ref context);
-                return false;
+                reader.ReadValueSafe(out DestroyGameObject);
+            }
+
+            if (networkManager.SpawnManager.SpawnedObjects.ContainsKey(NetworkObjectId))
+            {
+                return true;
+            }
+
+            // Client-Server mode we always defer where in distributed authority mode we only defer if it is not a targeted destroy
+            if (!networkManager.DistributedAuthorityMode || (networkManager.DistributedAuthorityMode && !IsTargetedDestroy))
+            {
+                networkManager.DeferredMessageManager.DeferMessage(IDeferredNetworkMessageManager.TriggerType.OnSpawn, NetworkObjectId, reader, ref context, k_Name);
             }
             return true;
         }
@@ -35,14 +125,90 @@ public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int
         public void Handle(ref NetworkContext context)
         {
             var networkManager = (NetworkManager)context.SystemOwner;
-            if (!networkManager.SpawnManager.SpawnedObjects.TryGetValue(NetworkObjectId, out var networkObject))
+            networkManager.SpawnManager.SpawnedObjects.TryGetValue(NetworkObjectId, out var networkObject);
+
+            // The DAHost needs to forward despawn messages to the other clients
+            if (networkManager.DAHost)
+            {
+                HandleDAHostForwardMessage(context.SenderId, ref networkManager, networkObject);
+
+                // DAHost adds the object to the queue only if it is not a targeted destroy, or it is and the target is the DAHost client.
+                if (networkObject && DeferredDespawnTick > 0 && (!IsTargetedDestroy || (IsTargetedDestroy && TargetClientId == 0)))
+                {
+                    HandleDeferredDespawn(ref networkManager, ref networkObject);
+                    return;
+                }
+            }
+
+            // If this NetworkObject does not exist on this instance then exit early
+            if (!networkObject)
             {
-                // This is the same check and log message that happens inside OnDespawnObject, but we have to do it here
+                if (networkManager.LogLevel <= LogLevel.Developer)
+                {
+                    NetworkLog.LogWarning($"[{nameof(DestroyObjectMessage)}] Received destroy object message for NetworkObjectId ({NetworkObjectId}) on Client-{networkManager.LocalClientId}, but that {nameof(NetworkObject)} does not exist!");
+                }
                 return;
             }
 
+            if (networkManager.DistributedAuthorityMode)
+            {
+                // If we are deferring the despawn, then add it to the deferred despawn queue
+                // If DAHost has reached this point, it is not valid to add to the queue
+                if (DeferredDespawnTick > 0 && !networkManager.DAHost)
+                {
+                    HandleDeferredDespawn(ref networkManager, ref networkObject);
+                    return;
+                }
+
+                // If this is targeted and we are not the target, then just update our local observers for this object
+                if (IsTargetedDestroy && TargetClientId != networkManager.LocalClientId)
+                {
+                    networkObject.Observers.Remove(TargetClientId);
+                    return;
+                }
+            }
+
+            // Otherwise just despawn the NetworkObject right now
+            networkManager.SpawnManager.OnDespawnNonAuthorityObject(networkObject);
             networkManager.NetworkMetrics.TrackObjectDestroyReceived(context.SenderId, networkObject, context.MessageSize);
-            networkManager.SpawnManager.OnDespawnObject(networkObject, DestroyGameObject);
+        }
+
+        /// <summary>
+        /// Handles forwarding the <see cref="DestroyObjectMessage"/> when acting as the DA Host
+        /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void HandleDAHostForwardMessage(ulong senderId, ref NetworkManager networkManager, NetworkObject networkObject)
+        {
+            var message = new DestroyObjectMessage
+            {
+                NetworkObjectId = NetworkObjectId,
+                DestroyGameObject = DestroyGameObject,
+                IsDistributedAuthority = true,
+                IsTargetedDestroy = IsTargetedDestroy,
+                TargetClientId = TargetClientId, // Just always populate this value whether we write it or not
+                DeferredDespawnTick = DeferredDespawnTick,
+            };
+            var ownerClientId = networkObject == null ? senderId : networkObject.OwnerClientId;
+            var clientIds = networkObject == null ? networkManager.ConnectedClientsIds.ToList() : networkObject.Observers.ToList();
+
+            foreach (var clientId in clientIds)
+            {
+                if (clientId != networkManager.LocalClientId && clientId != ownerClientId)
+                {
+                    networkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableSequenced, clientId);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Handles adding to the deferred despawn queue when the <see cref="DestroyObjectMessage"/> indicates a deferred despawn
+        /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void HandleDeferredDespawn(ref NetworkManager networkManager, ref NetworkObject networkObject)
+        {
+            networkObject.DeferredDespawnTick = DeferredDespawnTick;
+            var hasCallback = networkObject.OnDeferredDespawnComplete != null;
+            networkManager.SpawnManager.DeferDespawnNetworkObject(NetworkObjectId, DeferredDespawnTick, hasCallback);
         }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/NetworkTransformMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/NetworkTransformMessage.cs
new file mode 100644
index 0000000000..cb01fcf7b4
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/NetworkTransformMessage.cs
@@ -0,0 +1,214 @@
+using Unity.Netcode.Components;
+using UnityEngine;
+
+namespace Unity.Netcode
+{
+    /// <summary>
+    /// NetworkTransform State Update Message
+    /// </summary>
+    internal struct NetworkTransformMessage : INetworkMessage
+    {
+        public int Version => 0;
+        private const string k_Name = "NetworkTransformMessage";
+
+        internal NetworkTransform NetworkTransform;
+
+        // Only used for DAHost
+        internal NetworkTransform.NetworkTransformState State;
+        private FastBufferReader m_CurrentReader;
+
+        internal int BytesWritten;
+
+        private unsafe void CopyPayload(ref FastBufferWriter writer)
+        {
+            writer.WriteBytesSafe(m_CurrentReader.GetUnsafePtrAtCurrentPosition(), m_CurrentReader.Length - m_CurrentReader.Position);
+        }
+
+        public void Serialize(FastBufferWriter writer, int targetVersion)
+        {
+            if (m_CurrentReader.IsInitialized)
+            {
+                CopyPayload(ref writer);
+            }
+            else
+            {
+                BytesWritten = NetworkTransform.SerializeMessage(writer, targetVersion);
+            }
+        }
+
+        public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int receivedMessageVersion)
+        {
+            var networkManager = context.SystemOwner as NetworkManager;
+            if (networkManager == null)
+            {
+                Debug.LogError($"[{nameof(NetworkTransformMessage)}] System owner context was not of type {nameof(NetworkManager)}!");
+                return false;
+            }
+            var currentPosition = reader.Position;
+            var networkObjectId = (ulong)0;
+            var networkBehaviourId = 0;
+
+            ByteUnpacker.ReadValueBitPacked(reader, out networkObjectId);
+            var isSpawnedLocally = networkManager.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId);
+
+            // Only defer if the NetworkObject is not spawned yet and the local NetworkManager is not running as a DAHost.
+            if (!isSpawnedLocally && !networkManager.DAHost)
+            {
+                networkManager.DeferredMessageManager.DeferMessage(IDeferredNetworkMessageManager.TriggerType.OnSpawn, networkObjectId, reader, ref context, k_Name);
+                return false;
+            }
+
+            // While the below check and assignment might seem out of place, this is specific to running in DAHost mode when a NetworkObject is
+            // hidden from the DAHost but is visible to other clients. Since the DAHost needs to forward updates to the clients, we ignore processing
+            // this message locally
+            var networkObject = (NetworkObject)null;
+            var isServerAuthoritative = false;
+            var ownerAuthoritativeServerSide = false;
+
+            // Get the behaviour index
+            ByteUnpacker.ReadValueBitPacked(reader, out networkBehaviourId);
+
+            if (isSpawnedLocally)
+            {
+                networkObject = networkManager.SpawnManager.SpawnedObjects[networkObjectId];
+                if (networkObject.ChildNetworkBehaviours.Count <= networkBehaviourId || networkObject.ChildNetworkBehaviours[networkBehaviourId] == null)
+                {
+                    Debug.LogError($"[{nameof(NetworkTransformMessage)}][Invalid] Targeted {nameof(NetworkTransform)}, {nameof(NetworkBehaviour.NetworkBehaviourId)} ({networkBehaviourId}), does not exist! Make sure you are not spawning {nameof(NetworkObject)}s with disabled {nameof(GameObject)}s that have {nameof(NetworkBehaviour)} components on them.");
+                    return false;
+                }
+
+                // Get the target NetworkTransform
+                var transform = networkObject.ChildNetworkBehaviours[networkBehaviourId] as NetworkTransform;
+                if (transform == null)
+                {
+                    Debug.LogError($"[{nameof(NetworkTransformMessage)}][Invalid] Targeted {nameof(NetworkTransform)}, {nameof(NetworkBehaviour.NetworkBehaviourId)} ({networkBehaviourId}), does not exist! Make sure you are not spawning {nameof(NetworkObject)}s with disabled {nameof(GameObject)}s that have {nameof(NetworkBehaviour)} components on them.");
+                    return false;
+                }
+
+                NetworkTransform = transform;
+                isServerAuthoritative = NetworkTransform.IsServerAuthoritative();
+                ownerAuthoritativeServerSide = !isServerAuthoritative && networkManager.IsServer;
+
+                reader.ReadNetworkSerializableInPlace(ref NetworkTransform.InboundState);
+                NetworkTransform.InboundState.LastSerializedSize = reader.Position - currentPosition;
+            }
+            else
+            {
+                ownerAuthoritativeServerSide = networkManager.DAHost;
+                // If we are the DAHost and the NetworkObject is hidden from the host we still need to forward this message.
+                if (ownerAuthoritativeServerSide)
+                {
+                    // We need to deserialize the state to our local State property so we can extract the reliability used.
+                    reader.ReadNetworkSerializableInPlace(ref State);
+                    // Fall through to act like a proxy for this message.
+                }
+                else
+                {
+                    // Otherwise we can error out because we either shouldn't be receiving this message.
+                    Debug.LogError($"[{nameof(NetworkTransformMessage)}][Invalid] Target NetworkObject ({networkObjectId}) does not exist!");
+                    return false;
+                }
+            }
+
+            unsafe
+            {
+                if (ownerAuthoritativeServerSide)
+                {
+                    var targetCount = 1;
+
+                    if (networkManager.DistributedAuthorityMode && networkManager.DAHost)
+                    {
+                        ByteUnpacker.ReadValueBitPacked(reader, out targetCount);
+                    }
+
+                    var targetIds = stackalloc ulong[targetCount];
+
+                    if (networkManager.DistributedAuthorityMode && networkManager.DAHost)
+                    {
+                        var targetId = (ulong)0;
+                        for (int i = 0; i < targetCount; i++)
+                        {
+                            ByteUnpacker.ReadValueBitPacked(reader, out targetId);
+                            targetIds[i] = targetId;
+                        }
+                    }
+
+                    var ownerClientId = (ulong)0;
+
+                    if (networkObject != null)
+                    {
+                        ownerClientId = networkObject.OwnerClientId;
+                        if (ownerClientId == NetworkManager.ServerClientId)
+                        {
+                            // Ownership must have changed, ignore any additional pending messages that might have
+                            // come from a previous owner client.
+                            return true;
+                        }
+                    }
+                    else if (networkManager.DAHost)
+                    {
+                        // Specific to distributed authority mode, the only sender of state updates will be the owner
+                        ownerClientId = context.SenderId;
+                    }
+
+                    // Depending upon whether it is spawned locally or not, get the deserialized state
+                    var stateToUse = NetworkTransform != null ? NetworkTransform.InboundState : State;
+                    // Determine the reliability used to send the message
+                    var networkDelivery = stateToUse.IsReliableStateUpdate() ? NetworkDelivery.ReliableSequenced : NetworkDelivery.UnreliableSequenced;
+
+                    // Forward the state update if there are any remote clients to foward it to
+                    if (networkManager.ConnectionManager.ConnectedClientsList.Count > (networkManager.IsHost ? 2 : 1))
+                    {
+                        var clientCount = networkManager.DistributedAuthorityMode ? targetCount : networkManager.ConnectionManager.ConnectedClientsList.Count;
+                        if (clientCount == 0)
+                        {
+                            return true;
+                        }
+
+                        // This is only to copy the existing and already serialized struct for forwarding purposes only.
+                        // This will not include any changes made to this struct at this particular stage of processing the message.
+                        var currentMessage = this;
+                        // Create a new reader that replicates this message
+                        currentMessage.m_CurrentReader = new FastBufferReader(reader, Collections.Allocator.None);
+                        // Rewind the new reader to the beginning of the message's payload
+                        currentMessage.m_CurrentReader.Seek(currentPosition);
+                        // Forward the message to all connected clients that are observers of the associated NetworkObject
+
+                        for (int i = 0; i < clientCount; i++)
+                        {
+                            var clientId = networkManager.DistributedAuthorityMode ? targetIds[i] : networkManager.ConnectionManager.ConnectedClientsList[i].ClientId;
+                            if (NetworkManager.ServerClientId == clientId || (!isServerAuthoritative && clientId == ownerClientId) ||
+                                (!networkManager.DistributedAuthorityMode && !networkObject.Observers.Contains(clientId)))
+                            {
+                                continue;
+                            }
+                            networkManager.MessageManager.SendMessage(ref currentMessage, networkDelivery, clientId);
+                        }
+                        // Dispose of the reader used for forwarding
+                        currentMessage.m_CurrentReader.Dispose();
+                    }
+                }
+            }
+            return true;
+        }
+
+        public void Handle(ref NetworkContext context)
+        {
+            var networkManager = context.SystemOwner as NetworkManager;
+            // Only if the local NetworkManager instance is running as the DAHost we just exit if there is no local
+            // NetworkTransform component to apply the state update to (i.e. it is hidden from the DAHost and it
+            // just forwarded the state update to any other connected client)
+            if (networkManager.DAHost && NetworkTransform == null)
+            {
+                return;
+            }
+
+            if (NetworkTransform == null)
+            {
+                Debug.LogError($"[{nameof(NetworkTransformMessage)}][Dropped] Reciever {nameof(NetworkTransform)} was not set!");
+                return;
+            }
+            NetworkTransform.TransformStateUpdate(context.SenderId);
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Components/Messages/NetworkTransformMessage.cs.meta b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/NetworkTransformMessage.cs.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Components/Messages/NetworkTransformMessage.cs.meta
rename to com.unity.netcode.gameobjects/Runtime/Messaging/Messages/NetworkTransformMessage.cs.meta
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/NetworkVariableDeltaMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/NetworkVariableDeltaMessage.cs
index 965286998a..e8d976faf8 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/NetworkVariableDeltaMessage.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/NetworkVariableDeltaMessage.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Runtime.CompilerServices;
 using Unity.Collections;
 
 namespace Unity.Netcode
@@ -10,9 +11,22 @@ namespace Unity.Netcode
     /// serialization. This is due to the generally amorphous nature of network variable
     /// deltas, since they're all driven by custom virtual method overloads.
     /// </summary>
+    /// <remarks>
+    /// Version 1:
+    /// This version -does not- use the "KeepDirty" approach. Instead, the server will forward any state updates
+    /// to the connected clients that are not the sender or the server itself. Each NetworkVariable state update
+    /// included, on a per client basis, is first validated that the client can read the NetworkVariable before
+    /// being added to the m_ForwardUpdates table.
+    /// Version 0:
+    /// The original version uses the "KeepDirty" approach in a client-server network topology where the server
+    /// proxies state updates by "keeping the NetworkVariable(s) dirty" so it will send state updates
+    /// at the end of the frame (but could delay until the next tick).
+    /// </remarks>
     internal struct NetworkVariableDeltaMessage : INetworkMessage
     {
-        public int Version => 0;
+        private const int k_ServerDeltaForwardingAndNetworkDelivery = 1;
+        public int Version => k_ServerDeltaForwardingAndNetworkDelivery;
+
 
         public ulong NetworkObjectId;
         public ushort NetworkBehaviourIndex;
@@ -21,8 +35,62 @@ internal struct NetworkVariableDeltaMessage : INetworkMessage
         public ulong TargetClientId;
         public NetworkBehaviour NetworkBehaviour;
 
+        public NetworkDelivery NetworkDelivery;
+
         private FastBufferReader m_ReceivedNetworkVariableData;
 
+        private bool m_ForwardingMessage;
+
+        private int m_ReceivedMessageVersion;
+
+        private const string k_Name = "NetworkVariableDeltaMessage";
+
+        private Dictionary<ulong, List<int>> m_ForwardUpdates;
+
+        private List<int> m_UpdatedNetworkVariables;
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void WriteNetworkVariable(ref FastBufferWriter writer, ref NetworkVariableBase networkVariable, bool distributedAuthorityMode, bool ensureNetworkVariableLengthSafety, int nonfragmentedSize, int fragmentedSize)
+        {
+            if (ensureNetworkVariableLengthSafety)
+            {
+                var tempWriter = new FastBufferWriter(nonfragmentedSize, Allocator.Temp, fragmentedSize);
+                networkVariable.WriteDelta(tempWriter);
+                BytePacker.WriteValueBitPacked(writer, tempWriter.Length);
+
+                if (!writer.TryBeginWrite(tempWriter.Length))
+                {
+                    throw new OverflowException($"Not enough space in the buffer to write {nameof(NetworkVariableDeltaMessage)}");
+                }
+
+                tempWriter.CopyTo(writer);
+            }
+            else
+            {
+                // TODO: Determine if we need to remove this with the 6.1 service updates
+                if (distributedAuthorityMode)
+                {
+                    var size_marker = writer.Position;
+                    writer.WriteValueSafe<ushort>(0);
+                    var start_marker = writer.Position;
+                    networkVariable.WriteDelta(writer);
+                    var end_marker = writer.Position;
+                    writer.Seek(size_marker);
+                    var size = end_marker - start_marker;
+                    if (size == 0)
+                    {
+                        UnityEngine.Debug.LogError($"Invalid write size of zero!");
+                    }
+                    writer.WriteValueSafe((ushort)size);
+                    writer.Seek(end_marker);
+                }
+                else
+                {
+                    networkVariable.WriteDelta(writer);
+                }
+            }
+        }
+
         public void Serialize(FastBufferWriter writer, int targetVersion)
         {
             if (!writer.TryBeginWrite(FastBufferWriter.GetWriteSize(NetworkObjectId) + FastBufferWriter.GetWriteSize(NetworkBehaviourIndex)))
@@ -32,16 +100,81 @@ public void Serialize(FastBufferWriter writer, int targetVersion)
 
             var obj = NetworkBehaviour.NetworkObject;
             var networkManager = obj.NetworkManagerOwner;
+            var typeName = NetworkBehaviour.__getTypeName();
+            var nonFragmentedMessageMaxSize = networkManager.MessageManager.NonFragmentedMessageMaxSize;
+            var fragmentedMessageMaxSize = networkManager.MessageManager.FragmentedMessageMaxSize;
+            var ensureNetworkVariableLengthSafety = networkManager.NetworkConfig.EnsureNetworkVariableLengthSafety;
+            var distributedAuthorityMode = networkManager.DistributedAuthorityMode;
 
             BytePacker.WriteValueBitPacked(writer, NetworkObjectId);
             BytePacker.WriteValueBitPacked(writer, NetworkBehaviourIndex);
 
+            // If using k_IncludeNetworkDelivery version, then we want to write the network delivery used and if we
+            // are forwarding state updates then serialize any NetworkVariable states specific to this client.
+            if (targetVersion >= k_ServerDeltaForwardingAndNetworkDelivery)
+            {
+                writer.WriteValueSafe(NetworkDelivery);
+                // If we are forwarding the message, then proceed to forward state updates specific to the targeted client
+                if (m_ForwardingMessage)
+                {
+                    // DANGO TODO: Remove distributedAuthorityMode portion when we remove the service specific NetworkVariable stuff
+                    if (distributedAuthorityMode)
+                    {
+                        writer.WriteValueSafe((ushort)NetworkBehaviour.NetworkVariableFields.Count);
+                    }
+
+                    for (int i = 0; i < NetworkBehaviour.NetworkVariableFields.Count; i++)
+                    {
+                        var startingSize = writer.Length;
+                        var networkVariable = NetworkBehaviour.NetworkVariableFields[i];
+                        var shouldWrite = m_ForwardUpdates[TargetClientId].Contains(i);
+
+                        // This var does not belong to the currently iterating delivery group.
+                        if (distributedAuthorityMode)
+                        {
+                            if (!shouldWrite)
+                            {
+                                writer.WriteValueSafe<ushort>(0);
+                            }
+                        }
+                        else if (ensureNetworkVariableLengthSafety)
+                        {
+                            if (!shouldWrite)
+                            {
+                                BytePacker.WriteValueBitPacked(writer, (ushort)0);
+                            }
+                        }
+                        else
+                        {
+                            writer.WriteValueSafe(shouldWrite);
+                        }
+
+                        if (shouldWrite)
+                        {
+                            WriteNetworkVariable(ref writer, ref networkVariable, distributedAuthorityMode, ensureNetworkVariableLengthSafety, nonFragmentedMessageMaxSize, fragmentedMessageMaxSize);
+                            networkManager.NetworkMetrics.TrackNetworkVariableDeltaSent(TargetClientId, obj, networkVariable.Name, typeName, writer.Length - startingSize);
+                        }
+                    }
+                    return;
+                }
+            }
+
+            // DANGO TODO: Remove this when we remove the service specific NetworkVariable stuff
+            if (distributedAuthorityMode)
+            {
+                writer.WriteValueSafe((ushort)NetworkBehaviour.NetworkVariableFields.Count);
+            }
+
             for (int i = 0; i < NetworkBehaviour.NetworkVariableFields.Count; i++)
             {
                 if (!DeliveryMappedNetworkVariableIndex.Contains(i))
                 {
-                    // This var does not belong to the currently iterating delivery group.
-                    if (networkManager.NetworkConfig.EnsureNetworkVariableLengthSafety)
+                    // DANGO TODO: Remove distributedAuthorityMode portion when we remove the service specific NetworkVariable stuff
+                    if (distributedAuthorityMode)
+                    {
+                        writer.WriteValueSafe<ushort>(0);
+                    }
+                    else if (ensureNetworkVariableLengthSafety)
                     {
                         BytePacker.WriteValueBitPacked(writer, (ushort)0);
                     }
@@ -79,7 +212,15 @@ public void Serialize(FastBufferWriter writer, int targetVersion)
                     shouldWrite = false;
                 }
 
-                if (networkManager.NetworkConfig.EnsureNetworkVariableLengthSafety)
+                // DANGO TODO: Remove distributedAuthorityMode portion when we remove the service specific NetworkVariable stuff
+                if (distributedAuthorityMode)
+                {
+                    if (!shouldWrite)
+                    {
+                        writer.WriteValueSafe<ushort>(0);
+                    }
+                }
+                else if (ensureNetworkVariableLengthSafety)
                 {
                     if (!shouldWrite)
                     {
@@ -93,38 +234,22 @@ public void Serialize(FastBufferWriter writer, int targetVersion)
 
                 if (shouldWrite)
                 {
-                    if (networkManager.NetworkConfig.EnsureNetworkVariableLengthSafety)
-                    {
-                        var tempWriter = new FastBufferWriter(networkManager.MessageManager.NonFragmentedMessageMaxSize, Allocator.Temp, networkManager.MessageManager.FragmentedMessageMaxSize);
-                        NetworkBehaviour.NetworkVariableFields[i].WriteDelta(tempWriter);
-                        BytePacker.WriteValueBitPacked(writer, tempWriter.Length);
-
-                        if (!writer.TryBeginWrite(tempWriter.Length))
-                        {
-                            throw new OverflowException($"Not enough space in the buffer to write {nameof(NetworkVariableDeltaMessage)}");
-                        }
-
-                        tempWriter.CopyTo(writer);
-                    }
-                    else
-                    {
-                        networkVariable.WriteDelta(writer);
-                    }
-                    networkManager.NetworkMetrics.TrackNetworkVariableDeltaSent(
-                        TargetClientId,
-                        obj,
-                        networkVariable.Name,
-                        NetworkBehaviour.__getTypeName(),
-                        writer.Length - startingSize);
+                    WriteNetworkVariable(ref writer, ref networkVariable, distributedAuthorityMode, ensureNetworkVariableLengthSafety, nonFragmentedMessageMaxSize, fragmentedMessageMaxSize);
+                    networkManager.NetworkMetrics.TrackNetworkVariableDeltaSent(TargetClientId, obj, networkVariable.Name, typeName, writer.Length - startingSize);
                 }
             }
         }
 
         public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int receivedMessageVersion)
         {
+            m_ReceivedMessageVersion = receivedMessageVersion;
             ByteUnpacker.ReadValueBitPacked(reader, out NetworkObjectId);
             ByteUnpacker.ReadValueBitPacked(reader, out NetworkBehaviourIndex);
-
+            // If we are using the k_IncludeNetworkDelivery message version, then read the NetworkDelivery used
+            if (receivedMessageVersion >= k_ServerDeltaForwardingAndNetworkDelivery)
+            {
+                reader.ReadValueSafe(out NetworkDelivery);
+            }
             m_ReceivedNetworkVariableData = reader;
 
             return true;
@@ -136,7 +261,12 @@ public void Handle(ref NetworkContext context)
 
             if (networkManager.SpawnManager.SpawnedObjects.TryGetValue(NetworkObjectId, out NetworkObject networkObject))
             {
+                var distributedAuthorityMode = networkManager.DistributedAuthorityMode;
+                var ensureNetworkVariableLengthSafety = networkManager.NetworkConfig.EnsureNetworkVariableLengthSafety;
                 var networkBehaviour = networkObject.GetNetworkBehaviourAtOrderIndex(NetworkBehaviourIndex);
+                var isServerAndDeltaForwarding = m_ReceivedMessageVersion >= k_ServerDeltaForwardingAndNetworkDelivery && networkManager.IsServer;
+                var markNetworkVariableDirty = m_ReceivedMessageVersion >= k_ServerDeltaForwardingAndNetworkDelivery ? false : networkManager.IsServer;
+                m_UpdatedNetworkVariables = new List<int>();
 
                 if (networkBehaviour == null)
                 {
@@ -147,18 +277,57 @@ public void Handle(ref NetworkContext context)
                 }
                 else
                 {
+                    // DANGO TODO: Remove distributedAuthorityMode portion when we remove the service specific NetworkVariable stuff
+                    if (distributedAuthorityMode)
+                    {
+                        m_ReceivedNetworkVariableData.ReadValueSafe(out ushort variableCount);
+                        if (variableCount != networkBehaviour.NetworkVariableFields.Count)
+                        {
+                            UnityEngine.Debug.LogError("Variable count mismatch");
+                        }
+                    }
+
+                    // (For client-server) As opposed to worrying about adding additional processing on the server to send NetworkVariable
+                    // updates at the end of the frame, we now track all NetworkVariable state updates, per client, that need to be forwarded
+                    // to the client. This creates a list of all remaining connected clients that could have updates applied.
+                    if (isServerAndDeltaForwarding)
+                    {
+                        m_ForwardUpdates = new Dictionary<ulong, List<int>>();
+                        foreach (var clientId in networkManager.ConnectedClientsIds)
+                        {
+                            if (clientId == context.SenderId || clientId == networkManager.LocalClientId || !networkObject.Observers.Contains(clientId))
+                            {
+                                continue;
+                            }
+                            m_ForwardUpdates.Add(clientId, new List<int>());
+                        }
+                    }
+
+                    // Update NetworkVariable Fields
                     for (int i = 0; i < networkBehaviour.NetworkVariableFields.Count; i++)
                     {
                         int varSize = 0;
-                        if (networkManager.NetworkConfig.EnsureNetworkVariableLengthSafety)
+                        var networkVariable = networkBehaviour.NetworkVariableFields[i];
+
+                        // DANGO TODO: Remove distributedAuthorityMode portion when we remove the service specific NetworkVariable stuff
+                        if (distributedAuthorityMode)
                         {
-                            ByteUnpacker.ReadValueBitPacked(m_ReceivedNetworkVariableData, out varSize);
+                            m_ReceivedNetworkVariableData.ReadValueSafe(out ushort variableSize);
+                            varSize = variableSize;
 
                             if (varSize == 0)
                             {
                                 continue;
                             }
                         }
+                        else if (ensureNetworkVariableLengthSafety)
+                        {
+                            ByteUnpacker.ReadValueBitPacked(m_ReceivedNetworkVariableData, out varSize);
+                            if (varSize == 0)
+                            {
+                                continue;
+                            }
+                        }
                         else
                         {
                             m_ReceivedNetworkVariableData.ReadValueSafe(out bool deltaExists);
@@ -168,8 +337,6 @@ public void Handle(ref NetworkContext context)
                             }
                         }
 
-                        var networkVariable = networkBehaviour.NetworkVariableFields[i];
-
                         if (networkManager.IsServer && !networkVariable.CanClientWrite(context.SenderId))
                         {
                             // we are choosing not to fire an exception here, because otherwise a malicious client could use this to crash the server
@@ -197,12 +364,58 @@ public void Handle(ref NetworkContext context)
                                 NetworkLog.LogError($"Client wrote to {typeof(NetworkVariable<>).Name} without permission. No more variables can be read. This is critical. => {nameof(NetworkObjectId)}: {NetworkObjectId} - {nameof(NetworkObject.GetNetworkBehaviourOrderIndex)}(): {networkObject.GetNetworkBehaviourOrderIndex(networkBehaviour)} - VariableIndex: {i}");
                                 NetworkLog.LogError($"[{networkVariable.GetType().Name}]");
                             }
-
                             return;
                         }
                         int readStartPos = m_ReceivedNetworkVariableData.Position;
 
-                        networkVariable.ReadDelta(m_ReceivedNetworkVariableData, networkManager.IsServer);
+                        // DANGO TODO: Remove distributedAuthorityMode portion when we remove the service specific NetworkVariable stuff
+                        if (distributedAuthorityMode || ensureNetworkVariableLengthSafety)
+                        {
+                            var remainingBufferSize = m_ReceivedNetworkVariableData.Length - m_ReceivedNetworkVariableData.Position;
+                            if (varSize > (remainingBufferSize))
+                            {
+                                UnityEngine.Debug.LogError($"[{networkBehaviour.name}][Delta State Read Error] Expecting to read {varSize} but only {remainingBufferSize} remains!");
+                                return;
+                            }
+                        }
+
+                        // Added a try catch here to assure any failure will only fail on this one message and not disrupt the stack
+                        try
+                        {
+                            // Read the delta
+                            networkVariable.ReadDelta(m_ReceivedNetworkVariableData, markNetworkVariableDirty);
+
+                            // Add the NetworkVariable field index so we can invoke the PostDeltaRead
+                            m_UpdatedNetworkVariables.Add(i);
+                        }
+                        catch (Exception ex)
+                        {
+                            UnityEngine.Debug.LogException(ex);
+                            return;
+                        }
+
+                        // (For client-server) As opposed to worrying about adding additional processing on the server to send NetworkVariable
+                        // updates at the end of the frame, we now track all NetworkVariable state updates, per client, that need to be forwarded
+                        // to the client. This happens once the server is finished processing all state updates for this message.
+                        if (isServerAndDeltaForwarding)
+                        {
+                            foreach (var forwardEntry in m_ForwardUpdates)
+                            {
+                                // Only track things that the client can read
+                                if (networkVariable.CanClientRead(forwardEntry.Key))
+                                {
+                                    // If the object is about to be shown to the client then don't send an update as it will
+                                    // send a full update when shown.
+                                    if (networkManager.SpawnManager.ObjectsToShowToClient.ContainsKey(forwardEntry.Key) &&
+                                        networkManager.SpawnManager.ObjectsToShowToClient[forwardEntry.Key]
+                                        .Contains(networkObject))
+                                    {
+                                        continue;
+                                    }
+                                    forwardEntry.Value.Add(i);
+                                }
+                            }
+                        }
 
                         networkManager.NetworkMetrics.TrackNetworkVariableDeltaReceived(
                             context.SenderId,
@@ -211,7 +424,8 @@ public void Handle(ref NetworkContext context)
                             networkBehaviour.__getTypeName(),
                             context.MessageSize);
 
-                        if (networkManager.NetworkConfig.EnsureNetworkVariableLengthSafety)
+                        // DANGO TODO: Remove distributedAuthorityMode portion when we remove the service specific NetworkVariable stuff
+                        if (distributedAuthorityMode || ensureNetworkVariableLengthSafety)
                         {
                             if (m_ReceivedNetworkVariableData.Position > (readStartPos + varSize))
                             {
@@ -233,11 +447,48 @@ public void Handle(ref NetworkContext context)
                             }
                         }
                     }
+
+                    // If we are using the version of this message that includes network delivery, then
+                    // forward this update to all connected clients (other than the sender and the server).
+                    if (isServerAndDeltaForwarding)
+                    {
+                        var message = new NetworkVariableDeltaMessage()
+                        {
+                            NetworkBehaviour = networkBehaviour,
+                            NetworkBehaviourIndex = NetworkBehaviourIndex,
+                            NetworkObjectId = NetworkObjectId,
+                            m_ForwardingMessage = true,
+                            m_ForwardUpdates = m_ForwardUpdates,
+                        };
+
+                        foreach (var forwardEntry in m_ForwardUpdates)
+                        {
+                            // Only forward updates to any client that has visibility to the state updates included in this message
+                            if (forwardEntry.Value.Count > 0)
+                            {
+                                message.TargetClientId = forwardEntry.Key;
+                                networkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery, forwardEntry.Key);
+                            }
+                        }
+                    }
+
+                    // This should be always invoked (client & server) to assure the previous values are set
+                    // !! IMPORTANT ORDER OF OPERATIONS !! (Has to happen after forwarding deltas)
+                    // When a server forwards delta updates to connected clients, it needs to preserve the previous value
+                    // until it is done serializing all valid NetworkVariable field deltas (relative to each client). This
+                    // is invoked after it is done forwarding the deltas.
+                    foreach (var fieldIndex in m_UpdatedNetworkVariables)
+                    {
+                        networkBehaviour.NetworkVariableFields[fieldIndex].PostDeltaRead();
+                    }
                 }
             }
             else
             {
-                networkManager.DeferredMessageManager.DeferMessage(IDeferredNetworkMessageManager.TriggerType.OnSpawn, NetworkObjectId, m_ReceivedNetworkVariableData, ref context);
+                // DANGO-TODO: Fix me!
+                // When a client-spawned NetworkObject is despawned by the owner client, the owner client will still get messages for deltas and cause this to
+                // log a warning. The issue is primarily how NetworkVariables handle updating and will require some additional re-factoring.
+                networkManager.DeferredMessageManager.DeferMessage(IDeferredNetworkMessageManager.TriggerType.OnSpawn, NetworkObjectId, m_ReceivedNetworkVariableData, ref context, k_Name);
             }
         }
     }
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ParentSyncMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ParentSyncMessage.cs
index abbe88802e..c2965d4b31 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ParentSyncMessage.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ParentSyncMessage.cs
@@ -6,6 +6,8 @@ internal struct ParentSyncMessage : INetworkMessage
     {
         public int Version => 0;
 
+        private const string k_Name = "ParentSyncMessage";
+
         public ulong NetworkObjectId;
 
         private byte m_BitField;
@@ -33,6 +35,12 @@ public bool RemoveParent
             set => ByteUtility.SetBit(ref m_BitField, 2, value);
         }
 
+        public bool AuthorityApplied
+        {
+            get => ByteUtility.GetBit(m_BitField, 3);
+            set => ByteUtility.SetBit(ref m_BitField, 3, value);
+        }
+
         // These additional properties are used to synchronize clients with the current position,
         // rotation, and scale after parenting/de-parenting (world/local space relative). This
         // allows users to control the final child's transform values without having to have a
@@ -62,10 +70,6 @@ public void Serialize(FastBufferWriter writer, int targetVersion)
         public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int receivedMessageVersion)
         {
             var networkManager = (NetworkManager)context.SystemOwner;
-            if (!networkManager.IsClient)
-            {
-                return false;
-            }
 
             ByteUnpacker.ReadValueBitPacked(reader, out NetworkObjectId);
             reader.ReadValueSafe(out m_BitField);
@@ -83,11 +87,20 @@ public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int
             reader.ReadValueSafe(out Rotation);
             reader.ReadValueSafe(out Scale);
 
+            // If the target NetworkObject does not exist then defer this message until it does.
             if (!networkManager.SpawnManager.SpawnedObjects.ContainsKey(NetworkObjectId))
             {
-                networkManager.DeferredMessageManager.DeferMessage(IDeferredNetworkMessageManager.TriggerType.OnSpawn, NetworkObjectId, reader, ref context);
+                networkManager.DeferredMessageManager.DeferMessage(IDeferredNetworkMessageManager.TriggerType.OnSpawn, NetworkObjectId, reader, ref context, k_Name);
+                return false;
+            }
+
+            // If the target parent does not exist, then defer this message until it does.
+            if (LatestParent.HasValue && !networkManager.SpawnManager.SpawnedObjects.ContainsKey(LatestParent.Value))
+            {
+                networkManager.DeferredMessageManager.DeferMessage(IDeferredNetworkMessageManager.TriggerType.OnSpawn, LatestParent.Value, reader, ref context, k_Name);
                 return false;
             }
+
             return true;
         }
 
@@ -95,22 +108,62 @@ public void Handle(ref NetworkContext context)
         {
             var networkManager = (NetworkManager)context.SystemOwner;
             var networkObject = networkManager.SpawnManager.SpawnedObjects[NetworkObjectId];
+
+            // For either DA or Client-Server modes, parenting is only valid if the parent was owned by a different authority (i.e. AuthorityApplied) or the sender is from the owner (DA mode)
+            // or the server (client-server mode).
+            networkObject.AuthorityAppliedParenting = AuthorityApplied || context.SenderId == networkObject.OwnerClientId || context.SenderId == NetworkManager.ServerClientId;
+            if (!networkObject.AuthorityAppliedParenting && networkManager.LogLevel <= LogLevel.Normal)
+            {
+                NetworkLog.LogWarningServer($"Client-{context.SenderId} sent a ParentSyncMessage but is not the authority of {networkObject.gameObject.name}'s {nameof(NetworkObject)} component!");
+                // DANGO-TODO: Still determining if we should not apply this change (I am leaning towards not allowing it).
+            }
+
             networkObject.SetNetworkParenting(LatestParent, WorldPositionStays);
             networkObject.ApplyNetworkParenting(RemoveParent);
 
-            // We set all of the transform values after parenting as they are
-            // the values of the server-side post-parenting transform values
-            if (!WorldPositionStays)
+            // This check is primarily for client-server network topologies when the motion model is owner authoritative:
+            // When SyncOwnerTransformWhenParented is enabled, then always apply the transform values.
+            // When SyncOwnerTransformWhenParented is disabled, then only synchronize the transform on non-owner instances.
+            if (networkObject.SyncOwnerTransformWhenParented || (!networkObject.SyncOwnerTransformWhenParented && !networkObject.IsOwner))
             {
-                networkObject.transform.localPosition = Position;
-                networkObject.transform.localRotation = Rotation;
+                // We set all of the transform values after parenting as they are
+                // the values of the server-side post-parenting transform values
+                if (!WorldPositionStays)
+                {
+                    networkObject.transform.localPosition = Position;
+                    networkObject.transform.localRotation = Rotation;
+                }
+                else
+                {
+                    networkObject.transform.position = Position;
+                    networkObject.transform.rotation = Rotation;
+                }
+                networkObject.transform.localScale = Scale;
             }
-            else
+
+            // If in distributed authority mode and we are running a DAHost and this is the DAHost, then forward the parent changed message to any remaining clients
+            if ((networkManager.DistributedAuthorityMode && !networkManager.CMBServiceConnection && networkManager.DAHost) || (networkObject.AllowOwnerToParent && context.SenderId == networkObject.OwnerClientId && networkManager.IsServer))
             {
-                networkObject.transform.position = Position;
-                networkObject.transform.rotation = Rotation;
+                var size = 0;
+                var message = this;
+
+                foreach (var client in networkManager.ConnectedClients)
+                {
+                    if (client.Value.ClientId == networkObject.OwnerClientId || client.Value.ClientId == networkManager.LocalClientId)
+                    {
+                        continue;
+                    }
+                    if (networkObject.IsNetworkVisibleTo(client.Value.ClientId))
+                    {
+                        size = networkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableSequenced, client.Value.ClientId);
+                        networkManager.NetworkMetrics.TrackOwnershipChangeSent(client.Key, networkObject, size);
+                    }
+                    else
+                    {
+                        Debug.Log($"[DAHost][ParentingProxy] Client-{client.Value.ClientId} has no visibility to {networkObject.name}!");
+                    }
+                }
             }
-            networkObject.transform.localScale = Scale;
         }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ProxyMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ProxyMessage.cs
index 7a77934737..57c8345175 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ProxyMessage.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ProxyMessage.cs
@@ -30,7 +30,6 @@ public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int
 
         public unsafe void Handle(ref NetworkContext context)
         {
-
             var networkManager = (NetworkManager)context.SystemOwner;
             if (!networkManager.SpawnManager.SpawnedObjects.TryGetValue(WrappedMessage.Metadata.NetworkObjectId, out var networkObject))
             {
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/RpcMessages.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/RpcMessages.cs
index 29a93c73c7..70e4c2aadf 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/RpcMessages.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/RpcMessages.cs
@@ -14,7 +14,7 @@ public static unsafe void Serialize(ref FastBufferWriter writer, ref RpcMetadata
             writer.WriteBytesSafe(payload.GetUnsafePtr(), payload.Length);
         }
 
-        public static unsafe bool Deserialize(ref FastBufferReader reader, ref NetworkContext context, ref RpcMetadata metadata, ref FastBufferReader payload)
+        public static unsafe bool Deserialize(ref FastBufferReader reader, ref NetworkContext context, ref RpcMetadata metadata, ref FastBufferReader payload, string messageType)
         {
             ByteUnpacker.ReadValueBitPacked(reader, out metadata.NetworkObjectId);
             ByteUnpacker.ReadValueBitPacked(reader, out metadata.NetworkBehaviourId);
@@ -23,7 +23,7 @@ public static unsafe bool Deserialize(ref FastBufferReader reader, ref NetworkCo
             var networkManager = (NetworkManager)context.SystemOwner;
             if (!networkManager.SpawnManager.SpawnedObjects.ContainsKey(metadata.NetworkObjectId))
             {
-                networkManager.DeferredMessageManager.DeferMessage(IDeferredNetworkMessageManager.TriggerType.OnSpawn, metadata.NetworkObjectId, reader, ref context);
+                networkManager.DeferredMessageManager.DeferMessage(IDeferredNetworkMessageManager.TriggerType.OnSpawn, metadata.NetworkObjectId, reader, ref context, messageType);
                 return false;
             }
 
@@ -52,7 +52,6 @@ public static unsafe bool Deserialize(ref FastBufferReader reader, ref NetworkCo
                     reader.Length);
             }
 #endif
-
             return true;
         }
 
@@ -106,6 +105,8 @@ internal struct ServerRpcMessage : INetworkMessage
         public FastBufferWriter WriteBuffer;
         public FastBufferReader ReadBuffer;
 
+        private const string k_Name = "ServerRpcMessage";
+
         public unsafe void Serialize(FastBufferWriter writer, int targetVersion)
         {
             RpcMessageHelpers.Serialize(ref writer, ref Metadata, ref WriteBuffer);
@@ -113,7 +114,7 @@ public unsafe void Serialize(FastBufferWriter writer, int targetVersion)
 
         public unsafe bool Deserialize(FastBufferReader reader, ref NetworkContext context, int receivedMessageVersion)
         {
-            return RpcMessageHelpers.Deserialize(ref reader, ref context, ref Metadata, ref ReadBuffer);
+            return RpcMessageHelpers.Deserialize(ref reader, ref context, ref Metadata, ref ReadBuffer, k_Name);
         }
 
         public void Handle(ref NetworkContext context)
@@ -141,6 +142,8 @@ internal struct ClientRpcMessage : INetworkMessage
         public FastBufferWriter WriteBuffer;
         public FastBufferReader ReadBuffer;
 
+        private const string k_Name = "ClientRpcMessage";
+
         public void Serialize(FastBufferWriter writer, int targetVersion)
         {
             RpcMessageHelpers.Serialize(ref writer, ref Metadata, ref WriteBuffer);
@@ -148,7 +151,7 @@ public void Serialize(FastBufferWriter writer, int targetVersion)
 
         public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int receivedMessageVersion)
         {
-            return RpcMessageHelpers.Deserialize(ref reader, ref context, ref Metadata, ref ReadBuffer);
+            return RpcMessageHelpers.Deserialize(ref reader, ref context, ref Metadata, ref ReadBuffer, k_Name);
         }
 
         public void Handle(ref NetworkContext context)
@@ -176,6 +179,8 @@ internal struct RpcMessage : INetworkMessage
         public FastBufferWriter WriteBuffer;
         public FastBufferReader ReadBuffer;
 
+        private const string k_Name = "RpcMessage";
+
         public unsafe void Serialize(FastBufferWriter writer, int targetVersion)
         {
             BytePacker.WriteValuePacked(writer, SenderClientId);
@@ -185,7 +190,8 @@ public unsafe void Serialize(FastBufferWriter writer, int targetVersion)
         public unsafe bool Deserialize(FastBufferReader reader, ref NetworkContext context, int receivedMessageVersion)
         {
             ByteUnpacker.ReadValuePacked(reader, out SenderClientId);
-            return RpcMessageHelpers.Deserialize(ref reader, ref context, ref Metadata, ref ReadBuffer);
+
+            return RpcMessageHelpers.Deserialize(ref reader, ref context, ref Metadata, ref ReadBuffer, k_Name);
         }
 
         public void Handle(ref NetworkContext context)
@@ -203,4 +209,138 @@ public void Handle(ref NetworkContext context)
             RpcMessageHelpers.Handle(ref context, ref Metadata, ref ReadBuffer, ref rpcParams);
         }
     }
+
+    // DANGO-EXP TODO: REMOVE THIS
+    internal struct ForwardServerRpcMessage : INetworkMessage
+    {
+        public int Version => 0;
+        public ulong OwnerId;
+        public NetworkDelivery NetworkDelivery;
+        public ServerRpcMessage ServerRpcMessage;
+
+        public unsafe void Serialize(FastBufferWriter writer, int targetVersion)
+        {
+            writer.WriteValueSafe(OwnerId);
+            writer.WriteValueSafe(NetworkDelivery);
+            ServerRpcMessage.Serialize(writer, targetVersion);
+        }
+
+        public unsafe bool Deserialize(FastBufferReader reader, ref NetworkContext context, int receivedMessageVersion)
+        {
+            reader.ReadValueSafe(out OwnerId);
+            reader.ReadValueSafe(out NetworkDelivery);
+            ServerRpcMessage.ReadBuffer = new FastBufferReader(reader, Allocator.Persistent, reader.Length - reader.Position, sizeof(RpcMetadata));
+
+            // If deserializing failed or this message was deferred.
+            if (!ServerRpcMessage.Deserialize(reader, ref context, receivedMessageVersion))
+            {
+                // release this reader as the handler will either be invoked later (deferred) or will not be invoked at all.
+                ServerRpcMessage.ReadBuffer.Dispose();
+                return false;
+            }
+            return true;
+        }
+
+        public void Handle(ref NetworkContext context)
+        {
+            var networkManager = (NetworkManager)context.SystemOwner;
+            if (networkManager.DAHost)
+            {
+                try
+                {
+                    // Since this is temporary, we will not be collection metrics for this.
+                    // DAHost just forwards the message to the owner
+                    ServerRpcMessage.WriteBuffer = new FastBufferWriter(ServerRpcMessage.ReadBuffer.Length, Allocator.TempJob);
+                    ServerRpcMessage.WriteBuffer.WriteBytesSafe(ServerRpcMessage.ReadBuffer.ToArray());
+                    networkManager.ConnectionManager.SendMessage(ref ServerRpcMessage, NetworkDelivery, OwnerId);
+                }
+                catch (Exception ex)
+                {
+                    Debug.LogException(ex);
+                }
+            }
+            else
+            {
+                NetworkLog.LogErrorServer($"Received {nameof(ForwardServerRpcMessage)} on client-{networkManager.LocalClientId}! Only DAHost may forward RPC messages!");
+            }
+            ServerRpcMessage.ReadBuffer.Dispose();
+            ServerRpcMessage.WriteBuffer.Dispose();
+        }
+
+    }
+
+    // DANGO-EXP TODO: REMOVE THIS
+    internal struct ForwardClientRpcMessage : INetworkMessage
+    {
+        public int Version => 0;
+        public bool BroadCast;
+        public ulong[] TargetClientIds;
+        public NetworkDelivery NetworkDelivery;
+        public ClientRpcMessage ClientRpcMessage;
+
+        public unsafe void Serialize(FastBufferWriter writer, int targetVersion)
+        {
+            if (TargetClientIds == null)
+            {
+                BroadCast = true;
+                writer.WriteValueSafe(BroadCast);
+            }
+            else
+            {
+                BroadCast = false;
+                writer.WriteValueSafe(BroadCast);
+                writer.WriteValueSafe(TargetClientIds);
+            }
+            writer.WriteValueSafe(NetworkDelivery);
+            ClientRpcMessage.Serialize(writer, targetVersion);
+        }
+
+        public unsafe bool Deserialize(FastBufferReader reader, ref NetworkContext context, int receivedMessageVersion)
+        {
+            reader.ReadValueSafe(out BroadCast);
+
+            if (!BroadCast)
+            {
+                reader.ReadValueSafe(out TargetClientIds);
+            }
+
+            reader.ReadValueSafe(out NetworkDelivery);
+
+            ClientRpcMessage.ReadBuffer = new FastBufferReader(reader, Allocator.Persistent, reader.Length - reader.Position, sizeof(RpcMetadata));
+            // If deserializing failed or this message was deferred.
+            if (!ClientRpcMessage.Deserialize(reader, ref context, receivedMessageVersion))
+            {
+                // release this reader as the handler will either be invoked later (deferred) or will not be invoked at all.
+                ClientRpcMessage.ReadBuffer.Dispose();
+                return false;
+            }
+            return true;
+        }
+
+        public void Handle(ref NetworkContext context)
+        {
+            var networkManager = (NetworkManager)context.SystemOwner;
+            if (networkManager.DAHost)
+            {
+                ClientRpcMessage.WriteBuffer = new FastBufferWriter(ClientRpcMessage.ReadBuffer.Length, Allocator.TempJob);
+                ClientRpcMessage.WriteBuffer.WriteBytesSafe(ClientRpcMessage.ReadBuffer.ToArray());
+                // Since this is temporary, we will not be collection metrics for this.
+                // DAHost just forwards the message to the clients
+                if (BroadCast)
+                {
+                    networkManager.ConnectionManager.SendMessage(ref ClientRpcMessage, NetworkDelivery, networkManager.ConnectedClientsIds);
+                }
+                else
+                {
+                    networkManager.ConnectionManager.SendMessage(ref ClientRpcMessage, NetworkDelivery, TargetClientIds);
+                }
+            }
+            else
+            {
+                NetworkLog.LogErrorServer($"Received {nameof(ForwardClientRpcMessage)} on client-{networkManager.LocalClientId}! Only DAHost may forward RPC messages!");
+            }
+            ClientRpcMessage.WriteBuffer.Dispose();
+            ClientRpcMessage.ReadBuffer.Dispose();
+        }
+    }
 }
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/SceneEventMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/SceneEventMessage.cs
index 44175690ea..25c53a2786 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/SceneEventMessage.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/SceneEventMessage.cs
@@ -1,3 +1,4 @@
+
 namespace Unity.Netcode
 {
     // Todo: Would be lovely to get this one nicely formatted with all the data it sends in the struct
@@ -8,6 +9,7 @@ internal struct SceneEventMessage : INetworkMessage
 
         public SceneEventData EventData;
 
+
         private FastBufferReader m_ReceivedData;
 
         public void Serialize(FastBufferWriter writer, int targetVersion)
@@ -23,7 +25,8 @@ public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int
 
         public void Handle(ref NetworkContext context)
         {
-            ((NetworkManager)context.SystemOwner).SceneManager.HandleSceneEvent(context.SenderId, m_ReceivedData);
+            var networkManager = (NetworkManager)context.SystemOwner;
+            networkManager.SceneManager.HandleSceneEvent(context.SenderId, m_ReceivedData);
         }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ServerLogMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ServerLogMessage.cs
index b12c0080d7..23f32a608f 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ServerLogMessage.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ServerLogMessage.cs
@@ -4,6 +4,8 @@ internal struct ServerLogMessage : INetworkMessage
     {
         public int Version => 0;
 
+        public ulong SenderId;
+
         public NetworkLog.LogType LogType;
         // It'd be lovely to be able to replace this with FixedString or NativeArray...
         // But it's not really practical. On the sending side, the user is likely to want
@@ -12,30 +14,39 @@ internal struct ServerLogMessage : INetworkMessage
         // So an allocation is unavoidable here on both sides.
         public string Message;
 
-
         public void Serialize(FastBufferWriter writer, int targetVersion)
         {
             writer.WriteValueSafe(LogType);
             BytePacker.WriteValuePacked(writer, Message);
+            BytePacker.WriteValueBitPacked(writer, SenderId);
         }
 
         public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int receivedMessageVersion)
         {
             var networkManager = (NetworkManager)context.SystemOwner;
-            if (networkManager.IsServer && networkManager.NetworkConfig.EnableNetworkLogs)
+
+            if ((networkManager.IsServer || networkManager.LocalClient.IsSessionOwner) && networkManager.NetworkConfig.EnableNetworkLogs)
             {
                 reader.ReadValueSafe(out LogType);
                 ByteUnpacker.ReadValuePacked(reader, out Message);
+                ByteUnpacker.ReadValuePacked(reader, out SenderId);
+                // If in distributed authority mode and the DAHost is not the session owner, then the DAHost will just forward the message.
+                if (networkManager.DAHost && networkManager.CurrentSessionOwner != networkManager.LocalClientId)
+                {
+                    var message = this;
+                    var size = networkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableFragmentedSequenced, networkManager.CurrentSessionOwner);
+                    networkManager.NetworkMetrics.TrackServerLogSent(networkManager.CurrentSessionOwner, (uint)LogType, size);
+                    return false;
+                }
                 return true;
             }
-
             return false;
         }
 
         public void Handle(ref NetworkContext context)
         {
             var networkManager = (NetworkManager)context.SystemOwner;
-            var senderId = context.SenderId;
+            var senderId = networkManager.DistributedAuthorityMode ? SenderId : context.SenderId;
 
             networkManager.NetworkMetrics.TrackServerLogReceived(senderId, (uint)LogType, context.MessageSize);
 
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/SessionOwnerMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/SessionOwnerMessage.cs
new file mode 100644
index 0000000000..e4ac254dec
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/SessionOwnerMessage.cs
@@ -0,0 +1,26 @@
+namespace Unity.Netcode
+{
+    internal struct SessionOwnerMessage : INetworkMessage
+    {
+        public int Version => 0;
+
+        public ulong SessionOwner;
+
+        public void Serialize(FastBufferWriter writer, int targetVersion)
+        {
+            BytePacker.WriteValuePacked(writer, SessionOwner);
+        }
+
+        public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int receivedMessageVersion)
+        {
+            ByteUnpacker.ReadValuePacked(reader, out SessionOwner);
+            return true;
+        }
+
+        public unsafe void Handle(ref NetworkContext context)
+        {
+            var networkManager = (NetworkManager)context.SystemOwner;
+            networkManager.SetSessionOwner(SessionOwner);
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/SessionOwnerMessage.cs.meta b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/SessionOwnerMessage.cs.meta
new file mode 100644
index 0000000000..832da7f253
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/SessionOwnerMessage.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8e02985965397ab44809c99406914311
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/TimeSyncMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/TimeSyncMessage.cs
index 97b0fcc5e7..e3ab1dfe32 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/TimeSyncMessage.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/TimeSyncMessage.cs
@@ -26,6 +26,7 @@ public void Handle(ref NetworkContext context)
         {
             var networkManager = (NetworkManager)context.SystemOwner;
             var time = new NetworkTime(networkManager.NetworkTickSystem.TickRate, Tick);
+            networkManager.NetworkTimeSystem.SyncCount++;
             networkManager.NetworkTimeSystem.Sync(time.Time, networkManager.NetworkConfig.NetworkTransport.GetCurrentRtt(context.SenderId) / 1000d);
         }
     }
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/UnnamedMessage.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/UnnamedMessage.cs
index ccce67c3f5..c5c0b031e0 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/UnnamedMessage.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/Messages/UnnamedMessage.cs
@@ -20,7 +20,7 @@ public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int
 
         public void Handle(ref NetworkContext context)
         {
-            ((NetworkManager)context.SystemOwner).CustomMessagingManager.InvokeUnnamedMessage(context.SenderId, m_ReceivedData, context.SerializedHeaderSize);
+            ((NetworkManager)context.SystemOwner).CustomMessagingManager?.InvokeUnnamedMessage(context.SenderId, m_ReceivedData, context.SerializedHeaderSize);
         }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/NetworkMessageManager.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/NetworkMessageManager.cs
index 7a89e30d19..8401ed147a 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/NetworkMessageManager.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/NetworkMessageManager.cs
@@ -34,6 +34,9 @@ public InvalidMessageStructureException(string issue) : base(issue)
     internal class NetworkMessageManager : IDisposable
     {
         public bool StopProcessing = false;
+        private static Type s_ConnectionApprovedType = typeof(ConnectionApprovedMessage);
+        private static Type s_ConnectionRequestType = typeof(ConnectionRequestMessage);
+        private static Type s_DisconnectReasonType = typeof(DisconnectReasonMessage);
 
         private struct ReceiveQueueItem
         {
@@ -120,49 +123,20 @@ internal struct MessageWithHandler
             public VersionGetter GetVersion;
         }
 
-        internal List<MessageWithHandler> PrioritizeMessageOrder(List<MessageWithHandler> allowedTypes)
-        {
-            var prioritizedTypes = new List<MessageWithHandler>();
-
-            // First pass puts the priority message in the first indices
-            // Those are the messages that must be delivered in order to allow re-ordering the others later
-            foreach (var t in allowedTypes)
-            {
-                if (t.MessageType.FullName == typeof(ConnectionRequestMessage).FullName ||
-                    t.MessageType.FullName == typeof(ConnectionApprovedMessage).FullName)
-                {
-                    prioritizedTypes.Add(t);
-                }
-            }
-
-            foreach (var t in allowedTypes)
-            {
-                if (t.MessageType.FullName != typeof(ConnectionRequestMessage).FullName &&
-                    t.MessageType.FullName != typeof(ConnectionApprovedMessage).FullName)
-                {
-                    prioritizedTypes.Add(t);
-                }
-            }
-
-            return prioritizedTypes;
-        }
-
         public NetworkMessageManager(INetworkMessageSender sender, object owner, INetworkMessageProvider provider = null)
         {
             try
             {
                 m_Sender = sender;
                 m_Owner = owner;
-
                 if (provider == null)
                 {
                     provider = new ILPPMessageProvider();
                 }
 
+                // Get the presorted message types returned by the provider
                 var allowedTypes = provider.GetMessages();
 
-                allowedTypes.Sort((a, b) => string.CompareOrdinal(a.MessageType.FullName, b.MessageType.FullName));
-                allowedTypes = PrioritizeMessageOrder(allowedTypes);
                 foreach (var type in allowedTypes)
                 {
                     RegisterMessageType(type);
@@ -175,6 +149,8 @@ public NetworkMessageManager(INetworkMessageSender sender, object owner, INetwor
             }
         }
 
+        internal static bool EnableMessageOrderConsoleLog = false;
+
         public void Dispose()
         {
             if (m_Disposed)
@@ -529,6 +505,7 @@ internal void CleanupDisconnectedClients()
             return new T().Version;
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal int GetMessageVersion(Type type, ulong clientId, bool forReceive = false)
         {
             if (!m_PerClientMessageVersions.TryGetValue(clientId, out var versionMap))
@@ -556,16 +533,20 @@ internal int GetMessageVersion(Type type, ulong clientId, bool forReceive = fals
             return messageVersion;
         }
 
+
+
         public static void ReceiveMessage<T>(FastBufferReader reader, ref NetworkContext context, NetworkMessageManager manager) where T : INetworkMessage, new()
         {
+            var messageType = typeof(T);
             var message = new T();
             var messageVersion = 0;
+
             // Special cases because these are the messages that carry the version info - thus the version info isn't
             // populated yet when we get these. The first part of these messages always has to be the version data
             // and can't change.
-            if (typeof(T) != typeof(ConnectionRequestMessage) && typeof(T) != typeof(ConnectionApprovedMessage) && typeof(T) != typeof(DisconnectReasonMessage) && context.SenderId != manager.m_LocalClientId)
+            if (messageType != s_ConnectionRequestType && messageType != s_ConnectionApprovedType && messageType != s_DisconnectReasonType && context.SenderId != manager.m_LocalClientId)
             {
-                messageVersion = manager.GetMessageVersion(typeof(T), context.SenderId, true);
+                messageVersion = manager.GetMessageVersion(messageType, context.SenderId, true);
                 if (messageVersion < 0)
                 {
                     return;
@@ -617,7 +598,7 @@ internal int SendMessage<TMessageType, TClientIdListType>(ref TMessageType messa
                 var messageVersion = 0;
                 // Special case because this is the message that carries the version info - thus the version info isn't populated yet when we get this.
                 // The first part of this message always has to be the version data and can't change.
-                if (typeof(TMessageType) != typeof(ConnectionRequestMessage))
+                if (typeof(TMessageType) != s_ConnectionRequestType)
                 {
                     messageVersion = GetMessageVersion(typeof(TMessageType), clientIds[i]);
                     if (messageVersion < 0)
@@ -671,7 +652,7 @@ internal unsafe int SendPreSerializedMessage<TMessageType>(in FastBufferWriter t
 
                 // Special case because this is the message that carries the version info - thus the version info isn't populated yet when we get this.
                 // The first part of this message always has to be the version data and can't change.
-                if (typeof(TMessageType) != typeof(ConnectionRequestMessage))
+                if (typeof(TMessageType) != s_ConnectionRequestType)
                 {
                     var messageVersion = GetMessageVersion(typeof(TMessageType), clientIds[i]);
                     if (messageVersion < 0)
@@ -755,7 +736,7 @@ internal unsafe int SendPreSerializedMessage<TMessageType>(in FastBufferWriter t
             // Special case because this is the message that carries the version info - thus the version info isn't
             // populated yet when we get this. The first part of this message always has to be the version data
             // and can't change.
-            if (typeof(TMessageType) != typeof(ConnectionRequestMessage))
+            if (typeof(TMessageType) != s_ConnectionRequestType)
             {
                 messageVersion = GetMessageVersion(typeof(TMessageType), clientId);
                 if (messageVersion < 0)
@@ -827,7 +808,7 @@ internal unsafe int SendMessage<T>(ref T message, NetworkDelivery delivery, in N
         internal unsafe int SendMessage<T>(ref T message, NetworkDelivery delivery, in NativeList<ulong> clientIds)
             where T : INetworkMessage
         {
-            return SendMessage(ref message, delivery, new PointerListWrapper<ulong>((ulong*)clientIds.GetUnsafePtr(), clientIds.Length));
+            return SendMessage(ref message, delivery, new PointerListWrapper<ulong>(clientIds.GetUnsafePtr(), clientIds.Length));
         }
 
         internal unsafe void ProcessSendQueues()
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcAttributes.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcAttributes.cs
index acb6289b5b..6d276ab580 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcAttributes.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcAttributes.cs
@@ -24,12 +24,29 @@ public enum RpcDelivery
     [AttributeUsage(AttributeTargets.Method)]
     public class RpcAttribute : Attribute
     {
-        // Must match the set of parameters below
+        /// <summary>
+        /// Parameters that define the behavior of an RPC attribute
+        /// </summary>
         public struct RpcAttributeParams
         {
+            /// <summary>
+            /// Specifies the delivery method for the RPC
+            /// </summary>
             public RpcDelivery Delivery;
+
+            /// <summary>
+            /// When true, only the owner of the object can execute this RPC
+            /// </summary>
             public bool RequireOwnership;
+
+            /// <summary>
+            /// When true, local execution of the RPC is deferred until the next network tick
+            /// </summary>
             public bool DeferLocal;
+
+            /// <summary>
+            /// When true, allows the RPC target to be overridden at runtime
+            /// </summary>
             public bool AllowTargetOverride;
         }
 
@@ -38,10 +55,26 @@ public struct RpcAttributeParams
         /// Type of RPC delivery method
         /// </summary>
         public RpcDelivery Delivery = RpcDelivery.Reliable;
+
+        /// <summary>
+        /// When true, only the owner of the object can execute this RPC
+        /// </summary>
         public bool RequireOwnership;
+
+        /// <summary>
+        /// When true, local execution of the RPC is deferred until the next network tick
+        /// </summary>
         public bool DeferLocal;
+
+        /// <summary>
+        /// When true, allows the RPC target to be overridden at runtime
+        /// </summary>
         public bool AllowTargetOverride;
 
+        /// <summary>
+        /// Initializes a new instance of the RpcAttribute with the specified target
+        /// </summary>
+        /// <param name="target">The target for this RPC</param>
         public RpcAttribute(SendTo target)
         {
         }
@@ -60,8 +93,15 @@ private RpcAttribute()
     [AttributeUsage(AttributeTargets.Method)]
     public class ServerRpcAttribute : RpcAttribute
     {
+        /// <summary>
+        /// When true, only the owner of the NetworkObject can invoke this ServerRpc.
+        /// This property overrides the base RpcAttribute.RequireOwnership.
+        /// </summary>
         public new bool RequireOwnership;
 
+        /// <summary>
+        /// Initializes a new instance of ServerRpcAttribute that targets the server
+        /// </summary>
         public ServerRpcAttribute() : base(SendTo.Server)
         {
 
@@ -75,6 +115,9 @@ public ServerRpcAttribute() : base(SendTo.Server)
     [AttributeUsage(AttributeTargets.Method)]
     public class ClientRpcAttribute : RpcAttribute
     {
+        /// <summary>
+        /// Initializes a new instance of ClientRpcAttribute that targets all clients except the server
+        /// </summary>
         public ClientRpcAttribute() : base(SendTo.NotServer)
         {
 
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcParams.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcParams.cs
index 7eb1a18009..b302e3f8f7 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcParams.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcParams.cs
@@ -3,22 +3,54 @@
 
 namespace Unity.Netcode
 {
+    /// <summary>
+    /// Specifies how RPC messages should be handled in terms of local execution timing
+    /// </summary>
     public enum LocalDeferMode
     {
+        /// <summary>
+        /// Uses the default behavior for RPC message handling
+        /// </summary>
         Default,
+
+        /// <summary>
+        /// Defers the local execution of the RPC until the next network tick
+        /// </summary>
         Defer,
+
+        /// <summary>
+        /// Executes the RPC immediately on the local client without waiting for network synchronization
+        /// </summary>
         SendImmediate
     }
+
     /// <summary>
-    /// Generic RPC
+    /// Generic RPC. Defines parameters for sending Remote Procedure Calls (RPCs) in the network system
     /// </summary>
     public struct RpcSendParams
     {
+        /// <summary>
+        /// Specifies the target that will receive this RPC
+        /// </summary>
         public BaseRpcTarget Target;
 
+        /// <summary>
+        /// Controls how the RPC is handled for local execution timing
+        /// </summary>
         public LocalDeferMode LocalDeferMode;
 
+        /// <summary>
+        /// Implicitly converts a BaseRpcTarget to RpcSendParams
+        /// </summary>
+        /// <param name="target">The RPC target to convert</param>
+        /// <returns>A new RpcSendParams instance with the specified target</returns>
         public static implicit operator RpcSendParams(BaseRpcTarget target) => new RpcSendParams { Target = target };
+
+        /// <summary>
+        /// Implicitly converts a LocalDeferMode to RpcSendParams
+        /// </summary>
+        /// <param name="deferMode">The defer mode to convert</param>
+        /// <returns>A new RpcSendParams instance with the specified defer mode</returns>
         public static implicit operator RpcSendParams(LocalDeferMode deferMode) => new RpcSendParams { LocalDeferMode = deferMode };
     }
 
@@ -51,9 +83,32 @@ public struct RpcParams
         /// </summary>
         public RpcReceiveParams Receive;
 
+        /// <summary>
+        /// Implicitly converts RpcSendParams to RpcParams
+        /// </summary>
+        /// <param name="send">The send parameters to convert</param>
+        /// <returns>A new RpcParams instance with the specified send parameters</returns>
         public static implicit operator RpcParams(RpcSendParams send) => new RpcParams { Send = send };
+
+        /// <summary>
+        /// Implicitly converts a BaseRpcTarget to RpcParams
+        /// </summary>
+        /// <param name="target">The RPC target to convert</param>
+        /// <returns>A new RpcParams instance with the specified target in its send parameters</returns>
         public static implicit operator RpcParams(BaseRpcTarget target) => new RpcParams { Send = new RpcSendParams { Target = target } };
+
+        /// <summary>
+        /// Implicitly converts a LocalDeferMode to RpcParams
+        /// </summary>
+        /// <param name="deferMode">The defer mode to convert</param>
+        /// <returns>A new RpcParams instance with the specified defer mode in its send parameters</returns>
         public static implicit operator RpcParams(LocalDeferMode deferMode) => new RpcParams { Send = new RpcSendParams { LocalDeferMode = deferMode } };
+
+        /// <summary>
+        /// Implicitly converts RpcReceiveParams to RpcParams
+        /// </summary>
+        /// <param name="receive">The receive parameters to convert</param>
+        /// <returns>A new RpcParams instance with the specified receive parameters</returns>
         public static implicit operator RpcParams(RpcReceiveParams receive) => new RpcParams { Receive = receive };
     }
 
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/AuthorityRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/AuthorityRpcTarget.cs
new file mode 100644
index 0000000000..30d22d4fcf
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/AuthorityRpcTarget.cs
@@ -0,0 +1,75 @@
+namespace Unity.Netcode
+{
+    internal class AuthorityRpcTarget : ServerRpcTarget
+    {
+        private ProxyRpcTarget m_AuthorityTarget;
+        private DirectSendRpcTarget m_DirectSendTarget;
+
+        public override void Dispose()
+        {
+            if (m_AuthorityTarget != null)
+            {
+                m_AuthorityTarget.Dispose();
+                m_AuthorityTarget = null;
+            }
+
+            if (m_DirectSendTarget != null)
+            {
+                m_DirectSendTarget.Dispose();
+                m_DirectSendTarget = null;
+            }
+
+            base.Dispose();
+        }
+
+        internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message, NetworkDelivery delivery, RpcParams rpcParams)
+        {
+            if (behaviour.NetworkManager.DistributedAuthorityMode)
+            {
+                // If invoked locally, then send locally
+                if (behaviour.HasAuthority)
+                {
+                    if (m_UnderlyingTarget == null)
+                    {
+                        m_UnderlyingTarget = new LocalSendRpcTarget(m_NetworkManager);
+                    }
+                    m_UnderlyingTarget.Send(behaviour, ref message, delivery, rpcParams);
+                }
+                else if (behaviour.NetworkManager.DAHost)
+                {
+                    if (m_DirectSendTarget == null)
+                    {
+                        m_DirectSendTarget = new DirectSendRpcTarget(behaviour.OwnerClientId, m_NetworkManager);
+                    }
+                    else
+                    {
+                        m_DirectSendTarget.ClientId = behaviour.OwnerClientId;
+                    }
+                    m_DirectSendTarget.Send(behaviour, ref message, delivery, rpcParams);
+                }
+                else // Otherwise (for now), we always proxy the RPC messages to the owner
+                {
+                    if (m_AuthorityTarget == null)
+                    {
+                        m_AuthorityTarget = new ProxyRpcTarget(behaviour.OwnerClientId, m_NetworkManager);
+                    }
+                    else
+                    {
+                        // Since the owner can change, for now we will just clear and set the owner each time
+                        m_AuthorityTarget.SetClientId(behaviour.OwnerClientId);
+                    }
+                    m_AuthorityTarget.Send(behaviour, ref message, delivery, rpcParams);
+                }
+            }
+            else
+            {
+                // If we are not in distributed authority mode, then we invoke the normal ServerRpc code.
+                base.Send(behaviour, ref message, delivery, rpcParams);
+            }
+        }
+
+        internal AuthorityRpcTarget(NetworkManager manager) : base(manager)
+        {
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/AuthorityRpcTarget.cs.meta b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/AuthorityRpcTarget.cs.meta
new file mode 100644
index 0000000000..fe0f8acc6e
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/AuthorityRpcTarget.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6b8f28b7a617fd34faee91e5f88e89ac
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/BaseRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/BaseRpcTarget.cs
index 3f9d4f9d88..66c88b3eec 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/BaseRpcTarget.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/BaseRpcTarget.cs
@@ -2,8 +2,14 @@
 
 namespace Unity.Netcode
 {
+    /// <summary>
+    /// The base abstract RPC Target class used by all universal RPC targets.
+    /// </summary>
     public abstract class BaseRpcTarget : IDisposable
     {
+        /// <summary>
+        /// The <see cref="NetworkManager"/> instance which can be used to handle sending and receiving the specific target(s)
+        /// </summary>
         protected NetworkManager m_NetworkManager;
         private bool m_Locked;
 
@@ -22,6 +28,10 @@ internal BaseRpcTarget(NetworkManager manager)
             m_NetworkManager = manager;
         }
 
+        /// <summary>
+        /// Verifies the target can be disposed based on its lock state.
+        /// </summary>
+        /// <exception cref="Exception">Thrown when attempting to dispose a locked temporary RPC target</exception>
         protected void CheckLockBeforeDispose()
         {
             if (m_Locked)
@@ -30,6 +40,9 @@ protected void CheckLockBeforeDispose()
             }
         }
 
+        /// <summary>
+        /// Releases resources used by the RPC target.
+        /// </summary>
         public abstract void Dispose();
 
         internal abstract void Send(NetworkBehaviour behaviour, ref RpcMessage message, NetworkDelivery delivery, RpcParams rpcParams);
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/ClientsAndHostRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/ClientsAndHostRpcTarget.cs
index 286b0b0134..373e43f4fe 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/ClientsAndHostRpcTarget.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/ClientsAndHostRpcTarget.cs
@@ -17,7 +17,8 @@ internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message,
                 // ClientsAndHost sends to everyone who runs any client logic
                 // So if the server is a host, this target includes it (as hosts run client logic)
                 // If the server is not a host, this target leaves it out, ergo the selection of NotServer.
-                if (behaviour.NetworkManager.ServerIsHost)
+                // If we are in distributed authority mode and connected to a service, then send to all clients.
+                if (behaviour.NetworkManager.ServerIsHost || (m_NetworkManager.DistributedAuthorityMode && m_NetworkManager.CMBServiceConnection))
                 {
                     m_UnderlyingTarget = behaviour.RpcTarget.Everyone;
                 }
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/EveryoneRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/EveryoneRpcTarget.cs
index b0ae7382c7..7b2089f6b8 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/EveryoneRpcTarget.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/EveryoneRpcTarget.cs
@@ -4,23 +4,37 @@ internal class EveryoneRpcTarget : BaseRpcTarget
     {
         private NotServerRpcTarget m_NotServerRpcTarget;
         private ServerRpcTarget m_ServerRpcTarget;
+        private NotAuthorityRpcTarget m_NotAuthorityRpcTarget;
+        private AuthorityRpcTarget m_AuthorityRpcTarget;
 
         public override void Dispose()
         {
             m_NotServerRpcTarget.Dispose();
             m_ServerRpcTarget.Dispose();
+            m_NotAuthorityRpcTarget.Dispose();
+            m_AuthorityRpcTarget.Dispose();
         }
 
         internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message, NetworkDelivery delivery, RpcParams rpcParams)
         {
-            m_NotServerRpcTarget.Send(behaviour, ref message, delivery, rpcParams);
-            m_ServerRpcTarget.Send(behaviour, ref message, delivery, rpcParams);
+            if (NetworkManager.IsDistributedAuthority)
+            {
+                m_NotAuthorityRpcTarget.Send(behaviour, ref message, delivery, rpcParams);
+                m_AuthorityRpcTarget.Send(behaviour, ref message, delivery, rpcParams);
+            }
+            else
+            {
+                m_NotServerRpcTarget.Send(behaviour, ref message, delivery, rpcParams);
+                m_ServerRpcTarget.Send(behaviour, ref message, delivery, rpcParams);
+            }
         }
 
         internal EveryoneRpcTarget(NetworkManager manager) : base(manager)
         {
             m_NotServerRpcTarget = new NotServerRpcTarget(manager);
             m_ServerRpcTarget = new ServerRpcTarget(manager);
+            m_NotAuthorityRpcTarget = new NotAuthorityRpcTarget(manager);
+            m_AuthorityRpcTarget = new AuthorityRpcTarget(manager);
         }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/LocalSendRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/LocalSendRpcTarget.cs
index a440f458f4..4c6567c262 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/LocalSendRpcTarget.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/LocalSendRpcTarget.cs
@@ -36,7 +36,7 @@ internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message,
                     MessageType = m_NetworkManager.MessageManager.GetMessageType(typeof(RpcMessage))
                 };
 
-                behaviour.NetworkManager.DeferredMessageManager.DeferMessage(IDeferredNetworkMessageManager.TriggerType.OnNextFrame, 0, reader, ref context);
+                networkManager.DeferredMessageManager.DeferMessage(IDeferredNetworkMessageManager.TriggerType.OnNextFrame, 0, reader, ref context);
                 length = reader.Length;
             }
             else
@@ -49,8 +49,8 @@ internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message,
 #if DEVELOPMENT_BUILD || UNITY_EDITOR || UNITY_MP_TOOLS_NET_STATS_MONITOR_ENABLED_IN_RELEASE
             if (NetworkBehaviour.__rpc_name_table[behaviour.GetType()].TryGetValue(message.Metadata.NetworkRpcMethodId, out var rpcMethodName))
             {
-                behaviour.NetworkManager.NetworkMetrics.TrackRpcSent(
-                    behaviour.NetworkManager.LocalClientId,
+                networkManager.NetworkMetrics.TrackRpcSent(
+                    networkManager.LocalClientId,
                     behaviour.NetworkObject,
                     rpcMethodName,
                     behaviour.__getTypeName(),
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotAuthorityRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotAuthorityRpcTarget.cs
new file mode 100644
index 0000000000..8ee736d6bf
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotAuthorityRpcTarget.cs
@@ -0,0 +1,77 @@
+namespace Unity.Netcode
+{
+    internal class NotAuthorityRpcTarget : NotServerRpcTarget
+    {
+        internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message, NetworkDelivery delivery, RpcParams rpcParams)
+        {
+            var networkObject = behaviour.NetworkObject;
+            if (m_NetworkManager.DistributedAuthorityMode)
+            {
+                if (m_GroupSendTarget == null)
+                {
+                    // When mocking the CMB service, we are running a server so create a non-proxy target group
+                    if (m_NetworkManager.DAHost)
+                    {
+                        m_GroupSendTarget = new RpcTargetGroup(m_NetworkManager);
+                    }
+                    else // Otherwise (for now), we always proxy the RPC messages
+                    {
+                        m_GroupSendTarget = new ProxyRpcTargetGroup(m_NetworkManager);
+                    }
+                }
+                m_GroupSendTarget.Clear();
+
+                if (behaviour.HasAuthority)
+                {
+                    foreach (var clientId in networkObject.Observers)
+                    {
+                        if (clientId == behaviour.OwnerClientId)
+                        {
+                            continue;
+                        }
+
+                        // The CMB-Service holds ID 0 and should not be added to the targets
+                        if (clientId == NetworkManager.ServerClientId && m_NetworkManager.CMBServiceConnection)
+                        {
+                            continue;
+                        }
+                        m_GroupSendTarget.Add(clientId);
+                    }
+                }
+                else
+                {
+                    foreach (var clientId in m_NetworkManager.ConnectedClientsIds)
+                    {
+                        if (clientId == behaviour.OwnerClientId || !networkObject.Observers.Contains(clientId))
+                        {
+                            continue;
+                        }
+
+                        // The CMB-Service holds ID 0 and should not be added to the targets
+                        if (clientId == NetworkManager.ServerClientId && m_NetworkManager.CMBServiceConnection)
+                        {
+                            continue;
+                        }
+
+                        if (clientId == m_NetworkManager.LocalClientId)
+                        {
+                            m_LocalSendRpcTarget.Send(behaviour, ref message, delivery, rpcParams);
+                            continue;
+                        }
+                        m_GroupSendTarget.Add(clientId);
+                    }
+                }
+
+                m_GroupSendTarget.Target.Send(behaviour, ref message, delivery, rpcParams);
+            }
+            else
+            {
+                base.Send(behaviour, ref message, delivery, rpcParams);
+            }
+        }
+
+        internal NotAuthorityRpcTarget(NetworkManager manager) : base(manager)
+        {
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotAuthorityRpcTarget.cs.meta b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotAuthorityRpcTarget.cs.meta
new file mode 100644
index 0000000000..6dd6f00aba
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotAuthorityRpcTarget.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4968ce7e70c277d4a892c1ed209ce4d6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotMeRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotMeRpcTarget.cs
index da8a0ed245..5ea687101c 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotMeRpcTarget.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotMeRpcTarget.cs
@@ -49,7 +49,8 @@ internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message,
                     {
                         continue;
                     }
-                    if (clientId == NetworkManager.ServerClientId)
+                    // In distributed authority mode, we send to target id 0 (which would be a DAHost) via the group
+                    if (clientId == NetworkManager.ServerClientId && !m_NetworkManager.DistributedAuthorityMode)
                     {
                         continue;
                     }
@@ -57,7 +58,9 @@ internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message,
                 }
             }
             m_GroupSendTarget.Target.Send(behaviour, ref message, delivery, rpcParams);
-            if (!behaviour.IsServer)
+
+            // In distributed authority mode, we don't use ServerRpc
+            if (!behaviour.IsServer && !m_NetworkManager.DistributedAuthorityMode)
             {
                 m_ServerRpcTarget.Send(behaviour, ref message, delivery, rpcParams);
             }
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotOwnerRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotOwnerRpcTarget.cs
index e4f64f0530..348c1af313 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotOwnerRpcTarget.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotOwnerRpcTarget.cs
@@ -4,12 +4,14 @@ internal class NotOwnerRpcTarget : BaseRpcTarget
     {
         private IGroupRpcTarget m_GroupSendTarget;
         private ServerRpcTarget m_ServerRpcTarget;
+        private NotAuthorityRpcTarget m_NotAuthorityRpcTarget;
         private LocalSendRpcTarget m_LocalSendRpcTarget;
 
         public override void Dispose()
         {
             m_ServerRpcTarget.Dispose();
             m_LocalSendRpcTarget.Dispose();
+            m_NotAuthorityRpcTarget.Dispose();
             if (m_GroupSendTarget != null)
             {
                 m_GroupSendTarget.Target.Dispose();
@@ -19,6 +21,13 @@ public override void Dispose()
 
         internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message, NetworkDelivery delivery, RpcParams rpcParams)
         {
+            // Not owner is the same as not authority in distributed authority mode
+            if (m_NetworkManager.DistributedAuthorityMode)
+            {
+                m_NotAuthorityRpcTarget.Send(behaviour, ref message, delivery, rpcParams);
+                return;
+            }
+
             if (m_GroupSendTarget == null)
             {
                 if (behaviour.IsServer)
@@ -86,6 +95,7 @@ internal NotOwnerRpcTarget(NetworkManager manager) : base(manager)
         {
             m_ServerRpcTarget = new ServerRpcTarget(manager);
             m_LocalSendRpcTarget = new LocalSendRpcTarget(manager);
+            m_NotAuthorityRpcTarget = new NotAuthorityRpcTarget(manager);
         }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotServerRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotServerRpcTarget.cs
index d348660cd9..3ac0b231a9 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotServerRpcTarget.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/NotServerRpcTarget.cs
@@ -2,8 +2,8 @@ namespace Unity.Netcode
 {
     internal class NotServerRpcTarget : BaseRpcTarget
     {
-        private IGroupRpcTarget m_GroupSendTarget;
-        private LocalSendRpcTarget m_LocalSendRpcTarget;
+        protected IGroupRpcTarget m_GroupSendTarget;
+        protected LocalSendRpcTarget m_LocalSendRpcTarget;
 
         public override void Dispose()
         {
@@ -51,7 +51,13 @@ internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message,
                         continue;
                     }
 
-                    if (clientId == behaviour.NetworkManager.LocalClientId)
+                    // If we are in distributed authority mode and connected to the service, then we exclude the owner/authority from the list
+                    if (m_NetworkManager.DistributedAuthorityMode && m_NetworkManager.CMBServiceConnection && clientId == behaviour.OwnerClientId)
+                    {
+                        continue;
+                    }
+
+                    if (clientId == m_NetworkManager.LocalClientId)
                     {
                         m_LocalSendRpcTarget.Send(behaviour, ref message, delivery, rpcParams);
                         continue;
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/OwnerRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/OwnerRpcTarget.cs
index 7c7829402d..e22c588ef3 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/OwnerRpcTarget.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/OwnerRpcTarget.cs
@@ -5,9 +5,12 @@ internal class OwnerRpcTarget : BaseRpcTarget
         private IIndividualRpcTarget m_UnderlyingTarget;
         private LocalSendRpcTarget m_LocalRpcTarget;
         private ServerRpcTarget m_ServerRpcTarget;
+        private AuthorityRpcTarget m_AuthorityRpcTarget;
 
         public override void Dispose()
         {
+            m_AuthorityRpcTarget.Dispose();
+            m_ServerRpcTarget.Dispose();
             m_LocalRpcTarget.Dispose();
             if (m_UnderlyingTarget != null)
             {
@@ -18,6 +21,13 @@ public override void Dispose()
 
         internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message, NetworkDelivery delivery, RpcParams rpcParams)
         {
+            // Sending to owner is the same as sending to authority in distributed authority mode
+            if (m_NetworkManager.DistributedAuthorityMode)
+            {
+                m_AuthorityRpcTarget.Send(behaviour, ref message, delivery, rpcParams);
+                return;
+            }
+
             if (behaviour.OwnerClientId == behaviour.NetworkManager.LocalClientId)
             {
                 m_LocalRpcTarget.Send(behaviour, ref message, delivery, rpcParams);
@@ -49,6 +59,7 @@ internal OwnerRpcTarget(NetworkManager manager) : base(manager)
         {
             m_LocalRpcTarget = new LocalSendRpcTarget(manager);
             m_ServerRpcTarget = new ServerRpcTarget(manager);
+            m_AuthorityRpcTarget = new AuthorityRpcTarget(manager);
         }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/ProxyRpcTargetGroup.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/ProxyRpcTargetGroup.cs
index 15bb63d307..5c58b4f488 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/ProxyRpcTargetGroup.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/ProxyRpcTargetGroup.cs
@@ -17,6 +17,11 @@ internal class ProxyRpcTargetGroup : BaseRpcTarget, IDisposable, IGroupRpcTarget
 
         internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message, NetworkDelivery delivery, RpcParams rpcParams)
         {
+            // If there are no targets then don't attempt to send anything.
+            if (TargetClientIds.Length == 0 && Ids.Count == 0)
+            {
+                return;
+            }
             var proxyMessage = new ProxyMessage { Delivery = delivery, TargetClientIds = TargetClientIds.AsArray(), WrappedMessage = message };
 #if DEVELOPMENT_BUILD || UNITY_EDITOR || UNITY_MP_TOOLS_NET_STATS_MONITOR_ENABLED_IN_RELEASE
             var size =
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/RpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/RpcTarget.cs
index 8d99c94b92..7b651ebcd4 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/RpcTarget.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/RpcTarget.cs
@@ -62,14 +62,45 @@ public enum SendTo
         /// </summary>
         ClientsAndHost,
         /// <summary>
+        /// Send this RPC to the authority.
+        /// In distributed authority mode, this will be the owner of the NetworkObject.
+        /// In normal client-server mode, this is basically the exact same thing as a server rpc.
+        /// </summary>
+        Authority,
+        /// <summary>
+        /// Send this RPC to all non-authority instances.
+        /// In distributed authority mode, this will be the non-owners of the NetworkObject.
+        /// In normal client-server mode, this is basically the exact same thing as a client rpc.
+        /// </summary>
+        NotAuthority,
+        /// <summary>
         /// This RPC cannot be sent without passing in a target in RpcSendParams.
         /// </summary>
         SpecifiedInParams
     }
 
+    /// <summary>
+    /// This parameter configures a performance optimization. This optimization is not valid in all situations.<br />
+    /// Because BaseRpcTarget is a managed type, allocating a new one is expensive, as it puts pressure on the garbage collector.
+    /// </summary>
+    /// <remarks>
+    /// When using a <see cref="Temp"/> allocation type for the RPC target(s):<br />
+    /// You typically don't need to worry about persisting the <see cref="BaseRpcTarget"/> generated.
+    /// When using a <see cref="Persistent"/> allocation type for the RPC target(s): <br />
+    /// You will want to use <see cref="RpcTarget"/>, which returns <see cref="BaseRpcTarget"/>, during <see cref="NetworkBehaviour"/> initialization (i.e. <see cref="NetworkBehaviour.OnNetworkPostSpawn"/>) and it to a property.<br />
+    /// Then, When invoking the RPC, you would use your <see cref="BaseRpcTarget"/> which is a persisted allocation of a given set of client identifiers.
+    /// !! Important !!<br />
+    /// You will want to invoke <see cref="BaseRpcTarget.Dispose"/> of any persisted properties created via <see cref="RpcTarget"/> when despawning or destroying the associated <see cref="NetworkBehaviour"/> component's <see cref="NetworkObject"/>. Not doing so will result in small memory leaks.
+    /// </remarks>
     public enum RpcTargetUse
     {
+        /// <summary>
+        /// Creates a temporary <see cref="BaseRpcTarget"/> used for the frame an <see cref="RpcAttribute"/> decorated method is invoked.
+        /// </summary>
         Temp,
+        /// <summary>
+        /// Creates a persisted <see cref="BaseRpcTarget"/> that does not change and will persist until <see cref="BaseRpcTarget.Dispose"/> is called.
+        /// </summary>
         Persistent
     }
 
@@ -100,7 +131,8 @@ internal RpcTarget(NetworkManager manager)
             NotMe = new NotMeRpcTarget(manager);
             Me = new LocalSendRpcTarget(manager);
             ClientsAndHost = new ClientsAndHostRpcTarget(manager);
-
+            Authority = new AuthorityRpcTarget(manager);
+            NotAuthority = new NotAuthorityRpcTarget(manager);
             m_CachedProxyRpcTargetGroup = new ProxyRpcTargetGroup(manager);
             m_CachedTargetGroup = new RpcTargetGroup(manager);
             m_CachedDirectSendTarget = new DirectSendRpcTarget(manager);
@@ -112,6 +144,9 @@ internal RpcTarget(NetworkManager manager)
             m_CachedProxyRpcTarget.Lock();
         }
 
+        /// <summary>
+        /// Invoked when this class is disposed.
+        /// </summary>
         public void Dispose()
         {
             Everyone.Dispose();
@@ -122,7 +157,8 @@ public void Dispose()
             NotMe.Dispose();
             Me.Dispose();
             ClientsAndHost.Dispose();
-
+            Authority.Dispose();
+            NotAuthority.Dispose();
             m_CachedProxyRpcTargetGroup.Unlock();
             m_CachedTargetGroup.Unlock();
             m_CachedDirectSendTarget.Unlock();
@@ -134,7 +170,6 @@ public void Dispose()
             m_CachedProxyRpcTarget.Dispose();
         }
 
-
         /// <summary>
         /// Send to the NetworkObject's current owner.
         /// Will execute locally if the local process is the owner.
@@ -196,14 +231,28 @@ public void Dispose()
         /// </summary>
         public BaseRpcTarget ClientsAndHost;
 
+        /// <summary>
+        /// Send this RPC to the authority.
+        /// In distributed authority mode, this will be the owner of the NetworkObject.
+        /// In normal client-server mode, this is basically the exact same thing as a server rpc.
+        /// </summary>
+        public BaseRpcTarget Authority;
+
+        /// <summary>
+        /// Send this RPC to all non-authority instances.
+        /// In distributed authority mode, this will be the non-owners of the NetworkObject.
+        /// In normal client-server mode, this is basically the exact same thing as a client rpc.
+        /// </summary>
+        public BaseRpcTarget NotAuthority;
+
         /// <summary>
         /// Send to a specific single client ID.
         /// </summary>
-        /// <param name="clientId"></param>
+        /// <param name="clientId">The ID of the client to send to</param>
         /// <param name="use"><see cref="RpcTargetUse.Temp"/> will return a cached target, which should not be stored as it will
         /// be overwritten in future calls to Single(). Do not call Dispose() on Temp targets.<br /><br /><see cref="RpcTargetUse.Persistent"/> will
         /// return a new target, which can be stored, but should not be done frequently because it results in a GC allocation. You must call Dispose() on Persistent targets when you are done with them.</param>
-        /// <returns></returns>
+        /// <returns>A <see cref="BaseRpcTarget"/> configured to send to the specified client. The type of target (cached or new instance) depends on the <paramref name="use"/> parameter</returns>
         public BaseRpcTarget Single(ulong clientId, RpcTargetUse use)
         {
             if (clientId == m_NetworkManager.LocalClientId)
@@ -232,11 +281,11 @@ public BaseRpcTarget Single(ulong clientId, RpcTargetUse use)
         /// <summary>
         /// Send to everyone EXCEPT a specific single client ID.
         /// </summary>
-        /// <param name="excludedClientId"></param>
+        /// <param name="excludedClientId">The IDs of the client to exclude from receiving the message</param>
         /// <param name="use"><see cref="RpcTargetUse.Temp"/> will return a cached target, which should not be stored as it will
         /// be overwritten in future calls to Not() or Group(). Do not call Dispose() on Temp targets.<br /><br /><see cref="RpcTargetUse.Persistent"/> will
         /// return a new target, which can be stored, but should not be done frequently because it results in a GC allocation. You must call Dispose() on Persistent targets when you are done with them.</param>
-        /// <returns></returns>
+        /// <returns>A <see cref="BaseRpcTarget"/> configured to send to all clients except the specified one. The type of target (cached or new instance) depends on the <paramref name="use"/> parameter and whether the caller is the server</returns>
         public BaseRpcTarget Not(ulong excludedClientId, RpcTargetUse use)
         {
             IGroupRpcTarget target;
@@ -245,7 +294,7 @@ public BaseRpcTarget Not(ulong excludedClientId, RpcTargetUse use)
                 if (use == RpcTargetUse.Persistent)
                 {
                     target = new RpcTargetGroup(m_NetworkManager);
-                }
+                } // HELLO from the dark side
                 else
                 {
                     target = m_CachedTargetGroup;
@@ -285,11 +334,11 @@ public BaseRpcTarget Not(ulong excludedClientId, RpcTargetUse use)
         /// NativeArrays can be trivially constructed using Allocator.Temp, making this an efficient
         /// Group method if the group list is dynamically constructed.
         /// </summary>
-        /// <param name="clientIds"></param>
+        /// <param name="clientIds">The IDs of the client that should receive the message.</param>
         /// <param name="use"><see cref="RpcTargetUse.Temp"/> will return a cached target, which should not be stored as it will
         /// be overwritten in future calls to Not() or Group(). Do not call Dispose() on Temp targets.<br /><br /><see cref="RpcTargetUse.Persistent"/> will
         /// return a new target, which can be stored, but should not be done frequently because it results in a GC allocation. You must call Dispose() on Persistent targets when you are done with them.</param>
-        /// <returns></returns>
+        /// <returns>A <see cref="BaseRpcTarget"/> configured to send to all clients except the specified one. The type of target (cached or new instance) depends on the <paramref name="use"/> parameter and whether the caller is the server</returns>
         public BaseRpcTarget Group(NativeArray<ulong> clientIds, RpcTargetUse use)
         {
             IGroupRpcTarget target;
@@ -329,11 +378,11 @@ public BaseRpcTarget Group(NativeArray<ulong> clientIds, RpcTargetUse use)
         /// NativeList can be trivially constructed using Allocator.Temp, making this an efficient
         /// Group method if the group list is dynamically constructed.
         /// </summary>
-        /// <param name="clientIds"></param>
+        /// <param name="clientIds">The IDs of the client that should receive the message.</param>
         /// <param name="use"><see cref="RpcTargetUse.Temp"/> will return a cached target, which should not be stored as it will
         /// be overwritten in future calls to Not() or Group(). Do not call Dispose() on Temp targets.<br /><br /><see cref="RpcTargetUse.Persistent"/> will
         /// return a new target, which can be stored, but should not be done frequently because it results in a GC allocation. You must call Dispose() on Persistent targets when you are done with them.</param>
-        /// <returns></returns>
+        /// <returns>A <see cref="BaseRpcTarget"/> configured to send to all clients except the specified one. The type of target (cached or new instance) depends on the <paramref name="use"/> parameter and whether the caller is the server</returns>
         public BaseRpcTarget Group(NativeList<ulong> clientIds, RpcTargetUse use)
         {
             var asArray = clientIds.AsArray();
@@ -346,11 +395,11 @@ public BaseRpcTarget Group(NativeList<ulong> clientIds, RpcTargetUse use)
         /// if you either have no strict performance requirements, or have the group of client IDs cached so
         /// it is not created each time.
         /// </summary>
-        /// <param name="clientIds"></param>
+        /// <param name="clientIds">The IDs of the client that should receive the message.</param>
         /// <param name="use"><see cref="RpcTargetUse.Temp"/> will return a cached target, which should not be stored as it will
         /// be overwritten in future calls to Not() or Group(). Do not call Dispose() on Temp targets.<br /><br /><see cref="RpcTargetUse.Persistent"/> will
         /// return a new target, which can be stored, but should not be done frequently because it results in a GC allocation. You must call Dispose() on Persistent targets when you are done with them.</param>
-        /// <returns></returns>
+        /// <returns>A <see cref="BaseRpcTarget"/> configured to send to all clients except the specified one. The type of target (cached or new instance) depends on the <paramref name="use"/> parameter and whether the caller is the server</returns>
         public BaseRpcTarget Group(ulong[] clientIds, RpcTargetUse use)
         {
             return Group(new NativeArray<ulong>(clientIds, Allocator.Temp), use);
@@ -363,11 +412,12 @@ public BaseRpcTarget Group(ulong[] clientIds, RpcTargetUse use)
         /// This override is only recommended if you either have no strict performance requirements,
         /// or have the group of client IDs cached so it is not created each time.
         /// </summary>
-        /// <param name="clientIds"></param>
+        /// <typeparam name="T">The type</typeparam>
+        /// <param name="clientIds">The IDs of the client that should receive the message.</param>
         /// <param name="use"><see cref="RpcTargetUse.Temp"/> will return a cached target, which should not be stored as it will
         /// be overwritten in future calls to Not() or Group(). Do not call Dispose() on Temp targets.<br /><br /><see cref="RpcTargetUse.Persistent"/> will
         /// return a new target, which can be stored, but should not be done frequently because it results in a GC allocation. You must call Dispose() on Persistent targets when you are done with them.</param>
-        /// <returns></returns>
+        /// <returns>A <see cref="BaseRpcTarget"/> configured to send to all clients except the specified one. The type of target (cached or new instance) depends on the <paramref name="use"/> parameter and whether the caller is the server</returns>
         public BaseRpcTarget Group<T>(T clientIds, RpcTargetUse use) where T : IEnumerable<ulong>
         {
             IGroupRpcTarget target;
@@ -407,11 +457,11 @@ public BaseRpcTarget Group<T>(T clientIds, RpcTargetUse use) where T : IEnumerab
         /// NativeArrays can be trivially constructed using Allocator.Temp, making this an efficient
         /// Group method if the group list is dynamically constructed.
         /// </summary>
-        /// <param name="excludedClientIds"></param>
+        /// <param name="excludedClientIds">The IDs of the client to exclude from receiving the message</param>
         /// <param name="use"><see cref="RpcTargetUse.Temp"/> will return a cached target, which should not be stored as it will
         /// be overwritten in future calls to Not() or Group(). Do not call Dispose() on Temp targets.<br /><br /><see cref="RpcTargetUse.Persistent"/> will
         /// return a new target, which can be stored, but should not be done frequently because it results in a GC allocation. You must call Dispose() on Persistent targets when you are done with them.</param>
-        /// <returns></returns>
+        /// <returns>A <see cref="BaseRpcTarget"/> configured to send to all clients except the specified one. The type of target (cached or new instance) depends on the <paramref name="use"/> parameter and whether the caller is the server</returns>
         public BaseRpcTarget Not(NativeArray<ulong> excludedClientIds, RpcTargetUse use)
         {
             IGroupRpcTarget target;
@@ -467,11 +517,11 @@ public BaseRpcTarget Not(NativeArray<ulong> excludedClientIds, RpcTargetUse use)
         /// NativeList can be trivially constructed using Allocator.Temp, making this an efficient
         /// Group method if the group list is dynamically constructed.
         /// </summary>
-        /// <param name="excludedClientIds"></param>
+        /// <param name="excludedClientIds">The IDs of the client to exclude from receiving the message</param>
         /// <param name="use"><see cref="RpcTargetUse.Temp"/> will return a cached target, which should not be stored as it will
         /// be overwritten in future calls to Not() or Group(). Do not call Dispose() on Temp targets.<br /><br /><see cref="RpcTargetUse.Persistent"/> will
         /// return a new target, which can be stored, but should not be done frequently because it results in a GC allocation. You must call Dispose() on Persistent targets when you are done with them.</param>
-        /// <returns></returns>
+        /// <returns>A <see cref="BaseRpcTarget"/> configured to send to all clients except the specified one. The type of target (cached or new instance) depends on the <paramref name="use"/> parameter and whether the caller is the server</returns>
         public BaseRpcTarget Not(NativeList<ulong> excludedClientIds, RpcTargetUse use)
         {
             var asArray = excludedClientIds.AsArray();
@@ -484,11 +534,11 @@ public BaseRpcTarget Not(NativeList<ulong> excludedClientIds, RpcTargetUse use)
         /// if you either have no strict performance requirements, or have the group of client IDs cached so
         /// it is not created each time.
         /// </summary>
-        /// <param name="excludedClientIds"></param>
+        /// <param name="excludedClientIds">The IDs of the client to exclude from receiving the message</param>
         /// <param name="use"><see cref="RpcTargetUse.Temp"/> will return a cached target, which should not be stored as it will
         /// be overwritten in future calls to Not() or Group(). Do not call Dispose() on Temp targets.<br /><br /><see cref="RpcTargetUse.Persistent"/> will
         /// return a new target, which can be stored, but should not be done frequently because it results in a GC allocation. You must call Dispose() on Persistent targets when you are done with them.</param>
-        /// <returns></returns>
+        /// <returns>A <see cref="BaseRpcTarget"/> configured to send to all clients except the specified one. The type of target (cached or new instance) depends on the <paramref name="use"/> parameter and whether the caller is the server</returns>
         public BaseRpcTarget Not(ulong[] excludedClientIds, RpcTargetUse use)
         {
             return Not(new NativeArray<ulong>(excludedClientIds, Allocator.Temp), use);
@@ -501,11 +551,12 @@ public BaseRpcTarget Not(ulong[] excludedClientIds, RpcTargetUse use)
         /// This override is only recommended if you either have no strict performance requirements,
         /// or have the group of client IDs cached so it is not created each time.
         /// </summary>
-        /// <param name="excludedClientIds"></param>
+        /// <typeparam name="T">The type</typeparam>
+        /// <param name="excludedClientIds">The IDs of the client to exclude from receiving the message</param>
         /// <param name="use"><see cref="RpcTargetUse.Temp"/> will return a cached target, which should not be stored as it will
         /// be overwritten in future calls to Not() or Group(). Do not call Dispose() on Temp targets.<br /><br /><see cref="RpcTargetUse.Persistent"/> will
         /// return a new target, which can be stored, but should not be done frequently because it results in a GC allocation. You must call Dispose() on Persistent targets when you are done with them.</param>
-        /// <returns></returns>
+        /// <returns>A <see cref="BaseRpcTarget"/> configured to send to all clients except the specified one. The type of target (cached or new instance) depends on the <paramref name="use"/> parameter and whether the caller is the server</returns>
         public BaseRpcTarget Not<T>(T excludedClientIds, RpcTargetUse use) where T : IEnumerable<ulong>
         {
             IGroupRpcTarget target;
diff --git a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/ServerRpcTarget.cs b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/ServerRpcTarget.cs
index 09b789ddb9..87bfbfb1c4 100644
--- a/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/ServerRpcTarget.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/ServerRpcTarget.cs
@@ -1,8 +1,10 @@
+using Unity.Collections;
 namespace Unity.Netcode
 {
     internal class ServerRpcTarget : BaseRpcTarget
     {
-        private BaseRpcTarget m_UnderlyingTarget;
+        protected BaseRpcTarget m_UnderlyingTarget;
+        protected ProxyRpcTarget m_ProxyRpcTarget;
 
         public override void Dispose()
         {
@@ -11,10 +13,65 @@ public override void Dispose()
                 m_UnderlyingTarget.Dispose();
                 m_UnderlyingTarget = null;
             }
+
+            if (m_ProxyRpcTarget != null)
+            {
+                m_ProxyRpcTarget.Dispose();
+                m_ProxyRpcTarget = null;
+            }
         }
 
         internal override void Send(NetworkBehaviour behaviour, ref RpcMessage message, NetworkDelivery delivery, RpcParams rpcParams)
         {
+            // For distributed authority the "server" is considered the authority of the object
+            if (behaviour.NetworkManager.DistributedAuthorityMode && behaviour.NetworkManager.CMBServiceConnection)
+            {
+                // If the local instance is the owner, then invoke the message locally on this behaviour
+                if (behaviour.IsOwner)
+                {
+                    var context = new NetworkContext
+                    {
+                        SenderId = m_NetworkManager.LocalClientId,
+                        Timestamp = m_NetworkManager.RealTimeProvider.RealTimeSinceStartup,
+                        SystemOwner = m_NetworkManager,
+                        // header information isn't valid since it's not a real message.
+                        // RpcMessage doesn't access this stuff so it's just left empty.
+                        Header = new NetworkMessageHeader(),
+                        SerializedHeaderSize = 0,
+                        MessageSize = 0
+                    };
+                    using var tempBuffer = new FastBufferReader(message.WriteBuffer, Allocator.None);
+                    message.ReadBuffer = tempBuffer;
+                    message.Handle(ref context);
+                    // If enabled, then add the RPC metrics for this
+#if DEVELOPMENT_BUILD || UNITY_EDITOR || UNITY_MP_TOOLS_NET_STATS_MONITOR_ENABLED_IN_RELEASE
+                    int length = tempBuffer.Length;
+                    if (NetworkBehaviour.__rpc_name_table[behaviour.GetType()].TryGetValue(message.Metadata.NetworkRpcMethodId, out var rpcMethodName))
+                    {
+                        m_NetworkManager.NetworkMetrics.TrackRpcSent(
+                            m_NetworkManager.LocalClientId,
+                            behaviour.NetworkObject,
+                            rpcMethodName,
+                            behaviour.__getTypeName(),
+                            length);
+                    }
+#endif
+                }
+                else // Otherwise, send a proxied message to the owner of the object
+                {
+                    if (m_ProxyRpcTarget == null)
+                    {
+                        m_ProxyRpcTarget = new ProxyRpcTarget(behaviour.OwnerClientId, m_NetworkManager);
+                    }
+                    else
+                    {
+                        m_ProxyRpcTarget.SetClientId(behaviour.OwnerClientId);
+                    }
+                    m_ProxyRpcTarget.Send(behaviour, ref message, delivery, rpcParams);
+                }
+                return;
+            }
+
             if (m_UnderlyingTarget == null)
             {
                 if (behaviour.NetworkManager.IsServer)
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/AnticipatedNetworkVariable.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/AnticipatedNetworkVariable.cs
index 2a08293206..5fe5d40818 100644
--- a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/AnticipatedNetworkVariable.cs
+++ b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/AnticipatedNetworkVariable.cs
@@ -4,10 +4,21 @@
 
 namespace Unity.Netcode
 {
-
+    /// <summary>
+    /// Defines how anticipated network variables handle authoritative updates that are older than the current anticipated state
+    /// </summary>
     public enum StaleDataHandling
     {
+        /// <summary>
+        /// Ignores authoritative updates that are older than the current anticipated state.
+        /// The anticipated value will not be replaced until a newer authoritative update is received.
+        /// </summary>
         Ignore,
+
+        /// <summary>
+        /// Applies authoritative updates even if they are older than the current anticipated state.
+        /// This triggers reanticipation to calculate a new anticipated value based on the authoritative state.
+        /// </summary>
         Reanticipate
     }
 
@@ -20,24 +31,24 @@ public enum StaleDataHandling
     ///
     /// <list type="bullet">
     ///
-    /// <item><b>Snap:</b> In this mode (with <see cref="StaleDataHandling"/> set to
+    /// <item><description><b>Snap:</b> In this mode (with <see cref="StaleDataHandling"/> set to
     /// <see cref="Netcode.StaleDataHandling.Ignore"/> and no <see cref="NetworkBehaviour.OnReanticipate"/> callback),
     /// the moment a more up-to-date value is received from the authority, it will simply replace the anticipated value,
-    /// resulting in a "snap" to the new value if it is different from the anticipated value.</item>
+    /// resulting in a "snap" to the new value if it is different from the anticipated value.</description></item>
     ///
-    /// <item><b>Smooth:</b> In this mode (with <see cref="StaleDataHandling"/> set to
+    /// <item><description><b>Smooth:</b> In this mode (with <see cref="StaleDataHandling"/> set to
     /// <see cref="Netcode.StaleDataHandling.Ignore"/> and an <see cref="NetworkBehaviour.OnReanticipate"/> callback that calls
     /// <see cref="Smooth"/> from the anticipated value to the authority value with an appropriate
     /// <see cref="Mathf.Lerp"/>-style smooth function), when a more up-to-date value is received from the authority,
-    /// it will interpolate over time from an incorrect anticipated value to the correct authoritative value.</item>
+    /// it will interpolate over time from an incorrect anticipated value to the correct authoritative value.</description></item>
     ///
-    /// <item><b>Constant Reanticipation:</b> In this mode (with <see cref="StaleDataHandling"/> set to
+    /// <item><description><b>Constant Reanticipation:</b> In this mode (with <see cref="StaleDataHandling"/> set to
     /// <see cref="Netcode.StaleDataHandling.Reanticipate"/> and an <see cref="NetworkBehaviour.OnReanticipate"/> that calculates a
     /// new anticipated value based on the current authoritative value), when a more up-to-date value is received from
     /// the authority, user code calculates a new anticipated value, possibly calling <see cref="Smooth"/> to interpolate
     /// between the previous anticipation and the new anticipation. This is useful for values that change frequently and
     /// need to constantly be re-evaluated, as opposed to values that change only in response to user action and simply
-    /// need a one-time anticipation when the user performs that action.</item>
+    /// need a one-time anticipation when the user performs that action.</description></item>
     ///
     /// </list>
     ///
@@ -83,8 +94,18 @@ public class AnticipatedNetworkVariable<T> : NetworkVariableBase
         /// the anticipationTime value, and that callback can be used to calculate a new anticipated value.
         /// </summary>
 #pragma warning restore IDE0001
+
+        /// <summary>
+        /// Controls how this network variable handles authoritative updates that are older than the current anticipated state
+        /// </summary>
         public StaleDataHandling StaleDataHandling;
 
+        /// <summary>
+        /// Delegate for handling changes in the authoritative value
+        /// </summary>
+        /// <param name="variable">The network variable that changed</param>
+        /// <param name="previousValue">The previous value before the change</param>
+        /// <param name="newValue">The new value after the change</param>
         public delegate void OnAuthoritativeValueChangedDelegate(AnticipatedNetworkVariable<T> variable, in T previousValue, in T newValue);
 
         /// <summary>
@@ -121,6 +142,9 @@ public void ResetAnticipation()
 
         private AnticipatedObject m_AnticipatedObject;
 
+        /// <summary>
+        /// Initializes the network variable, setting up initial values and registering with the anticipation system
+        /// </summary>
         public override void OnInitialize()
         {
             m_AuthoritativeValue.Initialize(m_NetworkBehaviour);
@@ -133,6 +157,10 @@ public override void OnInitialize()
             }
         }
 
+        /// <summary>
+        /// Checks if the current value has changed enough from its last synchronized value to warrant a new network update
+        /// </summary>
+        /// <returns>True if the value should be synchronized, false otherwise</returns>
         public override bool ExceedsDirtinessThreshold()
         {
             return m_AuthoritativeValue.ExceedsDirtinessThreshold();
@@ -177,7 +205,7 @@ public bool ShouldReanticipate
         /// Sets the current value of the variable on the expectation that the authority will set the variable
         /// to the same value within one network round trip (i.e., in response to an RPC).
         /// </summary>
-        /// <param name="value"></param>
+        /// <param name="value">The anticipated value that is expected to be confirmed by the authority</param>
         public void Anticipate(T value)
         {
             if (m_NetworkBehaviour.NetworkManager.ShutdownInProgress || !m_NetworkBehaviour.NetworkManager.IsListening)
@@ -227,10 +255,19 @@ public T AuthoritativeValue
         /// See <see cref="Mathf.Lerp"/>, <see cref="Vector3.Lerp"/>, <see cref="Vector3.Slerp"/>, and so on
         /// for examples.
         /// </summary>
+        /// <param name="authoritativeValue">The authoritative value to interpolate from</param>
+        /// <param name="anticipatedValue">The anticipated value to interpolate to</param>
+        /// <param name="amount">The interpolation factor between 0 and 1</param>
+        /// <returns>The interpolated value</returns>
         public delegate T SmoothDelegate(T authoritativeValue, T anticipatedValue, float amount);
 
         private SmoothDelegate m_SmoothDelegate = null;
 
+        /// <summary>
+        /// Initializes a new instance of the AnticipatedNetworkVariable class
+        /// </summary>
+        /// <param name="value">The initial value for the network variable. Defaults to the type's default value if not specified.</param>
+        /// <param name="staleDataHandling">Determines how the variable handles authoritative updates that are older than the current anticipated state. Defaults to StaleDataHandling.Ignore.</param>
         public AnticipatedNetworkVariable(T value = default,
             StaleDataHandling staleDataHandling = StaleDataHandling.Ignore)
             : base()
@@ -242,6 +279,9 @@ public AnticipatedNetworkVariable(T value = default,
             };
         }
 
+        /// <summary>
+        /// Updates the smooth interpolation state if active
+        /// </summary>
         public void Update()
         {
             if (m_CurrentSmoothTime < m_SmoothDuration)
@@ -253,6 +293,7 @@ public void Update()
             }
         }
 
+        /// <inheritdoc/>
         public override void Dispose()
         {
             if (m_IsDisposed)
@@ -302,6 +343,9 @@ public override void Dispose()
             }
         }
 
+        /// <summary>
+        /// Finalizer that ensures proper cleanup of network variable resources
+        /// </summary>
         ~AnticipatedNetworkVariable()
         {
             Dispose();
@@ -334,10 +378,10 @@ private void OnValueChangedInternal(T previousValue, T newValue)
         /// Interpolate this variable from <see cref="from"/> to <see cref="to"/> over <see cref="durationSeconds"/> of
         /// real time. The duration uses <see cref="Time.deltaTime"/>, so it is affected by <see cref="Time.timeScale"/>.
         /// </summary>
-        /// <param name="from"></param>
-        /// <param name="to"></param>
-        /// <param name="durationSeconds"></param>
-        /// <param name="how"></param>
+        /// <param name="from">The starting value for the interpolation</param>
+        /// <param name="to">The target value to interpolate towards</param>
+        /// <param name="durationSeconds">The duration of the interpolation in seconds</param>
+        /// <param name="how">A delegate that defines how the interpolation should be performed between the two values. It provides a function to interpolate between two values based on a percentage.</param>
         public void Smooth(in T from, in T to, float durationSeconds, SmoothDelegate how)
         {
             if (durationSeconds <= 0)
@@ -357,26 +401,31 @@ public void Smooth(in T from, in T to, float durationSeconds, SmoothDelegate how
             m_HasSmoothValues = true;
         }
 
+        /// <inheritdoc/>
         public override bool IsDirty()
         {
             return m_AuthoritativeValue.IsDirty();
         }
 
+        /// <inheritdoc/>
         public override void ResetDirty()
         {
             m_AuthoritativeValue.ResetDirty();
         }
 
+        /// <inheritdoc/>
         public override void WriteDelta(FastBufferWriter writer)
         {
             m_AuthoritativeValue.WriteDelta(writer);
         }
 
+        /// <inheritdoc/>
         public override void WriteField(FastBufferWriter writer)
         {
             m_AuthoritativeValue.WriteField(writer);
         }
 
+        /// <inheritdoc/>
         public override void ReadField(FastBufferReader reader)
         {
             m_AuthoritativeValue.ReadField(reader);
@@ -384,9 +433,13 @@ public override void ReadField(FastBufferReader reader)
             NetworkVariableSerialization<T>.Duplicate(m_AnticipatedValue, ref m_PreviousAnticipatedValue);
         }
 
+        /// <inheritdoc/>
         public override void ReadDelta(FastBufferReader reader, bool keepDirtyDelta)
         {
             m_AuthoritativeValue.ReadDelta(reader, keepDirtyDelta);
+            // Assure that the post delta read is invoked in order to update
+            // previous value.
+            m_AuthoritativeValue.PostDeltaRead();
         }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/AnticipatedNetworkVariable.cs.meta b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/AnticipatedNetworkVariable.cs.meta
index 1bcf6805bc..d3fe73428c 100644
--- a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/AnticipatedNetworkVariable.cs.meta
+++ b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/AnticipatedNetworkVariable.cs.meta
@@ -1,3 +1,2 @@
-fileFormatVersion: 2
-guid: 10f5188736b742d1993a2aad46a03e78
-timeCreated: 1705595868
\ No newline at end of file
+fileFormatVersion: 2
+guid: fc9fd5701bee8534a971eb9f49178e21
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Collections/NetworkList.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Collections/NetworkList.cs
index a489e9dbff..b2f26296aa 100644
--- a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Collections/NetworkList.cs
+++ b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Collections/NetworkList.cs
@@ -21,19 +21,19 @@ public class NetworkList<T> : NetworkVariableBase where T : unmanaged, IEquatabl
         public delegate void OnListChangedDelegate(NetworkListEvent<T> changeEvent);
 
         /// <summary>
-        /// The callback to be invoked when the list gets changed
+        /// Creates A NetworkList/>
         /// </summary>
         public event OnListChangedDelegate OnListChanged;
 
         /// <summary>
-        /// Constructor method for <see cref="NetworkList"/>
+        /// Constructor method for <see cref="NetworkList{T}"/>
         /// </summary>
         public NetworkList() { }
 
-        /// <inheritdoc/>
-        /// <param name="values"></param>
-        /// <param name="readPerm"></param>
-        /// <param name="writePerm"></param>
+        /// <inheritdoc cref="NetworkList{T}"/>
+        /// <param name="values">An optional collection of initial values to populate the list. If null, the list will start empty.</param>
+        /// <param name="readPerm">The read permission level for the network list. Determines who can read the list (e.g., server-only or everyone). Default is defined by DefaultReadPerm</param>
+        /// <param name="writePerm">The write permission level for the network list. Determines who can modify the list (e.g., server-only or specific clients). Default is defined by DefaultWritePerm.</param>
         public NetworkList(IEnumerable<T> values = default,
             NetworkVariableReadPermission readPerm = DefaultReadPerm,
             NetworkVariableWritePermission writePerm = DefaultWritePerm)
@@ -49,7 +49,15 @@ public NetworkList(IEnumerable<T> values = default,
             }
         }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Finalizer that ensures proper cleanup of network list resources
+        /// </summary>
+        ~NetworkList()
+        {
+            Dispose();
+        }
+
+        /// <inheritdoc cref="NetworkVariable{T}.ResetDirty"/>
         public override void ResetDirty()
         {
             base.ResetDirty();
@@ -59,7 +67,7 @@ public override void ResetDirty()
             }
         }
 
-        /// <inheritdoc />
+        /// <inheritdoc cref="NetworkVariable{T}.IsDirty"/>
         public override bool IsDirty()
         {
             // we call the base class to allow the SetDirty() mechanism to work
@@ -71,7 +79,7 @@ internal void MarkNetworkObjectDirty()
             MarkNetworkBehaviourDirty();
         }
 
-        /// <inheritdoc />
+        /// <inheritdoc cref="NetworkVariable{T}.WriteDelta"/>
         public override void WriteDelta(FastBufferWriter writer)
         {
 
@@ -93,29 +101,29 @@ public override void WriteDelta(FastBufferWriter writer)
                 {
                     case NetworkListEvent<T>.EventType.Add:
                         {
-                            NetworkVariableSerialization<T>.Write(writer, ref element.Value);
+                            NetworkVariableSerialization<T>.Serializer.Write(writer, ref element.Value);
                         }
                         break;
                     case NetworkListEvent<T>.EventType.Insert:
                         {
-                            writer.WriteValueSafe(element.Index);
-                            NetworkVariableSerialization<T>.Write(writer, ref element.Value);
+                            BytePacker.WriteValueBitPacked(writer, element.Index);
+                            NetworkVariableSerialization<T>.Serializer.Write(writer, ref element.Value);
                         }
                         break;
                     case NetworkListEvent<T>.EventType.Remove:
                         {
-                            NetworkVariableSerialization<T>.Write(writer, ref element.Value);
+                            NetworkVariableSerialization<T>.Serializer.Write(writer, ref element.Value);
                         }
                         break;
                     case NetworkListEvent<T>.EventType.RemoveAt:
                         {
-                            writer.WriteValueSafe(element.Index);
+                            BytePacker.WriteValueBitPacked(writer, element.Index);
                         }
                         break;
                     case NetworkListEvent<T>.EventType.Value:
                         {
-                            writer.WriteValueSafe(element.Index);
-                            NetworkVariableSerialization<T>.Write(writer, ref element.Value);
+                            BytePacker.WriteValueBitPacked(writer, element.Index);
+                            NetworkVariableSerialization<T>.Serializer.Write(writer, ref element.Value);
                         }
                         break;
                     case NetworkListEvent<T>.EventType.Clear:
@@ -127,17 +135,17 @@ public override void WriteDelta(FastBufferWriter writer)
             }
         }
 
-        /// <inheritdoc />
+        /// <inheritdoc cref="NetworkVariable{T}.WriteField"/>
         public override void WriteField(FastBufferWriter writer)
         {
             writer.WriteValueSafe((ushort)m_List.Length);
             for (int i = 0; i < m_List.Length; i++)
             {
-                NetworkVariableSerialization<T>.Write(writer, ref m_List.ElementAt(i));
+                NetworkVariableSerialization<T>.Serializer.Write(writer, ref m_List.ElementAt(i));
             }
         }
 
-        /// <inheritdoc />
+        /// <inheritdoc cref="NetworkVariable{T}.ReadField"/>
         public override void ReadField(FastBufferReader reader)
         {
             m_List.Clear();
@@ -145,14 +153,21 @@ public override void ReadField(FastBufferReader reader)
             for (int i = 0; i < count; i++)
             {
                 var value = new T();
-                NetworkVariableSerialization<T>.Read(reader, ref value);
+                NetworkVariableSerialization<T>.Serializer.Read(reader, ref value);
                 m_List.Add(value);
             }
         }
 
-        /// <inheritdoc />
+        /// <inheritdoc cref="NetworkVariable{T}.ReadDelta"/>
         public override void ReadDelta(FastBufferReader reader, bool keepDirtyDelta)
         {
+            // This is only invoked by <see cref="NetworkVariableDeltaMessage"/> and the only time
+            // keepDirtyDelta is set is when it is the server processing. To be able to handle previous
+            // versions, we use IsServer to keep the dirty states received and the keepDirtyDelta to
+            // actually mark this as dirty and add it to the list of <see cref="NetworkObject"/>s to
+            // be updated. With the forwarding of deltas being handled by <see cref="NetworkVariableDeltaMessage"/>,
+            // once all clients have been forwarded the dirty events, we clear them by invoking <see cref="PostDeltaRead"/>.
+            var isServer = m_NetworkManager.IsServer;
             reader.ReadValueSafe(out ushort deltaCount);
             for (int i = 0; i < deltaCount; i++)
             {
@@ -162,7 +177,7 @@ public override void ReadDelta(FastBufferReader reader, bool keepDirtyDelta)
                     case NetworkListEvent<T>.EventType.Add:
                         {
                             var value = new T();
-                            NetworkVariableSerialization<T>.Read(reader, ref value);
+                            NetworkVariableSerialization<T>.Serializer.Read(reader, ref value);
                             m_List.Add(value);
 
                             if (OnListChanged != null)
@@ -175,7 +190,7 @@ public override void ReadDelta(FastBufferReader reader, bool keepDirtyDelta)
                                 });
                             }
 
-                            if (keepDirtyDelta)
+                            if (isServer)
                             {
                                 m_DirtyEvents.Add(new NetworkListEvent<T>()
                                 {
@@ -183,15 +198,19 @@ public override void ReadDelta(FastBufferReader reader, bool keepDirtyDelta)
                                     Index = m_List.Length - 1,
                                     Value = m_List[m_List.Length - 1]
                                 });
-                                MarkNetworkObjectDirty();
+                                // Preserve the legacy way of handling this
+                                if (keepDirtyDelta)
+                                {
+                                    MarkNetworkObjectDirty();
+                                }
                             }
                         }
                         break;
                     case NetworkListEvent<T>.EventType.Insert:
                         {
-                            reader.ReadValueSafe(out int index);
+                            ByteUnpacker.ReadValueBitPacked(reader, out int index);
                             var value = new T();
-                            NetworkVariableSerialization<T>.Read(reader, ref value);
+                            NetworkVariableSerialization<T>.Serializer.Read(reader, ref value);
 
                             if (index < m_List.Length)
                             {
@@ -213,7 +232,7 @@ public override void ReadDelta(FastBufferReader reader, bool keepDirtyDelta)
                                 });
                             }
 
-                            if (keepDirtyDelta)
+                            if (isServer)
                             {
                                 m_DirtyEvents.Add(new NetworkListEvent<T>()
                                 {
@@ -221,14 +240,18 @@ public override void ReadDelta(FastBufferReader reader, bool keepDirtyDelta)
                                     Index = index,
                                     Value = m_List[index]
                                 });
-                                MarkNetworkObjectDirty();
+                                // Preserve the legacy way of handling this
+                                if (keepDirtyDelta)
+                                {
+                                    MarkNetworkObjectDirty();
+                                }
                             }
                         }
                         break;
                     case NetworkListEvent<T>.EventType.Remove:
                         {
                             var value = new T();
-                            NetworkVariableSerialization<T>.Read(reader, ref value);
+                            NetworkVariableSerialization<T>.Serializer.Read(reader, ref value);
                             int index = m_List.IndexOf(value);
                             if (index == -1)
                             {
@@ -247,7 +270,7 @@ public override void ReadDelta(FastBufferReader reader, bool keepDirtyDelta)
                                 });
                             }
 
-                            if (keepDirtyDelta)
+                            if (isServer)
                             {
                                 m_DirtyEvents.Add(new NetworkListEvent<T>()
                                 {
@@ -255,13 +278,17 @@ public override void ReadDelta(FastBufferReader reader, bool keepDirtyDelta)
                                     Index = index,
                                     Value = value
                                 });
-                                MarkNetworkObjectDirty();
+                                // Preserve the legacy way of handling this
+                                if (keepDirtyDelta)
+                                {
+                                    MarkNetworkObjectDirty();
+                                }
                             }
                         }
                         break;
                     case NetworkListEvent<T>.EventType.RemoveAt:
                         {
-                            reader.ReadValueSafe(out int index);
+                            ByteUnpacker.ReadValueBitPacked(reader, out int index);
                             T value = m_List[index];
                             m_List.RemoveAt(index);
 
@@ -275,7 +302,7 @@ public override void ReadDelta(FastBufferReader reader, bool keepDirtyDelta)
                                 });
                             }
 
-                            if (keepDirtyDelta)
+                            if (isServer)
                             {
                                 m_DirtyEvents.Add(new NetworkListEvent<T>()
                                 {
@@ -283,15 +310,19 @@ public override void ReadDelta(FastBufferReader reader, bool keepDirtyDelta)
                                     Index = index,
                                     Value = value
                                 });
-                                MarkNetworkObjectDirty();
+                                // Preserve the legacy way of handling this
+                                if (keepDirtyDelta)
+                                {
+                                    MarkNetworkObjectDirty();
+                                }
                             }
                         }
                         break;
                     case NetworkListEvent<T>.EventType.Value:
                         {
-                            reader.ReadValueSafe(out int index);
+                            ByteUnpacker.ReadValueBitPacked(reader, out int index);
                             var value = new T();
-                            NetworkVariableSerialization<T>.Read(reader, ref value);
+                            NetworkVariableSerialization<T>.Serializer.Read(reader, ref value);
                             if (index >= m_List.Length)
                             {
                                 throw new Exception("Shouldn't be here, index is higher than list length");
@@ -311,7 +342,7 @@ public override void ReadDelta(FastBufferReader reader, bool keepDirtyDelta)
                                 });
                             }
 
-                            if (keepDirtyDelta)
+                            if (isServer)
                             {
                                 m_DirtyEvents.Add(new NetworkListEvent<T>()
                                 {
@@ -320,7 +351,11 @@ public override void ReadDelta(FastBufferReader reader, bool keepDirtyDelta)
                                     Value = value,
                                     PreviousValue = previousValue
                                 });
-                                MarkNetworkObjectDirty();
+                                // Preserve the legacy way of handling this
+                                if (keepDirtyDelta)
+                                {
+                                    MarkNetworkObjectDirty();
+                                }
                             }
                         }
                         break;
@@ -337,13 +372,18 @@ public override void ReadDelta(FastBufferReader reader, bool keepDirtyDelta)
                                 });
                             }
 
-                            if (keepDirtyDelta)
+                            if (isServer)
                             {
                                 m_DirtyEvents.Add(new NetworkListEvent<T>()
                                 {
                                     Type = eventType
                                 });
-                                MarkNetworkObjectDirty();
+
+                                // Preserve the legacy way of handling this
+                                if (keepDirtyDelta)
+                                {
+                                    MarkNetworkObjectDirty();
+                                }
                             }
                         }
                         break;
@@ -357,17 +397,38 @@ public override void ReadDelta(FastBufferReader reader, bool keepDirtyDelta)
             }
         }
 
-        /// <inheritdoc />
+        /// <inheritdoc cref="NetworkVariable{T}.PostDeltaRead"/>
+        /// <remarks>
+        /// For NetworkList, we just need to reset dirty if a server has read deltas
+        /// </remarks>
+        internal override void PostDeltaRead()
+        {
+            if (m_NetworkManager.IsServer)
+            {
+                ResetDirty();
+            }
+        }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through the <see cref="NetworkList{T}" />.
+        /// </summary>
+        /// <returns>An enumerator for the <see cref="NetworkList{T}"/>.</returns>
         public IEnumerator<T> GetEnumerator()
         {
             return m_List.GetEnumerator();
         }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Adds an item to the end of the <see cref="NetworkList{T}"/>.
+        /// </summary>
+        /// <param name="item">The item to be added to the list.</param>
+        /// <remarks>
+        /// This method checks for write permissions before adding the item.
+        /// </remarks>
         public void Add(T item)
         {
             // check write permissions
-            if (!CanClientWrite(m_NetworkBehaviour.NetworkManager.LocalClientId))
+            if (!CanClientWrite(m_NetworkManager.LocalClientId))
             {
                 LogWritePermissionError();
                 return;
@@ -385,11 +446,16 @@ public void Add(T item)
             HandleAddListEvent(listEvent);
         }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Removes all items from the <see cref="NetworkList{T}"/>.
+        /// </summary>
+        /// <remarks>
+        /// This method checks for write permissions before clearing the list.
+        /// </remarks>
         public void Clear()
         {
             // check write permissions
-            if (!CanClientWrite(m_NetworkBehaviour.NetworkManager.LocalClientId))
+            if (!CanClientWrite(m_NetworkManager.LocalClientId))
             {
                 LogWritePermissionError();
                 return;
@@ -405,18 +471,29 @@ public void Clear()
             HandleAddListEvent(listEvent);
         }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Determines whether the <see cref="NetworkList{T}"/> contains a specific value.
+        /// </summary>
+        /// <param name="item">The object to locate in the <see cref="NetworkList{T}"/>.</param>
+        /// <returns><see langword="true" /> if the <see cref="item"/> is found in the <see cref="NetworkList{T}"/>; otherwise, <see langword="false" />.</returns>
         public bool Contains(T item)
         {
             int index = m_List.IndexOf(item);
             return index != -1;
         }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Removes the first occurrence of a specific object from the NetworkList.
+        /// </summary>
+        /// <remarks>
+        /// This method checks for write permissions before removing the item.
+        /// </remarks>
+        /// <param name="item">The object to remove from the list.</param>
+        /// <returns><see langword="true" /> if the item was successfully removed from the list; otherwise, <see langword="false" />.</returns>
         public bool Remove(T item)
         {
             // check write permissions
-            if (!CanClientWrite(m_NetworkBehaviour.NetworkManager.LocalClientId))
+            if (!CanClientWrite(m_NetworkManager.LocalClientId))
             {
                 LogWritePermissionError();
                 return false;
@@ -439,20 +516,33 @@ public bool Remove(T item)
             return true;
         }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Gets the number of elements contained in the <see cref="NetworkList{T}"/>.
+        /// </summary>
         public int Count => m_List.Length;
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Determines the index of a specific <see cref="item"/> in the <see cref="NetworkList{T}"/>.
+        /// </summary>
+        /// <param name="item">The object to remove from the list.</param>
+        /// <returns>The index of the <see cref="item"/> if found in the list; otherwise, -1.</returns>
         public int IndexOf(T item)
         {
             return m_List.IndexOf(item);
         }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Inserts <see cref="item"/> to the <see cref="NetworkList{T}"/> at the specified <see cref="index"/>.
+        /// </summary>
+        /// <remarks>
+        /// This method checks for write permissions before inserting the item.
+        /// </remarks>
+        /// <param name="index">The index at which the item should be inserted.</param>
+        /// <param name="item">The item to insert.</param>
         public void Insert(int index, T item)
         {
             // check write permissions
-            if (!CanClientWrite(m_NetworkBehaviour.NetworkManager.LocalClientId))
+            if (!CanClientWrite(m_NetworkManager.LocalClientId))
             {
                 LogWritePermissionError();
                 return;
@@ -478,11 +568,17 @@ public void Insert(int index, T item)
             HandleAddListEvent(listEvent);
         }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Removes the <see cref="NetworkList{T}"/> item at the specified <see cref="index"/>.
+        /// </summary>
+        /// <remarks>
+        /// This method checks for write permissions before removing the item.
+        /// </remarks>
+        /// <param name="index">The index of the element to remove.</param>
         public void RemoveAt(int index)
         {
             // check write permissions
-            if (!CanClientWrite(m_NetworkBehaviour.NetworkManager.LocalClientId))
+            if (!CanClientWrite(m_NetworkManager.LocalClientId))
             {
                 LogWritePermissionError();
                 return;
@@ -501,14 +597,21 @@ public void RemoveAt(int index)
             HandleAddListEvent(listEvent);
         }
 
-        /// <inheritdoc />
+        /// <summary>
+        /// Gets or sets the element at the specified index in the <see cref="NetworkList{T}"/>.
+        /// </summary>
+        /// <remarks>
+        /// This method checks for write permissions before setting the value.
+        /// </remarks>
+        /// <param name="index">The zero-based index of the element to get or set.</param>
+        /// <value>The element at the specified index.</value>
         public T this[int index]
         {
             get => m_List[index];
             set
             {
                 // check write permissions
-                if (!CanClientWrite(m_NetworkBehaviour.NetworkManager.LocalClientId))
+                if (!CanClientWrite(m_NetworkManager.LocalClientId))
                 {
                     LogWritePermissionError();
                     return;
@@ -537,7 +640,7 @@ private void HandleAddListEvent(NetworkListEvent<T> listEvent)
         }
 
         /// <summary>
-        /// This is actually unused left-over from a previous interface
+        /// This method should not be used. It is left over from a previous interface
         /// </summary>
         public int LastModifiedTick
         {
@@ -555,8 +658,17 @@ public int LastModifiedTick
         /// </summary>
         public override void Dispose()
         {
-            m_List.Dispose();
-            m_DirtyEvents.Dispose();
+            if (m_List.IsCreated)
+            {
+                m_List.Dispose();
+            }
+
+            if (m_DirtyEvents.IsCreated)
+            {
+                m_DirtyEvents.Dispose();
+            }
+
+            base.Dispose();
         }
     }
 
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariable.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariable.cs
index 938d53401b..21f92957d2 100644
--- a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariable.cs
+++ b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariable.cs
@@ -22,10 +22,23 @@ public class NetworkVariable<T> : NetworkVariableBase
         /// </summary>
         public OnValueChangedDelegate OnValueChanged;
 
+        /// <summary>
+        /// Delegate that determines if the difference between two values exceeds a threshold for network synchronization
+        /// </summary>
+        /// <param name="previousValue">The previous value to compare against</param>
+        /// <param name="newValue">The new value to compare</param>
+        /// <returns>True if the difference exceeds the threshold and should be synchronized, false otherwise</returns>
         public delegate bool CheckExceedsDirtinessThresholdDelegate(in T previousValue, in T newValue);
 
+        /// <summary>
+        /// Delegate instance for checking if value changes exceed the dirtiness threshold
+        /// </summary>
         public CheckExceedsDirtinessThresholdDelegate CheckExceedsDirtinessThreshold;
 
+        /// <summary>
+        /// Determines if the current value has changed enough from its previous value to warrant network synchronization
+        /// </summary>
+        /// <returns>True if the value should be synchronized, false otherwise</returns>
         public override bool ExceedsDirtinessThreshold()
         {
             if (CheckExceedsDirtinessThreshold != null && m_HasPreviousValue)
@@ -36,11 +49,15 @@ public override bool ExceedsDirtinessThreshold()
             return true;
         }
 
+        /// <summary>
+        /// Initializes the NetworkVariable by setting up initial and previous values
+        /// </summary>
         public override void OnInitialize()
         {
             base.OnInitialize();
 
             m_HasPreviousValue = true;
+            NetworkVariableSerialization<T>.Duplicate(m_InternalValue, ref m_InternalOriginalValue);
             NetworkVariableSerialization<T>.Duplicate(m_InternalValue, ref m_PreviousValue);
         }
 
@@ -56,6 +73,7 @@ public NetworkVariable(T value = default,
             : base(readPerm, writePerm)
         {
             m_InternalValue = value;
+            m_InternalOriginalValue = default;
             // Since we start with IsDirty = true, this doesn't need to be duplicated
             // right away. It won't get read until after ResetDirty() is called, and
             // the duplicate will be made there. Avoiding calling
@@ -65,12 +83,32 @@ public NetworkVariable(T value = default,
             m_PreviousValue = default;
         }
 
+        /// <summary>
+        /// Resets the NetworkVariable when the associated NetworkObject is not spawned
+        /// </summary>
+        /// <param name="value">the value to reset the NetworkVariable to (if none specified it resets to the default)</param>
+        public void Reset(T value = default)
+        {
+            if (m_NetworkBehaviour == null || m_NetworkBehaviour != null && !m_NetworkBehaviour.NetworkObject.IsSpawned)
+            {
+                m_InternalValue = value;
+                NetworkVariableSerialization<T>.Duplicate(m_InternalValue, ref m_InternalOriginalValue);
+                m_PreviousValue = default;
+            }
+        }
+
         /// <summary>
         /// The internal value of the NetworkVariable
         /// </summary>
         [SerializeField]
         private protected T m_InternalValue;
 
+        // The introduction of standard .NET collections caused an issue with permissions since there is no way to detect changes in the
+        // collection without doing a full comparison. While this approach does consume more memory per collection instance, it is the
+        // lowest risk approach to resolving the issue where a client with no write permissions could make changes to a collection locally
+        // which can cause a myriad of issues.
+        private protected T m_InternalOriginalValue;
+
         private protected T m_PreviousValue;
 
         private bool m_HasPreviousValue;
@@ -101,6 +139,7 @@ public virtual T Value
                 {
                     T previousValue = m_InternalValue;
                     m_InternalValue = value;
+                    NetworkVariableSerialization<T>.Duplicate(m_InternalValue, ref m_InternalOriginalValue);
                     SetDirty(true);
                     m_IsDisposed = false;
                     OnValueChanged?.Invoke(previousValue, m_InternalValue);
@@ -112,15 +151,27 @@ public virtual T Value
         /// Invoke this method to check if a collection's items are dirty.
         /// The default behavior is to exit early if the <see cref="NetworkVariable{T}"/> is already dirty.
         /// </summary>
-        /// <param name="forceCheck"> when true, this check will force a full item collection check even if the NetworkVariable is already dirty</param>
         /// <remarks>
         /// This is to be used as a way to check if a <see cref="NetworkVariable{T}"/> containing a managed collection has any changees to the collection items.<br />
-        /// If you invoked this when a collection is dirty, it will not trigger the <see cref="OnValueChanged"/> unless you set <param name="forceCheck"/> to true. <br />
+        /// If you invoked this when a collection is dirty, it will not trigger the <see cref="OnValueChanged"/> unless you set forceCheck param to true. <br />
         /// </remarks>
+        /// <param name="forceCheck"> when true, this check will force a full item collection check even if the NetworkVariable is already dirty</param>
+        /// <returns>True if the variable is dirty and needs synchronization, false otherwise</returns>
         public bool CheckDirtyState(bool forceCheck = false)
         {
             var isDirty = base.IsDirty();
 
+            // A client without permissions invoking this method should only check to assure the current value is equal to the last known current value
+            if (m_NetworkManager && !CanClientWrite(m_NetworkManager.LocalClientId))
+            {
+                // If modifications are detected, then revert back to the last known current value
+                if (!NetworkVariableSerialization<T>.AreEqual(ref m_InternalValue, ref m_InternalOriginalValue))
+                {
+                    NetworkVariableSerialization<T>.Duplicate(m_InternalOriginalValue, ref m_InternalValue);
+                }
+                return false;
+            }
+
             // Compare the previous with the current if not dirty or forcing a check.
             if ((!isDirty || forceCheck) && !NetworkVariableSerialization<T>.AreEqual(ref m_PreviousValue, ref m_InternalValue))
             {
@@ -132,11 +183,19 @@ public bool CheckDirtyState(bool forceCheck = false)
             return isDirty;
         }
 
+        /// <inheritdoc/>
+        internal override void OnCheckIsDirtyState()
+        {
+            CheckDirtyState();
+            base.OnCheckIsDirtyState();
+        }
+
         internal ref T RefValue()
         {
             return ref m_InternalValue;
         }
 
+        /// <inheritdoc/>
         public override void Dispose()
         {
             if (m_IsDisposed)
@@ -145,21 +204,34 @@ public override void Dispose()
             }
 
             m_IsDisposed = true;
+            // Dispose the internal value
             if (m_InternalValue is IDisposable internalValueDisposable)
             {
                 internalValueDisposable.Dispose();
             }
-
             m_InternalValue = default;
+
+            // Dispose the internal original value
+            if (m_InternalOriginalValue is IDisposable internalOriginalValueDisposable)
+            {
+                internalOriginalValueDisposable.Dispose();
+            }
+            m_InternalOriginalValue = default;
+
+            // Dispose the previous value if there is one
             if (m_HasPreviousValue && m_PreviousValue is IDisposable previousValueDisposable)
             {
                 m_HasPreviousValue = false;
                 previousValueDisposable.Dispose();
             }
-
             m_PreviousValue = default;
+
+            base.Dispose();
         }
 
+        /// <summary>
+        /// Finalizer that ensures proper cleanup of resources
+        /// </summary>
         ~NetworkVariable()
         {
             Dispose();
@@ -171,6 +243,13 @@ public override void Dispose()
         /// <returns>Whether or not the container is dirty</returns>
         public override bool IsDirty()
         {
+            // If the client does not have write permissions but the internal value is determined to be locally modified and we are applying updates, then we should revert
+            // to the original collection value prior to applying updates (primarily for collections).
+            if (!NetworkUpdaterCheck && m_NetworkManager && !CanClientWrite(m_NetworkManager.LocalClientId) && !NetworkVariableSerialization<T>.AreEqual(ref m_InternalValue, ref m_InternalOriginalValue))
+            {
+                NetworkVariableSerialization<T>.Duplicate(m_InternalOriginalValue, ref m_InternalValue);
+                return true;
+            }
             // For most cases we can use the dirty flag.
             // This doesn't work for cases where we're wrapping more complex types
             // like INetworkSerializable, NativeList, NativeArray, etc.
@@ -182,11 +261,11 @@ public override bool IsDirty()
                 return true;
             }
 
+            var dirty = !NetworkVariableSerialization<T>.AreEqual(ref m_PreviousValue, ref m_InternalValue);
             // Cache the dirty value so we don't perform this again if we already know we're dirty
             // Unfortunately we can't cache the NOT dirty state, because that might change
             // in between to checks... but the DIRTY state won't change until ResetDirty()
             // is called.
-            var dirty = !NetworkVariableSerialization<T>.AreEqual(ref m_PreviousValue, ref m_InternalValue);
             SetDirty(dirty);
             return dirty;
         }
@@ -204,22 +283,12 @@ public override void ResetDirty()
             {
                 m_HasPreviousValue = true;
                 NetworkVariableSerialization<T>.Duplicate(m_InternalValue, ref m_PreviousValue);
+                // Once updated, assure the original current value is updated for future comparison purposes
+                NetworkVariableSerialization<T>.Duplicate(m_InternalValue, ref m_InternalOriginalValue);
             }
             base.ResetDirty();
         }
 
-        /// <summary>
-        /// Sets the <see cref="Value"/>, marks the <see cref="NetworkVariable{T}"/> dirty, and invokes the <see cref="OnValueChanged"/> callback
-        /// if there are subscribers to that event.
-        /// </summary>
-        /// <param name="value">the new value of type `T` to be set/></param>
-        private protected void Set(T value)
-        {
-            SetDirty(true);
-            m_InternalValue = value;
-            OnValueChanged?.Invoke(m_PreviousValue, m_InternalValue);
-        }
-
         /// <summary>
         /// Writes the variable to the writer
         /// </summary>
@@ -236,16 +305,20 @@ public override void WriteDelta(FastBufferWriter writer)
         /// <param name="keepDirtyDelta">Whether or not the container should keep the dirty delta, or mark the delta as consumed</param>
         public override void ReadDelta(FastBufferReader reader, bool keepDirtyDelta)
         {
-            // In order to get managed collections to properly have a previous and current value, we have to
-            // duplicate the collection at this point before making any modifications to the current.
-            m_HasPreviousValue = true;
-            NetworkVariableSerialization<T>.Duplicate(m_InternalValue, ref m_PreviousValue);
+            // If the client does not have write permissions but the internal value is determined to be locally modified and we are applying updates, then we should revert
+            // to the original collection value prior to applying updates (primarily for collections).
+            if (m_NetworkManager && !CanClientWrite(m_NetworkManager.LocalClientId) && !NetworkVariableSerialization<T>.AreEqual(ref m_InternalOriginalValue, ref m_InternalValue))
+            {
+                NetworkVariableSerialization<T>.Duplicate(m_InternalOriginalValue, ref m_InternalValue);
+            }
+
             NetworkVariableSerialization<T>.ReadDelta(reader, ref m_InternalValue);
 
-            // todo:
             // keepDirtyDelta marks a variable received as dirty and causes the server to send the value to clients
             // In a prefect world, whether a variable was A) modified locally or B) received and needs retransmit
             // would be stored in different fields
+            // LEGACY NOTE: This is only to handle NetworkVariableDeltaMessage Version 0 connections. The updated
+            // NetworkVariableDeltaMessage no longer uses this approach.
             if (keepDirtyDelta)
             {
                 SetDirty(true);
@@ -254,10 +327,43 @@ public override void ReadDelta(FastBufferReader reader, bool keepDirtyDelta)
             OnValueChanged?.Invoke(m_PreviousValue, m_InternalValue);
         }
 
+        /// <summary>
+        /// This should be always invoked (client & server) to assure the previous values are set
+        /// !! IMPORTANT !!
+        /// When a server forwards delta updates to connected clients, it needs to preserve the previous dirty value(s)
+        /// until it is done serializing all valid NetworkVariable field deltas (relative to each client). This is invoked
+        /// after it is done forwarding the deltas at the end of the <see cref="NetworkVariableDeltaMessage.Handle(ref NetworkContext)"/> method.
+        /// </summary>
+        internal override void PostDeltaRead()
+        {
+            // In order to get managed collections to properly have a previous and current value, we have to
+            // duplicate the collection at this point before making any modifications to the current.
+            m_HasPreviousValue = true;
+            NetworkVariableSerialization<T>.Duplicate(m_InternalValue, ref m_PreviousValue);
+            // Once updated, assure the original current value is updated for future comparison purposes
+            NetworkVariableSerialization<T>.Duplicate(m_InternalValue, ref m_InternalOriginalValue);
+        }
+
         /// <inheritdoc />
         public override void ReadField(FastBufferReader reader)
         {
+            // If the client does not have write permissions but the internal value is determined to be locally modified and we are applying updates, then we should revert
+            // to the original collection value prior to applying updates (primarily for collections).
+            if (m_NetworkManager && !CanClientWrite(m_NetworkManager.LocalClientId) && !NetworkVariableSerialization<T>.AreEqual(ref m_InternalOriginalValue, ref m_InternalValue))
+            {
+                NetworkVariableSerialization<T>.Duplicate(m_InternalOriginalValue, ref m_InternalValue);
+            }
+
             NetworkVariableSerialization<T>.Read(reader, ref m_InternalValue);
+            // In order to get managed collections to properly have a previous and current value, we have to
+            // duplicate the collection at this point before making any modifications to the current.
+            // We duplicate the final value after the read (for ReadField ONLY) so the previous value is at par
+            // with the current value (since this is only invoked when initially synchronizing).
+            m_HasPreviousValue = true;
+            NetworkVariableSerialization<T>.Duplicate(m_InternalValue, ref m_PreviousValue);
+
+            // Once updated, assure the original current value is updated for future comparison purposes
+            NetworkVariableSerialization<T>.Duplicate(m_InternalValue, ref m_InternalOriginalValue);
         }
 
         /// <inheritdoc />
@@ -265,5 +371,20 @@ public override void WriteField(FastBufferWriter writer)
         {
             NetworkVariableSerialization<T>.Write(writer, ref m_InternalValue);
         }
+
+        internal override void WriteFieldSynchronization(FastBufferWriter writer)
+        {
+            // If we have a pending update, then synchronize the client with the previously known
+            // value since the updated version will be sent on the next tick or next time it is
+            // set to be updated
+            if (base.IsDirty() && m_HasPreviousValue)
+            {
+                NetworkVariableSerialization<T>.Write(writer, ref m_PreviousValue);
+            }
+            else
+            {
+                base.WriteFieldSynchronization(writer);
+            }
+        }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariableBase.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariableBase.cs
index 8c7db22a24..6b97ce90e3 100644
--- a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariableBase.cs
+++ b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariableBase.cs
@@ -3,11 +3,20 @@
 
 namespace Unity.Netcode
 {
+    /// <summary>
+    /// Defines update timing constraints for NetworkVariables
+    /// </summary>
     public struct NetworkVariableUpdateTraits
     {
+        /// <summary>
+        /// The minimum amount of time that must pass between sending updates. If this amount of time has not passed since the last update, dirtiness will be ignored.
+        /// </summary>
         [Tooltip("The minimum amount of time that must pass between sending updates. If this amount of time has not passed since the last update, dirtiness will be ignored.")]
         public float MinSecondsBetweenUpdates;
 
+        /// <summary>
+        /// The maximum amount of time that a variable can be dirty without sending an update. If this amount of time has passed since the last update, an update will be sent even if the dirtiness threshold has not been met.
+        /// </summary>
         [Tooltip("The maximum amount of time that a variable can be dirty without sending an update. If this amount of time has passed since the last update, an update will be sent even if the dirtiness threshold has not been met.")]
         public float MaxSecondsBetweenUpdates;
     }
@@ -32,12 +41,14 @@ public abstract class NetworkVariableBase : IDisposable
         /// Maintains a link to the associated NetworkBehaviour
         /// </summary>
         private protected NetworkBehaviour m_NetworkBehaviour;
+
         private NetworkManager m_InternalNetworkManager;
 
-        public NetworkBehaviour GetBehaviour()
-        {
-            return m_NetworkBehaviour;
-        }
+        // Determines if this NetworkVariable has been "initialized" to prevent initializing more than once which can happen when first
+        // instantiated and spawned. If this NetworkVariable instance is on an in-scene placed NetworkObject =or= a pooled NetworkObject
+        // that can persist between sessions and/or be recycled we need to reset the LastUpdateSent value prior to spawning otherwise
+        // this NetworkVariableBase property instance will not update until the last session time used.
+        internal bool HasBeenInitialized { get; private set; }
 
         internal string GetWritePermissionError()
         {
@@ -49,16 +60,15 @@ internal void LogWritePermissionError()
             Debug.LogError(GetWritePermissionError());
         }
 
-        private protected NetworkManager m_NetworkManager
+        private protected NetworkManager m_NetworkManager => m_InternalNetworkManager;
+
+        /// <summary>
+        /// Gets the NetworkBehaviour instance associated with this network variable
+        /// </summary>
+        /// <returns>The NetworkBehaviour that owns this network variable</returns>
+        public NetworkBehaviour GetBehaviour()
         {
-            get
-            {
-                if (m_InternalNetworkManager == null && m_NetworkBehaviour && m_NetworkBehaviour.NetworkObject?.NetworkManager)
-                {
-                    m_InternalNetworkManager = m_NetworkBehaviour.NetworkObject?.NetworkManager;
-                }
-                return m_InternalNetworkManager;
-            }
+            return m_NetworkBehaviour;
         }
 
         /// <summary>
@@ -67,19 +77,77 @@ private protected NetworkManager m_NetworkManager
         /// <param name="networkBehaviour">The NetworkBehaviour the NetworkVariable belongs to</param>
         public void Initialize(NetworkBehaviour networkBehaviour)
         {
-            m_InternalNetworkManager = null;
+            // If we have already been initialized, then exit early.
+            // This can happen on the very first instantiation and spawning of the associated NetworkObject
+            if (HasBeenInitialized)
+            {
+                return;
+            }
+
+            // Throw an exception if there is an invalid NetworkBehaviour parameter
+            if (!networkBehaviour)
+            {
+                throw new Exception($"[{GetType().Name}][Initialize] {nameof(NetworkBehaviour)} parameter passed in is null!");
+            }
             m_NetworkBehaviour = networkBehaviour;
-            if (m_NetworkBehaviour && m_NetworkBehaviour.NetworkObject?.NetworkManager)
+
+            // Throw an exception if there is no NetworkManager available
+            if (!m_NetworkBehaviour.NetworkManager)
             {
-                m_InternalNetworkManager = m_NetworkBehaviour.NetworkObject?.NetworkManager;
+                // Exit early if there has yet to be a NetworkManager assigned.
+                // This is ok because Initialize is invoked multiple times until
+                // it is considered "initialized".
+                return;
+            }
 
-                if (m_NetworkBehaviour.NetworkManager.NetworkTimeSystem != null)
-                {
-                    UpdateLastSentTime();
-                }
+            if (!m_NetworkBehaviour.NetworkObject)
+            {
+                // Exit early if there has yet to be a NetworkObject assigned.
+                // This is ok because Initialize is invoked multiple times until
+                // it is considered "initialized".
+                return;
+            }
+
+            if (!m_NetworkBehaviour.NetworkObject.NetworkManagerOwner)
+            {
+                // Exit early if there has yet to be a NetworkManagerOwner assigned
+                // to the NetworkObject. This is ok because Initialize is invoked
+                // multiple times until it is considered "initialized".
+                return;
             }
+            m_InternalNetworkManager = m_NetworkBehaviour.NetworkObject.NetworkManagerOwner;
+
+            // When in distributed authority mode, there is no such thing as server write permissions
+            InternalWritePerm = m_InternalNetworkManager.DistributedAuthorityMode ? NetworkVariableWritePermission.Owner : InternalWritePerm;
 
             OnInitialize();
+
+            // Some unit tests don't operate with a running NetworkManager.
+            // Only update the last time if there is a NetworkTimeSystem.
+            if (m_InternalNetworkManager.NetworkTimeSystem != null)
+            {
+                // Update our last sent time relative to when this was initialized
+                UpdateLastSentTime();
+
+                // At this point, this instance is considered initialized
+                HasBeenInitialized = true;
+            }
+            else if (m_InternalNetworkManager.LogLevel == LogLevel.Developer)
+            {
+                Debug.LogWarning($"[{m_NetworkBehaviour.name}][{m_NetworkBehaviour.GetType().Name}][{GetType().Name}][Initialize] {nameof(NetworkManager)} has no {nameof(NetworkTimeSystem)} assigned!");
+            }
+        }
+
+        /// <summary>
+        /// Deinitialize is invoked when a NetworkObject is despawned.
+        /// This allows for a recyled NetworkObject (in-scene or pooled)
+        /// to be properly initialized upon the next use/spawn.
+        /// </summary>
+        internal void Deinitialize()
+        {
+            // When despawned, reset the HasBeenInitialized so if the associated NetworkObject instance
+            // is recylced (i.e. in-scene placed or pooled) it will re-initialize the LastUpdateSent time.
+            HasBeenInitialized = false;
         }
 
         /// <summary>
@@ -93,7 +161,7 @@ public virtual void OnInitialize()
         /// <summary>
         /// Sets the update traits for this network variable to determine how frequently it will send updates.
         /// </summary>
-        /// <param name="traits"></param>
+        /// <param name="traits">The new update traits to apply to this network variable</param>
         public void SetUpdateTraits(NetworkVariableUpdateTraits traits)
         {
             UpdateTraits = traits;
@@ -104,7 +172,7 @@ public void SetUpdateTraits(NetworkVariableUpdateTraits traits)
         /// If not, no update will be sent even if the variable is dirty, unless the time since last update exceeds
         /// the <see cref="UpdateTraits"/>' <see cref="NetworkVariableUpdateTraits.MaxSecondsBetweenUpdates"/>.
         /// </summary>
-        /// <returns></returns>
+        /// <returns>True if the variable exceeds the dirtiness threshold or the time since the last update exceeds MaxSecondsBetweenUpdates. otherwise, false</returns>
         public virtual bool ExceedsDirtinessThreshold()
         {
             return true;
@@ -131,7 +199,7 @@ protected NetworkVariableBase(
             NetworkVariableWritePermission writePerm = DefaultWritePerm)
         {
             ReadPerm = readPerm;
-            WritePerm = writePerm;
+            InternalWritePerm = writePerm;
         }
 
         /// <summary>
@@ -154,7 +222,17 @@ protected NetworkVariableBase(
         /// <summary>
         /// The write permission for this var
         /// </summary>
-        public readonly NetworkVariableWritePermission WritePerm;
+        public NetworkVariableWritePermission WritePerm
+        {
+            get
+            {
+                return InternalWritePerm;
+            }
+        }
+
+        // We had to change the Write Permission in distributed authority.
+        // (It is too bad we initially declared it as readonly)
+        internal NetworkVariableWritePermission InternalWritePerm;
 
         /// <summary>
         /// Sets whether or not the variable needs to be delta synced
@@ -172,7 +250,9 @@ public virtual void SetDirty(bool isDirty)
 
         internal bool CanSend()
         {
-            var timeSinceLastUpdate = m_NetworkBehaviour.NetworkManager.NetworkTimeSystem.LocalTime - LastUpdateSent;
+            // When connected to a service or not the server, always use the synchronized server time as opposed to the local time
+            var time = m_InternalNetworkManager.CMBServiceConnection || !m_InternalNetworkManager.IsServer ? m_NetworkBehaviour.NetworkManager.ServerTime.Time : m_NetworkBehaviour.NetworkManager.NetworkTimeSystem.LocalTime;
+            var timeSinceLastUpdate = time - LastUpdateSent;
             return
                 (
                     UpdateTraits.MaxSecondsBetweenUpdates > 0 &&
@@ -186,15 +266,24 @@ internal bool CanSend()
 
         internal void UpdateLastSentTime()
         {
-            LastUpdateSent = m_NetworkBehaviour.NetworkManager.NetworkTimeSystem.LocalTime;
+            // When connected to a service or not the server, always use the synchronized server time as opposed to the local time
+            LastUpdateSent = m_InternalNetworkManager.CMBServiceConnection || !m_InternalNetworkManager.IsServer ? m_NetworkBehaviour.NetworkManager.ServerTime.Time : m_NetworkBehaviour.NetworkManager.NetworkTimeSystem.LocalTime;
         }
 
+        internal static bool IgnoreInitializeWarning;
+
+        /// <summary>
+        /// Marks the associated NetworkBehaviour as dirty, indicating it needs synchronization
+        /// </summary>
         protected void MarkNetworkBehaviourDirty()
         {
             if (m_NetworkBehaviour == null)
             {
-                Debug.LogWarning($"NetworkVariable is written to, but doesn't know its NetworkBehaviour yet. " +
-                                 "Are you modifying a NetworkVariable before the NetworkObject is spawned?");
+                if (!IgnoreInitializeWarning)
+                {
+                    Debug.LogWarning($"NetworkVariable is written to, but doesn't know its NetworkBehaviour yet. " +
+                                     "Are you modifying a NetworkVariable before the NetworkObject is spawned?");
+                }
                 return;
             }
             if (m_NetworkBehaviour.NetworkManager.ShutdownInProgress)
@@ -216,7 +305,8 @@ protected void MarkNetworkBehaviourDirty()
                 }
                 return;
             }
-            m_NetworkBehaviour.NetworkManager.BehaviourUpdater.AddForUpdate(m_NetworkBehaviour.NetworkObject);
+
+            m_NetworkBehaviour.NetworkManager.BehaviourUpdater?.AddForUpdate(m_NetworkBehaviour.NetworkObject);
         }
 
         /// <summary>
@@ -227,6 +317,12 @@ public virtual void ResetDirty()
             m_IsDirty = false;
         }
 
+        /// <summary>
+        /// Only used during the NetworkBehaviourUpdater pass and only used for NetworkVariable.
+        /// This is to bypass duplication of the "original internal value" for collections.
+        /// </summary>
+        internal bool NetworkUpdaterCheck;
+
         /// <summary>
         /// Gets Whether or not the container is dirty
         /// </summary>
@@ -248,6 +344,11 @@ public bool CanClientRead(ulong clientId)
                 return false;
             }
 
+            // When in distributed authority mode, everyone can read (but only the owner can write)
+            if (m_NetworkManager != null && m_NetworkManager.DistributedAuthorityMode)
+            {
+                return true;
+            }
             switch (ReadPerm)
             {
                 default:
@@ -288,6 +389,15 @@ internal ulong OwnerClientId()
             return m_NetworkBehaviour.NetworkObject.OwnerClientId;
         }
 
+        /// <summary>
+        /// Primarily to check for collections dirty states when doing
+        /// a fully owner read/write NetworkVariable update.
+        /// </summary>
+        internal virtual void OnCheckIsDirtyState()
+        {
+
+        }
+
         /// <summary>
         /// Writes the dirty changes, that is, the changes since the variable was last dirty, to the writer
         /// </summary>
@@ -305,7 +415,6 @@ internal ulong OwnerClientId()
         /// </summary>
         /// <param name="reader">The stream to read the state from</param>
         public abstract void ReadField(FastBufferReader reader);
-
         /// <summary>
         /// Reads delta from the reader and applies them to the internal value
         /// </summary>
@@ -313,11 +422,38 @@ internal ulong OwnerClientId()
         /// <param name="keepDirtyDelta">Whether or not the delta should be kept as dirty or consumed</param>
         public abstract void ReadDelta(FastBufferReader reader, bool keepDirtyDelta);
 
+        /// <summary>
+        /// This should be always invoked (client & server) to assure the previous values are set
+        /// !! IMPORTANT !!
+        /// When a server forwards delta updates to connected clients, it needs to preserve the previous dirty value(s)
+        /// until it is done serializing all valid NetworkVariable field deltas (relative to each client). This is invoked
+        /// after it is done forwarding the deltas at the end of the <see cref="NetworkVariableDeltaMessage.Handle(ref NetworkContext)"/> method.
+        /// </summary>
+        internal virtual void PostDeltaRead()
+        {
+        }
+
+        /// <summary>
+        /// There are scenarios, specifically with collections, where a client could be synchronizing and
+        /// some NetworkVariables have pending updates. To avoid duplicating entries, this is invoked only
+        /// when sending the full synchronization information.
+        /// </summary>
+        /// <remarks>
+        /// Derrived classes should send the previous value for synchronization so when the updated value
+        /// is sent (after synchronizing the client) it will apply the updates.
+        /// </remarks>
+        /// <param name="writer"></param>
+        internal virtual void WriteFieldSynchronization(FastBufferWriter writer)
+        {
+            WriteField(writer);
+        }
+
         /// <summary>
         /// Virtual <see cref="IDisposable"/> implementation
         /// </summary>
         public virtual void Dispose()
         {
+            m_InternalNetworkManager = null;
         }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariableSerialization.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariableSerialization.cs
deleted file mode 100644
index 2d77e568ad..0000000000
--- a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariableSerialization.cs
+++ /dev/null
@@ -1,2050 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Unity.Collections;
-using Unity.Collections.LowLevel.Unsafe;
-using Unity.Mathematics;
-using UnityEditor;
-using UnityEngine;
-
-namespace Unity.Netcode
-{
-    /// <summary>
-    /// Interface used by NetworkVariables to serialize them
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    internal interface INetworkVariableSerializer<T>
-    {
-        // Write has to be taken by ref here because of INetworkSerializable
-        // Open Instance Delegates (pointers to methods without an instance attached to them)
-        // require the first parameter passed to them (the instance) to be passed by ref.
-        // So foo.Bar() becomes BarDelegate(ref foo);
-        // Taking T as an in parameter like we do in other places would require making a copy
-        // of it to pass it as a ref parameter.
-        public void Write(FastBufferWriter writer, ref T value);
-        public void Read(FastBufferReader reader, ref T value);
-        public void WriteDelta(FastBufferWriter writer, ref T value, ref T previousValue);
-        public void ReadDelta(FastBufferReader reader, ref T value);
-        internal void ReadWithAllocator(FastBufferReader reader, out T value, Allocator allocator);
-        public void Duplicate(in T value, ref T duplicatedValue);
-    }
-
-    /// <summary>
-    /// Packing serializer for shorts
-    /// </summary>
-    internal class ShortSerializer : INetworkVariableSerializer<short>
-    {
-        public void Write(FastBufferWriter writer, ref short value)
-        {
-            BytePacker.WriteValueBitPacked(writer, value);
-        }
-        public void Read(FastBufferReader reader, ref short value)
-        {
-            ByteUnpacker.ReadValueBitPacked(reader, out value);
-        }
-
-        public void WriteDelta(FastBufferWriter writer, ref short value, ref short previousValue)
-        {
-            Write(writer, ref value);
-        }
-        public void ReadDelta(FastBufferReader reader, ref short value)
-        {
-            Read(reader, ref value);
-        }
-
-        void INetworkVariableSerializer<short>.ReadWithAllocator(FastBufferReader reader, out short value, Allocator allocator)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Duplicate(in short value, ref short duplicatedValue)
-        {
-            duplicatedValue = value;
-        }
-    }
-
-    /// <summary>
-    /// Packing serializer for shorts
-    /// </summary>
-    internal class UshortSerializer : INetworkVariableSerializer<ushort>
-    {
-        public void Write(FastBufferWriter writer, ref ushort value)
-        {
-            BytePacker.WriteValueBitPacked(writer, value);
-        }
-        public void Read(FastBufferReader reader, ref ushort value)
-        {
-            ByteUnpacker.ReadValueBitPacked(reader, out value);
-        }
-
-        public void WriteDelta(FastBufferWriter writer, ref ushort value, ref ushort previousValue)
-        {
-            Write(writer, ref value);
-        }
-        public void ReadDelta(FastBufferReader reader, ref ushort value)
-        {
-            Read(reader, ref value);
-        }
-
-        void INetworkVariableSerializer<ushort>.ReadWithAllocator(FastBufferReader reader, out ushort value, Allocator allocator)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Duplicate(in ushort value, ref ushort duplicatedValue)
-        {
-            duplicatedValue = value;
-        }
-    }
-
-    /// <summary>
-    /// Packing serializer for ints
-    /// </summary>
-    internal class IntSerializer : INetworkVariableSerializer<int>
-    {
-        public void Write(FastBufferWriter writer, ref int value)
-        {
-            BytePacker.WriteValueBitPacked(writer, value);
-        }
-        public void Read(FastBufferReader reader, ref int value)
-        {
-            ByteUnpacker.ReadValueBitPacked(reader, out value);
-        }
-
-        public void WriteDelta(FastBufferWriter writer, ref int value, ref int previousValue)
-        {
-            Write(writer, ref value);
-        }
-        public void ReadDelta(FastBufferReader reader, ref int value)
-        {
-            Read(reader, ref value);
-        }
-
-        void INetworkVariableSerializer<int>.ReadWithAllocator(FastBufferReader reader, out int value, Allocator allocator)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Duplicate(in int value, ref int duplicatedValue)
-        {
-            duplicatedValue = value;
-        }
-    }
-
-    /// <summary>
-    /// Packing serializer for ints
-    /// </summary>
-    internal class UintSerializer : INetworkVariableSerializer<uint>
-    {
-        public void Write(FastBufferWriter writer, ref uint value)
-        {
-            BytePacker.WriteValueBitPacked(writer, value);
-        }
-        public void Read(FastBufferReader reader, ref uint value)
-        {
-            ByteUnpacker.ReadValueBitPacked(reader, out value);
-        }
-
-        public void WriteDelta(FastBufferWriter writer, ref uint value, ref uint previousValue)
-        {
-            Write(writer, ref value);
-        }
-        public void ReadDelta(FastBufferReader reader, ref uint value)
-        {
-            Read(reader, ref value);
-        }
-
-        void INetworkVariableSerializer<uint>.ReadWithAllocator(FastBufferReader reader, out uint value, Allocator allocator)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Duplicate(in uint value, ref uint duplicatedValue)
-        {
-            duplicatedValue = value;
-        }
-    }
-
-    /// <summary>
-    /// Packing serializer for longs
-    /// </summary>
-    internal class LongSerializer : INetworkVariableSerializer<long>
-    {
-        public void Write(FastBufferWriter writer, ref long value)
-        {
-            BytePacker.WriteValueBitPacked(writer, value);
-        }
-        public void Read(FastBufferReader reader, ref long value)
-        {
-            ByteUnpacker.ReadValueBitPacked(reader, out value);
-        }
-
-        public void WriteDelta(FastBufferWriter writer, ref long value, ref long previousValue)
-        {
-            Write(writer, ref value);
-        }
-        public void ReadDelta(FastBufferReader reader, ref long value)
-        {
-            Read(reader, ref value);
-        }
-
-        void INetworkVariableSerializer<long>.ReadWithAllocator(FastBufferReader reader, out long value, Allocator allocator)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Duplicate(in long value, ref long duplicatedValue)
-        {
-            duplicatedValue = value;
-        }
-    }
-
-    /// <summary>
-    /// Packing serializer for longs
-    /// </summary>
-    internal class UlongSerializer : INetworkVariableSerializer<ulong>
-    {
-        public void Write(FastBufferWriter writer, ref ulong value)
-        {
-            BytePacker.WriteValueBitPacked(writer, value);
-        }
-        public void Read(FastBufferReader reader, ref ulong value)
-        {
-            ByteUnpacker.ReadValueBitPacked(reader, out value);
-        }
-
-        public void WriteDelta(FastBufferWriter writer, ref ulong value, ref ulong previousValue)
-        {
-            Write(writer, ref value);
-        }
-        public void ReadDelta(FastBufferReader reader, ref ulong value)
-        {
-            Read(reader, ref value);
-        }
-
-        void INetworkVariableSerializer<ulong>.ReadWithAllocator(FastBufferReader reader, out ulong value, Allocator allocator)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Duplicate(in ulong value, ref ulong duplicatedValue)
-        {
-            duplicatedValue = value;
-        }
-    }
-
-    /// <summary>
-    /// Basic serializer for unmanaged types.
-    /// This covers primitives, built-in unity types, and IForceSerializeByMemcpy
-    /// Since all of those ultimately end up calling WriteUnmanagedSafe, this simplifies things
-    /// by calling that directly - thus preventing us from having to have a specific T that meets
-    /// the specific constraints that the various generic WriteValue calls require.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    internal class UnmanagedTypeSerializer<T> : INetworkVariableSerializer<T> where T : unmanaged
-    {
-        public void Write(FastBufferWriter writer, ref T value)
-        {
-            writer.WriteUnmanagedSafe(value);
-        }
-        public void Read(FastBufferReader reader, ref T value)
-        {
-            reader.ReadUnmanagedSafe(out value);
-        }
-
-        public void WriteDelta(FastBufferWriter writer, ref T value, ref T previousValue)
-        {
-            Write(writer, ref value);
-        }
-        public void ReadDelta(FastBufferReader reader, ref T value)
-        {
-            Read(reader, ref value);
-        }
-
-        void INetworkVariableSerializer<T>.ReadWithAllocator(FastBufferReader reader, out T value, Allocator allocator)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Duplicate(in T value, ref T duplicatedValue)
-        {
-            duplicatedValue = value;
-        }
-    }
-
-    internal class ListSerializer<T> : INetworkVariableSerializer<List<T>>
-    {
-        public void Write(FastBufferWriter writer, ref List<T> value)
-        {
-            bool isNull = value == null;
-            writer.WriteValueSafe(isNull);
-            if (!isNull)
-            {
-                BytePacker.WriteValuePacked(writer, value.Count);
-                foreach (var item in value)
-                {
-                    var reffable = item;
-                    NetworkVariableSerialization<T>.Write(writer, ref reffable);
-                }
-            }
-        }
-        public void Read(FastBufferReader reader, ref List<T> value)
-        {
-            reader.ReadValueSafe(out bool isNull);
-            if (isNull)
-            {
-                value = null;
-            }
-            else
-            {
-                if (value == null)
-                {
-                    value = new List<T>();
-                }
-
-                ByteUnpacker.ReadValuePacked(reader, out int len);
-                if (len < value.Count)
-                {
-                    value.RemoveRange(len, value.Count - len);
-                }
-                for (var i = 0; i < len; ++i)
-                {
-                    // Read in place where possible
-                    if (i < value.Count)
-                    {
-                        T item = value[i];
-                        NetworkVariableSerialization<T>.Read(reader, ref item);
-                        value[i] = item;
-                    }
-                    else
-                    {
-                        T item = default;
-                        NetworkVariableSerialization<T>.Read(reader, ref item);
-                        value.Add(item);
-                    }
-                }
-            }
-        }
-
-        public void WriteDelta(FastBufferWriter writer, ref List<T> value, ref List<T> previousValue)
-        {
-            CollectionSerializationUtility.WriteListDelta(writer, ref value, ref previousValue);
-        }
-        public void ReadDelta(FastBufferReader reader, ref List<T> value)
-        {
-            CollectionSerializationUtility.ReadListDelta(reader, ref value);
-        }
-
-        void INetworkVariableSerializer<List<T>>.ReadWithAllocator(FastBufferReader reader, out List<T> value, Allocator allocator)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Duplicate(in List<T> value, ref List<T> duplicatedValue)
-        {
-            if (duplicatedValue == null)
-            {
-                duplicatedValue = new List<T>();
-            }
-
-            duplicatedValue.Clear();
-            foreach (var item in value)
-            {
-                // This handles the nested list scenario List<List<T>>
-                T subValue = default;
-                NetworkVariableSerialization<T>.Duplicate(item, ref subValue);
-                duplicatedValue.Add(subValue);
-            }
-        }
-    }
-
-    internal class HashSetSerializer<T> : INetworkVariableSerializer<HashSet<T>> where T : IEquatable<T>
-    {
-        public void Write(FastBufferWriter writer, ref HashSet<T> value)
-        {
-            bool isNull = value == null;
-            writer.WriteValueSafe(isNull);
-            if (!isNull)
-            {
-                writer.WriteValueSafe(value.Count);
-                foreach (var item in value)
-                {
-                    var reffable = item;
-                    NetworkVariableSerialization<T>.Write(writer, ref reffable);
-                }
-            }
-        }
-        public void Read(FastBufferReader reader, ref HashSet<T> value)
-        {
-            reader.ReadValueSafe(out bool isNull);
-            if (isNull)
-            {
-                value = null;
-            }
-            else
-            {
-                if (value == null)
-                {
-                    value = new HashSet<T>();
-                }
-                else
-                {
-                    value.Clear();
-                }
-                reader.ReadValueSafe(out int len);
-                for (var i = 0; i < len; ++i)
-                {
-                    T item = default;
-                    NetworkVariableSerialization<T>.Read(reader, ref item);
-                    value.Add(item);
-                }
-            }
-        }
-
-        public void WriteDelta(FastBufferWriter writer, ref HashSet<T> value, ref HashSet<T> previousValue)
-        {
-            CollectionSerializationUtility.WriteHashSetDelta(writer, ref value, ref previousValue);
-        }
-        public void ReadDelta(FastBufferReader reader, ref HashSet<T> value)
-        {
-            CollectionSerializationUtility.ReadHashSetDelta(reader, ref value);
-        }
-
-        void INetworkVariableSerializer<HashSet<T>>.ReadWithAllocator(FastBufferReader reader, out HashSet<T> value, Allocator allocator)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Duplicate(in HashSet<T> value, ref HashSet<T> duplicatedValue)
-        {
-            if (duplicatedValue == null)
-            {
-                duplicatedValue = new HashSet<T>();
-            }
-
-            duplicatedValue.Clear();
-            foreach (var item in value)
-            {
-                // Handles nested HashSets
-                T subValue = default;
-                NetworkVariableSerialization<T>.Duplicate(item, ref subValue);
-                duplicatedValue.Add(item);
-            }
-        }
-    }
-
-
-    internal class DictionarySerializer<TKey, TVal> : INetworkVariableSerializer<Dictionary<TKey, TVal>>
-        where TKey : IEquatable<TKey>
-    {
-        public void Write(FastBufferWriter writer, ref Dictionary<TKey, TVal> value)
-        {
-            bool isNull = value == null;
-            writer.WriteValueSafe(isNull);
-            if (!isNull)
-            {
-                writer.WriteValueSafe(value.Count);
-                foreach (var item in value)
-                {
-                    (var key, var val) = (item.Key, item.Value);
-                    NetworkVariableSerialization<TKey>.Write(writer, ref key);
-                    NetworkVariableSerialization<TVal>.Write(writer, ref val);
-                }
-            }
-        }
-        public void Read(FastBufferReader reader, ref Dictionary<TKey, TVal> value)
-        {
-            reader.ReadValueSafe(out bool isNull);
-            if (isNull)
-            {
-                value = null;
-            }
-            else
-            {
-                if (value == null)
-                {
-                    value = new Dictionary<TKey, TVal>();
-                }
-                else
-                {
-                    value.Clear();
-                }
-                reader.ReadValueSafe(out int len);
-                for (var i = 0; i < len; ++i)
-                {
-                    (TKey key, TVal val) = (default, default);
-                    NetworkVariableSerialization<TKey>.Read(reader, ref key);
-                    NetworkVariableSerialization<TVal>.Read(reader, ref val);
-                    value.Add(key, val);
-                }
-            }
-        }
-
-        public void WriteDelta(FastBufferWriter writer, ref Dictionary<TKey, TVal> value, ref Dictionary<TKey, TVal> previousValue)
-        {
-            CollectionSerializationUtility.WriteDictionaryDelta(writer, ref value, ref previousValue);
-        }
-        public void ReadDelta(FastBufferReader reader, ref Dictionary<TKey, TVal> value)
-        {
-            CollectionSerializationUtility.ReadDictionaryDelta(reader, ref value);
-        }
-
-        void INetworkVariableSerializer<Dictionary<TKey, TVal>>.ReadWithAllocator(FastBufferReader reader, out Dictionary<TKey, TVal> value, Allocator allocator)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Duplicate(in Dictionary<TKey, TVal> value, ref Dictionary<TKey, TVal> duplicatedValue)
-        {
-            if (duplicatedValue == null)
-            {
-                duplicatedValue = new Dictionary<TKey, TVal>();
-            }
-
-            duplicatedValue.Clear();
-            foreach (var item in value)
-            {
-                // Handles nested dictionaries
-                TKey subKey = default;
-                TVal subValue = default;
-                NetworkVariableSerialization<TKey>.Duplicate(item.Key, ref subKey);
-                NetworkVariableSerialization<TVal>.Duplicate(item.Value, ref subValue);
-                duplicatedValue.Add(subKey, subValue);
-            }
-        }
-    }
-
-    internal class UnmanagedArraySerializer<T> : INetworkVariableSerializer<NativeArray<T>> where T : unmanaged
-    {
-        public void Write(FastBufferWriter writer, ref NativeArray<T> value)
-        {
-            writer.WriteUnmanagedSafe(value);
-        }
-        public void Read(FastBufferReader reader, ref NativeArray<T> value)
-        {
-            value.Dispose();
-            reader.ReadUnmanagedSafe(out value, Allocator.Persistent);
-        }
-
-        public void WriteDelta(FastBufferWriter writer, ref NativeArray<T> value, ref NativeArray<T> previousValue)
-        {
-            CollectionSerializationUtility.WriteNativeArrayDelta(writer, ref value, ref previousValue);
-        }
-        public void ReadDelta(FastBufferReader reader, ref NativeArray<T> value)
-        {
-            CollectionSerializationUtility.ReadNativeArrayDelta(reader, ref value);
-        }
-
-        void INetworkVariableSerializer<NativeArray<T>>.ReadWithAllocator(FastBufferReader reader, out NativeArray<T> value, Allocator allocator)
-        {
-            reader.ReadUnmanagedSafe(out value, allocator);
-        }
-
-        public void Duplicate(in NativeArray<T> value, ref NativeArray<T> duplicatedValue)
-        {
-            if (!duplicatedValue.IsCreated || duplicatedValue.Length != value.Length)
-            {
-                if (duplicatedValue.IsCreated)
-                {
-                    duplicatedValue.Dispose();
-                }
-
-                duplicatedValue = new NativeArray<T>(value.Length, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
-            }
-
-            duplicatedValue.CopyFrom(value);
-        }
-    }
-
-#if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
-    internal class UnmanagedListSerializer<T> : INetworkVariableSerializer<NativeList<T>> where T : unmanaged
-    {
-        public void Write(FastBufferWriter writer, ref NativeList<T> value)
-        {
-            writer.WriteUnmanagedSafe(value);
-        }
-        public void Read(FastBufferReader reader, ref NativeList<T> value)
-        {
-            reader.ReadUnmanagedSafeInPlace(ref value);
-        }
-
-        public void WriteDelta(FastBufferWriter writer, ref NativeList<T> value, ref NativeList<T> previousValue)
-        {
-            CollectionSerializationUtility.WriteNativeListDelta(writer, ref value, ref previousValue);
-        }
-        public void ReadDelta(FastBufferReader reader, ref NativeList<T> value)
-        {
-            CollectionSerializationUtility.ReadNativeListDelta(reader, ref value);
-        }
-
-        void INetworkVariableSerializer<NativeList<T>>.ReadWithAllocator(FastBufferReader reader, out NativeList<T> value, Allocator allocator)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Duplicate(in NativeList<T> value, ref NativeList<T> duplicatedValue)
-        {
-            if (!duplicatedValue.IsCreated)
-            {
-                duplicatedValue = new NativeList<T>(value.Length, Allocator.Persistent);
-            }
-            else if (value.Length != duplicatedValue.Length)
-            {
-                duplicatedValue.ResizeUninitialized(value.Length);
-            }
-
-            duplicatedValue.CopyFrom(value);
-        }
-    }
-
-
-    internal class NativeHashSetSerializer<T> : INetworkVariableSerializer<NativeHashSet<T>> where T : unmanaged, IEquatable<T>
-    {
-        public void Write(FastBufferWriter writer, ref NativeHashSet<T> value)
-        {
-            writer.WriteValueSafe(value);
-        }
-        public void Read(FastBufferReader reader, ref NativeHashSet<T> value)
-        {
-            reader.ReadValueSafeInPlace(ref value);
-        }
-
-        public void WriteDelta(FastBufferWriter writer, ref NativeHashSet<T> value, ref NativeHashSet<T> previousValue)
-        {
-            CollectionSerializationUtility.WriteNativeHashSetDelta(writer, ref value, ref previousValue);
-        }
-        public void ReadDelta(FastBufferReader reader, ref NativeHashSet<T> value)
-        {
-            CollectionSerializationUtility.ReadNativeHashSetDelta(reader, ref value);
-        }
-
-        void INetworkVariableSerializer<NativeHashSet<T>>.ReadWithAllocator(FastBufferReader reader, out NativeHashSet<T> value, Allocator allocator)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Duplicate(in NativeHashSet<T> value, ref NativeHashSet<T> duplicatedValue)
-        {
-            if (!duplicatedValue.IsCreated)
-            {
-                duplicatedValue = new NativeHashSet<T>(value.Capacity, Allocator.Persistent);
-            }
-
-            duplicatedValue.Clear();
-            foreach (var item in value)
-            {
-                duplicatedValue.Add(item);
-            }
-        }
-    }
-
-
-    internal class NativeHashMapSerializer<TKey, TVal> : INetworkVariableSerializer<NativeHashMap<TKey, TVal>>
-        where TKey : unmanaged, IEquatable<TKey>
-        where TVal : unmanaged
-    {
-        public void Write(FastBufferWriter writer, ref NativeHashMap<TKey, TVal> value)
-        {
-            writer.WriteValueSafe(value);
-        }
-        public void Read(FastBufferReader reader, ref NativeHashMap<TKey, TVal> value)
-        {
-            reader.ReadValueSafeInPlace(ref value);
-        }
-
-        public void WriteDelta(FastBufferWriter writer, ref NativeHashMap<TKey, TVal> value, ref NativeHashMap<TKey, TVal> previousValue)
-        {
-            CollectionSerializationUtility.WriteNativeHashMapDelta(writer, ref value, ref previousValue);
-        }
-        public void ReadDelta(FastBufferReader reader, ref NativeHashMap<TKey, TVal> value)
-        {
-            CollectionSerializationUtility.ReadNativeHashMapDelta(reader, ref value);
-        }
-
-        void INetworkVariableSerializer<NativeHashMap<TKey, TVal>>.ReadWithAllocator(FastBufferReader reader, out NativeHashMap<TKey, TVal> value, Allocator allocator)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Duplicate(in NativeHashMap<TKey, TVal> value, ref NativeHashMap<TKey, TVal> duplicatedValue)
-        {
-            if (!duplicatedValue.IsCreated)
-            {
-                duplicatedValue = new NativeHashMap<TKey, TVal>(value.Capacity, Allocator.Persistent);
-            }
-
-            duplicatedValue.Clear();
-            foreach (var item in value)
-            {
-                duplicatedValue.Add(item.Key, item.Value);
-            }
-        }
-    }
-#endif
-
-    /// <summary>
-    /// Serializer for FixedStrings
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    internal class FixedStringSerializer<T> : INetworkVariableSerializer<T> where T : unmanaged, INativeList<byte>, IUTF8Bytes
-    {
-        public void Write(FastBufferWriter writer, ref T value)
-        {
-            writer.WriteValueSafe(value);
-        }
-        public void Read(FastBufferReader reader, ref T value)
-        {
-            reader.ReadValueSafeInPlace(ref value);
-        }
-
-        // Because of how strings are generally used, it is likely that most strings will still write as full strings
-        // instead of deltas. This actually adds one byte to the data to encode that it was serialized in full.
-        // But the potential savings from a small change to a large string are valuable enough to be worth that extra
-        // byte.
-        public unsafe void WriteDelta(FastBufferWriter writer, ref T value, ref T previousValue)
-        {
-            using var changes = new ResizableBitVector(Allocator.Temp);
-            int minLength = math.min(value.Length, previousValue.Length);
-            var numChanges = 0;
-            for (var i = 0; i < minLength; ++i)
-            {
-                var val = value[i];
-                var prevVal = previousValue[i];
-                if (val != prevVal)
-                {
-                    ++numChanges;
-                    changes.Set(i);
-                }
-            }
-
-            for (var i = previousValue.Length; i < value.Length; ++i)
-            {
-                ++numChanges;
-                changes.Set(i);
-            }
-
-            if (changes.GetSerializedSize() + FastBufferWriter.GetWriteSize<byte>() * numChanges > FastBufferWriter.GetWriteSize<byte>() * value.Length)
-            {
-                writer.WriteByteSafe(1);
-                writer.WriteValueSafe(value);
-                return;
-            }
-            writer.WriteByteSafe(0);
-            BytePacker.WriteValuePacked(writer, value.Length);
-            writer.WriteValueSafe(changes);
-            unsafe
-            {
-                byte* ptr = value.GetUnsafePtr();
-                for (int i = 0; i < value.Length; ++i)
-                {
-                    if (changes.IsSet(i))
-                    {
-                        writer.WriteByteSafe(ptr[i]);
-                    }
-                }
-            }
-        }
-        public unsafe void ReadDelta(FastBufferReader reader, ref T value)
-        {
-            // Writing can use the NativeArray logic as it is, but reading is a little different.
-            // Using the NativeArray logic for reading would result in length changes allocating a new NativeArray,
-            // which is not what we want for FixedString. With FixedString, the actual size of the data does not change,
-            // only an in-memory "length" value - so if the length changes, the only thing we want to do is change
-            // that value, and otherwise read everything in-place.
-            reader.ReadByteSafe(out byte full);
-            if (full == 1)
-            {
-                reader.ReadValueSafeInPlace(ref value);
-                return;
-            }
-            ByteUnpacker.ReadValuePacked(reader, out int length);
-            var changes = new ResizableBitVector(Allocator.Temp);
-            using var toDispose = changes;
-            {
-                reader.ReadNetworkSerializableInPlace(ref changes);
-
-                value.Length = length;
-
-                byte* ptr = value.GetUnsafePtr();
-                for (var i = 0; i < value.Length; ++i)
-                {
-                    if (changes.IsSet(i))
-                    {
-                        reader.ReadByteSafe(out ptr[i]);
-                    }
-                }
-            }
-        }
-
-        void INetworkVariableSerializer<T>.ReadWithAllocator(FastBufferReader reader, out T value, Allocator allocator)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Duplicate(in T value, ref T duplicatedValue)
-        {
-            duplicatedValue = value;
-        }
-    }
-
-    /// <summary>
-    /// Serializer for FixedStrings
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    internal class FixedStringArraySerializer<T> : INetworkVariableSerializer<NativeArray<T>> where T : unmanaged, INativeList<byte>, IUTF8Bytes
-    {
-        public void Write(FastBufferWriter writer, ref NativeArray<T> value)
-        {
-            writer.WriteValueSafe(value);
-        }
-        public void Read(FastBufferReader reader, ref NativeArray<T> value)
-        {
-            value.Dispose();
-            reader.ReadValueSafe(out value, Allocator.Persistent);
-        }
-
-
-        public void WriteDelta(FastBufferWriter writer, ref NativeArray<T> value, ref NativeArray<T> previousValue)
-        {
-            CollectionSerializationUtility.WriteNativeArrayDelta(writer, ref value, ref previousValue);
-        }
-        public void ReadDelta(FastBufferReader reader, ref NativeArray<T> value)
-        {
-            CollectionSerializationUtility.ReadNativeArrayDelta(reader, ref value);
-        }
-
-        void INetworkVariableSerializer<NativeArray<T>>.ReadWithAllocator(FastBufferReader reader, out NativeArray<T> value, Allocator allocator)
-        {
-            reader.ReadValueSafe(out value, allocator);
-        }
-
-        public void Duplicate(in NativeArray<T> value, ref NativeArray<T> duplicatedValue)
-        {
-            if (!duplicatedValue.IsCreated || duplicatedValue.Length != value.Length)
-            {
-                if (duplicatedValue.IsCreated)
-                {
-                    duplicatedValue.Dispose();
-                }
-
-                duplicatedValue = new NativeArray<T>(value.Length, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
-            }
-
-            duplicatedValue.CopyFrom(value);
-        }
-    }
-
-#if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
-    /// <summary>
-    /// Serializer for FixedStrings
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    internal class FixedStringListSerializer<T> : INetworkVariableSerializer<NativeList<T>> where T : unmanaged, INativeList<byte>, IUTF8Bytes
-    {
-        public void Write(FastBufferWriter writer, ref NativeList<T> value)
-        {
-            writer.WriteValueSafe(value);
-        }
-        public void Read(FastBufferReader reader, ref NativeList<T> value)
-        {
-            reader.ReadValueSafeInPlace(ref value);
-        }
-
-        public void WriteDelta(FastBufferWriter writer, ref NativeList<T> value, ref NativeList<T> previousValue)
-        {
-            CollectionSerializationUtility.WriteNativeListDelta(writer, ref value, ref previousValue);
-        }
-        public void ReadDelta(FastBufferReader reader, ref NativeList<T> value)
-        {
-            CollectionSerializationUtility.ReadNativeListDelta(reader, ref value);
-        }
-
-        void INetworkVariableSerializer<NativeList<T>>.ReadWithAllocator(FastBufferReader reader, out NativeList<T> value, Allocator allocator)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Duplicate(in NativeList<T> value, ref NativeList<T> duplicatedValue)
-        {
-            if (!duplicatedValue.IsCreated)
-            {
-                duplicatedValue = new NativeList<T>(value.Length, Allocator.Persistent);
-            }
-            else if (value.Length != duplicatedValue.Length)
-            {
-                duplicatedValue.ResizeUninitialized(value.Length);
-            }
-
-            duplicatedValue.CopyFrom(value);
-        }
-    }
-#endif
-
-    /// <summary>
-    /// Serializer for unmanaged INetworkSerializable types
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    internal class UnmanagedNetworkSerializableSerializer<T> : INetworkVariableSerializer<T> where T : unmanaged, INetworkSerializable
-    {
-        public void Write(FastBufferWriter writer, ref T value)
-        {
-            var bufferSerializer = new BufferSerializer<BufferSerializerWriter>(new BufferSerializerWriter(writer));
-            value.NetworkSerialize(bufferSerializer);
-        }
-        public void Read(FastBufferReader reader, ref T value)
-        {
-            var bufferSerializer = new BufferSerializer<BufferSerializerReader>(new BufferSerializerReader(reader));
-            value.NetworkSerialize(bufferSerializer);
-        }
-
-        public void WriteDelta(FastBufferWriter writer, ref T value, ref T previousValue)
-        {
-            if (UserNetworkVariableSerialization<T>.WriteDelta != null && UserNetworkVariableSerialization<T>.ReadDelta != null)
-            {
-                UserNetworkVariableSerialization<T>.WriteDelta(writer, value, previousValue);
-                return;
-            }
-            Write(writer, ref value);
-        }
-        public void ReadDelta(FastBufferReader reader, ref T value)
-        {
-            if (UserNetworkVariableSerialization<T>.WriteDelta != null && UserNetworkVariableSerialization<T>.ReadDelta != null)
-            {
-                UserNetworkVariableSerialization<T>.ReadDelta(reader, ref value);
-                return;
-            }
-            Read(reader, ref value);
-        }
-
-        void INetworkVariableSerializer<T>.ReadWithAllocator(FastBufferReader reader, out T value, Allocator allocator)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Duplicate(in T value, ref T duplicatedValue)
-        {
-            duplicatedValue = value;
-        }
-    }
-
-    /// <summary>
-    /// Serializer for unmanaged INetworkSerializable types
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    internal class UnmanagedNetworkSerializableArraySerializer<T> : INetworkVariableSerializer<NativeArray<T>> where T : unmanaged, INetworkSerializable
-    {
-        public void Write(FastBufferWriter writer, ref NativeArray<T> value)
-        {
-            writer.WriteNetworkSerializable(value);
-        }
-        public void Read(FastBufferReader reader, ref NativeArray<T> value)
-        {
-            value.Dispose();
-            reader.ReadNetworkSerializable(out value, Allocator.Persistent);
-        }
-
-
-        public void WriteDelta(FastBufferWriter writer, ref NativeArray<T> value, ref NativeArray<T> previousValue)
-        {
-            CollectionSerializationUtility.WriteNativeArrayDelta(writer, ref value, ref previousValue);
-        }
-        public void ReadDelta(FastBufferReader reader, ref NativeArray<T> value)
-        {
-            CollectionSerializationUtility.ReadNativeArrayDelta(reader, ref value);
-        }
-
-        void INetworkVariableSerializer<NativeArray<T>>.ReadWithAllocator(FastBufferReader reader, out NativeArray<T> value, Allocator allocator)
-        {
-            reader.ReadNetworkSerializable(out value, allocator);
-        }
-
-        public void Duplicate(in NativeArray<T> value, ref NativeArray<T> duplicatedValue)
-        {
-            if (!duplicatedValue.IsCreated || duplicatedValue.Length != value.Length)
-            {
-                if (duplicatedValue.IsCreated)
-                {
-                    duplicatedValue.Dispose();
-                }
-
-                duplicatedValue = new NativeArray<T>(value.Length, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
-            }
-
-            duplicatedValue.CopyFrom(value);
-        }
-    }
-
-#if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
-    /// <summary>
-    /// Serializer for unmanaged INetworkSerializable types
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    internal class UnmanagedNetworkSerializableListSerializer<T> : INetworkVariableSerializer<NativeList<T>> where T : unmanaged, INetworkSerializable
-    {
-        public void Write(FastBufferWriter writer, ref NativeList<T> value)
-        {
-            writer.WriteNetworkSerializable(value);
-        }
-        public void Read(FastBufferReader reader, ref NativeList<T> value)
-        {
-            reader.ReadNetworkSerializableInPlace(ref value);
-        }
-
-        public void WriteDelta(FastBufferWriter writer, ref NativeList<T> value, ref NativeList<T> previousValue)
-        {
-            CollectionSerializationUtility.WriteNativeListDelta(writer, ref value, ref previousValue);
-        }
-        public void ReadDelta(FastBufferReader reader, ref NativeList<T> value)
-        {
-            CollectionSerializationUtility.ReadNativeListDelta(reader, ref value);
-        }
-
-        void INetworkVariableSerializer<NativeList<T>>.ReadWithAllocator(FastBufferReader reader, out NativeList<T> value, Allocator allocator)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Duplicate(in NativeList<T> value, ref NativeList<T> duplicatedValue)
-        {
-            if (!duplicatedValue.IsCreated)
-            {
-                duplicatedValue = new NativeList<T>(value.Length, Allocator.Persistent);
-            }
-            else if (value.Length != duplicatedValue.Length)
-            {
-                duplicatedValue.ResizeUninitialized(value.Length);
-            }
-
-            duplicatedValue.CopyFrom(value);
-        }
-    }
-#endif
-
-    /// <summary>
-    /// Serializer for managed INetworkSerializable types, which differs from the unmanaged implementation in that it
-    /// has to be null-aware
-    /// <typeparam name="T"></typeparam>
-    internal class ManagedNetworkSerializableSerializer<T> : INetworkVariableSerializer<T> where T : class, INetworkSerializable, new()
-    {
-        public void Write(FastBufferWriter writer, ref T value)
-        {
-            var bufferSerializer = new BufferSerializer<BufferSerializerWriter>(new BufferSerializerWriter(writer));
-            bool isNull = (value == null);
-            bufferSerializer.SerializeValue(ref isNull);
-            if (!isNull)
-            {
-                value.NetworkSerialize(bufferSerializer);
-            }
-        }
-        public void Read(FastBufferReader reader, ref T value)
-        {
-            var bufferSerializer = new BufferSerializer<BufferSerializerReader>(new BufferSerializerReader(reader));
-            bool isNull = false;
-            bufferSerializer.SerializeValue(ref isNull);
-            if (isNull)
-            {
-                value = null;
-            }
-            else
-            {
-                if (value == null)
-                {
-                    value = new T();
-                }
-                value.NetworkSerialize(bufferSerializer);
-            }
-        }
-
-        public void WriteDelta(FastBufferWriter writer, ref T value, ref T previousValue)
-        {
-            if (UserNetworkVariableSerialization<T>.WriteDelta != null && UserNetworkVariableSerialization<T>.ReadDelta != null)
-            {
-                UserNetworkVariableSerialization<T>.WriteDelta(writer, value, previousValue);
-                return;
-            }
-            Write(writer, ref value);
-        }
-        public void ReadDelta(FastBufferReader reader, ref T value)
-        {
-            if (UserNetworkVariableSerialization<T>.WriteDelta != null && UserNetworkVariableSerialization<T>.ReadDelta != null)
-            {
-                UserNetworkVariableSerialization<T>.ReadDelta(reader, ref value);
-                return;
-            }
-            Read(reader, ref value);
-        }
-
-        void INetworkVariableSerializer<T>.ReadWithAllocator(FastBufferReader reader, out T value, Allocator allocator)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Duplicate(in T value, ref T duplicatedValue)
-        {
-            using var writer = new FastBufferWriter(256, Allocator.Temp, int.MaxValue);
-            var refValue = value;
-            Write(writer, ref refValue);
-
-            using var reader = new FastBufferReader(writer, Allocator.None);
-            Read(reader, ref duplicatedValue);
-        }
-    }
-
-    /// <summary>
-    /// This class is used to register user serialization with NetworkVariables for types
-    /// that are serialized via user serialization, such as with FastBufferReader and FastBufferWriter
-    /// extension methods. Finding those methods isn't achievable efficiently at runtime, so this allows
-    /// users to tell NetworkVariable about those extension methods (or simply pass in a lambda)
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    public class UserNetworkVariableSerialization<T>
-    {
-        /// <summary>
-        /// The write value delegate handler definition
-        /// </summary>
-        /// <param name="writer">The <see cref="FastBufferWriter"/> to write the value of type `T`</param>
-        /// <param name="value">The value of type `T` to be written</param>
-        public delegate void WriteValueDelegate(FastBufferWriter writer, in T value);
-
-        /// <summary>
-        /// The write value delegate handler definition
-        /// </summary>
-        /// <param name="writer">The <see cref="FastBufferWriter"/> to write the value of type `T`</param>
-        /// <param name="value">The value of type `T` to be written</param>
-        public delegate void WriteDeltaDelegate(FastBufferWriter writer, in T value, in T previousValue);
-
-        /// <summary>
-        /// The read value delegate handler definition
-        /// </summary>
-        /// <param name="reader">The <see cref="FastBufferReader"/> to read the value of type `T`</param>
-        /// <param name="value">The value of type `T` to be read</param>
-        public delegate void ReadValueDelegate(FastBufferReader reader, out T value);
-
-        /// <summary>
-        /// The read value delegate handler definition
-        /// </summary>
-        /// <param name="reader">The <see cref="FastBufferReader"/> to read the value of type `T`</param>
-        /// <param name="value">The value of type `T` to be read</param>
-        public delegate void ReadDeltaDelegate(FastBufferReader reader, ref T value);
-
-        /// <summary>
-        /// The read value delegate handler definition
-        /// </summary>
-        /// <param name="reader">The <see cref="FastBufferReader"/> to read the value of type `T`</param>
-        /// <param name="value">The value of type `T` to be read</param>
-        public delegate void DuplicateValueDelegate(in T value, ref T duplicatedValue);
-
-        /// <summary>
-        /// Callback to write a value
-        /// </summary>
-        public static WriteValueDelegate WriteValue;
-
-        /// <summary>
-        /// Callback to read a value
-        /// </summary>
-        public static ReadValueDelegate ReadValue;
-
-        /// <summary>
-        /// Callback to write a delta between two values, based on computing the difference between the previous and
-        /// current values.
-        /// </summary>
-        public static WriteDeltaDelegate WriteDelta;
-
-        /// <summary>
-        /// Callback to read a delta, applying only select changes to the current value.
-        /// </summary>
-        public static ReadDeltaDelegate ReadDelta;
-
-        /// <summary>
-        /// Callback to create a duplicate of a value, used to check for dirty status.
-        /// </summary>
-        public static DuplicateValueDelegate DuplicateValue;
-    }
-
-    /// <summary>
-    /// This class is instantiated for types that we can't determine ahead of time are serializable - types
-    /// that don't meet any of the constraints for methods that are available on FastBufferReader and
-    /// FastBufferWriter. These types may or may not be serializable through extension methods. To ensure
-    /// the user has time to pass in the delegates to UserNetworkVariableSerialization, the existence
-    /// of user serialization isn't checked until it's used, so if no serialization is provided, this
-    /// will throw an exception when an object containing the relevant NetworkVariable is spawned.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    internal class FallbackSerializer<T> : INetworkVariableSerializer<T>
-    {
-        private void ThrowArgumentError()
-        {
-            throw new ArgumentException($"Serialization has not been generated for type {typeof(T).FullName}. This can be addressed by adding a [{nameof(GenerateSerializationForGenericParameterAttribute)}] to your generic class that serializes this value (if you are using one), adding [{nameof(GenerateSerializationForTypeAttribute)}(typeof({typeof(T).FullName})] to the class or method that is attempting to serialize it, or creating a field on a {nameof(NetworkBehaviour)} of type {nameof(NetworkVariable<T>)}. If this error continues to appear after doing one of those things and this is a type you can change, then either implement {nameof(INetworkSerializable)} or mark it as serializable by memcpy by adding {nameof(INetworkSerializeByMemcpy)} to its interface list to enable automatic serialization generation. If not, assign serialization code to {nameof(UserNetworkVariableSerialization<T>)}.{nameof(UserNetworkVariableSerialization<T>.WriteValue)}, {nameof(UserNetworkVariableSerialization<T>)}.{nameof(UserNetworkVariableSerialization<T>.ReadValue)}, and {nameof(UserNetworkVariableSerialization<T>)}.{nameof(UserNetworkVariableSerialization<T>.DuplicateValue)}, or if it's serializable by memcpy (contains no pointers), wrap it in {typeof(ForceNetworkSerializeByMemcpy<>).Name}.");
-        }
-
-        public void Write(FastBufferWriter writer, ref T value)
-        {
-            if (UserNetworkVariableSerialization<T>.ReadValue == null || UserNetworkVariableSerialization<T>.WriteValue == null || UserNetworkVariableSerialization<T>.DuplicateValue == null)
-            {
-                ThrowArgumentError();
-            }
-            UserNetworkVariableSerialization<T>.WriteValue(writer, value);
-        }
-        public void Read(FastBufferReader reader, ref T value)
-        {
-            if (UserNetworkVariableSerialization<T>.ReadValue == null || UserNetworkVariableSerialization<T>.WriteValue == null || UserNetworkVariableSerialization<T>.DuplicateValue == null)
-            {
-                ThrowArgumentError();
-            }
-            UserNetworkVariableSerialization<T>.ReadValue(reader, out value);
-        }
-
-        public void WriteDelta(FastBufferWriter writer, ref T value, ref T previousValue)
-        {
-            if (UserNetworkVariableSerialization<T>.ReadValue == null || UserNetworkVariableSerialization<T>.WriteValue == null || UserNetworkVariableSerialization<T>.DuplicateValue == null)
-            {
-                ThrowArgumentError();
-            }
-
-            if (UserNetworkVariableSerialization<T>.WriteDelta == null || UserNetworkVariableSerialization<T>.ReadDelta == null)
-            {
-                UserNetworkVariableSerialization<T>.WriteValue(writer, value);
-                return;
-            }
-            UserNetworkVariableSerialization<T>.WriteDelta(writer, value, previousValue);
-        }
-
-        public void ReadDelta(FastBufferReader reader, ref T value)
-        {
-            if (UserNetworkVariableSerialization<T>.ReadValue == null || UserNetworkVariableSerialization<T>.WriteValue == null || UserNetworkVariableSerialization<T>.DuplicateValue == null)
-            {
-                ThrowArgumentError();
-            }
-
-            if (UserNetworkVariableSerialization<T>.WriteDelta == null || UserNetworkVariableSerialization<T>.ReadDelta == null)
-            {
-                UserNetworkVariableSerialization<T>.ReadValue(reader, out value);
-                return;
-            }
-            UserNetworkVariableSerialization<T>.ReadDelta(reader, ref value);
-        }
-
-        void INetworkVariableSerializer<T>.ReadWithAllocator(FastBufferReader reader, out T value, Allocator allocator)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Duplicate(in T value, ref T duplicatedValue)
-        {
-            if (UserNetworkVariableSerialization<T>.ReadValue == null || UserNetworkVariableSerialization<T>.WriteValue == null || UserNetworkVariableSerialization<T>.DuplicateValue == null)
-            {
-                ThrowArgumentError();
-            }
-            UserNetworkVariableSerialization<T>.DuplicateValue(value, ref duplicatedValue);
-        }
-    }
-
-    /// <summary>
-    /// This class contains initialization functions for various different types used in NetworkVariables.
-    /// Generally speaking, these methods are called by a module initializer created by codegen (NetworkBehaviourILPP)
-    /// and do not need to be called manually.
-    ///
-    /// There are two types of initializers: Serializers and EqualityCheckers. Every type must have an EqualityChecker
-    /// registered to it in order to be used in NetworkVariable; however, not all types need a Serializer. Types without
-    /// a serializer registered will fall back to using the delegates in <see cref="UserNetworkVariableSerialization{T}"/>.
-    /// If no such delegate has been registered, a type without a serializer will throw an exception on the first attempt
-    /// to serialize or deserialize it. (Again, however, codegen handles this automatically and this registration doesn't
-    /// typically need to be performed manually.)
-    /// </summary>
-    public static class NetworkVariableSerializationTypes
-    {
-        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterAssembliesLoaded)]
-#if UNITY_EDITOR
-        [InitializeOnLoadMethod]
-#endif
-        internal static void InitializeIntegerSerialization()
-        {
-            NetworkVariableSerialization<short>.Serializer = new ShortSerializer();
-            NetworkVariableSerialization<short>.AreEqual = NetworkVariableSerialization<short>.ValueEquals;
-            NetworkVariableSerialization<ushort>.Serializer = new UshortSerializer();
-            NetworkVariableSerialization<ushort>.AreEqual = NetworkVariableSerialization<ushort>.ValueEquals;
-            NetworkVariableSerialization<int>.Serializer = new IntSerializer();
-            NetworkVariableSerialization<int>.AreEqual = NetworkVariableSerialization<int>.ValueEquals;
-            NetworkVariableSerialization<uint>.Serializer = new UintSerializer();
-            NetworkVariableSerialization<uint>.AreEqual = NetworkVariableSerialization<uint>.ValueEquals;
-            NetworkVariableSerialization<long>.Serializer = new LongSerializer();
-            NetworkVariableSerialization<long>.AreEqual = NetworkVariableSerialization<long>.ValueEquals;
-            NetworkVariableSerialization<ulong>.Serializer = new UlongSerializer();
-            NetworkVariableSerialization<ulong>.AreEqual = NetworkVariableSerialization<ulong>.ValueEquals;
-        }
-
-        /// <summary>
-        /// Registeres an unmanaged type that will be serialized by a direct memcpy into a buffer
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeSerializer_UnmanagedByMemcpy<T>() where T : unmanaged
-        {
-            NetworkVariableSerialization<T>.Serializer = new UnmanagedTypeSerializer<T>();
-        }
-
-        /// <summary>
-        /// Registeres an unmanaged type that will be serialized by a direct memcpy into a buffer
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeSerializer_UnmanagedByMemcpyArray<T>() where T : unmanaged
-        {
-            NetworkVariableSerialization<NativeArray<T>>.Serializer = new UnmanagedArraySerializer<T>();
-        }
-
-#if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
-        /// <summary>
-        /// Registeres an unmanaged type that will be serialized by a direct memcpy into a buffer
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeSerializer_UnmanagedByMemcpyList<T>() where T : unmanaged
-        {
-            NetworkVariableSerialization<NativeList<T>>.Serializer = new UnmanagedListSerializer<T>();
-        }
-
-        /// <summary>
-        /// Registeres a native hash set (this generic implementation works with all types)
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeSerializer_NativeHashSet<T>() where T : unmanaged, IEquatable<T>
-        {
-            NetworkVariableSerialization<NativeHashSet<T>>.Serializer = new NativeHashSetSerializer<T>();
-        }
-
-        /// <summary>
-        /// Registeres a native hash set (this generic implementation works with all types)
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeSerializer_NativeHashMap<TKey, TVal>()
-            where TKey : unmanaged, IEquatable<TKey>
-            where TVal : unmanaged
-        {
-            NetworkVariableSerialization<NativeHashMap<TKey, TVal>>.Serializer = new NativeHashMapSerializer<TKey, TVal>();
-        }
-#endif
-
-        /// <summary>
-        /// Registeres a native hash set (this generic implementation works with all types)
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeSerializer_List<T>()
-        {
-            NetworkVariableSerialization<List<T>>.Serializer = new ListSerializer<T>();
-        }
-
-        /// <summary>
-        /// Registeres a native hash set (this generic implementation works with all types)
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeSerializer_HashSet<T>() where T : IEquatable<T>
-        {
-            NetworkVariableSerialization<HashSet<T>>.Serializer = new HashSetSerializer<T>();
-        }
-
-        /// <summary>
-        /// Registeres a native hash set (this generic implementation works with all types)
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeSerializer_Dictionary<TKey, TVal>() where TKey : IEquatable<TKey>
-        {
-            NetworkVariableSerialization<Dictionary<TKey, TVal>>.Serializer = new DictionarySerializer<TKey, TVal>();
-        }
-
-        /// <summary>
-        /// Registers an unmanaged type that implements INetworkSerializable and will be serialized through a call to
-        /// NetworkSerialize
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeSerializer_UnmanagedINetworkSerializable<T>() where T : unmanaged, INetworkSerializable
-        {
-            NetworkVariableSerialization<T>.Serializer = new UnmanagedNetworkSerializableSerializer<T>();
-        }
-
-        /// <summary>
-        /// Registers an unmanaged type that implements INetworkSerializable and will be serialized through a call to
-        /// NetworkSerialize
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeSerializer_UnmanagedINetworkSerializableArray<T>() where T : unmanaged, INetworkSerializable
-        {
-            NetworkVariableSerialization<NativeArray<T>>.Serializer = new UnmanagedNetworkSerializableArraySerializer<T>();
-        }
-
-#if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
-        /// <summary>
-        /// Registers an unmanaged type that implements INetworkSerializable and will be serialized through a call to
-        /// NetworkSerialize
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeSerializer_UnmanagedINetworkSerializableList<T>() where T : unmanaged, INetworkSerializable
-        {
-            NetworkVariableSerialization<NativeList<T>>.Serializer = new UnmanagedNetworkSerializableListSerializer<T>();
-        }
-#endif
-
-        /// <summary>
-        /// Registers a managed type that implements INetworkSerializable and will be serialized through a call to
-        /// NetworkSerialize
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeSerializer_ManagedINetworkSerializable<T>() where T : class, INetworkSerializable, new()
-        {
-            NetworkVariableSerialization<T>.Serializer = new ManagedNetworkSerializableSerializer<T>();
-        }
-
-        /// <summary>
-        /// Registers a FixedString type that will be serialized through FastBufferReader/FastBufferWriter's FixedString
-        /// serializers
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeSerializer_FixedString<T>() where T : unmanaged, INativeList<byte>, IUTF8Bytes
-        {
-            NetworkVariableSerialization<T>.Serializer = new FixedStringSerializer<T>();
-        }
-
-        /// <summary>
-        /// Registers a FixedString type that will be serialized through FastBufferReader/FastBufferWriter's FixedString
-        /// serializers
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeSerializer_FixedStringArray<T>() where T : unmanaged, INativeList<byte>, IUTF8Bytes
-        {
-            NetworkVariableSerialization<NativeArray<T>>.Serializer = new FixedStringArraySerializer<T>();
-        }
-
-#if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
-        /// <summary>
-        /// Registers a FixedString type that will be serialized through FastBufferReader/FastBufferWriter's FixedString
-        /// serializers
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeSerializer_FixedStringList<T>() where T : unmanaged, INativeList<byte>, IUTF8Bytes
-        {
-            NetworkVariableSerialization<NativeList<T>>.Serializer = new FixedStringListSerializer<T>();
-        }
-#endif
-
-        /// <summary>
-        /// Registers a managed type that will be checked for equality using T.Equals()
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeEqualityChecker_ManagedIEquatable<T>() where T : class, IEquatable<T>
-        {
-            NetworkVariableSerialization<T>.AreEqual = NetworkVariableSerialization<T>.EqualityEqualsObject;
-        }
-
-        /// <summary>
-        /// Registers an unmanaged type that will be checked for equality using T.Equals()
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeEqualityChecker_UnmanagedIEquatable<T>() where T : unmanaged, IEquatable<T>
-        {
-            NetworkVariableSerialization<T>.AreEqual = NetworkVariableSerialization<T>.EqualityEquals;
-        }
-
-        /// <summary>
-        /// Registers an unmanaged type that will be checked for equality using T.Equals()
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeEqualityChecker_UnmanagedIEquatableArray<T>() where T : unmanaged, IEquatable<T>
-        {
-            NetworkVariableSerialization<NativeArray<T>>.AreEqual = NetworkVariableSerialization<T>.EqualityEqualsArray;
-        }
-        /// <summary>
-        /// Registers an unmanaged type that will be checked for equality using T.Equals()
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeEqualityChecker_List<T>()
-        {
-            NetworkVariableSerialization<List<T>>.AreEqual = NetworkVariableSerialization<T>.EqualityEqualsList;
-        }
-        /// <summary>
-        /// Registers an unmanaged type that will be checked for equality using T.Equals()
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeEqualityChecker_HashSet<T>() where T : IEquatable<T>
-        {
-            NetworkVariableSerialization<HashSet<T>>.AreEqual = NetworkVariableSerialization<T>.EqualityEqualsHashSet;
-        }
-        /// <summary>
-        /// Registers an unmanaged type that will be checked for equality using T.Equals()
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeEqualityChecker_Dictionary<TKey, TVal>()
-            where TKey : IEquatable<TKey>
-        {
-            NetworkVariableSerialization<Dictionary<TKey, TVal>>.AreEqual = NetworkVariableDictionarySerialization<TKey, TVal>.GenericEqualsDictionary;
-        }
-
-#if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
-        /// <summary>
-        /// Registers an unmanaged type that will be checked for equality using T.Equals()
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeEqualityChecker_UnmanagedIEquatableList<T>() where T : unmanaged, IEquatable<T>
-        {
-            NetworkVariableSerialization<NativeList<T>>.AreEqual = NetworkVariableSerialization<T>.EqualityEqualsNativeList;
-        }
-        /// <summary>
-        /// Registers an unmanaged type that will be checked for equality using T.Equals()
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeEqualityChecker_NativeHashSet<T>() where T : unmanaged, IEquatable<T>
-        {
-            NetworkVariableSerialization<NativeHashSet<T>>.AreEqual = NetworkVariableSerialization<T>.EqualityEqualsNativeHashSet;
-        }
-        /// <summary>
-        /// Registers an unmanaged type that will be checked for equality using T.Equals()
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeEqualityChecker_NativeHashMap<TKey, TVal>()
-            where TKey : unmanaged, IEquatable<TKey>
-            where TVal : unmanaged
-        {
-            NetworkVariableSerialization<NativeHashMap<TKey, TVal>>.AreEqual = NetworkVariableMapSerialization<TKey, TVal>.GenericEqualsNativeHashMap;
-        }
-#endif
-
-        /// <summary>
-        /// Registers an unmanaged type that will be checked for equality using memcmp and only considered
-        /// equal if they are bitwise equivalent in memory
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeEqualityChecker_UnmanagedValueEquals<T>() where T : unmanaged
-        {
-            NetworkVariableSerialization<T>.AreEqual = NetworkVariableSerialization<T>.ValueEquals;
-        }
-
-        /// <summary>
-        /// Registers an unmanaged type that will be checked for equality using memcmp and only considered
-        /// equal if they are bitwise equivalent in memory
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeEqualityChecker_UnmanagedValueEqualsArray<T>() where T : unmanaged
-        {
-            NetworkVariableSerialization<NativeArray<T>>.AreEqual = NetworkVariableSerialization<T>.ValueEqualsArray;
-        }
-
-#if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
-        /// <summary>
-        /// Registers an unmanaged type that will be checked for equality using memcmp and only considered
-        /// equal if they are bitwise equivalent in memory
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeEqualityChecker_UnmanagedValueEqualsList<T>() where T : unmanaged
-        {
-            NetworkVariableSerialization<NativeList<T>>.AreEqual = NetworkVariableSerialization<T>.ValueEqualsList;
-        }
-#endif
-
-        /// <summary>
-        /// Registers a managed type that will be checked for equality using the == operator
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        public static void InitializeEqualityChecker_ManagedClassEquals<T>() where T : class
-        {
-            NetworkVariableSerialization<T>.AreEqual = NetworkVariableSerialization<T>.ClassEquals;
-        }
-    }
-
-    /// <summary>
-    /// Support methods for reading/writing NetworkVariables
-    /// Because there are multiple overloads of WriteValue/ReadValue based on different generic constraints,
-    /// but there's no way to achieve the same thing with a class, this sets up various read/write schemes
-    /// based on which constraints are met by `T` using reflection, which is done at module load time.
-    /// </summary>
-    /// <typeparam name="T">The type the associated NetworkVariable is templated on</typeparam>
-    [Serializable]
-    public static class NetworkVariableSerialization<T>
-    {
-        internal static INetworkVariableSerializer<T> Serializer = new FallbackSerializer<T>();
-
-        /// <summary>
-        /// A callback to check if two values are equal.
-        /// </summary>
-        public delegate bool EqualsDelegate(ref T a, ref T b);
-
-        /// <summary>
-        /// Uses the most efficient mechanism for a given type to determine if two values are equal.
-        /// For types that implement <see cref="IEquatable{T}"/>, it will call the Equals() method.
-        /// For unmanaged types, it will do a bytewise memory comparison.
-        /// For other types, it will call the == operator.
-        /// <br/>
-        /// <br/>
-        /// Note: If you are using this in a custom generic class, please make sure your class is
-        /// decorated with <see cref="GenerateSerializationForGenericParameterAttribute"/> so that codegen can
-        /// initialize the serialization mechanisms correctly. If your class is NOT
-        /// generic, it is better to check their equality yourself.
-        /// </summary>
-        public static EqualsDelegate AreEqual { get; internal set; }
-
-        /// <summary>
-        /// Serialize a value using the best-known serialization method for a generic value.
-        /// Will reliably serialize any value that is passed to it correctly with no boxing.
-        /// <br/>
-        /// <br/>
-        /// Note: If you are using this in a custom generic class, please make sure your class is
-        /// decorated with <see cref="GenerateSerializationForGenericParameterAttribute"/> so that codegen can
-        /// initialize the serialization mechanisms correctly. If your class is NOT
-        /// generic, it is better to use FastBufferWriter directly.
-        /// <br/>
-        /// <br/>
-        /// If the codegen is unable to determine a serializer for a type,
-        /// <see cref="UserNetworkVariableSerialization{T}"/>.<see cref="UserNetworkVariableSerialization{T}.WriteValue"/> is called, which, by default,
-        /// will throw an exception, unless you have assigned a user serialization callback to it at runtime.
-        /// </summary>
-        /// <param name="writer"></param>
-        /// <param name="value"></param>
-        public static void Write(FastBufferWriter writer, ref T value)
-        {
-            Serializer.Write(writer, ref value);
-        }
-
-        /// <summary>
-        /// Deserialize a value using the best-known serialization method for a generic value.
-        /// Will reliably deserialize any value that is passed to it correctly with no boxing.
-        /// For types whose deserialization can be determined by codegen (which is most types),
-        /// GC will only be incurred if the type is a managed type and the ref value passed in is `null`,
-        /// in which case a new value is created; otherwise, it will be deserialized in-place.
-        /// <br/>
-        /// <br/>
-        /// Note: If you are using this in a custom generic class, please make sure your class is
-        /// decorated with <see cref="GenerateSerializationForGenericParameterAttribute"/> so that codegen can
-        /// initialize the serialization mechanisms correctly. If your class is NOT
-        /// generic, it is better to use FastBufferReader directly.
-        /// <br/>
-        /// <br/>
-        /// If the codegen is unable to determine a serializer for a type,
-        /// <see cref="UserNetworkVariableSerialization{T}"/>.<see cref="UserNetworkVariableSerialization{T}.ReadValue"/> is called, which, by default,
-        /// will throw an exception, unless you have assigned a user deserialization callback to it at runtime.
-        /// </summary>
-        /// <param name="reader"></param>
-        /// <param name="value"></param>
-        public static void Read(FastBufferReader reader, ref T value)
-        {
-            Serializer.Read(reader, ref value);
-        }
-
-        /// <summary>
-        /// Serialize a value using the best-known serialization method for a generic value.
-        /// Will reliably serialize any value that is passed to it correctly with no boxing.
-        /// <br/>
-        /// <br/>
-        /// Note: If you are using this in a custom generic class, please make sure your class is
-        /// decorated with <see cref="GenerateSerializationForGenericParameterAttribute"/> so that codegen can
-        /// initialize the serialization mechanisms correctly. If your class is NOT
-        /// generic, it is better to use FastBufferWriter directly.
-        /// <br/>
-        /// <br/>
-        /// If the codegen is unable to determine a serializer for a type,
-        /// <see cref="UserNetworkVariableSerialization{T}"/>.<see cref="UserNetworkVariableSerialization{T}.WriteValue"/> is called, which, by default,
-        /// will throw an exception, unless you have assigned a user serialization callback to it at runtime.
-        /// </summary>
-        /// <param name="writer"></param>
-        /// <param name="value"></param>
-        public static void WriteDelta(FastBufferWriter writer, ref T value, ref T previousValue)
-        {
-            Serializer.WriteDelta(writer, ref value, ref previousValue);
-        }
-
-        /// <summary>
-        /// Deserialize a value using the best-known serialization method for a generic value.
-        /// Will reliably deserialize any value that is passed to it correctly with no boxing.
-        /// For types whose deserialization can be determined by codegen (which is most types),
-        /// GC will only be incurred if the type is a managed type and the ref value passed in is `null`,
-        /// in which case a new value is created; otherwise, it will be deserialized in-place.
-        /// <br/>
-        /// <br/>
-        /// Note: If you are using this in a custom generic class, please make sure your class is
-        /// decorated with <see cref="GenerateSerializationForGenericParameterAttribute"/> so that codegen can
-        /// initialize the serialization mechanisms correctly. If your class is NOT
-        /// generic, it is better to use FastBufferReader directly.
-        /// <br/>
-        /// <br/>
-        /// If the codegen is unable to determine a serializer for a type,
-        /// <see cref="UserNetworkVariableSerialization{T}"/>.<see cref="UserNetworkVariableSerialization{T}.ReadValue"/> is called, which, by default,
-        /// will throw an exception, unless you have assigned a user deserialization callback to it at runtime.
-        /// </summary>
-        /// <param name="reader"></param>
-        /// <param name="value"></param>
-        public static void ReadDelta(FastBufferReader reader, ref T value)
-        {
-            Serializer.ReadDelta(reader, ref value);
-        }
-
-        /// <summary>
-        /// Duplicates a value using the most efficient means of creating a complete copy.
-        /// For most types this is a simple assignment or memcpy.
-        /// For managed types, this is will serialize and then deserialize the value to ensure
-        /// a correct copy.
-        /// <br/>
-        /// <br/>
-        /// Note: If you are using this in a custom generic class, please make sure your class is
-        /// decorated with <see cref="GenerateSerializationForGenericParameterAttribute"/> so that codegen can
-        /// initialize the serialization mechanisms correctly. If your class is NOT
-        /// generic, it is better to duplicate it directly.
-        /// <br/>
-        /// <br/>
-        /// If the codegen is unable to determine a serializer for a type,
-        /// <see cref="UserNetworkVariableSerialization{T}"/>.<see cref="UserNetworkVariableSerialization{T}.DuplicateValue"/> is called, which, by default,
-        /// will throw an exception, unless you have assigned a user duplication callback to it at runtime.
-        /// </summary>
-        /// <param name="value"></param>
-        /// <param name="duplicatedValue"></param>
-        public static void Duplicate(in T value, ref T duplicatedValue)
-        {
-            Serializer.Duplicate(value, ref duplicatedValue);
-        }
-
-        // Compares two values of the same unmanaged type by underlying memory
-        // Ignoring any overridden value checks
-        // Size is fixed
-        internal static unsafe bool ValueEquals<TValueType>(ref TValueType a, ref TValueType b) where TValueType : unmanaged
-        {
-            // get unmanaged pointers
-            var aptr = UnsafeUtility.AddressOf(ref a);
-            var bptr = UnsafeUtility.AddressOf(ref b);
-
-            // compare addresses
-            return UnsafeUtility.MemCmp(aptr, bptr, sizeof(TValueType)) == 0;
-        }
-
-#if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
-        // Compares two values of the same unmanaged type by underlying memory
-        // Ignoring any overridden value checks
-        // Size is fixed
-        internal static unsafe bool ValueEqualsList<TValueType>(ref NativeList<TValueType> a, ref NativeList<TValueType> b) where TValueType : unmanaged
-        {
-            if (a.IsCreated != b.IsCreated)
-            {
-                return false;
-            }
-
-            if (!a.IsCreated)
-            {
-                return true;
-            }
-
-            if (a.Length != b.Length)
-            {
-                return false;
-            }
-
-#if UTP_TRANSPORT_2_0_ABOVE
-            var aptr = a.GetUnsafePtr();
-            var bptr = b.GetUnsafePtr();
-#else
-            var aptr = (TValueType*)a.GetUnsafePtr();
-            var bptr = (TValueType*)b.GetUnsafePtr();
-#endif
-            return UnsafeUtility.MemCmp(aptr, bptr, sizeof(TValueType) * a.Length) == 0;
-        }
-#endif
-
-        // Compares two values of the same unmanaged type by underlying memory
-        // Ignoring any overridden value checks
-        // Size is fixed
-        internal static unsafe bool ValueEqualsArray<TValueType>(ref NativeArray<TValueType> a, ref NativeArray<TValueType> b) where TValueType : unmanaged
-        {
-            if (a.IsCreated != b.IsCreated)
-            {
-                return false;
-            }
-
-            if (!a.IsCreated)
-            {
-                return true;
-            }
-
-            if (a.Length != b.Length)
-            {
-                return false;
-            }
-
-            var aptr = (TValueType*)a.GetUnsafePtr();
-            var bptr = (TValueType*)b.GetUnsafePtr();
-            return UnsafeUtility.MemCmp(aptr, bptr, sizeof(TValueType) * a.Length) == 0;
-        }
-
-        internal static bool EqualityEqualsObject<TValueType>(ref TValueType a, ref TValueType b) where TValueType : class, IEquatable<TValueType>
-        {
-            if (a == null)
-            {
-                return b == null;
-            }
-
-            if (b == null)
-            {
-                return false;
-            }
-
-            return a.Equals(b);
-        }
-
-        internal static bool EqualityEquals<TValueType>(ref TValueType a, ref TValueType b) where TValueType : unmanaged, IEquatable<TValueType>
-        {
-            return a.Equals(b);
-        }
-
-        internal static bool EqualityEqualsList<TValueType>(ref List<TValueType> a, ref List<TValueType> b)
-        {
-            if ((a == null) != (b == null))
-            {
-                return false;
-            }
-
-            if (a == null)
-            {
-                return true;
-            }
-
-            if (a.Count != b.Count)
-            {
-                return false;
-            }
-
-            for (var i = 0; i < a.Count; ++i)
-            {
-                var aItem = a[i];
-                var bItem = b[i];
-                if (!NetworkVariableSerialization<TValueType>.AreEqual(ref aItem, ref bItem))
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        internal static bool EqualityEqualsHashSet<TValueType>(ref HashSet<TValueType> a, ref HashSet<TValueType> b) where TValueType : IEquatable<TValueType>
-        {
-            if ((a == null) != (b == null))
-            {
-                return false;
-            }
-
-            if (a == null)
-            {
-                return true;
-            }
-
-            if (a.Count != b.Count)
-            {
-                return false;
-            }
-
-            foreach (var item in a)
-            {
-                if (!b.Contains(item))
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-#if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
-        // Compares two values of the same unmanaged type by underlying memory
-        // Ignoring any overridden value checks
-        // Size is fixed
-        internal static unsafe bool EqualityEqualsNativeList<TValueType>(ref NativeList<TValueType> a, ref NativeList<TValueType> b) where TValueType : unmanaged, IEquatable<TValueType>
-        {
-            if (a.IsCreated != b.IsCreated)
-            {
-                return false;
-            }
-
-            if (!a.IsCreated)
-            {
-                return true;
-            }
-
-            if (a.Length != b.Length)
-            {
-                return false;
-            }
-#if UTP_TRANSPORT_2_0_ABOVE
-            var aptr = a.GetUnsafePtr();
-            var bptr = b.GetUnsafePtr();
-#else
-            var aptr = (TValueType*)a.GetUnsafePtr();
-            var bptr = (TValueType*)b.GetUnsafePtr();
-#endif
-
-            for (var i = 0; i < a.Length; ++i)
-            {
-                if (!EqualityEquals(ref aptr[i], ref bptr[i]))
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        internal static bool EqualityEqualsNativeHashSet<TValueType>(ref NativeHashSet<TValueType> a, ref NativeHashSet<TValueType> b) where TValueType : unmanaged, IEquatable<TValueType>
-        {
-            if (a.IsCreated != b.IsCreated)
-            {
-                return false;
-            }
-
-            if (!a.IsCreated)
-            {
-                return true;
-            }
-
-#if UTP_TRANSPORT_2_0_ABOVE
-            if (a.Count != b.Count)
-#else
-            if (a.Count() != b.Count())
-#endif
-            {
-                return false;
-            }
-
-            foreach (var item in a)
-            {
-                if (!b.Contains(item))
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-#endif
-
-        // Compares two values of the same unmanaged type by underlying memory
-        // Ignoring any overridden value checks
-        // Size is fixed
-        internal static unsafe bool EqualityEqualsArray<TValueType>(ref NativeArray<TValueType> a, ref NativeArray<TValueType> b) where TValueType : unmanaged, IEquatable<TValueType>
-        {
-            if (a.IsCreated != b.IsCreated)
-            {
-                return false;
-            }
-
-            if (!a.IsCreated)
-            {
-                return true;
-            }
-
-            if (a.Length != b.Length)
-            {
-                return false;
-            }
-
-            var aptr = (TValueType*)a.GetUnsafePtr();
-            var bptr = (TValueType*)b.GetUnsafePtr();
-            for (var i = 0; i < a.Length; ++i)
-            {
-                if (!EqualityEquals(ref aptr[i], ref bptr[i]))
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        internal static bool ClassEquals<TValueType>(ref TValueType a, ref TValueType b) where TValueType : class
-        {
-            return a == b;
-        }
-    }
-    internal class NetworkVariableDictionarySerialization<TKey, TVal>
-        where TKey : IEquatable<TKey>
-    {
-
-        internal static bool GenericEqualsDictionary(ref Dictionary<TKey, TVal> a, ref Dictionary<TKey, TVal> b)
-        {
-            if ((a == null) != (b == null))
-            {
-                return false;
-            }
-
-            if (a == null)
-            {
-                return true;
-            }
-
-            if (a.Count != b.Count)
-            {
-                return false;
-            }
-
-            foreach (var item in a)
-            {
-                var hasKey = b.TryGetValue(item.Key, out var val);
-                if (!hasKey)
-                {
-                    return false;
-                }
-
-                var bVal = item.Value;
-                if (!NetworkVariableSerialization<TVal>.AreEqual(ref bVal, ref val))
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-    }
-
-#if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
-    internal class NetworkVariableMapSerialization<TKey, TVal>
-        where TKey : unmanaged, IEquatable<TKey>
-        where TVal : unmanaged
-    {
-
-        internal static bool GenericEqualsNativeHashMap(ref NativeHashMap<TKey, TVal> a, ref NativeHashMap<TKey, TVal> b)
-        {
-            if (a.IsCreated != b.IsCreated)
-            {
-                return false;
-            }
-
-            if (!a.IsCreated)
-            {
-                return true;
-            }
-#if UTP_TRANSPORT_2_0_ABOVE
-            if (a.Count != b.Count)
-#else
-            if (a.Count() != b.Count())
-#endif
-            {
-                return false;
-            }
-
-            foreach (var item in a)
-            {
-                var hasKey = b.TryGetValue(item.Key, out var val);
-                if (!hasKey || !NetworkVariableSerialization<TVal>.AreEqual(ref item.Value, ref val))
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-    }
-#endif
-
-    // RuntimeAccessModifiersILPP will make this `public`
-    // This is just pass-through to NetworkVariableSerialization<T> but is here becaues I could not get ILPP
-    // to generate code that would successfully call Type<T>.Method(T), but it has no problem calling Type.Method<T>(T)
-    internal class RpcFallbackSerialization
-    {
-        public static void Write<T>(FastBufferWriter writer, ref T value)
-        {
-            NetworkVariableSerialization<T>.Write(writer, ref value);
-        }
-
-        public static void Read<T>(FastBufferReader reader, ref T value)
-        {
-            NetworkVariableSerialization<T>.Read(reader, ref value);
-        }
-    }
-}
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariableSerialization.cs.meta b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariableSerialization.cs.meta
deleted file mode 100644
index 7ab0efc436..0000000000
--- a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/NetworkVariableSerialization.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 2c6ef5fdf2e94ec3b4ce8086d52700b3
-timeCreated: 1650985453
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization.meta b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization.meta
new file mode 100644
index 0000000000..4937ff6d52
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: d960ae6c5b8241aa9e2906b709095ea1
+timeCreated: 1718215841
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/CollectionSerializationUtility.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/CollectionSerializationUtility.cs
similarity index 97%
rename from com.unity.netcode.gameobjects/Runtime/NetworkVariable/CollectionSerializationUtility.cs
rename to com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/CollectionSerializationUtility.cs
index ae8cda6871..e8c61ceea7 100644
--- a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/CollectionSerializationUtility.cs
+++ b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/CollectionSerializationUtility.cs
@@ -505,13 +505,8 @@ public static void WriteNativeListDelta<T>(FastBufferWriter writer, ref NativeLi
             writer.WriteValueSafe(changes);
             unsafe
             {
-#if UTP_TRANSPORT_2_0_ABOVE
                 var ptr = value.GetUnsafePtr();
                 var prevPtr = previousValue.GetUnsafePtr();
-#else
-                var ptr = (T*)value.GetUnsafePtr();
-                var prevPtr = (T*)previousValue.GetUnsafePtr();
-#endif
                 for (int i = 0; i < value.Length; ++i)
                 {
                     if (changes.IsSet(i))
@@ -554,11 +549,7 @@ public static void ReadNativeListDelta<T>(FastBufferReader reader, ref NativeLis
 
                 unsafe
                 {
-#if UTP_TRANSPORT_2_0_ABOVE
                     var ptr = value.GetUnsafePtr();
-#else
-                    var ptr = (T*)value.GetUnsafePtr();
-#endif
                     for (var i = 0; i < value.Length; ++i)
                     {
                         if (changes.IsSet(i))
@@ -580,13 +571,8 @@ public static void ReadNativeListDelta<T>(FastBufferReader reader, ref NativeLis
         public static unsafe void WriteNativeHashSetDelta<T>(FastBufferWriter writer, ref NativeHashSet<T> value, ref NativeHashSet<T> previousValue) where T : unmanaged, IEquatable<T>
         {
             // See WriteHashSet; this is the same algorithm, adjusted for the NativeHashSet API
-#if UTP_TRANSPORT_2_0_ABOVE
             var added = stackalloc T[value.Count];
             var removed = stackalloc T[previousValue.Count];
-#else
-            var added = stackalloc T[value.Count()];
-            var removed = stackalloc T[previousValue.Count()];
-#endif
             var addedCount = 0;
             var removedCount = 0;
             foreach (var item in value)
@@ -606,11 +592,8 @@ public static unsafe void WriteNativeHashSetDelta<T>(FastBufferWriter writer, re
                     ++removedCount;
                 }
             }
-#if UTP_TRANSPORT_2_0_ABOVE
+
             if (addedCount + removedCount >= value.Count)
-#else
-            if (addedCount + removedCount >= value.Count())
-#endif
             {
                 writer.WriteByteSafe(1);
                 writer.WriteValueSafe(value);
@@ -660,20 +643,16 @@ public static unsafe void WriteNativeHashMapDelta<TKey, TVal>(FastBufferWriter w
             where TVal : unmanaged
         {
             // See WriteDictionary; this is the same algorithm, adjusted for the NativeHashMap API
-#if UTP_TRANSPORT_2_0_ABOVE
             var added = stackalloc KVPair<TKey, TVal>[value.Count];
             var changed = stackalloc KVPair<TKey, TVal>[value.Count];
             var removed = stackalloc KVPair<TKey, TVal>[previousValue.Count];
-#else
-            var added = stackalloc KeyValue<TKey, TVal>[value.Count()];
-            var changed = stackalloc KeyValue<TKey, TVal>[value.Count()];
-            var removed = stackalloc KeyValue<TKey, TVal>[previousValue.Count()];
-#endif
+
             var addedCount = 0;
             var changedCount = 0;
             var removedCount = 0;
             foreach (var item in value)
             {
+
                 var hasPrevVal = previousValue.TryGetValue(item.Key, out var prevVal);
                 if (!hasPrevVal)
                 {
@@ -695,11 +674,8 @@ public static unsafe void WriteNativeHashMapDelta<TKey, TVal>(FastBufferWriter w
                     ++removedCount;
                 }
             }
-#if UTP_TRANSPORT_2_0_ABOVE
+
             if (addedCount + removedCount + changedCount >= value.Count)
-#else
-            if (addedCount + removedCount + changedCount >= value.Count())
-#endif
             {
                 writer.WriteByteSafe(1);
                 writer.WriteValueSafe(value);
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/CollectionSerializationUtility.cs.meta b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/CollectionSerializationUtility.cs.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Runtime/NetworkVariable/CollectionSerializationUtility.cs.meta
rename to com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/CollectionSerializationUtility.cs.meta
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/FallbackSerializer.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/FallbackSerializer.cs
new file mode 100644
index 0000000000..5e855745c0
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/FallbackSerializer.cs
@@ -0,0 +1,99 @@
+using System;
+using Unity.Collections;
+
+namespace Unity.Netcode
+{
+    /// <summary>
+    /// This class is instantiated for types that we can't determine ahead of time are serializable - types
+    /// that don't meet any of the constraints for methods that are available on FastBufferReader and
+    /// FastBufferWriter. These types may or may not be serializable through extension methods. To ensure
+    /// the user has time to pass in the delegates to UserNetworkVariableSerialization, the existence
+    /// of user serialization isn't checked until it's used, so if no serialization is provided, this
+    /// will throw an exception when an object containing the relevant NetworkVariable is spawned.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class FallbackSerializer<T> : INetworkVariableSerializer<T>
+    {
+        private void ThrowArgumentError()
+        {
+            throw new ArgumentException($"Serialization has not been generated for type {typeof(T).FullName}. This can be addressed by adding a [{nameof(GenerateSerializationForGenericParameterAttribute)}] to your generic class that serializes this value (if you are using one), adding [{nameof(GenerateSerializationForTypeAttribute)}(typeof({typeof(T).FullName})] to the class or method that is attempting to serialize it, or creating a field on a {nameof(NetworkBehaviour)} of type {nameof(NetworkVariable<T>)}. If this error continues to appear after doing one of those things and this is a type you can change, then either implement {nameof(INetworkSerializable)} or mark it as serializable by memcpy by adding {nameof(INetworkSerializeByMemcpy)} to its interface list to enable automatic serialization generation. If not, assign serialization code to {nameof(UserNetworkVariableSerialization<T>)}.{nameof(UserNetworkVariableSerialization<T>.WriteValue)}, {nameof(UserNetworkVariableSerialization<T>)}.{nameof(UserNetworkVariableSerialization<T>.ReadValue)}, and {nameof(UserNetworkVariableSerialization<T>)}.{nameof(UserNetworkVariableSerialization<T>.DuplicateValue)}, or if it's serializable by memcpy (contains no pointers), wrap it in {typeof(ForceNetworkSerializeByMemcpy<>).Name}.");
+        }
+
+        public void Write(FastBufferWriter writer, ref T value)
+        {
+            if (UserNetworkVariableSerialization<T>.ReadValue == null || UserNetworkVariableSerialization<T>.WriteValue == null || UserNetworkVariableSerialization<T>.DuplicateValue == null)
+            {
+                ThrowArgumentError();
+            }
+            UserNetworkVariableSerialization<T>.WriteValue(writer, value);
+        }
+        public void Read(FastBufferReader reader, ref T value)
+        {
+            if (UserNetworkVariableSerialization<T>.ReadValue == null || UserNetworkVariableSerialization<T>.WriteValue == null || UserNetworkVariableSerialization<T>.DuplicateValue == null)
+            {
+                ThrowArgumentError();
+            }
+            UserNetworkVariableSerialization<T>.ReadValue(reader, out value);
+        }
+
+        public void WriteDelta(FastBufferWriter writer, ref T value, ref T previousValue)
+        {
+            if (UserNetworkVariableSerialization<T>.ReadValue == null || UserNetworkVariableSerialization<T>.WriteValue == null || UserNetworkVariableSerialization<T>.DuplicateValue == null)
+            {
+                ThrowArgumentError();
+            }
+
+            if (UserNetworkVariableSerialization<T>.WriteDelta == null || UserNetworkVariableSerialization<T>.ReadDelta == null)
+            {
+                UserNetworkVariableSerialization<T>.WriteValue(writer, value);
+                return;
+            }
+            UserNetworkVariableSerialization<T>.WriteDelta(writer, value, previousValue);
+        }
+
+        public void ReadDelta(FastBufferReader reader, ref T value)
+        {
+            if (UserNetworkVariableSerialization<T>.ReadValue == null || UserNetworkVariableSerialization<T>.WriteValue == null || UserNetworkVariableSerialization<T>.DuplicateValue == null)
+            {
+                ThrowArgumentError();
+            }
+
+            if (UserNetworkVariableSerialization<T>.WriteDelta == null || UserNetworkVariableSerialization<T>.ReadDelta == null)
+            {
+                UserNetworkVariableSerialization<T>.ReadValue(reader, out value);
+                return;
+            }
+            UserNetworkVariableSerialization<T>.ReadDelta(reader, ref value);
+        }
+
+        void INetworkVariableSerializer<T>.ReadWithAllocator(FastBufferReader reader, out T value, Allocator allocator)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Duplicate(in T value, ref T duplicatedValue)
+        {
+            if (UserNetworkVariableSerialization<T>.ReadValue == null || UserNetworkVariableSerialization<T>.WriteValue == null || UserNetworkVariableSerialization<T>.DuplicateValue == null)
+            {
+                ThrowArgumentError();
+            }
+            UserNetworkVariableSerialization<T>.DuplicateValue(value, ref duplicatedValue);
+        }
+    }
+
+    // RuntimeAccessModifiersILPP will make this `public`
+    // This is just pass-through to NetworkVariableSerialization<T> but is here because I could not get ILPP
+    // to generate code that would successfully call Type<T>.Method(T), but it has no problem calling Type.Method<T>(T)
+    internal class RpcFallbackSerialization
+    {
+        public static void Write<T>(FastBufferWriter writer, ref T value)
+        {
+            NetworkVariableSerialization<T>.Write(writer, ref value);
+        }
+
+        public static void Read<T>(FastBufferReader reader, ref T value)
+        {
+            NetworkVariableSerialization<T>.Read(reader, ref value);
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/FallbackSerializer.cs.meta b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/FallbackSerializer.cs.meta
new file mode 100644
index 0000000000..4472d153c4
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/FallbackSerializer.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 288dbe7d1ff74860ae3552c034485538
+timeCreated: 1718219109
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/INetworkVariableSerializer.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/INetworkVariableSerializer.cs
new file mode 100644
index 0000000000..d515c0c309
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/INetworkVariableSerializer.cs
@@ -0,0 +1,22 @@
+using Unity.Collections;
+
+namespace Unity.Netcode
+{
+    /// <typeparam name="T"></typeparam>
+    internal interface INetworkVariableSerializer<T>
+    {
+        // Write has to be taken by ref here because of INetworkSerializable
+        // Open Instance Delegates (pointers to methods without an instance attached to them)
+        // require the first parameter passed to them (the instance) to be passed by ref.
+        // So foo.Bar() becomes BarDelegate(ref foo);
+        // Taking T as an in parameter like we do in other places would require making a copy
+        // of it to pass it as a ref parameter.,
+
+        public void Write(FastBufferWriter writer, ref T value);
+        public void Read(FastBufferReader reader, ref T value);
+        public void WriteDelta(FastBufferWriter writer, ref T value, ref T previousValue);
+        public void ReadDelta(FastBufferReader reader, ref T value);
+        internal void ReadWithAllocator(FastBufferReader reader, out T value, Allocator allocator);
+        public void Duplicate(in T value, ref T duplicatedValue);
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/INetworkVariableSerializer.cs.meta b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/INetworkVariableSerializer.cs.meta
new file mode 100644
index 0000000000..58433bb58a
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/INetworkVariableSerializer.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f78e258ef55f4ee89bc3f24d67b8d242
+timeCreated: 1718218205
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/NetworkVariableEquality.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/NetworkVariableEquality.cs
new file mode 100644
index 0000000000..6b0a3c08c0
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/NetworkVariableEquality.cs
@@ -0,0 +1,340 @@
+using System;
+using System.Collections.Generic;
+using Unity.Collections;
+using Unity.Collections.LowLevel.Unsafe;
+using Unity.Netcode;
+
+namespace Unity.Netcode
+{
+    internal static class NetworkVariableEquality<T>
+    {
+        // Compares two values of the same unmanaged type by underlying memory
+        // Ignoring any overridden value checks
+        // Size is fixed
+        internal static unsafe bool ValueEquals<TValueType>(ref TValueType a, ref TValueType b) where TValueType : unmanaged
+        {
+            // get unmanaged pointers
+            var aptr = UnsafeUtility.AddressOf(ref a);
+            var bptr = UnsafeUtility.AddressOf(ref b);
+
+            // compare addresses
+            return UnsafeUtility.MemCmp(aptr, bptr, sizeof(TValueType)) == 0;
+        }
+
+#if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
+        // Compares two values of the same unmanaged type by underlying memory
+        // Ignoring any overridden value checks
+        // Size is fixed
+        internal static unsafe bool ValueEqualsList<TValueType>(ref NativeList<TValueType> a, ref NativeList<TValueType> b) where TValueType : unmanaged
+        {
+            if (a.IsCreated != b.IsCreated)
+            {
+                return false;
+            }
+
+            if (!a.IsCreated)
+            {
+                return true;
+            }
+
+            if (a.Length != b.Length)
+            {
+                return false;
+            }
+
+            var aptr = a.GetUnsafePtr();
+            var bptr = b.GetUnsafePtr();
+
+            return UnsafeUtility.MemCmp(aptr, bptr, sizeof(TValueType) * a.Length) == 0;
+        }
+#endif
+
+        // Compares two values of the same unmanaged type by underlying memory
+        // Ignoring any overridden value checks
+        // Size is fixed
+        internal static unsafe bool ValueEqualsArray<TValueType>(ref NativeArray<TValueType> a, ref NativeArray<TValueType> b) where TValueType : unmanaged
+        {
+            if (a.IsCreated != b.IsCreated)
+            {
+                return false;
+            }
+
+            if (!a.IsCreated)
+            {
+                return true;
+            }
+
+            if (a.Length != b.Length)
+            {
+                return false;
+            }
+
+            var aptr = (TValueType*)a.GetUnsafePtr();
+            var bptr = (TValueType*)b.GetUnsafePtr();
+            return UnsafeUtility.MemCmp(aptr, bptr, sizeof(TValueType) * a.Length) == 0;
+        }
+
+        internal static bool EqualityEqualsObject<TValueType>(ref TValueType a, ref TValueType b) where TValueType : class, IEquatable<TValueType>
+        {
+            if (a == null)
+            {
+                return b == null;
+            }
+
+            if (b == null)
+            {
+                return false;
+            }
+
+            return a.Equals(b);
+        }
+
+        internal static bool EqualityEquals<TValueType>(ref TValueType a, ref TValueType b) where TValueType : unmanaged, IEquatable<TValueType>
+        {
+            return a.Equals(b);
+        }
+
+        internal static bool EqualityEqualsList<TValueType>(ref List<TValueType> a, ref List<TValueType> b)
+        {
+            if (a == null != (b == null))
+            {
+                return false;
+            }
+
+            if (a == null)
+            {
+                return true;
+            }
+
+            if (a.Count != b.Count)
+            {
+                return false;
+            }
+
+            for (var i = 0; i < a.Count; ++i)
+            {
+                var aItem = a[i];
+                var bItem = b[i];
+                if (!NetworkVariableSerialization<TValueType>.AreEqual(ref aItem, ref bItem))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        internal static bool EqualityEqualsHashSet<TValueType>(ref HashSet<TValueType> a, ref HashSet<TValueType> b) where TValueType : IEquatable<TValueType>
+        {
+            if (a == null != (b == null))
+            {
+                return false;
+            }
+
+            if (a == null)
+            {
+                return true;
+            }
+
+            if (a.Count != b.Count)
+            {
+                return false;
+            }
+
+            foreach (var item in a)
+            {
+                if (!b.Contains(item))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        // Compares two values of the same unmanaged type by underlying memory
+        // Ignoring any overridden value checks
+        // Size is fixed
+        internal static unsafe bool EqualityEqualsArray<TValueType>(ref NativeArray<TValueType> a, ref NativeArray<TValueType> b) where TValueType : unmanaged, IEquatable<TValueType>
+        {
+            if (a.IsCreated != b.IsCreated)
+            {
+                return false;
+            }
+
+            if (!a.IsCreated)
+            {
+                return true;
+            }
+
+            if (a.Length != b.Length)
+            {
+                return false;
+            }
+
+            var aptr = (TValueType*)a.GetUnsafePtr();
+            var bptr = (TValueType*)b.GetUnsafePtr();
+            for (var i = 0; i < a.Length; ++i)
+            {
+                if (!EqualityEquals(ref aptr[i], ref bptr[i]))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        internal static bool ClassEquals<TValueType>(ref TValueType a, ref TValueType b) where TValueType : class
+        {
+            return a == b;
+        }
+
+#if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
+        // Compares two values of the same unmanaged type by underlying memory
+        // Ignoring any overridden value checks
+        // Size is fixed
+        internal static unsafe bool EqualityEqualsNativeList<TValueType>(ref NativeList<TValueType> a, ref NativeList<TValueType> b) where TValueType : unmanaged, IEquatable<TValueType>
+        {
+            if (a.IsCreated != b.IsCreated)
+            {
+                return false;
+            }
+
+            if (!a.IsCreated)
+            {
+                return true;
+            }
+
+            if (a.Length != b.Length)
+            {
+                return false;
+            }
+
+            var aptr = a.GetUnsafePtr();
+            var bptr = b.GetUnsafePtr();
+
+            for (var i = 0; i < a.Length; ++i)
+            {
+                if (!EqualityEquals(ref aptr[i], ref bptr[i]))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        internal static bool EqualityEqualsNativeHashSet<TValueType>(ref NativeHashSet<TValueType> a, ref NativeHashSet<TValueType> b) where TValueType : unmanaged, IEquatable<TValueType>
+        {
+            if (a.IsCreated != b.IsCreated)
+            {
+                return false;
+            }
+
+            if (!a.IsCreated)
+            {
+                return true;
+            }
+
+            if (a.Count != b.Count)
+            {
+                return false;
+            }
+
+            foreach (var item in a)
+            {
+                if (!b.Contains(item))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+#endif
+    }
+}
+
+/// <summary>
+///     Support methods for equality of NetworkVariable collection types.
+///     Because there are multiple overloads of WriteValue/ReadValue based on different generic constraints,
+///     but there's no way to achieve the same thing with a class, this sets up various read/write schemes
+///     based on which constraints are met by `T` using reflection, which is done at module load time.
+/// </summary>
+/// <typeparam name="TKey">The type the associated NetworkVariable dictionary collection key templated on</typeparam>
+/// <typeparam name="TVal">The type the associated NetworkVariable dictionary collection value templated on</typeparam>
+internal class NetworkVariableDictionarySerialization<TKey, TVal>
+    where TKey : IEquatable<TKey>
+{
+    internal static bool GenericEqualsDictionary(ref Dictionary<TKey, TVal> a, ref Dictionary<TKey, TVal> b)
+    {
+        if (a == null != (b == null))
+        {
+            return false;
+        }
+
+        if (a == null)
+        {
+            return true;
+        }
+
+        if (a.Count != b.Count)
+        {
+            return false;
+        }
+
+        foreach (var item in a)
+        {
+            var hasKey = b.TryGetValue(item.Key, out var val);
+            if (!hasKey)
+            {
+                return false;
+            }
+
+            var bVal = item.Value;
+            if (!NetworkVariableSerialization<TVal>.AreEqual(ref bVal, ref val))
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}
+
+#if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
+internal class NetworkVariableMapSerialization<TKey, TVal>
+    where TKey : unmanaged, IEquatable<TKey>
+    where TVal : unmanaged
+{
+    internal static bool GenericEqualsNativeHashMap(ref NativeHashMap<TKey, TVal> a, ref NativeHashMap<TKey, TVal> b)
+    {
+        if (a.IsCreated != b.IsCreated)
+        {
+            return false;
+        }
+
+        if (!a.IsCreated)
+        {
+            return true;
+        }
+
+        if (a.Count != b.Count)
+        {
+            return false;
+        }
+
+        foreach (var item in a)
+        {
+            var hasKey = b.TryGetValue(item.Key, out var val);
+            if (!hasKey || !NetworkVariableSerialization<TVal>.AreEqual(ref item.Value, ref val))
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}
+#endif
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/NetworkVariableEquality.cs.meta b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/NetworkVariableEquality.cs.meta
new file mode 100644
index 0000000000..9a91970355
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/NetworkVariableEquality.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 24b8352a975044509931bf684ccfdb82
+timeCreated: 1718219366
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/NetworkVariableSerialization.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/NetworkVariableSerialization.cs
new file mode 100644
index 0000000000..1a00d2c86a
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/NetworkVariableSerialization.cs
@@ -0,0 +1,158 @@
+using System;
+
+namespace Unity.Netcode
+{
+    /// <summary>
+    ///     Support methods for reading/writing NetworkVariables
+    ///     Because there are multiple overloads of WriteValue/ReadValue based on different generic constraints,
+    ///     but there's no way to achieve the same thing with a class, this sets up various read/write schemes
+    ///     based on which constraints are met by `T` using reflection, which is done at module load time.
+    /// </summary>
+    /// <typeparam name="T">The type the associated NetworkVariable is templated on</typeparam>
+    [Serializable]
+    public static class NetworkVariableSerialization<T>
+    {
+        internal static INetworkVariableSerializer<T> Serializer = new FallbackSerializer<T>();
+
+        /// <summary>
+        /// Delegate for comparing two values of type T for equality
+        /// </summary>
+        /// <param name="a">First value to compare</param>
+        /// <param name="b">Second value to compare</param>
+        /// <returns>True if the values are equal, false otherwise</returns>
+        public delegate bool EqualsDelegate(ref T a, ref T b);
+
+        /// <summary>
+        /// Uses the most efficient mechanism for a given type to determine if two values are equal.
+        /// For types that implement <see cref="IEquatable{T}"/>, it will call the Equals() method.
+        /// For unmanaged types, it will do a bytewise memory comparison.
+        /// For other types, it will call the == operator.
+        /// <br/>
+        /// <br/>
+        /// Note: If you are using this in a custom generic class, please make sure your class is
+        /// decorated with <see cref="GenerateSerializationForGenericParameterAttribute"/> so that codegen can
+        /// initialize the serialization mechanisms correctly. If your class is NOT
+        /// generic, it is better to check their equality yourself.
+        /// </summary>
+        public static EqualsDelegate AreEqual { get; internal set; }
+
+        /// <summary>
+        ///     Serialize a value using the best-known serialization method for a generic value.
+        ///     Will reliably serialize any value that is passed to it correctly with no boxing.
+        ///     <br />
+        ///     <br />
+        ///     Note: If you are using this in a custom generic class, please make sure your class is
+        ///     decorated with <see cref="GenerateSerializationForGenericParameterAttribute" /> so that codegen can
+        ///     initialize the serialization mechanisms correctly. If your class is NOT
+        ///     generic, it is better to use FastBufferWriter directly.
+        ///     <br />
+        ///     <br />
+        ///     If the codegen is unable to determine a serializer for a type,
+        ///     <see cref="UserNetworkVariableSerialization{T}" />.<see cref="UserNetworkVariableSerialization{T}.WriteValue" /> is called, which, by default,
+        ///     will throw an exception, unless you have assigned a user serialization callback to it at runtime.
+        /// </summary>
+        /// <param name="writer">The FastBufferWriter to write the serialized data to</param>
+        /// <param name="value">Reference to the value to serialize</param>
+        public static void Write(FastBufferWriter writer, ref T value)
+        {
+            Serializer.Write(writer, ref value);
+        }
+
+        /// <summary>
+        ///     Deserialize a value using the best-known serialization method for a generic value.
+        ///     Will reliably deserialize any value that is passed to it correctly with no boxing.
+        ///     For types whose deserialization can be determined by codegen (which is most types),
+        ///     GC will only be incurred if the type is a managed type and the ref value passed in is `null`,
+        ///     in which case a new value is created; otherwise, it will be deserialized in-place.
+        ///     <br />
+        ///     <br />
+        ///     Note: If you are using this in a custom generic class, please make sure your class is
+        ///     decorated with <see cref="GenerateSerializationForGenericParameterAttribute" /> so that codegen can
+        ///     initialize the serialization mechanisms correctly. If your class is NOT
+        ///     generic, it is better to use FastBufferReader directly.
+        ///     <br />
+        ///     <br />
+        ///     If the codegen is unable to determine a serializer for a type,
+        ///     <see cref="UserNetworkVariableSerialization{T}" />.<see cref="UserNetworkVariableSerialization{T}.ReadValue" /> is called, which, by default,
+        ///     will throw an exception, unless you have assigned a user deserialization callback to it at runtime.
+        /// </summary>
+        /// <param name="reader">The FastBufferReader to read the serialized data from</param>
+        /// <param name="value">Reference to store the deserialized value</param>
+        public static void Read(FastBufferReader reader, ref T value)
+        {
+            Serializer.Read(reader, ref value);
+        }
+
+        /// <summary>
+        ///     Serialize a value using the best-known serialization method for a generic value.
+        ///     Will reliably serialize any value that is passed to it correctly with no boxing.
+        ///     <br />
+        ///     <br />
+        ///     Note: If you are using this in a custom generic class, please make sure your class is
+        ///     decorated with <see cref="GenerateSerializationForGenericParameterAttribute" /> so that codegen can
+        ///     initialize the serialization mechanisms correctly. If your class is NOT
+        ///     generic, it is better to use FastBufferWriter directly.
+        ///     <br />
+        ///     <br />
+        ///     If the codegen is unable to determine a serializer for a type,
+        ///     <see cref="UserNetworkVariableSerialization{T}" />.<see cref="UserNetworkVariableSerialization{T}.WriteValue" /> is called, which, by default,
+        ///     will throw an exception, unless you have assigned a user serialization callback to it at runtime.
+        /// </summary>
+        /// <param name="writer">The FastBufferWriter to write the serialized delta to</param>
+        /// <param name="value">Reference to the current value</param>
+        /// <param name="previousValue">Reference to the previous value for delta comparison</param>
+        public static void WriteDelta(FastBufferWriter writer, ref T value, ref T previousValue)
+        {
+            Serializer.WriteDelta(writer, ref value, ref previousValue);
+        }
+
+        /// <summary>
+        ///     Deserialize a value using the best-known serialization method for a generic value.
+        ///     Will reliably deserialize any value that is passed to it correctly with no boxing.
+        ///     For types whose deserialization can be determined by codegen (which is most types),
+        ///     GC will only be incurred if the type is a managed type and the ref value passed in is `null`,
+        ///     in which case a new value is created; otherwise, it will be deserialized in-place.
+        ///     <br />
+        ///     <br />
+        ///     Note: If you are using this in a custom generic class, please make sure your class is
+        ///     decorated with <see cref="GenerateSerializationForGenericParameterAttribute" /> so that codegen can
+        ///     initialize the serialization mechanisms correctly. If your class is NOT
+        ///     generic, it is better to use FastBufferReader directly.
+        ///     <br />
+        ///     <br />
+        ///     If the codegen is unable to determine a serializer for a type,
+        ///     <see cref="UserNetworkVariableSerialization{T}" />.<see cref="UserNetworkVariableSerialization{T}.ReadValue" /> is called, which, by default,
+        ///     will throw an exception, unless you have assigned a user deserialization callback to it at runtime.
+        /// </summary>
+        /// <param name="reader">The FastBufferReader to read the serialized delta from</param>
+        /// <param name="value">Reference to update with the deserialized delta</param>
+        public static void ReadDelta(FastBufferReader reader, ref T value)
+        {
+            Serializer.ReadDelta(reader, ref value);
+        }
+
+        /// <summary>
+        ///     Duplicates a value using the most efficient means of creating a complete copy.
+        ///     For most types this is a simple assignment or memcpy.
+        ///     For managed types, this is will serialize and then deserialize the value to ensure
+        ///     a correct copy.
+        ///     <br />
+        ///     <br />
+        ///     Note: If you are using this in a custom generic class, please make sure your class is
+        ///     decorated with <see cref="GenerateSerializationForGenericParameterAttribute" /> so that codegen can
+        ///     initialize the serialization mechanisms correctly. If your class is NOT
+        ///     generic, it is better to duplicate it directly.
+        ///     <br />
+        ///     <br />
+        ///     If the codegen is unable to determine a serializer for a type,
+        ///     <see cref="UserNetworkVariableSerialization{T}" />.<see cref="UserNetworkVariableSerialization{T}.DuplicateValue" /> is called, which, by default,
+        ///     will throw an exception, unless you have assigned a user duplication callback to it at runtime.
+        /// </summary>
+        /// <param name="value">The source value to duplicate</param>
+        /// <param name="duplicatedValue">Reference to store the duplicated value</param>
+        public static void Duplicate(in T value, ref T duplicatedValue)
+        {
+            Serializer.Duplicate(value, ref duplicatedValue);
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/NetworkVariableSerialization.cs.meta b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/NetworkVariableSerialization.cs.meta
new file mode 100644
index 0000000000..d7b821f95b
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/NetworkVariableSerialization.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7a943170e35746e8913dd494d79bb63d
+timeCreated: 1718215899
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/ResizableBitVector.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/ResizableBitVector.cs
similarity index 93%
rename from com.unity.netcode.gameobjects/Runtime/NetworkVariable/ResizableBitVector.cs
rename to com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/ResizableBitVector.cs
index b4b4b76e83..03f351d501 100644
--- a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/ResizableBitVector.cs
+++ b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/ResizableBitVector.cs
@@ -95,19 +95,11 @@ public unsafe void NetworkSerialize<T>(BufferSerializer<T> serializer) where T :
             {
                 if (serializer.IsReader)
                 {
-#if UTP_TRANSPORT_2_0_ABOVE
                     serializer.GetFastBufferReader().ReadBytesSafe(ptr, length);
-#else
-                    serializer.GetFastBufferReader().ReadBytesSafe((byte*)ptr, length);
-#endif
                 }
                 else
                 {
-#if UTP_TRANSPORT_2_0_ABOVE
                     serializer.GetFastBufferWriter().WriteBytesSafe(ptr, length);
-#else
-                    serializer.GetFastBufferWriter().WriteBytesSafe((byte*)ptr, length);
-#endif
                 }
             }
         }
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/ResizableBitVector.cs.meta b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/ResizableBitVector.cs.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Runtime/NetworkVariable/ResizableBitVector.cs.meta
rename to com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/ResizableBitVector.cs.meta
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/TypedILPPInitializers.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/TypedILPPInitializers.cs
new file mode 100644
index 0000000000..8a639258da
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/TypedILPPInitializers.cs
@@ -0,0 +1,320 @@
+using System;
+using System.Collections.Generic;
+using Unity.Collections;
+using UnityEditor;
+using UnityEngine;
+
+namespace Unity.Netcode
+{
+    /// <summary>
+    /// This class contains initialization functions for various different types used in NetworkVariables.
+    /// Generally speaking, these methods are called by a module initializer created by codegen (NetworkBehaviourILPP)
+    /// and do not need to be called manually.
+    ///
+    /// There are two types of initializers: Serializers and EqualityCheckers. Every type must have an EqualityChecker
+    /// registered to it in order to be used in NetworkVariable; however, not all types need a Serializer. Types without
+    /// a serializer registered will fall back to using the delegates in <see cref="UserNetworkVariableSerialization{T}"/>.
+    /// If no such delegate has been registered, a type without a serializer will throw an exception on the first attempt
+    /// to serialize or deserialize it. (Again, however, codegen handles this automatically and this registration doesn't
+    /// typically need to be performed manually.)
+    /// </summary>
+    public static class NetworkVariableSerializationTypedInitializers
+    {
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterAssembliesLoaded)]
+#if UNITY_EDITOR
+        [InitializeOnLoadMethod]
+#endif
+        internal static void InitializeIntegerSerialization()
+        {
+            NetworkVariableSerialization<short>.Serializer = new ShortSerializer();
+            NetworkVariableSerialization<short>.AreEqual = NetworkVariableEquality<short>.ValueEquals;
+            NetworkVariableSerialization<ushort>.Serializer = new UshortSerializer();
+            NetworkVariableSerialization<ushort>.AreEqual = NetworkVariableEquality<ushort>.ValueEquals;
+            NetworkVariableSerialization<int>.Serializer = new IntSerializer();
+            NetworkVariableSerialization<int>.AreEqual = NetworkVariableEquality<int>.ValueEquals;
+            NetworkVariableSerialization<uint>.Serializer = new UintSerializer();
+            NetworkVariableSerialization<uint>.AreEqual = NetworkVariableEquality<uint>.ValueEquals;
+            NetworkVariableSerialization<long>.Serializer = new LongSerializer();
+            NetworkVariableSerialization<long>.AreEqual = NetworkVariableEquality<long>.ValueEquals;
+            NetworkVariableSerialization<ulong>.Serializer = new UlongSerializer();
+            NetworkVariableSerialization<ulong>.AreEqual = NetworkVariableEquality<ulong>.ValueEquals;
+        }
+
+        /// <summary>
+        /// Registeres an unmanaged type that will be serialized by a direct memcpy into a buffer
+        /// </summary>
+        /// <typeparam name="T">The unmanaged type to be registered for serialization</typeparam>
+        public static void InitializeSerializer_UnmanagedByMemcpy<T>() where T : unmanaged
+        {
+            NetworkVariableSerialization<T>.Serializer = new UnmanagedTypeSerializer<T>();
+        }
+
+        /// <summary>
+        /// Registeres an unmanaged type that will be serialized by a direct memcpy into a buffer
+        /// </summary>
+        /// <typeparam name="T">The unmanaged element type of the array to be registered for serialization</typeparam>
+        public static void InitializeSerializer_UnmanagedByMemcpyArray<T>() where T : unmanaged
+        {
+            NetworkVariableSerialization<NativeArray<T>>.Serializer = new UnmanagedArraySerializer<T>();
+        }
+
+#if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
+        /// <summary>
+        /// Registeres an unmanaged type that will be serialized by a direct memcpy into a buffer
+        /// </summary>
+        /// <typeparam name="T">The unmanaged element type contained in the NativeList</typeparam>
+        public static void InitializeSerializer_UnmanagedByMemcpyList<T>() where T : unmanaged
+        {
+            NetworkVariableSerialization<NativeList<T>>.Serializer = new UnmanagedListSerializer<T>();
+        }
+
+        /// <summary>
+        /// Registeres a native hash set (this generic implementation works with all types)
+        /// </summary>
+        /// <typeparam name="T">The unmanaged element type contained in the NativeHashSet, must implement IEquatable</typeparam>
+        public static void InitializeSerializer_NativeHashSet<T>() where T : unmanaged, IEquatable<T>
+        {
+            NetworkVariableSerialization<NativeHashSet<T>>.Serializer = new NativeHashSetSerializer<T>();
+        }
+
+        /// <summary>
+        /// Registeres a native hash set (this generic implementation works with all types)
+        /// </summary>
+        /// <typeparam name="TKey">The unmanaged key type, must implement IEquatable</typeparam>
+        /// <typeparam name="TVal">The unmanaged value type stored in the hash map</typeparam>
+        public static void InitializeSerializer_NativeHashMap<TKey, TVal>()
+            where TKey : unmanaged, IEquatable<TKey>
+            where TVal : unmanaged
+        {
+            NetworkVariableSerialization<NativeHashMap<TKey, TVal>>.Serializer = new NativeHashMapSerializer<TKey, TVal>();
+        }
+#endif
+
+        /// <summary>
+        /// Registeres a native hash set (this generic implementation works with all types)
+        /// </summary>
+        /// <typeparam name="T">The type of elements contained in the List</typeparam>
+        public static void InitializeSerializer_List<T>()
+        {
+            NetworkVariableSerialization<List<T>>.Serializer = new ListSerializer<T>();
+        }
+
+        /// <summary>
+        /// Registeres a native hash set (this generic implementation works with all types)
+        /// </summary>
+        /// <typeparam name="T">The type of elements contained in the HashSet, must implement IEquatable</typeparam>
+        public static void InitializeSerializer_HashSet<T>() where T : IEquatable<T>
+        {
+            NetworkVariableSerialization<HashSet<T>>.Serializer = new HashSetSerializer<T>();
+        }
+
+        /// <summary>
+        /// Registeres a native hash set (this generic implementation works with all types)
+        /// </summary>
+        /// <typeparam name="TKey">The type of keys in the Dictionary, must implement IEquatable</typeparam>
+        /// <typeparam name="TVal">The type of values stored in the Dictionary</typeparam>
+        public static void InitializeSerializer_Dictionary<TKey, TVal>() where TKey : IEquatable<TKey>
+        {
+            NetworkVariableSerialization<Dictionary<TKey, TVal>>.Serializer = new DictionarySerializer<TKey, TVal>();
+        }
+
+        /// <summary>
+        /// Registers an unmanaged type that implements INetworkSerializable and will be serialized through a call to
+        /// NetworkSerialize
+        /// </summary>
+        /// <typeparam name="T">The unmanaged type that implements INetworkSerializable</typeparam>
+        public static void InitializeSerializer_UnmanagedINetworkSerializable<T>() where T : unmanaged, INetworkSerializable
+        {
+            NetworkVariableSerialization<T>.Serializer = new UnmanagedNetworkSerializableSerializer<T>();
+        }
+
+        /// <summary>
+        /// Registers an unmanaged type that implements INetworkSerializable and will be serialized through a call to
+        /// NetworkSerialize
+        /// </summary>
+        /// <typeparam name="T">The unmanaged element type that implements INetworkSerializable</typeparam>
+        public static void InitializeSerializer_UnmanagedINetworkSerializableArray<T>() where T : unmanaged, INetworkSerializable
+        {
+            NetworkVariableSerialization<NativeArray<T>>.Serializer = new UnmanagedNetworkSerializableArraySerializer<T>();
+        }
+
+#if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
+        /// <summary>
+        /// Registers an unmanaged type that implements INetworkSerializable and will be serialized through a call to
+        /// NetworkSerialize
+        /// </summary>
+        /// <typeparam name="T">The unmanaged element type that implements INetworkSerializable</typeparam>
+        public static void InitializeSerializer_UnmanagedINetworkSerializableList<T>() where T : unmanaged, INetworkSerializable
+        {
+            NetworkVariableSerialization<NativeList<T>>.Serializer = new UnmanagedNetworkSerializableListSerializer<T>();
+        }
+#endif
+
+        /// <summary>
+        /// Registers a managed type that implements INetworkSerializable and will be serialized through a call to
+        /// NetworkSerialize
+        /// </summary>
+        /// <typeparam name="T">The managed type that implements INetworkSerializable and has a parameterless constructor</typeparam>
+        public static void InitializeSerializer_ManagedINetworkSerializable<T>() where T : class, INetworkSerializable, new()
+        {
+            NetworkVariableSerialization<T>.Serializer = new ManagedNetworkSerializableSerializer<T>();
+        }
+
+        /// <summary>
+        /// Registers a FixedString type that will be serialized through FastBufferReader/FastBufferWriter's FixedString
+        /// serializers
+        /// </summary>
+        /// <typeparam name="T">The FixedString type that implements INativeList{byte} and IUTF8Bytes</typeparam>
+        public static void InitializeSerializer_FixedString<T>() where T : unmanaged, INativeList<byte>, IUTF8Bytes
+        {
+            NetworkVariableSerialization<T>.Serializer = new FixedStringSerializer<T>();
+        }
+
+        /// <summary>
+        /// Registers a FixedString type that will be serialized through FastBufferReader/FastBufferWriter's FixedString
+        /// serializers
+        /// </summary>
+        /// <typeparam name="T">The FixedString type that implements INativeList{byte} and IUTF8Bytes</typeparam>
+        public static void InitializeSerializer_FixedStringArray<T>() where T : unmanaged, INativeList<byte>, IUTF8Bytes
+        {
+            NetworkVariableSerialization<NativeArray<T>>.Serializer = new FixedStringArraySerializer<T>();
+        }
+
+#if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
+        /// <summary>
+        /// Registers a FixedString type that will be serialized through FastBufferReader/FastBufferWriter's FixedString
+        /// serializers
+        /// </summary>
+        /// <typeparam name="T">The FixedString type that implements INativeList{byte} and IUTF8Bytes</typeparam>
+        public static void InitializeSerializer_FixedStringList<T>() where T : unmanaged, INativeList<byte>, IUTF8Bytes
+        {
+            NetworkVariableSerialization<NativeList<T>>.Serializer = new FixedStringListSerializer<T>();
+        }
+#endif
+
+        /// <summary>
+        /// Registers a managed type that will be checked for equality using T.Equals()
+        /// </summary>
+        /// <typeparam name="T">The managed type that implements IEquatable</typeparam>
+        public static void InitializeEqualityChecker_ManagedIEquatable<T>() where T : class, IEquatable<T>
+        {
+            NetworkVariableSerialization<T>.AreEqual = NetworkVariableEquality<T>.EqualityEqualsObject;
+        }
+
+        /// <summary>
+        /// Registers an unmanaged type that will be checked for equality using T.Equals()
+        /// </summary>
+        /// <typeparam name="T">The unmanaged type to register</typeparam>
+        public static void InitializeEqualityChecker_UnmanagedIEquatable<T>() where T : unmanaged, IEquatable<T>
+        {
+            NetworkVariableSerialization<T>.AreEqual = NetworkVariableEquality<T>.EqualityEquals;
+        }
+
+        /// <summary>
+        /// Registers an unmanaged type that will be checked for equality using T.Equals()
+        /// </summary>
+        /// <typeparam name="T">The unmanaged element type that implements IEquatable</typeparam>
+        public static void InitializeEqualityChecker_UnmanagedIEquatableArray<T>() where T : unmanaged, IEquatable<T>
+        {
+            NetworkVariableSerialization<NativeArray<T>>.AreEqual = NetworkVariableEquality<T>.EqualityEqualsArray;
+        }
+
+        /// <summary>
+        /// Registers an unmanaged type that will be checked for equality using T.Equals()
+        /// </summary>
+        /// <typeparam name="T">The type of elements in the List</typeparam>
+        public static void InitializeEqualityChecker_List<T>()
+        {
+            NetworkVariableSerialization<List<T>>.AreEqual = NetworkVariableEquality<T>.EqualityEqualsList;
+        }
+        /// <summary>
+        /// Registers an unmanaged type that will be checked for equality using T.Equals()
+        /// </summary>
+        /// <typeparam name="T">The type of elements in the HashSet</typeparam>
+        public static void InitializeEqualityChecker_HashSet<T>() where T : IEquatable<T>
+        {
+            NetworkVariableSerialization<HashSet<T>>.AreEqual = NetworkVariableEquality<T>.EqualityEqualsHashSet;
+        }
+        /// <summary>
+        /// Registers an unmanaged type that will be checked for equality using T.Equals()
+        /// </summary>
+        /// <typeparam name="TKey">The type of keys in the Dictionary, must implement IEquatable</typeparam>
+        /// <typeparam name="TVal">The type of values in the Dictionary</typeparam>
+        public static void InitializeEqualityChecker_Dictionary<TKey, TVal>()
+            where TKey : IEquatable<TKey>
+        {
+            NetworkVariableSerialization<Dictionary<TKey, TVal>>.AreEqual = NetworkVariableDictionarySerialization<TKey, TVal>.GenericEqualsDictionary;
+        }
+
+#if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
+        /// <summary>
+        /// Registers an unmanaged type that will be checked for equality using T.Equals()
+        /// </summary>
+        /// <typeparam name="T">The unmanaged element type that implements IEquatable</typeparam>
+        public static void InitializeEqualityChecker_UnmanagedIEquatableList<T>() where T : unmanaged, IEquatable<T>
+        {
+            NetworkVariableSerialization<NativeList<T>>.AreEqual = NetworkVariableEquality<T>.EqualityEqualsNativeList;
+        }
+        /// <summary>
+        /// Registers an unmanaged type that will be checked for equality using T.Equals()
+        /// </summary>
+        /// <typeparam name="T">The unmanaged element type that implements IEquatable</typeparam>
+        public static void InitializeEqualityChecker_NativeHashSet<T>() where T : unmanaged, IEquatable<T>
+        {
+            NetworkVariableSerialization<NativeHashSet<T>>.AreEqual = NetworkVariableEquality<T>.EqualityEqualsNativeHashSet;
+        }
+        /// <summary>
+        /// Registers an unmanaged type that will be checked for equality using T.Equals()
+        /// </summary>
+        /// <typeparam name="TKey">The unmanaged key type that implements IEquatable</typeparam>
+        /// <typeparam name="TVal">The unmanaged value type</typeparam>
+        public static void InitializeEqualityChecker_NativeHashMap<TKey, TVal>()
+            where TKey : unmanaged, IEquatable<TKey>
+            where TVal : unmanaged
+        {
+            NetworkVariableSerialization<NativeHashMap<TKey, TVal>>.AreEqual = NetworkVariableMapSerialization<TKey, TVal>.GenericEqualsNativeHashMap;
+        }
+#endif
+
+        /// <summary>
+        /// Registers an unmanaged type that will be checked for equality using memcmp and only considered
+        /// equal if they are bitwise equivalent in memory
+        /// </summary>
+        /// <typeparam name="T">The unmanaged type to register for equality checking</typeparam>
+        public static void InitializeEqualityChecker_UnmanagedValueEquals<T>() where T : unmanaged
+        {
+            NetworkVariableSerialization<T>.AreEqual = NetworkVariableEquality<T>.ValueEquals;
+        }
+
+        /// <summary>
+        /// Registers an unmanaged type that will be checked for equality using memcmp and only considered
+        /// equal if they are bitwise equivalent in memory
+        /// </summary>
+        /// <typeparam name="T">The unmanaged element type to register for equality checking</typeparam>
+        public static void InitializeEqualityChecker_UnmanagedValueEqualsArray<T>() where T : unmanaged
+        {
+            NetworkVariableSerialization<NativeArray<T>>.AreEqual = NetworkVariableEquality<T>.ValueEqualsArray;
+        }
+
+#if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
+        /// <summary>
+        /// Registers an unmanaged type that will be checked for equality using memcmp and only considered
+        /// equal if they are bitwise equivalent in memory
+        /// </summary>
+        /// <typeparam name="T">The unmanaged element type to register for equality checking</typeparam>
+        public static void InitializeEqualityChecker_UnmanagedValueEqualsList<T>() where T : unmanaged
+        {
+            NetworkVariableSerialization<NativeList<T>>.AreEqual = NetworkVariableEquality<T>.ValueEqualsList;
+        }
+#endif
+
+        /// <summary>
+        /// Registers a managed type that will be checked for equality using the == operator
+        /// </summary>
+        /// <typeparam name="T">The class type to register for equality checking</typeparam>
+        public static void InitializeEqualityChecker_ManagedClassEquals<T>() where T : class
+        {
+            NetworkVariableSerialization<T>.AreEqual = NetworkVariableEquality<T>.ClassEquals;
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/TypedILPPInitializers.cs.meta b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/TypedILPPInitializers.cs.meta
new file mode 100644
index 0000000000..6d1ebba80d
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/TypedILPPInitializers.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 65bdb3e11a9a412ab5e936a9c96a3da0
+timeCreated: 1718216842
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/TypedSerializerImplementations.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/TypedSerializerImplementations.cs
new file mode 100644
index 0000000000..49e7e5e7cf
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/TypedSerializerImplementations.cs
@@ -0,0 +1,1121 @@
+using System;
+using System.Collections.Generic;
+using Unity.Collections;
+using Unity.Mathematics;
+
+namespace Unity.Netcode
+{
+    /// <summary>
+    ///     Packing serializer for shorts
+    /// </summary>
+    internal class ShortSerializer : INetworkVariableSerializer<short>
+    {
+        public void Write(FastBufferWriter writer, ref short value)
+        {
+            BytePacker.WriteValueBitPacked(writer, value);
+        }
+
+        public void Read(FastBufferReader reader, ref short value)
+        {
+            ByteUnpacker.ReadValueBitPacked(reader, out value);
+        }
+
+        public void WriteDelta(FastBufferWriter writer, ref short value, ref short previousValue)
+        {
+            Write(writer, ref value);
+        }
+
+        public void ReadDelta(FastBufferReader reader, ref short value)
+        {
+            Read(reader, ref value);
+        }
+
+        void INetworkVariableSerializer<short>.ReadWithAllocator(FastBufferReader reader, out short value, Allocator allocator)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Duplicate(in short value, ref short duplicatedValue)
+        {
+            duplicatedValue = value;
+        }
+    }
+
+    /// <summary>
+    ///     Packing serializer for shorts
+    /// </summary>
+    internal class UshortSerializer : INetworkVariableSerializer<ushort>
+    {
+        public void Write(FastBufferWriter writer, ref ushort value)
+        {
+            BytePacker.WriteValueBitPacked(writer, value);
+        }
+
+        public void Read(FastBufferReader reader, ref ushort value)
+        {
+            ByteUnpacker.ReadValueBitPacked(reader, out value);
+        }
+
+        public void WriteDelta(FastBufferWriter writer, ref ushort value, ref ushort previousValue)
+        {
+            Write(writer, ref value);
+        }
+
+        public void ReadDelta(FastBufferReader reader, ref ushort value)
+        {
+            Read(reader, ref value);
+        }
+
+        void INetworkVariableSerializer<ushort>.ReadWithAllocator(FastBufferReader reader, out ushort value, Allocator allocator)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Duplicate(in ushort value, ref ushort duplicatedValue)
+        {
+            duplicatedValue = value;
+        }
+    }
+
+    /// <summary>
+    ///     Packing serializer for ints
+    /// </summary>
+    internal class IntSerializer : INetworkVariableSerializer<int>
+    {
+        public void Write(FastBufferWriter writer, ref int value)
+        {
+            BytePacker.WriteValueBitPacked(writer, value);
+        }
+
+        public void Read(FastBufferReader reader, ref int value)
+        {
+            ByteUnpacker.ReadValueBitPacked(reader, out value);
+        }
+
+        public void WriteDelta(FastBufferWriter writer, ref int value, ref int previousValue)
+        {
+            Write(writer, ref value);
+        }
+
+        public void ReadDelta(FastBufferReader reader, ref int value)
+        {
+            Read(reader, ref value);
+        }
+
+        void INetworkVariableSerializer<int>.ReadWithAllocator(FastBufferReader reader, out int value, Allocator allocator)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Duplicate(in int value, ref int duplicatedValue)
+        {
+            duplicatedValue = value;
+        }
+    }
+
+    /// <summary>
+    ///     Packing serializer for ints
+    /// </summary>
+    internal class UintSerializer : INetworkVariableSerializer<uint>
+    {
+        public void Write(FastBufferWriter writer, ref uint value)
+        {
+            BytePacker.WriteValueBitPacked(writer, value);
+        }
+
+        public void Read(FastBufferReader reader, ref uint value)
+        {
+            ByteUnpacker.ReadValueBitPacked(reader, out value);
+        }
+
+        public void WriteDelta(FastBufferWriter writer, ref uint value, ref uint previousValue)
+        {
+            Write(writer, ref value);
+        }
+
+        public void ReadDelta(FastBufferReader reader, ref uint value)
+        {
+            Read(reader, ref value);
+        }
+
+        void INetworkVariableSerializer<uint>.ReadWithAllocator(FastBufferReader reader, out uint value, Allocator allocator)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Duplicate(in uint value, ref uint duplicatedValue)
+        {
+            duplicatedValue = value;
+        }
+    }
+
+    /// <summary>
+    ///     Packing serializer for longs
+    /// </summary>
+    internal class LongSerializer : INetworkVariableSerializer<long>
+    {
+        public void Write(FastBufferWriter writer, ref long value)
+        {
+            BytePacker.WriteValueBitPacked(writer, value);
+        }
+
+        public void Read(FastBufferReader reader, ref long value)
+        {
+            ByteUnpacker.ReadValueBitPacked(reader, out value);
+        }
+
+        public void WriteDelta(FastBufferWriter writer, ref long value, ref long previousValue)
+        {
+            Write(writer, ref value);
+        }
+
+        public void ReadDelta(FastBufferReader reader, ref long value)
+        {
+            Read(reader, ref value);
+        }
+
+        void INetworkVariableSerializer<long>.ReadWithAllocator(FastBufferReader reader, out long value, Allocator allocator)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Duplicate(in long value, ref long duplicatedValue)
+        {
+            duplicatedValue = value;
+        }
+    }
+
+    /// <summary>
+    ///     Packing serializer for longs
+    /// </summary>
+    internal class UlongSerializer : INetworkVariableSerializer<ulong>
+    {
+        public void Write(FastBufferWriter writer, ref ulong value)
+        {
+            BytePacker.WriteValueBitPacked(writer, value);
+        }
+
+        public void Read(FastBufferReader reader, ref ulong value)
+        {
+            ByteUnpacker.ReadValueBitPacked(reader, out value);
+        }
+
+        public void WriteDelta(FastBufferWriter writer, ref ulong value, ref ulong previousValue)
+        {
+            Write(writer, ref value);
+        }
+
+        public void ReadDelta(FastBufferReader reader, ref ulong value)
+        {
+            Read(reader, ref value);
+        }
+
+        void INetworkVariableSerializer<ulong>.ReadWithAllocator(FastBufferReader reader, out ulong value, Allocator allocator)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Duplicate(in ulong value, ref ulong duplicatedValue)
+        {
+            duplicatedValue = value;
+        }
+    }
+
+    /// <summary>
+    ///     Basic serializer for unmanaged types.
+    ///     This covers primitives, built-in unity types, and IForceSerializeByMemcpy
+    ///     Since all of those ultimately end up calling WriteUnmanagedSafe, this simplifies things
+    ///     by calling that directly - thus preventing us from having to have a specific T that meets
+    ///     the specific constraints that the various generic WriteValue calls require.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class UnmanagedTypeSerializer<T> : INetworkVariableSerializer<T> where T : unmanaged
+    {
+        public void Write(FastBufferWriter writer, ref T value)
+        {
+            writer.WriteUnmanagedSafe(value);
+        }
+
+        public void Read(FastBufferReader reader, ref T value)
+        {
+            reader.ReadUnmanagedSafe(out value);
+        }
+
+        public void WriteDelta(FastBufferWriter writer, ref T value, ref T previousValue)
+        {
+            Write(writer, ref value);
+        }
+
+        public void ReadDelta(FastBufferReader reader, ref T value)
+        {
+            Read(reader, ref value);
+        }
+
+        void INetworkVariableSerializer<T>.ReadWithAllocator(FastBufferReader reader, out T value, Allocator allocator)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Duplicate(in T value, ref T duplicatedValue)
+        {
+            duplicatedValue = value;
+        }
+    }
+
+    internal class ListSerializer<T> : INetworkVariableSerializer<List<T>>
+    {
+        public void Write(FastBufferWriter writer, ref List<T> value)
+        {
+            var isNull = value == null;
+            writer.WriteValueSafe(isNull);
+            if (!isNull)
+            {
+                BytePacker.WriteValuePacked(writer, value.Count);
+                foreach (var item in value)
+                {
+                    var reffable = item;
+                    NetworkVariableSerialization<T>.Write(writer, ref reffable);
+                }
+            }
+        }
+
+        public void Read(FastBufferReader reader, ref List<T> value)
+        {
+            reader.ReadValueSafe(out bool isNull);
+            if (isNull)
+            {
+                value = null;
+            }
+            else
+            {
+                if (value == null)
+                {
+                    value = new List<T>();
+                }
+
+                ByteUnpacker.ReadValuePacked(reader, out int len);
+                if (len < value.Count)
+                {
+                    value.RemoveRange(len, value.Count - len);
+                }
+
+                for (var i = 0; i < len; ++i)
+                {
+                    // Read in place where possible
+                    if (i < value.Count)
+                    {
+                        var item = value[i];
+                        NetworkVariableSerialization<T>.Read(reader, ref item);
+                        value[i] = item;
+                    }
+                    else
+                    {
+                        T item = default;
+                        NetworkVariableSerialization<T>.Read(reader, ref item);
+                        value.Add(item);
+                    }
+                }
+            }
+        }
+
+        public void WriteDelta(FastBufferWriter writer, ref List<T> value, ref List<T> previousValue)
+        {
+            CollectionSerializationUtility.WriteListDelta(writer, ref value, ref previousValue);
+        }
+
+        public void ReadDelta(FastBufferReader reader, ref List<T> value)
+        {
+            CollectionSerializationUtility.ReadListDelta(reader, ref value);
+        }
+
+        void INetworkVariableSerializer<List<T>>.ReadWithAllocator(FastBufferReader reader, out List<T> value, Allocator allocator)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Duplicate(in List<T> value, ref List<T> duplicatedValue)
+        {
+            if (duplicatedValue == null)
+            {
+                duplicatedValue = new List<T>();
+            }
+
+            duplicatedValue.Clear();
+            foreach (var item in value)
+            {
+                // This handles the nested list scenario List<List<T>>
+                T subValue = default;
+                NetworkVariableSerialization<T>.Duplicate(item, ref subValue);
+                duplicatedValue.Add(subValue);
+            }
+        }
+    }
+
+    internal class HashSetSerializer<T> : INetworkVariableSerializer<HashSet<T>> where T : IEquatable<T>
+    {
+        public void Write(FastBufferWriter writer, ref HashSet<T> value)
+        {
+            var isNull = value == null;
+            writer.WriteValueSafe(isNull);
+            if (!isNull)
+            {
+                writer.WriteValueSafe(value.Count);
+                foreach (var item in value)
+                {
+                    var reffable = item;
+                    NetworkVariableSerialization<T>.Write(writer, ref reffable);
+                }
+            }
+        }
+
+
+        public void Read(FastBufferReader reader, ref HashSet<T> value)
+        {
+            reader.ReadValueSafe(out bool isNull);
+            if (isNull)
+            {
+                value = null;
+            }
+            else
+            {
+                if (value == null)
+                {
+                    value = new HashSet<T>();
+                }
+                else
+                {
+                    value.Clear();
+                }
+
+                reader.ReadValueSafe(out int len);
+                for (var i = 0; i < len; ++i)
+                {
+                    T item = default;
+                    NetworkVariableSerialization<T>.Read(reader, ref item);
+                    value.Add(item);
+                }
+            }
+        }
+
+        public void WriteDelta(FastBufferWriter writer, ref HashSet<T> value, ref HashSet<T> previousValue)
+        {
+            CollectionSerializationUtility.WriteHashSetDelta(writer, ref value, ref previousValue);
+        }
+
+        public void ReadDelta(FastBufferReader reader, ref HashSet<T> value)
+        {
+            CollectionSerializationUtility.ReadHashSetDelta(reader, ref value);
+        }
+
+        void INetworkVariableSerializer<HashSet<T>>.ReadWithAllocator(FastBufferReader reader, out HashSet<T> value, Allocator allocator)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Duplicate(in HashSet<T> value, ref HashSet<T> duplicatedValue)
+        {
+            if (duplicatedValue == null)
+            {
+                duplicatedValue = new HashSet<T>();
+            }
+
+            duplicatedValue.Clear();
+            foreach (var item in value)
+            {
+                // Handles nested HashSets
+                T subValue = default;
+                NetworkVariableSerialization<T>.Duplicate(item, ref subValue);
+                duplicatedValue.Add(item);
+            }
+        }
+    }
+
+
+    internal class DictionarySerializer<TKey, TVal> : INetworkVariableSerializer<Dictionary<TKey, TVal>>
+        where TKey : IEquatable<TKey>
+    {
+        public void Write(FastBufferWriter writer, ref Dictionary<TKey, TVal> value)
+        {
+            var isNull = value == null;
+            writer.WriteValueSafe(isNull);
+            if (!isNull)
+            {
+                writer.WriteValueSafe(value.Count);
+                foreach (var item in value)
+                {
+                    var (key, val) = (item.Key, item.Value);
+                    NetworkVariableSerialization<TKey>.Write(writer, ref key);
+                    NetworkVariableSerialization<TVal>.Write(writer, ref val);
+                }
+            }
+        }
+
+        public void Read(FastBufferReader reader, ref Dictionary<TKey, TVal> value)
+        {
+            reader.ReadValueSafe(out bool isNull);
+            if (isNull)
+            {
+                value = null;
+            }
+            else
+            {
+                if (value == null)
+                {
+                    value = new Dictionary<TKey, TVal>();
+                }
+                else
+                {
+                    value.Clear();
+                }
+
+                reader.ReadValueSafe(out int len);
+                for (var i = 0; i < len; ++i)
+                {
+                    (TKey key, TVal val) = (default, default);
+                    NetworkVariableSerialization<TKey>.Read(reader, ref key);
+                    NetworkVariableSerialization<TVal>.Read(reader, ref val);
+                    value.Add(key, val);
+                }
+            }
+        }
+
+        public void WriteDelta(FastBufferWriter writer, ref Dictionary<TKey, TVal> value, ref Dictionary<TKey, TVal> previousValue)
+        {
+            CollectionSerializationUtility.WriteDictionaryDelta(writer, ref value, ref previousValue);
+        }
+
+        public void ReadDelta(FastBufferReader reader, ref Dictionary<TKey, TVal> value)
+        {
+            CollectionSerializationUtility.ReadDictionaryDelta(reader, ref value);
+        }
+
+        void INetworkVariableSerializer<Dictionary<TKey, TVal>>.ReadWithAllocator(FastBufferReader reader, out Dictionary<TKey, TVal> value, Allocator allocator)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Duplicate(in Dictionary<TKey, TVal> value, ref Dictionary<TKey, TVal> duplicatedValue)
+        {
+            if (duplicatedValue == null)
+            {
+                duplicatedValue = new Dictionary<TKey, TVal>();
+            }
+
+            duplicatedValue.Clear();
+            foreach (var item in value)
+            {
+                // Handles nested dictionaries
+                TKey subKey = default;
+                TVal subValue = default;
+                NetworkVariableSerialization<TKey>.Duplicate(item.Key, ref subKey);
+                NetworkVariableSerialization<TVal>.Duplicate(item.Value, ref subValue);
+                duplicatedValue.Add(subKey, subValue);
+            }
+        }
+    }
+
+    internal class UnmanagedArraySerializer<T> : INetworkVariableSerializer<NativeArray<T>> where T : unmanaged
+    {
+        public void Write(FastBufferWriter writer, ref NativeArray<T> value)
+        {
+            writer.WriteUnmanagedSafe(value);
+        }
+
+        public void Read(FastBufferReader reader, ref NativeArray<T> value)
+        {
+            value.Dispose();
+            reader.ReadUnmanagedSafe(out value, Allocator.Persistent);
+        }
+
+        public void WriteDelta(FastBufferWriter writer, ref NativeArray<T> value, ref NativeArray<T> previousValue)
+        {
+            CollectionSerializationUtility.WriteNativeArrayDelta(writer, ref value, ref previousValue);
+        }
+
+        public void ReadDelta(FastBufferReader reader, ref NativeArray<T> value)
+        {
+            CollectionSerializationUtility.ReadNativeArrayDelta(reader, ref value);
+        }
+
+        void INetworkVariableSerializer<NativeArray<T>>.ReadWithAllocator(FastBufferReader reader, out NativeArray<T> value, Allocator allocator)
+        {
+            reader.ReadUnmanagedSafe(out value, allocator);
+        }
+
+        public void Duplicate(in NativeArray<T> value, ref NativeArray<T> duplicatedValue)
+        {
+            if (!duplicatedValue.IsCreated || duplicatedValue.Length != value.Length)
+            {
+                if (duplicatedValue.IsCreated)
+                {
+                    duplicatedValue.Dispose();
+                }
+
+                duplicatedValue = new NativeArray<T>(value.Length, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
+            }
+
+            duplicatedValue.CopyFrom(value);
+        }
+    }
+
+#if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
+    internal class UnmanagedListSerializer<T> : INetworkVariableSerializer<NativeList<T>> where T : unmanaged
+    {
+        public void Write(FastBufferWriter writer, ref NativeList<T> value)
+        {
+            writer.WriteUnmanagedSafe(value);
+        }
+
+        public void Read(FastBufferReader reader, ref NativeList<T> value)
+        {
+            reader.ReadUnmanagedSafeInPlace(ref value);
+        }
+
+        public void WriteDelta(FastBufferWriter writer, ref NativeList<T> value, ref NativeList<T> previousValue)
+        {
+            CollectionSerializationUtility.WriteNativeListDelta(writer, ref value, ref previousValue);
+        }
+
+        public void ReadDelta(FastBufferReader reader, ref NativeList<T> value)
+        {
+            CollectionSerializationUtility.ReadNativeListDelta(reader, ref value);
+        }
+
+        void INetworkVariableSerializer<NativeList<T>>.ReadWithAllocator(FastBufferReader reader, out NativeList<T> value, Allocator allocator)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Duplicate(in NativeList<T> value, ref NativeList<T> duplicatedValue)
+        {
+            if (!duplicatedValue.IsCreated)
+            {
+                duplicatedValue = new NativeList<T>(value.Length, Allocator.Persistent);
+            }
+            else if (value.Length != duplicatedValue.Length)
+            {
+                duplicatedValue.ResizeUninitialized(value.Length);
+            }
+
+            duplicatedValue.CopyFrom(value);
+        }
+    }
+
+
+    internal class NativeHashSetSerializer<T> : INetworkVariableSerializer<NativeHashSet<T>> where T : unmanaged, IEquatable<T>
+    {
+        public void Write(FastBufferWriter writer, ref NativeHashSet<T> value)
+        {
+            writer.WriteValueSafe(value);
+        }
+
+        public void Read(FastBufferReader reader, ref NativeHashSet<T> value)
+        {
+            reader.ReadValueSafeInPlace(ref value);
+        }
+
+        public void WriteDelta(FastBufferWriter writer, ref NativeHashSet<T> value, ref NativeHashSet<T> previousValue)
+        {
+            CollectionSerializationUtility.WriteNativeHashSetDelta(writer, ref value, ref previousValue);
+        }
+
+        public void ReadDelta(FastBufferReader reader, ref NativeHashSet<T> value)
+        {
+            CollectionSerializationUtility.ReadNativeHashSetDelta(reader, ref value);
+        }
+
+        void INetworkVariableSerializer<NativeHashSet<T>>.ReadWithAllocator(FastBufferReader reader, out NativeHashSet<T> value, Allocator allocator)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Duplicate(in NativeHashSet<T> value, ref NativeHashSet<T> duplicatedValue)
+        {
+            if (!duplicatedValue.IsCreated)
+            {
+                duplicatedValue = new NativeHashSet<T>(value.Capacity, Allocator.Persistent);
+            }
+
+            duplicatedValue.Clear();
+            foreach (var item in value)
+            {
+                duplicatedValue.Add(item);
+            }
+        }
+    }
+
+
+    internal class NativeHashMapSerializer<TKey, TVal> : INetworkVariableSerializer<NativeHashMap<TKey, TVal>>
+        where TKey : unmanaged, IEquatable<TKey>
+        where TVal : unmanaged
+    {
+        public void Write(FastBufferWriter writer, ref NativeHashMap<TKey, TVal> value)
+        {
+            writer.WriteValueSafe(value);
+        }
+
+        public void Read(FastBufferReader reader, ref NativeHashMap<TKey, TVal> value)
+        {
+            reader.ReadValueSafeInPlace(ref value);
+        }
+
+        public void WriteDelta(FastBufferWriter writer, ref NativeHashMap<TKey, TVal> value, ref NativeHashMap<TKey, TVal> previousValue)
+        {
+            CollectionSerializationUtility.WriteNativeHashMapDelta(writer, ref value, ref previousValue);
+        }
+
+        public void ReadDelta(FastBufferReader reader, ref NativeHashMap<TKey, TVal> value)
+        {
+            CollectionSerializationUtility.ReadNativeHashMapDelta(reader, ref value);
+        }
+
+        void INetworkVariableSerializer<NativeHashMap<TKey, TVal>>.ReadWithAllocator(FastBufferReader reader, out NativeHashMap<TKey, TVal> value, Allocator allocator)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Duplicate(in NativeHashMap<TKey, TVal> value, ref NativeHashMap<TKey, TVal> duplicatedValue)
+        {
+            if (!duplicatedValue.IsCreated)
+            {
+                duplicatedValue = new NativeHashMap<TKey, TVal>(value.Capacity, Allocator.Persistent);
+            }
+
+            duplicatedValue.Clear();
+            foreach (var item in value)
+            {
+                duplicatedValue.Add(item.Key, item.Value);
+            }
+        }
+    }
+#endif
+
+    /// <summary>
+    /// Serializer for FixedStrings
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class FixedStringSerializer<T> : INetworkVariableSerializer<T> where T : unmanaged, INativeList<byte>, IUTF8Bytes
+    {
+        public void Write(FastBufferWriter writer, ref T value)
+        {
+            writer.WriteValueSafe(value);
+        }
+
+        public void Read(FastBufferReader reader, ref T value)
+        {
+            reader.ReadValueSafeInPlace(ref value);
+        }
+
+        // Because of how strings are generally used, it is likely that most strings will still write as full strings
+        // instead of deltas. This actually adds one byte to the data to encode that it was serialized in full.
+        // But the potential savings from a small change to a large string are valuable enough to be worth that extra
+        // byte.
+        public unsafe void WriteDelta(FastBufferWriter writer, ref T value, ref T previousValue)
+        {
+            using var changes = new ResizableBitVector(Allocator.Temp);
+            var minLength = math.min(value.Length, previousValue.Length);
+            var numChanges = 0;
+            for (var i = 0; i < minLength; ++i)
+            {
+                var val = value[i];
+                var prevVal = previousValue[i];
+                if (val != prevVal)
+                {
+                    ++numChanges;
+                    changes.Set(i);
+                }
+            }
+
+            for (var i = previousValue.Length; i < value.Length; ++i)
+            {
+                ++numChanges;
+                changes.Set(i);
+            }
+
+            if (changes.GetSerializedSize() + FastBufferWriter.GetWriteSize<byte>() * numChanges > FastBufferWriter.GetWriteSize<byte>() * value.Length)
+            {
+                // If there are too many changes, send the entire array.
+                writer.WriteByteSafe(1); // Flag that we're sending the entire array
+                writer.WriteValueSafe(value);
+                return;
+            }
+
+            writer.WriteByteSafe(0); // Flag that we're sending a delta
+            BytePacker.WriteValuePacked(writer, value.Length);
+            writer.WriteValueSafe(changes);
+            var ptr = value.GetUnsafePtr();
+            for (var i = 0; i < value.Length; ++i)
+            {
+                if (changes.IsSet(i))
+                {
+                    writer.WriteByteSafe(ptr[i]);
+                }
+            }
+        }
+
+        public unsafe void ReadDelta(FastBufferReader reader, ref T value)
+        {
+            // Writing can use the NativeArray logic as it is, but reading is a little different.
+            // Using the NativeArray logic for reading would result in length changes allocating a new NativeArray,
+            // which is not what we want for FixedString. With FixedString, the actual size of the data does not change,
+            // only an in-memory "length" value - so if the length changes, the only thing we want to do is change
+            // that value, and otherwise read everything in-place.
+            reader.ReadByteSafe(out var full);
+            if (full == 1)
+            {
+                reader.ReadValueSafeInPlace(ref value);
+                return;
+            }
+
+            ByteUnpacker.ReadValuePacked(reader, out int length);
+            var changes = new ResizableBitVector(Allocator.Temp);
+            using var toDispose = changes;
+            {
+                reader.ReadNetworkSerializableInPlace(ref changes);
+
+                value.Length = length;
+
+                var ptr = value.GetUnsafePtr();
+                for (var i = 0; i < value.Length; ++i)
+                {
+                    if (changes.IsSet(i))
+                    {
+                        reader.ReadByteSafe(out ptr[i]);
+                    }
+                }
+            }
+        }
+
+        void INetworkVariableSerializer<T>.ReadWithAllocator(FastBufferReader reader, out T value, Allocator allocator)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Duplicate(in T value, ref T duplicatedValue)
+        {
+            duplicatedValue = value;
+        }
+    }
+
+    /// <summary>
+    ///     Serializer for FixedStrings
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class FixedStringArraySerializer<T> : INetworkVariableSerializer<NativeArray<T>> where T : unmanaged, INativeList<byte>, IUTF8Bytes
+    {
+        public void Write(FastBufferWriter writer, ref NativeArray<T> value)
+        {
+            writer.WriteValueSafe(value);
+        }
+
+        public void Read(FastBufferReader reader, ref NativeArray<T> value)
+        {
+            value.Dispose();
+            reader.ReadValueSafe(out value, Allocator.Persistent);
+        }
+
+
+        public void WriteDelta(FastBufferWriter writer, ref NativeArray<T> value, ref NativeArray<T> previousValue)
+        {
+            CollectionSerializationUtility.WriteNativeArrayDelta(writer, ref value, ref previousValue);
+        }
+
+        public void ReadDelta(FastBufferReader reader, ref NativeArray<T> value)
+        {
+            CollectionSerializationUtility.ReadNativeArrayDelta(reader, ref value);
+        }
+
+        void INetworkVariableSerializer<NativeArray<T>>.ReadWithAllocator(FastBufferReader reader, out NativeArray<T> value, Allocator allocator)
+        {
+            reader.ReadValueSafe(out value, allocator);
+        }
+
+        public void Duplicate(in NativeArray<T> value, ref NativeArray<T> duplicatedValue)
+        {
+            if (!duplicatedValue.IsCreated || duplicatedValue.Length != value.Length)
+            {
+                if (duplicatedValue.IsCreated)
+                {
+                    duplicatedValue.Dispose();
+                }
+
+                duplicatedValue = new NativeArray<T>(value.Length, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
+            }
+
+            duplicatedValue.CopyFrom(value);
+        }
+    }
+
+#if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
+    /// <summary>
+    ///     Serializer for FixedStrings
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class FixedStringListSerializer<T> : INetworkVariableSerializer<NativeList<T>> where T : unmanaged, INativeList<byte>, IUTF8Bytes
+    {
+        public void Write(FastBufferWriter writer, ref NativeList<T> value)
+        {
+            writer.WriteValueSafe(value);
+        }
+
+        public void Read(FastBufferReader reader, ref NativeList<T> value)
+        {
+            reader.ReadValueSafeInPlace(ref value);
+        }
+
+        public void WriteDelta(FastBufferWriter writer, ref NativeList<T> value, ref NativeList<T> previousValue)
+        {
+            CollectionSerializationUtility.WriteNativeListDelta(writer, ref value, ref previousValue);
+        }
+
+        public void ReadDelta(FastBufferReader reader, ref NativeList<T> value)
+        {
+            CollectionSerializationUtility.ReadNativeListDelta(reader, ref value);
+        }
+
+        void INetworkVariableSerializer<NativeList<T>>.ReadWithAllocator(FastBufferReader reader, out NativeList<T> value, Allocator allocator)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Duplicate(in NativeList<T> value, ref NativeList<T> duplicatedValue)
+        {
+            if (!duplicatedValue.IsCreated)
+            {
+                duplicatedValue = new NativeList<T>(value.Length, Allocator.Persistent);
+            }
+            else if (value.Length != duplicatedValue.Length)
+            {
+                duplicatedValue.ResizeUninitialized(value.Length);
+            }
+
+            duplicatedValue.CopyFrom(value);
+        }
+    }
+#endif
+
+    /// <summary>
+    ///     Serializer for unmanaged INetworkSerializable types
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class UnmanagedNetworkSerializableSerializer<T> : INetworkVariableSerializer<T> where T : unmanaged, INetworkSerializable
+    {
+        public void Write(FastBufferWriter writer, ref T value)
+        {
+            var bufferSerializer = new BufferSerializer<BufferSerializerWriter>(new BufferSerializerWriter(writer));
+            value.NetworkSerialize(bufferSerializer);
+        }
+
+        public void Read(FastBufferReader reader, ref T value)
+        {
+            var bufferSerializer = new BufferSerializer<BufferSerializerReader>(new BufferSerializerReader(reader));
+            value.NetworkSerialize(bufferSerializer);
+        }
+
+        public void WriteDelta(FastBufferWriter writer, ref T value, ref T previousValue)
+        {
+            if (UserNetworkVariableSerialization<T>.WriteDelta != null && UserNetworkVariableSerialization<T>.ReadDelta != null)
+            {
+                UserNetworkVariableSerialization<T>.WriteDelta(writer, value, previousValue);
+                return;
+            }
+
+            Write(writer, ref value);
+        }
+
+        public void ReadDelta(FastBufferReader reader, ref T value)
+        {
+            if (UserNetworkVariableSerialization<T>.WriteDelta != null && UserNetworkVariableSerialization<T>.ReadDelta != null)
+            {
+                UserNetworkVariableSerialization<T>.ReadDelta(reader, ref value);
+                return;
+            }
+
+            Read(reader, ref value);
+        }
+
+        void INetworkVariableSerializer<T>.ReadWithAllocator(FastBufferReader reader, out T value, Allocator allocator)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Duplicate(in T value, ref T duplicatedValue)
+        {
+            duplicatedValue = value;
+        }
+    }
+
+
+    /// <summary>
+    ///     Serializer for unmanaged INetworkSerializable types
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class UnmanagedNetworkSerializableArraySerializer<T> : INetworkVariableSerializer<NativeArray<T>> where T : unmanaged, INetworkSerializable
+    {
+        public void Write(FastBufferWriter writer, ref NativeArray<T> value)
+        {
+            writer.WriteNetworkSerializable(value);
+        }
+
+        public void Read(FastBufferReader reader, ref NativeArray<T> value)
+        {
+            value.Dispose();
+            reader.ReadNetworkSerializable(out value, Allocator.Persistent);
+        }
+
+
+        public void WriteDelta(FastBufferWriter writer, ref NativeArray<T> value, ref NativeArray<T> previousValue)
+        {
+            CollectionSerializationUtility.WriteNativeArrayDelta(writer, ref value, ref previousValue);
+        }
+
+        public void ReadDelta(FastBufferReader reader, ref NativeArray<T> value)
+        {
+            CollectionSerializationUtility.ReadNativeArrayDelta(reader, ref value);
+        }
+
+        void INetworkVariableSerializer<NativeArray<T>>.ReadWithAllocator(FastBufferReader reader, out NativeArray<T> value, Allocator allocator)
+        {
+            reader.ReadNetworkSerializable(out value, allocator);
+        }
+
+        public void Duplicate(in NativeArray<T> value, ref NativeArray<T> duplicatedValue)
+        {
+            if (!duplicatedValue.IsCreated || duplicatedValue.Length != value.Length)
+            {
+                if (duplicatedValue.IsCreated)
+                {
+                    duplicatedValue.Dispose();
+                }
+
+                duplicatedValue = new NativeArray<T>(value.Length, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
+            }
+
+            duplicatedValue.CopyFrom(value);
+        }
+    }
+
+#if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
+    /// <summary>
+    ///     Serializer for unmanaged INetworkSerializable types
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class UnmanagedNetworkSerializableListSerializer<T> : INetworkVariableSerializer<NativeList<T>> where T : unmanaged, INetworkSerializable
+    {
+        public void Write(FastBufferWriter writer, ref NativeList<T> value)
+        {
+            writer.WriteNetworkSerializable(value);
+        }
+
+        public void Read(FastBufferReader reader, ref NativeList<T> value)
+        {
+            reader.ReadNetworkSerializableInPlace(ref value);
+        }
+
+        public void WriteDelta(FastBufferWriter writer, ref NativeList<T> value, ref NativeList<T> previousValue)
+        {
+            CollectionSerializationUtility.WriteNativeListDelta(writer, ref value, ref previousValue);
+        }
+
+        public void ReadDelta(FastBufferReader reader, ref NativeList<T> value)
+        {
+            CollectionSerializationUtility.ReadNativeListDelta(reader, ref value);
+        }
+
+        void INetworkVariableSerializer<NativeList<T>>.ReadWithAllocator(FastBufferReader reader, out NativeList<T> value, Allocator allocator)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void Duplicate(in NativeList<T> value, ref NativeList<T> duplicatedValue)
+        {
+            if (!duplicatedValue.IsCreated)
+            {
+                duplicatedValue = new NativeList<T>(value.Length, Allocator.Persistent);
+            }
+            else if (value.Length != duplicatedValue.Length)
+            {
+                duplicatedValue.ResizeUninitialized(value.Length);
+            }
+
+            duplicatedValue.CopyFrom(value);
+        }
+    }
+#endif
+
+    /// <summary>
+    ///     Serializer for managed INetworkSerializable types, which differs from the unmanaged implementation in that it
+    ///     has to be null-aware
+    ///     <typeparam name="T"></typeparam>
+    internal class ManagedNetworkSerializableSerializer<T> : INetworkVariableSerializer<T> where T : class, INetworkSerializable, new()
+    {
+        public void Write(FastBufferWriter writer, ref T value)
+        {
+            var bufferSerializer = new BufferSerializer<BufferSerializerWriter>(new BufferSerializerWriter(writer));
+            var isNull = value == null;
+            bufferSerializer.SerializeValue(ref isNull);
+            if (!isNull)
+            {
+                value.NetworkSerialize(bufferSerializer);
+            }
+        }
+
+        public void Read(FastBufferReader reader, ref T value)
+        {
+            var bufferSerializer = new BufferSerializer<BufferSerializerReader>(new BufferSerializerReader(reader));
+            var isNull = false;
+            bufferSerializer.SerializeValue(ref isNull);
+            if (isNull)
+            {
+                value = null;
+            }
+            else
+            {
+                if (value == null)
+                {
+                    value = new T();
+                }
+
+                value.NetworkSerialize(bufferSerializer);
+            }
+        }
+
+        public void WriteDelta(FastBufferWriter writer, ref T value, ref T previousValue)
+        {
+            if (UserNetworkVariableSerialization<T>.WriteDelta != null && UserNetworkVariableSerialization<T>.ReadDelta != null)
+            {
+                UserNetworkVariableSerialization<T>.WriteDelta(writer, value, previousValue);
+                return;
+            }
+
+            Write(writer, ref value);
+        }
+
+        public void ReadDelta(FastBufferReader reader, ref T value)
+        {
+            if (UserNetworkVariableSerialization<T>.WriteDelta != null && UserNetworkVariableSerialization<T>.ReadDelta != null)
+            {
+                UserNetworkVariableSerialization<T>.ReadDelta(reader, ref value);
+                return;
+            }
+
+            Read(reader, ref value);
+        }
+
+        void INetworkVariableSerializer<T>.ReadWithAllocator(FastBufferReader reader, out T value, Allocator allocator)
+        {
+            throw new NotImplementedException();
+        }
+
+
+        public void Duplicate(in T value, ref T duplicatedValue)
+        {
+            using var writer = new FastBufferWriter(256, Allocator.Temp, int.MaxValue);
+            var refValue = value;
+            Write(writer, ref refValue);
+
+            using var reader = new FastBufferReader(writer, Allocator.None);
+            Read(reader, ref duplicatedValue);
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/TypedSerializerImplementations.cs.meta b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/TypedSerializerImplementations.cs.meta
new file mode 100644
index 0000000000..e430403d6d
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/TypedSerializerImplementations.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: bbfa170e9dd448bbbe381ce38d5c139d
+timeCreated: 1718216671
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/UserNetworkVariableSerialization.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/UserNetworkVariableSerialization.cs
new file mode 100644
index 0000000000..3f2a64585c
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/UserNetworkVariableSerialization.cs
@@ -0,0 +1,74 @@
+namespace Unity.Netcode
+{
+    /// <summary>
+    /// This class is used to register user serialization with NetworkVariables for types
+    /// that are serialized via user serialization, such as with FastBufferReader and FastBufferWriter
+    /// extension methods. Finding those methods isn't achievable efficiently at runtime, so this allows
+    /// users to tell NetworkVariable about those extension methods (or simply pass in a lambda)
+    /// </summary>
+    /// <typeparam name="T">The type of value being serialized</typeparam>
+    public class UserNetworkVariableSerialization<T>
+    {
+        /// <summary>
+        /// The write value delegate handler definition
+        /// </summary>
+        /// <param name="writer">The <see cref="FastBufferWriter"/> to write the value of type `T`</param>
+        /// <param name="value">The value of type `T` to be written</param>
+        public delegate void WriteValueDelegate(FastBufferWriter writer, in T value);
+
+        /// <summary>
+        /// The write value delegate handler definition
+        /// </summary>
+        /// <param name="writer">The <see cref="FastBufferWriter"/> to write the value of type `T`</param>
+        /// <param name="value">The value of type `T` to be written</param>
+        /// <param name="previousValue">The previous value to compute the delta against</param>
+        public delegate void WriteDeltaDelegate(FastBufferWriter writer, in T value, in T previousValue);
+
+        /// <summary>
+        /// The read value delegate handler definition
+        /// </summary>
+        /// <param name="reader">The <see cref="FastBufferReader"/> to read the value of type `T`</param>
+        /// <param name="value">The value of type `T` to be read</param>
+        public delegate void ReadValueDelegate(FastBufferReader reader, out T value);
+
+        /// <summary>
+        /// The read value delegate handler definition
+        /// </summary>
+        /// <param name="reader">The <see cref="FastBufferReader"/> to read the value of type `T`</param>
+        /// <param name="value">The value of type `T` to be read</param>
+        public delegate void ReadDeltaDelegate(FastBufferReader reader, ref T value);
+
+        /// <summary>
+        /// The read value delegate handler definition
+        /// </summary>
+        /// <param name="value">The value of type `T` to be read</param>
+        /// <param name="duplicatedValue">The reference to store the duplicated value in</param>
+        public delegate void DuplicateValueDelegate(in T value, ref T duplicatedValue);
+
+        /// <summary>
+        /// Callback to write a value
+        /// </summary>
+        public static WriteValueDelegate WriteValue;
+
+        /// <summary>
+        /// Callback to read a value
+        /// </summary>
+        public static ReadValueDelegate ReadValue;
+
+        /// <summary>
+        /// Callback to write a delta between two values, based on computing the difference between the previous and
+        /// current values.
+        /// </summary>
+        public static WriteDeltaDelegate WriteDelta;
+
+        /// <summary>
+        /// Callback to read a delta, applying only select changes to the current value.
+        /// </summary>
+        public static ReadDeltaDelegate ReadDelta;
+
+        /// <summary>
+        /// Callback to create a duplicate of a value, used to check for dirty status.
+        /// </summary>
+        public static DuplicateValueDelegate DuplicateValue;
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/UserNetworkVariableSerialization.cs.meta b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/UserNetworkVariableSerialization.cs.meta
new file mode 100644
index 0000000000..a21252a911
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Serialization/UserNetworkVariableSerialization.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: b295a6756640488b9824d2ec6e26ddae
+timeCreated: 1718218272
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Runtime/SceneManagement/DefaultSceneManagerHandler.cs b/com.unity.netcode.gameobjects/Runtime/SceneManagement/DefaultSceneManagerHandler.cs
index be4e00eace..2340327262 100644
--- a/com.unity.netcode.gameobjects/Runtime/SceneManagement/DefaultSceneManagerHandler.cs
+++ b/com.unity.netcode.gameobjects/Runtime/SceneManagement/DefaultSceneManagerHandler.cs
@@ -1,6 +1,10 @@
 using System;
 using System.Collections.Generic;
+using TrollKing.Core;
 using UnityEngine;
+using UnityEngine.AddressableAssets;
+using UnityEngine.ResourceManagement.AsyncOperations;
+using UnityEngine.ResourceManagement.ResourceProviders;
 using UnityEngine.SceneManagement;
 
 
@@ -11,6 +15,8 @@ namespace Unity.Netcode
     /// </summary>
     internal class DefaultSceneManagerHandler : ISceneManagerHandler
     {
+        private static NetworkLogScope s_Log = new NetworkLogScope(nameof(DefaultSceneManagerHandler));
+
         private Scene m_InvalidScene = new Scene();
 
         internal struct SceneEntry
@@ -18,21 +24,59 @@ internal struct SceneEntry
             public bool IsAssigned;
             public Scene Scene;
         }
+        public bool IsIntegrationTest() { return false; }
 
         internal Dictionary<string, Dictionary<int, SceneEntry>> SceneNameToSceneHandles = new Dictionary<string, Dictionary<int, SceneEntry>>();
 
-        public AsyncOperation LoadSceneAsync(string sceneName, LoadSceneMode loadSceneMode, SceneEventProgress sceneEventProgress)
+        public AsyncOperationHandle<SceneInstance> LoadSceneAsync(string sceneName, LoadSceneMode loadSceneMode, SceneEventProgress sceneEventProgress)
         {
-            var operation = SceneManager.LoadSceneAsync(sceneName, loadSceneMode);
-            sceneEventProgress.SetAsyncOperation(operation);
+            s_Log.Info(() => $"Loading scene '{sceneName}'...");
+            AsyncOperationHandle<SceneInstance> operation = default;
+            if (loadSceneMode == LoadSceneMode.Single)
+            {
+                operation = Addressables.LoadSceneAsync(sceneName, LoadSceneMode.Additive, false);
+                // Handle the async load
+                operation.Completed += handle =>
+                {
+                    var sceneInstance = handle.Result;
+                    var current = SceneManager.GetActiveScene();
+                    var async = sceneInstance.ActivateAsync();
+                    async.completed += asyncOperation =>
+                    {
+                        var scene = sceneInstance.Scene;
+                        SceneManager.SetActiveScene(scene);
+                        SceneManager.UnloadSceneAsync(current);
+                    };
+
+                };
+                sceneEventProgress.SetAsyncOperation(operation);
+            }
+            else
+            {
+                operation = Addressables.LoadSceneAsync(sceneName, loadSceneMode);
+                sceneEventProgress.SetAsyncOperation(operation);
+            }
+
             return operation;
         }
 
-        public AsyncOperation UnloadSceneAsync(Scene scene, SceneEventProgress sceneEventProgress)
+        public AsyncOperationHandle<SceneInstance> UnloadSceneAsync(NetworkSceneManager.SceneData scene, SceneEventProgress sceneEventProgress)
         {
-            var operation = SceneManager.UnloadSceneAsync(scene);
-            sceneEventProgress.SetAsyncOperation(operation);
-            return operation;
+            if (scene.SceneInstance.HasValue)
+            {
+                var operation = Addressables.UnloadSceneAsync(scene.SceneInstance.Value);
+                sceneEventProgress.SetAsyncOperation(operation);
+                return operation;
+            }
+            else
+            {
+                s_Log.Error(() => $"Unloaded a scene that wasn't loaded with addressables '{scene.SceneInstance}'");
+                var unloadOp = SceneManager.UnloadSceneAsync(scene.SceneReference);
+                AsyncOperationHandle<SceneInstance> operation = default;
+                sceneEventProgress.SetAsyncOperation(operation);
+                return operation;
+            }
+
         }
 
         /// <summary>
@@ -167,8 +211,9 @@ public Scene GetSceneFromLoadedScenes(string sceneName, NetworkManager networkMa
         /// same application instance is still running, the same scenes are still loaded on the client, and
         /// upon reconnecting the client doesn't have to unload the scenes and then reload them)
         /// </summary>
-        public void PopulateLoadedScenes(ref Dictionary<int, Scene> scenesLoaded, NetworkManager networkManager)
+        public void PopulateLoadedScenes(ref Dictionary<int, NetworkSceneManager.SceneData> scenesLoaded, NetworkManager networkManager)
         {
+            Debug.LogError($"PopulateLoadedScenes START");
             SceneNameToSceneHandles.Clear();
             var sceneCount = SceneManager.sceneCount;
             for (int i = 0; i < sceneCount; i++)
@@ -189,7 +234,7 @@ public void PopulateLoadedScenes(ref Dictionary<int, Scene> scenesLoaded, Networ
                     SceneNameToSceneHandles[scene.name].Add(scene.handle, sceneEntry);
                     if (!scenesLoaded.ContainsKey(scene.handle))
                     {
-                        scenesLoaded.Add(scene.handle, scene);
+                        scenesLoaded.Add(scene.handle, new NetworkSceneManager.SceneData(null, scene));
                     }
                 }
                 else
@@ -197,6 +242,7 @@ public void PopulateLoadedScenes(ref Dictionary<int, Scene> scenesLoaded, Networ
                     throw new Exception($"[Duplicate Handle] Scene {scene.name} already has scene handle {scene.handle} registered!");
                 }
             }
+            Debug.LogError($"PopulateLoadedScenes END");
         }
 
         private List<Scene> m_ScenesToUnload = new List<Scene>();
@@ -332,8 +378,9 @@ public void MoveObjectsFromSceneToDontDestroyOnLoad(ref NetworkManager networkMa
         public void SetClientSynchronizationMode(ref NetworkManager networkManager, LoadSceneMode mode)
         {
             var sceneManager = networkManager.SceneManager;
-            // Don't let client's set this value
-            if (!networkManager.IsServer)
+            // In client-server, we don't let client's set this value.
+            // In distributed authority, since session owner can be promoted clients can set this value
+            if (!networkManager.DistributedAuthorityMode && !networkManager.IsServer)
             {
                 if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
                 {
@@ -342,7 +389,7 @@ public void SetClientSynchronizationMode(ref NetworkManager networkManager, Load
                 return;
             }
             else // Warn users if they are changing this after there are clients already connected and synchronized
-            if (networkManager.ConnectedClientsIds.Count > (networkManager.IsHost ? 1 : 0) && sceneManager.ClientSynchronizationMode != mode)
+            if (!networkManager.DistributedAuthorityMode && networkManager.ConnectedClientsIds.Count > (networkManager.IsHost ? 1 : 0) && sceneManager.ClientSynchronizationMode != mode)
             {
                 if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
                 {
@@ -371,7 +418,7 @@ public void SetClientSynchronizationMode(ref NetworkManager networkManager, Load
                     // If the scene is not already in the ScenesLoaded list, then add it
                     if (!sceneManager.ScenesLoaded.ContainsKey(scene.handle))
                     {
-                        sceneManager.ScenesLoaded.Add(scene.handle, scene);
+                        sceneManager.ScenesLoaded.Add(scene.handle, new NetworkSceneManager.SceneData(null, scene));
                     }
                 }
             }
diff --git a/com.unity.netcode.gameobjects/Runtime/SceneManagement/ISceneManagerHandler.cs b/com.unity.netcode.gameobjects/Runtime/SceneManagement/ISceneManagerHandler.cs
index 240a5c94f6..9f52e28da6 100644
--- a/com.unity.netcode.gameobjects/Runtime/SceneManagement/ISceneManagerHandler.cs
+++ b/com.unity.netcode.gameobjects/Runtime/SceneManagement/ISceneManagerHandler.cs
@@ -1,5 +1,7 @@
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.ResourceManagement.AsyncOperations;
+using UnityEngine.ResourceManagement.ResourceProviders;
 using UnityEngine.SceneManagement;
 
 namespace Unity.Netcode
@@ -8,13 +10,13 @@ namespace Unity.Netcode
     /// Used to override the LoadSceneAsync and UnloadSceneAsync methods called
     /// within the NetworkSceneManager.
     /// </summary>
-    internal interface ISceneManagerHandler
+    public interface ISceneManagerHandler
     {
-        AsyncOperation LoadSceneAsync(string sceneName, LoadSceneMode loadSceneMode, SceneEventProgress sceneEventProgress);
+        AsyncOperationHandle<SceneInstance> LoadSceneAsync(string sceneAssetKey, LoadSceneMode loadSceneMode, SceneEventProgress sceneEventProgress);
 
-        AsyncOperation UnloadSceneAsync(Scene scene, SceneEventProgress sceneEventProgress);
+        AsyncOperationHandle<SceneInstance> UnloadSceneAsync(NetworkSceneManager.SceneData scene, SceneEventProgress sceneEventProgress);
 
-        void PopulateLoadedScenes(ref Dictionary<int, Scene> scenesLoaded, NetworkManager networkManager = null);
+        void PopulateLoadedScenes(ref Dictionary<int, NetworkSceneManager.SceneData> scenesLoaded, NetworkManager networkManager = null);
         Scene GetSceneFromLoadedScenes(string sceneName, NetworkManager networkManager = null);
 
         bool DoesSceneHaveUnassignedEntry(string sceneName, NetworkManager networkManager = null);
@@ -32,5 +34,7 @@ internal interface ISceneManagerHandler
         void SetClientSynchronizationMode(ref NetworkManager networkManager, LoadSceneMode mode);
 
         bool ClientShouldPassThrough(string sceneName, bool isPrimaryScene, LoadSceneMode clientSynchronizationMode, NetworkManager networkManager);
+
+        bool IsIntegrationTest();
     }
 }
diff --git a/com.unity.netcode.gameobjects/Runtime/SceneManagement/NetworkSceneManager.cs b/com.unity.netcode.gameobjects/Runtime/SceneManagement/NetworkSceneManager.cs
index 67dab511cf..084fd6286e 100644
--- a/com.unity.netcode.gameobjects/Runtime/SceneManagement/NetworkSceneManager.cs
+++ b/com.unity.netcode.gameobjects/Runtime/SceneManagement/NetworkSceneManager.cs
@@ -1,9 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using TrollKing.Core;
 using Unity.Collections;
 using UnityEngine;
+using UnityEngine.AddressableAssets;
+using UnityEngine.Profiling;
+using UnityEngine.ResourceManagement.AsyncOperations;
+using UnityEngine.ResourceManagement.ResourceProviders;
 using UnityEngine.SceneManagement;
+using Object = UnityEngine.Object;
 
 
 namespace Unity.Netcode
@@ -15,7 +21,7 @@ namespace Unity.Netcode
     /// <em>Note: This is only when <see cref="NetworkConfig.EnableSceneManagement"/> is enabled.</em><br />
     /// <em>*** Do not start new scene events within scene event notification callbacks.</em><br />
     /// See also: <br />
-    /// <seealso cref="SceneEventType"/>
+    /// <see cref="SceneEventType"/>
     /// </summary>
     public class SceneEvent
     {
@@ -27,7 +33,7 @@ public class SceneEvent
         /// <item><term><see cref="SceneEventType.Unload"/></term></item>
         /// </list>
         /// </summary>
-        public AsyncOperation AsyncOperation;
+        public AsyncOperationHandle AsyncOperation;
 
         /// <summary>
         /// Will always be set to the current <see cref="Netcode.SceneEventType"/>
@@ -131,6 +137,8 @@ public class SceneEvent
     /// </summary>
     public class NetworkSceneManager : IDisposable
     {
+        private static readonly NetworkLogScope Log = new NetworkLogScope(nameof(NetworkSceneManager));
+
         private const NetworkDelivery k_DeliveryType = NetworkDelivery.ReliableFragmentedSequenced;
         internal const int InvalidSceneNameOrPath = -1;
 
@@ -146,10 +154,10 @@ public class NetworkSceneManager : IDisposable
         /// <summary>
         /// The delegate callback definition for scene event notifications.<br />
         /// See also: <br />
-        /// <seealso cref="SceneEvent"/><br />
-        /// <seealso cref="SceneEventData"/>
+        /// <see cref="SceneEvent"/><br />
+        /// <see cref="SceneEventData"/>
         /// </summary>
-        /// <param name="sceneEvent"></param>
+        /// <param name="sceneEvent">SceneEvent which contains information about the scene event, including type, progress, and scene details</param>
         public delegate void SceneEventDelegate(SceneEvent sceneEvent);
 
         /// <summary>
@@ -175,28 +183,28 @@ public class NetworkSceneManager : IDisposable
         /// <summary>
         /// Delegate declaration for the OnLoad event.<br />
         /// See also: <br />
-        /// <seealso cref="SceneEventType.Load"/>for more information
+        /// <see cref="SceneEventType.Load"/>for more information
         /// </summary>
         /// <param name="clientId">the client that is processing this event (the server will receive all of these events for every client and itself)</param>
         /// <param name="sceneName">name of the scene being processed</param>
         /// <param name="loadSceneMode">the LoadSceneMode mode for the scene being loaded</param>
         /// <param name="asyncOperation">the associated <see cref="AsyncOperation"/> that can be used for scene loading progress</param>
-        public delegate void OnLoadDelegateHandler(ulong clientId, string sceneName, LoadSceneMode loadSceneMode, AsyncOperation asyncOperation);
+        public delegate void OnLoadDelegateHandler(ulong clientId, string sceneName, LoadSceneMode loadSceneMode, AsyncOperationHandle<SceneInstance> asyncOperation);
 
         /// <summary>
         /// Delegate declaration for the OnUnload event.<br />
         /// See also: <br />
-        /// <seealso cref="SceneEventType.Unload"/> for more information
+        /// <see cref="SceneEventType.Unload"/> for more information
         /// </summary>
         /// <param name="clientId">the client that is processing this event (the server will receive all of these events for every client and itself)</param>
         /// <param name="sceneName">name of the scene being processed</param>
         /// <param name="asyncOperation">the associated <see cref="AsyncOperation"/> that can be used for scene unloading progress</param>
-        public delegate void OnUnloadDelegateHandler(ulong clientId, string sceneName, AsyncOperation asyncOperation);
+        public delegate void OnUnloadDelegateHandler(ulong clientId, string sceneName, AsyncOperationHandle<SceneInstance> asyncOperation);
 
         /// <summary>
         /// Delegate declaration for the OnSynchronize event.<br />
         /// See also: <br />
-        /// <seealso cref="SceneEventType.Synchronize"/> for more information
+        /// <see cref="SceneEventType.Synchronize"/> for more information
         /// </summary>
         /// <param name="clientId">the client that is processing this event (the server will receive all of these events for every client and itself)</param>
         public delegate void OnSynchronizeDelegateHandler(ulong clientId);
@@ -204,8 +212,8 @@ public class NetworkSceneManager : IDisposable
         /// <summary>
         /// Delegate declaration for the OnLoadEventCompleted and OnUnloadEventCompleted events.<br />
         /// See also:<br />
-        /// <seealso cref="SceneEventType.LoadEventCompleted"/><br />
-        /// <seealso cref="SceneEventType.UnloadEventCompleted"/>
+        /// <see cref="SceneEventType.LoadEventCompleted"/><br />
+        /// <see cref="SceneEventType.UnloadEventCompleted"/>
         /// </summary>
         /// <param name="sceneName">scene pertaining to this event</param>
         /// <param name="loadSceneMode"><see cref="LoadSceneMode"/> of the associated event completed</param>
@@ -216,7 +224,7 @@ public class NetworkSceneManager : IDisposable
         /// <summary>
         /// Delegate declaration for the OnLoadComplete event.<br />
         /// See also:<br />
-        /// <seealso cref="SceneEventType.LoadComplete"/> for more information
+        /// <see cref="SceneEventType.LoadComplete"/> for more information
         /// </summary>
         /// <param name="clientId">the client that is processing this event (the server will receive all of these events for every client and itself)</param>
         /// <param name="sceneName">the scene name pertaining to this event</param>
@@ -226,7 +234,7 @@ public class NetworkSceneManager : IDisposable
         /// <summary>
         /// Delegate declaration for the OnUnloadComplete event.<br />
         /// See also:<br />
-        /// <seealso cref="SceneEventType.UnloadComplete"/> for more information
+        /// <see cref="SceneEventType.UnloadComplete"/> for more information
         /// </summary>
         /// <param name="clientId">the client that is processing this event (the server will receive all of these events for every client and itself)</param>
         /// <param name="sceneName">the scene name pertaining to this event</param>
@@ -235,7 +243,7 @@ public class NetworkSceneManager : IDisposable
         /// <summary>
         /// Delegate declaration for the OnSynchronizeComplete event.<br />
         /// See also:<br />
-        /// <seealso cref="SceneEventType.SynchronizeComplete"/> for more information
+        /// <see cref="SceneEventType.SynchronizeComplete"/> for more information
         /// </summary>
         /// <param name="clientId">the client that completed this event</param>
         public delegate void OnSynchronizeCompleteDelegateHandler(ulong clientId);
@@ -394,7 +402,7 @@ public bool ActiveSceneSynchronizationEnabled
         /// <summary>
         /// The SceneManagerHandler implementation
         /// </summary>
-        internal ISceneManagerHandler SceneManagerHandler = new DefaultSceneManagerHandler();
+        public ISceneManagerHandler SceneManagerHandler = new DefaultSceneManagerHandler();
 
         internal readonly Dictionary<Guid, SceneEventProgress> SceneEventProgressTracking = new Dictionary<Guid, SceneEventProgress>();
 
@@ -413,6 +421,17 @@ public bool ActiveSceneSynchronizationEnabled
         /// </summary>
         internal Scene SceneBeingSynchronized;
 
+        public class SceneData
+        {
+            public SceneData(SceneInstance? instance, Scene reference)
+            {
+                SceneReference = reference;
+                SceneInstance = instance;
+            }
+            public Scene SceneReference;
+            public SceneInstance? SceneInstance;
+        }
+
         /// <summary>
         /// Used to track which scenes are currently loaded
         /// We store the scenes as [SceneHandle][Scene] in order to handle the loading and unloading of the same scene additively
@@ -421,7 +440,21 @@ public bool ActiveSceneSynchronizationEnabled
         /// The client links the server scene handle to the client local scene handle upon a scene being loaded
         /// <see cref="GetAndAddNewlyLoadedSceneByName"/>
         /// </summary>
-        internal Dictionary<int, Scene> ScenesLoaded = new Dictionary<int, Scene>();
+        public Dictionary<int, SceneData> ScenesLoaded = new Dictionary<int, SceneData>();
+
+        /// <summary>
+        /// Returns the currently loaded scenes that are synchronized with the session owner or server depending upon the selected
+        /// network topology.
+        /// </summary>
+        /// <remarks>
+        /// The <see cref="SceneManager"/> scenes loaded returns all scenes loaded where this returns only the scenes that have been
+        /// synchronized remotely. This can be useful when using scene validation and excluding certain scenes from being synchronized.
+        /// </remarks>
+        /// <returns>List of the known synchronized scenes</returns>
+        public List<SceneData> GetSynchronizedScenes()
+        {
+            return ScenesLoaded.Values.ToList();
+        }
 
         /// <summary>
         /// Since Scene.handle is unique per client, we create a look-up table between the client and server to associate server unique scene
@@ -430,6 +463,7 @@ public bool ActiveSceneSynchronizationEnabled
         internal Dictionary<int, int> ServerSceneHandleToClientSceneHandle = new Dictionary<int, int>();
         internal Dictionary<int, int> ClientSceneHandleToServerSceneHandle = new Dictionary<int, int>();
 
+        internal bool IsRestoringSession;
         /// <summary>
         /// Add the client to server (and vice versa) scene handle lookup.
         /// Add the client-side handle to scene entry in the HandleToScene table.
@@ -439,18 +473,20 @@ internal bool UpdateServerClientSceneHandle(int serverHandle, int clientHandle,
         {
             if (!ServerSceneHandleToClientSceneHandle.ContainsKey(serverHandle))
             {
+                Log.Info(() => $"Adding Server Scene Handle {clientHandle} {localScene.name}");
                 ServerSceneHandleToClientSceneHandle.Add(serverHandle, clientHandle);
             }
-            else
+            else if (!IsRestoringSession)
             {
                 return false;
             }
 
             if (!ClientSceneHandleToServerSceneHandle.ContainsKey(clientHandle))
             {
+                Log.Info(() => $"Adding Client Scene Handle {clientHandle} {localScene.name}");
                 ClientSceneHandleToServerSceneHandle.Add(clientHandle, serverHandle);
             }
-            else
+            else if (!IsRestoringSession)
             {
                 return false;
             }
@@ -458,7 +494,7 @@ internal bool UpdateServerClientSceneHandle(int serverHandle, int clientHandle,
             // It is "Ok" if this already has an entry
             if (!ScenesLoaded.ContainsKey(clientHandle))
             {
-                ScenesLoaded.Add(clientHandle, localScene);
+                ScenesLoaded.Add(clientHandle, new SceneData(null, localScene));
             }
 
             return true;
@@ -472,6 +508,7 @@ internal bool RemoveServerClientSceneHandle(int serverHandle, int clientHandle)
         {
             if (ServerSceneHandleToClientSceneHandle.ContainsKey(serverHandle))
             {
+                Log.Info(() => $"Remove ServerSceneHandleToClientSceneHandle {clientHandle} {serverHandle}");
                 ServerSceneHandleToClientSceneHandle.Remove(serverHandle);
             }
             else
@@ -481,6 +518,7 @@ internal bool RemoveServerClientSceneHandle(int serverHandle, int clientHandle)
 
             if (ClientSceneHandleToServerSceneHandle.ContainsKey(clientHandle))
             {
+                Log.Info(() => $"Remove ClientSceneHandleToServerSceneHandle {clientHandle} {serverHandle}");
                 ClientSceneHandleToServerSceneHandle.Remove(clientHandle);
             }
             else
@@ -490,6 +528,7 @@ internal bool RemoveServerClientSceneHandle(int serverHandle, int clientHandle)
 
             if (ScenesLoaded.ContainsKey(clientHandle))
             {
+                Log.Info(() => $"Remove ScenesLoaded {clientHandle} {serverHandle}");
                 ScenesLoaded.Remove(clientHandle);
             }
             else
@@ -500,16 +539,6 @@ internal bool RemoveServerClientSceneHandle(int serverHandle, int clientHandle)
             return true;
         }
 
-        /// <summary>
-        /// Hash to build index lookup table
-        /// </summary>
-        internal Dictionary<uint, int> HashToBuildIndex = new Dictionary<uint, int>();
-
-        /// <summary>
-        /// Build index to hash lookup table
-        /// </summary>
-        internal Dictionary<int, uint> BuildIndexToHash = new Dictionary<int, uint>();
-
         /// <summary>
         /// The Condition: While a scene is asynchronously loaded in single loading scene mode, if any new NetworkObjects are spawned
         /// they need to be moved into the do not destroy temporary scene
@@ -525,10 +554,12 @@ internal bool RemoveServerClientSceneHandle(int serverHandle, int clientHandle)
         /// </summary>
         internal Dictionary<uint, SceneEventData> SceneEventDataStore;
 
-        internal readonly NetworkManager NetworkManager;
+        internal Dictionary<string, string> ScenePathsBySceneName;
+
+        private NetworkManager NetworkManager { get; }
 
         // Keep track of this scene until the NetworkSceneManager is destroyed.
-        internal Scene DontDestroyOnLoadScene;
+        public Scene DontDestroyOnLoadScene;
 
         /// <summary>
         /// This setting changes how clients handle scene loading when initially synchronizing with the server.<br />
@@ -543,13 +574,22 @@ internal bool RemoveServerClientSceneHandle(int serverHandle, int clientHandle)
         /// <see cref="VerifySceneBeforeLoading"/> and, if <see cref="PostSynchronizationSceneUnloading"/> is
         /// set, <see cref="VerifySceneBeforeUnloading"/> callback(s).
         /// </remarks>
-        public LoadSceneMode ClientSynchronizationMode { get; internal set; }
+        public LoadSceneMode ClientSynchronizationMode { get; set; }
 
         /// <summary>
         /// When true, the <see cref="Debug.LogWarning(object)"/> messages will be turned off
         /// </summary>
         private bool m_DisableValidationWarningMessages;
 
+        internal bool HasSceneAuthority()
+        {
+            if (!NetworkManager)
+            {
+                return false;
+            }
+            return (!NetworkManager.DistributedAuthorityMode && NetworkManager.IsServer) || (NetworkManager.DistributedAuthorityMode && NetworkManager.LocalClient.IsSessionOwner);
+        }
+
         /// <summary>
         /// Handle NetworkSeneManager clean up
         /// </summary>
@@ -614,7 +654,7 @@ internal void EndSceneEvent(uint sceneEventId)
         internal bool ShouldDeferCreateObject()
         {
             // This applies only to remote clients and when scene management is enabled
-            if (!NetworkManager.NetworkConfig.EnableSceneManagement || NetworkManager.IsServer)
+            if (!NetworkManager.NetworkConfig.EnableSceneManagement || HasSceneAuthority())
             {
                 return false;
             }
@@ -639,104 +679,6 @@ internal bool ShouldDeferCreateObject()
             return (synchronizeEventDetected && ClientSynchronizationMode == LoadSceneMode.Single) || (!synchronizeEventDetected && loadingEventDetected);
         }
 
-        /// <summary>
-        /// Gets the scene name from full path to the scene
-        /// </summary>
-        internal string GetSceneNameFromPath(string scenePath)
-        {
-            var begin = scenePath.LastIndexOf("/", StringComparison.Ordinal) + 1;
-            var end = scenePath.LastIndexOf(".", StringComparison.Ordinal);
-            return scenePath.Substring(begin, end - begin);
-        }
-
-        /// <summary>
-        /// Generates the hash values and associated tables
-        /// for the scenes in build list
-        /// </summary>
-        internal void GenerateScenesInBuild()
-        {
-            // TODO 2023: We could support addressable or asset bundle scenes by
-            // adding a method that would allow users to add scenes to this.
-            // The method would be server-side only and require an additional SceneEventType
-            // that would be used to notify clients of the added scene. This might need
-            // to include information about the addressable or asset bundle (i.e. address to load assets)
-            HashToBuildIndex.Clear();
-            BuildIndexToHash.Clear();
-            for (int i = 0; i < SceneManager.sceneCountInBuildSettings; i++)
-            {
-                var scenePath = SceneUtility.GetScenePathByBuildIndex(i);
-                var hash = XXHash.Hash32(scenePath);
-                var buildIndex = SceneUtility.GetBuildIndexByScenePath(scenePath);
-
-                // In the rare-case scenario where a programmatically generated build has duplicate
-                // scene entries, we will log an error and skip the entry
-                if (!HashToBuildIndex.ContainsKey(hash))
-                {
-                    HashToBuildIndex.Add(hash, buildIndex);
-                    BuildIndexToHash.Add(buildIndex, hash);
-                }
-                else
-                {
-                    Debug.LogError($"{nameof(NetworkSceneManager)} is skipping duplicate scene path entry {scenePath}. Make sure your scenes in build list does not contain duplicates!");
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the scene name from a hash value generated from the full scene path
-        /// </summary>
-        internal string SceneNameFromHash(uint sceneHash)
-        {
-            // In the event there is no scene associated with the scene event then just return "No Scene"
-            // This can happen during unit tests when clients first connect and the only scene loaded is the
-            // unit test scene (which is ignored by default) that results in a scene event that has no associated
-            // scene.  Under this specific special case, we just return "No Scene".
-            if (sceneHash == 0)
-            {
-                return "No Scene";
-            }
-            return GetSceneNameFromPath(ScenePathFromHash(sceneHash));
-        }
-
-        /// <summary>
-        /// Gets the full scene path from a hash value
-        /// </summary>
-        internal string ScenePathFromHash(uint sceneHash)
-        {
-            if (HashToBuildIndex.ContainsKey(sceneHash))
-            {
-                return SceneUtility.GetScenePathByBuildIndex(HashToBuildIndex[sceneHash]);
-            }
-            else
-            {
-                throw new Exception($"Scene Hash {sceneHash} does not exist in the {nameof(HashToBuildIndex)} table!  Verify that all scenes requiring" +
-                    $" server to client synchronization are in the scenes in build list.");
-            }
-        }
-
-        /// <summary>
-        /// Gets the associated hash value for the scene name or path
-        /// </summary>
-        internal uint SceneHashFromNameOrPath(string sceneNameOrPath)
-        {
-            var buildIndex = SceneUtility.GetBuildIndexByScenePath(sceneNameOrPath);
-            if (buildIndex >= 0)
-            {
-                if (BuildIndexToHash.ContainsKey(buildIndex))
-                {
-                    return BuildIndexToHash[buildIndex];
-                }
-                else
-                {
-                    throw new Exception($"Scene '{sceneNameOrPath}' has a build index of {buildIndex} that does not exist in the {nameof(BuildIndexToHash)} table!");
-                }
-            }
-            else
-            {
-                throw new Exception($"Scene '{sceneNameOrPath}' couldn't be loaded because it has not been added to the build settings scenes in build list.");
-            }
-        }
-
         /// <summary>
         /// When set to true, this will disable the console warnings about
         /// a scene being invalidated.
@@ -750,6 +692,7 @@ public void DisableValidationWarnings(bool disabled)
         /// <summary>
         /// This setting changes how clients handle scene loading when initially synchronizing with the server.<br />
         /// The server or host should set this value as clients will automatically be synchronized with the server (or host) side.
+        /// </summary>
         /// <remarks>
         /// <b>LoadSceneMode.Single:</b> All currently loaded scenes on the client will be unloaded and the
         /// server's currently active scene will be loaded in single mode on the client unless it was already
@@ -776,21 +719,19 @@ internal NetworkSceneManager(NetworkManager networkManager)
             NetworkManager = networkManager;
             SceneEventDataStore = new Dictionary<uint, SceneEventData>();
 
-            // Generates the scene name to hash value
-            GenerateScenesInBuild();
-
             // Since NetworkManager is now always migrated to the DDOL we will use this to get the DDOL scene
             DontDestroyOnLoadScene = networkManager.gameObject.scene;
 
-            // Since the server tracks loaded scenes, we need to add any currently loaded scenes on the 
+            // Since the server tracks loaded scenes, we need to add any currently loaded scenes on the
             // server side when the NetworkManager is started and NetworkSceneManager instantiated when
             // scene management is enabled.
-            if (networkManager.IsServer && networkManager.NetworkConfig.EnableSceneManagement)
+
+            if (!NetworkManager.DistributedAuthorityMode && NetworkManager.IsServer && networkManager.NetworkConfig.EnableSceneManagement)
             {
                 for (int i = 0; i < SceneManager.sceneCount; i++)
                 {
                     var loadedScene = SceneManager.GetSceneAt(i);
-                    ScenesLoaded.Add(loadedScene.handle, loadedScene);
+                    ScenesLoaded.Add(loadedScene.handle, new SceneData(null, loadedScene));
                 }
                 SceneManagerHandler.PopulateLoadedScenes(ref ScenesLoaded, NetworkManager);
             }
@@ -799,11 +740,34 @@ internal NetworkSceneManager(NetworkManager networkManager)
             UpdateServerClientSceneHandle(DontDestroyOnLoadScene.handle, DontDestroyOnLoadScene.handle, DontDestroyOnLoadScene);
         }
 
+        internal void InitializeScenesLoaded()
+        {
+            if (!NetworkManager.DistributedAuthorityMode)
+            {
+                return;
+            }
+
+            if (HasSceneAuthority() && NetworkManager.NetworkConfig.EnableSceneManagement)
+            {
+                for (int i = 0; i < SceneManager.sceneCount; i++)
+                {
+                    var loadedScene = SceneManager.GetSceneAt(i);
+                    UpdateServerClientSceneHandle(loadedScene.handle, loadedScene.handle, loadedScene);
+                }
+                SceneManagerHandler.PopulateLoadedScenes(ref ScenesLoaded, NetworkManager);
+            }
+        }
+
         /// <summary>
         /// Synchronizes clients when the currently active scene is changed
         /// </summary>
         private void SceneManager_ActiveSceneChanged(Scene current, Scene next)
         {
+            if ((!NetworkManager.DistributedAuthorityMode && !NetworkManager.IsServer) || (NetworkManager.DistributedAuthorityMode && !NetworkManager.LocalClient.IsSessionOwner))
+            {
+                return;
+            }
+
             // If no clients are connected, then don't worry about notifications
             if (!(NetworkManager.ConnectedClientsIds.Count > (NetworkManager.IsHost ? 1 : 0)))
             {
@@ -819,16 +783,17 @@ private void SceneManager_ActiveSceneChanged(Scene current, Scene next)
                 }
             }
 
-            // If the scene's build index is in the hash table
-            if (BuildIndexToHash.ContainsKey(next.buildIndex))
+            // Notify clients of the change in active scene
+            var sceneEvent = BeginSceneEvent();
+            sceneEvent.SceneEventType = SceneEventType.ActiveSceneChanged;
+            sceneEvent.ActiveSceneAsset = next.name;
+			var sessionOwner = NetworkManager.ServerClientId;
+            if (NetworkManager.DistributedAuthorityMode)
             {
-                // Notify clients of the change in active scene
-                var sceneEvent = BeginSceneEvent();
-                sceneEvent.SceneEventType = SceneEventType.ActiveSceneChanged;
-                sceneEvent.ActiveSceneHash = BuildIndexToHash[next.buildIndex];
-                SendSceneEventData(sceneEvent.SceneEventId, NetworkManager.ConnectedClientsIds.Where(c => c != NetworkManager.ServerClientId).ToArray());
-                EndSceneEvent(sceneEvent.SceneEventId);
+                sessionOwner = NetworkManager.CurrentSessionOwner;
             }
+            SendSceneEventData(sceneEvent.SceneEventId, NetworkManager.ConnectedClientsIds.Where(c => c != sessionOwner).ToArray());
+            EndSceneEvent(sceneEvent.SceneEventId);
         }
 
         /// <summary>
@@ -839,35 +804,28 @@ private void SceneManager_ActiveSceneChanged(Scene current, Scene next)
         /// <param name="sceneIndex">index into ScenesInBuild</param>
         /// <param name="loadSceneMode">LoadSceneMode the scene is going to be loaded</param>
         /// <returns>true (Valid) or false (Invalid)</returns>
-        internal bool ValidateSceneBeforeLoading(uint sceneHash, LoadSceneMode loadSceneMode)
-        {
-            var sceneName = SceneNameFromHash(sceneHash);
-            var sceneIndex = SceneUtility.GetBuildIndexByScenePath(sceneName);
-            return ValidateSceneBeforeLoading(sceneIndex, sceneName, loadSceneMode);
-        }
-
-        /// <summary>
-        /// Overloaded version that is invoked by <see cref="ValidateSceneBeforeLoading"/> and <see cref="SynchronizeNetworkObjects"/>.
-        /// This specifically is to allow runtime generated scenes to be excluded by the server during synchronization.
-        /// </summary>
-        internal bool ValidateSceneBeforeLoading(int sceneIndex, string sceneName, LoadSceneMode loadSceneMode)
+        internal bool ValidateSceneBeforeLoading(string sceneName, LoadSceneMode loadSceneMode)
         {
-            var validated = true;
-            if (VerifySceneBeforeLoading != null)
-            {
-                validated = VerifySceneBeforeLoading.Invoke(sceneIndex, sceneName, loadSceneMode);
-            }
-            if (!validated && !m_DisableValidationWarningMessages)
-            {
-                var serverHostorClient = "Client";
-                if (NetworkManager.IsServer)
-                {
-                    serverHostorClient = NetworkManager.IsHost ? "Host" : "Server";
-                }
+            Log.Debug(() => $"ValidateSceneBeforeLoading {sceneName} {loadSceneMode}");
+            return true;
 
-                Debug.LogWarning($"Scene {sceneName} of Scenes in Build Index {sceneIndex} being loaded in {loadSceneMode} mode failed validation on the {serverHostorClient}!");
-            }
-            return validated;
+            // var validated = true;
+            // var sceneIndex = SceneUtility.GetBuildIndexByScenePath(sceneName);
+            // if (VerifySceneBeforeLoading != null)
+            // {
+            //     validated = VerifySceneBeforeLoading.Invoke(sceneIndex, sceneName, loadSceneMode);
+            // }
+            // if (!validated && !m_DisableValidationWarningMessages)
+            // {
+            //     var serverHostorClient = "Client";
+            //     if (NetworkManager.IsServer)
+            //     {
+            //         serverHostorClient = NetworkManager.IsHost ? "Host" : "Server";
+            //     }
+            //
+            //     Debug.LogWarning($"Scene {sceneName} of Scenes in Build Index {sceneIndex} being loaded in {loadSceneMode} mode failed validation on the {serverHostorClient}!");
+            // }
+            // return validated;
         }
 
         /// <summary>
@@ -900,7 +858,7 @@ internal Scene GetAndAddNewlyLoadedSceneByName(string sceneName)
                     {
                         if (!ScenesLoaded.ContainsKey(sceneLoaded.handle))
                         {
-                            ScenesLoaded.Add(sceneLoaded.handle, sceneLoaded);
+                            ScenesLoaded.Add(sceneLoaded.handle, new SceneData(null, sceneLoaded));
                             SceneManagerHandler.StartTrackingScene(sceneLoaded, true, NetworkManager);
                             return sceneLoaded;
                         }
@@ -934,7 +892,7 @@ internal void SetTheSceneBeingSynchronized(int serverSceneHandle)
                 }
 
                 // Get the scene currently being synchronized
-                SceneBeingSynchronized = ScenesLoaded.ContainsKey(clientSceneHandle) ? ScenesLoaded[clientSceneHandle] : new Scene();
+                SceneBeingSynchronized = ScenesLoaded.ContainsKey(clientSceneHandle) ? ScenesLoaded[clientSceneHandle].SceneReference : new Scene();
 
                 if (!SceneBeingSynchronized.IsValid() || !SceneBeingSynchronized.isLoaded)
                 {
@@ -961,7 +919,7 @@ internal void SetTheSceneBeingSynchronized(int serverSceneHandle)
 
                     // This could be the scenario where NetworkManager.DontDestroy is false and we are creating the first NetworkObject (client side) to be in the DontDestroyOnLoad scene
                     // Otherwise, this is some other specific scenario that we might not be handling currently.
-                    Debug.LogWarning($"[{nameof(SceneEventData)}- Scene Handle Mismatch] {nameof(serverSceneHandle)} could not be found in {nameof(ServerSceneHandleToClientSceneHandle)}. Using the currently active scene.");
+                    Debug.LogWarning($"[{nameof(SceneEventData)}- Scene Handle Mismatch] {nameof(serverSceneHandle)} ({serverSceneHandle}) could not be found in {nameof(ServerSceneHandleToClientSceneHandle)}. Using the currently active scene.");
                 }
             }
         }
@@ -976,7 +934,7 @@ internal NetworkObject GetSceneRelativeInSceneNetworkObject(uint globalObjectIdH
             if (ScenePlacedObjects.ContainsKey(globalObjectIdHash))
             {
                 var sceneHandle = SceneBeingSynchronized.handle;
-                if (networkSceneHandle.HasValue && networkSceneHandle.Value != 0)
+                if (networkSceneHandle.HasValue && networkSceneHandle.Value != 0 && ServerSceneHandleToClientSceneHandle.ContainsKey(networkSceneHandle.Value))
                 {
                     sceneHandle = ServerSceneHandleToClientSceneHandle[networkSceneHandle.Value];
                 }
@@ -994,19 +952,48 @@ internal NetworkObject GetSceneRelativeInSceneNetworkObject(uint globalObjectIdH
         /// <param name="targetClientIds">array of client identifiers to receive the scene event message</param>
         private void SendSceneEventData(uint sceneEventId, ulong[] targetClientIds)
         {
-            if (targetClientIds.Length == 0)
+            if (targetClientIds.Length == 0 && !NetworkManager.DistributedAuthorityMode)
             {
                 // This would be the Host/Server with no clients connected
                 // Silently return as there is nothing to be done
                 return;
             }
-            var message = new SceneEventMessage
+            var sceneEvent = SceneEventDataStore[sceneEventId];
+            sceneEvent.SenderClientId = NetworkManager.LocalClientId;
+
+            if (NetworkManager.DistributedAuthorityMode && !NetworkManager.DAHost)
             {
-                EventData = SceneEventDataStore[sceneEventId]
-            };
-            var size = NetworkManager.ConnectionManager.SendMessage(ref message, k_DeliveryType, targetClientIds);
+                if (NetworkManager.DistributedAuthorityMode && HasSceneAuthority())
+                {
+                    sceneEvent.TargetClientId = NetworkManager.ServerClientId;
+                    var message = new SceneEventMessage
+                    {
+                        EventData = sceneEvent,
+                    };
+                    var size = NetworkManager.ConnectionManager.SendMessage(ref message, k_DeliveryType, NetworkManager.ServerClientId);
+                    NetworkManager.NetworkMetrics.TrackSceneEventSent(NetworkManager.ServerClientId, (uint)sceneEvent.SceneEventType, sceneEvent.SceneAsset, size);
+                }
+                foreach (var clientId in targetClientIds)
+                {
+                    sceneEvent.TargetClientId = clientId;
+                    var message = new SceneEventMessage
+                    {
+                        EventData = sceneEvent,
+                    };
+                    var size = NetworkManager.ConnectionManager.SendMessage(ref message, k_DeliveryType, NetworkManager.ServerClientId);
+                    NetworkManager.NetworkMetrics.TrackSceneEventSent(clientId, (uint)sceneEvent.SceneEventType, sceneEvent.SceneAsset, size);
+                }
+            }
+            else
+            {
+                var message = new SceneEventMessage
+                {
+                    EventData = sceneEvent,
+                };
+                var size = NetworkManager.ConnectionManager.SendMessage(ref message, k_DeliveryType, targetClientIds);
+                NetworkManager.NetworkMetrics.TrackSceneEventSent(targetClientIds, (uint)SceneEventDataStore[sceneEventId].SceneEventType, sceneEvent.SceneAsset, size);
+            }
 
-            NetworkManager.NetworkMetrics.TrackSceneEventSent(targetClientIds, (uint)SceneEventDataStore[sceneEventId].SceneEventType, SceneNameFromHash(SceneEventDataStore[sceneEventId].SceneHash), size);
         }
 
         /// <summary>
@@ -1022,10 +1009,18 @@ private SceneEventProgress ValidateSceneEventUnloading(Scene scene)
                 return new SceneEventProgress(null, SceneEventProgressStatus.SceneManagementNotEnabled);
             }
 
-            if (!NetworkManager.IsServer)
+            if (!HasSceneAuthority())
             {
-                Debug.LogWarning($"[{nameof(SceneEventProgressStatus.ServerOnlyAction)}][Unload] Clients cannot invoke the {nameof(UnloadScene)} method!");
-                return new SceneEventProgress(null, SceneEventProgressStatus.ServerOnlyAction);
+                if (NetworkManager.DistributedAuthorityMode)
+                {
+                    Debug.LogWarning($"[{nameof(SceneEventProgressStatus.SessionOwnerOnlyAction)}][Unload] Clients cannot invoke the {nameof(UnloadScene)} method!");
+                    return new SceneEventProgress(null, SceneEventProgressStatus.SessionOwnerOnlyAction);
+                }
+                else
+                {
+                    Debug.LogWarning($"[{nameof(SceneEventProgressStatus.ServerOnlyAction)}][Unload] Clients cannot invoke the {nameof(UnloadScene)} method!");
+                    return new SceneEventProgress(null, SceneEventProgressStatus.ServerOnlyAction);
+                }
             }
 
             if (!scene.isLoaded)
@@ -1050,12 +1045,19 @@ private SceneEventProgress ValidateSceneEventLoading(string sceneName)
                 return new SceneEventProgress(null, SceneEventProgressStatus.SceneManagementNotEnabled);
             }
 
-            if (!NetworkManager.IsServer)
+            if (!HasSceneAuthority())
             {
-                Debug.LogWarning($"[{nameof(SceneEventProgressStatus.ServerOnlyAction)}][Load] Clients cannot invoke the {nameof(LoadScene)} method!");
-                return new SceneEventProgress(null, SceneEventProgressStatus.ServerOnlyAction);
+                if (NetworkManager.DistributedAuthorityMode)
+                {
+                    Debug.LogWarning($"[{nameof(SceneEventProgressStatus.SessionOwnerOnlyAction)}][Load] Only the session owner can invoke the {nameof(LoadScene)} method!");
+                    return new SceneEventProgress(null, SceneEventProgressStatus.SessionOwnerOnlyAction);
+                }
+                else
+                {
+                    Debug.LogWarning($"[{nameof(SceneEventProgressStatus.ServerOnlyAction)}][Load] Clients cannot invoke the {nameof(LoadScene)} method!");
+                    return new SceneEventProgress(null, SceneEventProgressStatus.ServerOnlyAction);
+                }
             }
-
             return ValidateSceneEvent(sceneName);
         }
 
@@ -1073,16 +1075,53 @@ private SceneEventProgress ValidateSceneEvent(string sceneName, bool isUnloading
                 return new SceneEventProgress(null, SceneEventProgressStatus.SceneEventInProgress);
             }
 
-            // Return invalid scene name status if the scene name is invalid
-            if (SceneUtility.GetBuildIndexByScenePath(sceneName) == InvalidSceneNameOrPath)
+            // // Return invalid scene name status if the scene name is invalid
+            // if (SceneUtility.GetBuildIndexByScenePath(sceneName) == InvalidSceneNameOrPath)
+            // {
+            //     Debug.LogError($"Scene '{sceneName}' couldn't be loaded because it has not been added to the build settings scenes in build list.");
+            //     return new SceneEventProgress(null, SceneEventProgressStatus.InvalidSceneName);
+            // }
+            var locatorInfo = Addressables.GetLocatorInfo(sceneName);
+
+            var resourceLocationAsync = Addressables.LoadResourceLocationsAsync(sceneName);
+            resourceLocationAsync.WaitForCompletion();
+            if (resourceLocationAsync.Status == AsyncOperationStatus.Succeeded)
+            {
+                if (resourceLocationAsync.Result.Count >= 1)
+                {
+                    var location = resourceLocationAsync.Result[0];
+                    var provider = location.ProviderId;
+                    if (!provider.Contains("Scene"))
+                    {
+                        Debug.LogWarning($"Provider is not a scene provider! {provider}");
+                    }
+
+                    var resourceType = location.ResourceType;
+                    if (resourceType != typeof(SceneInstance))
+                    {
+                        throw new Exception($"Scene is not of the SceneInstance type! {resourceType}");
+                    }
+                    if (location.HasDependencies)
+                    {
+                        // Has dependencies!
+                        // download something?
+                        // no! this is just a verification method
+                    }
+
+                    if (location.PrimaryKey != sceneName)
+                    {
+                        throw new Exception($"Scene is not primary key of the scene name! {location.PrimaryKey} {sceneName}");
+                    }
+                }
+            }
+            else
             {
-                Debug.LogError($"Scene '{sceneName}' couldn't be loaded because it has not been added to the build settings scenes in build list.");
-                return new SceneEventProgress(null, SceneEventProgressStatus.InvalidSceneName);
+                throw new Exception($"Scene '{sceneName}' couldn't be loaded for its resource location.");
             }
 
             var sceneEventProgress = new SceneEventProgress(NetworkManager)
             {
-                SceneHash = SceneHashFromNameOrPath(sceneName)
+                SceneName = sceneName
             };
 
             SceneEventProgressTracking.Add(sceneEventProgress.Guid, sceneEventProgress);
@@ -1105,30 +1144,37 @@ private bool OnSceneEventProgressCompleted(SceneEventProgress sceneEventProgress
             var clientsThatCompleted = sceneEventProgress.GetClientsWithStatus(true);
             var clientsThatTimedOut = sceneEventProgress.GetClientsWithStatus(false);
             sceneEventData.SceneEventProgressId = sceneEventProgress.Guid;
-            sceneEventData.SceneHash = sceneEventProgress.SceneHash;
+            sceneEventData.SceneAsset = sceneEventProgress.SceneName;
             sceneEventData.SceneEventType = sceneEventProgress.SceneEventType;
             sceneEventData.ClientsCompleted = clientsThatCompleted;
             sceneEventData.LoadSceneMode = sceneEventProgress.LoadSceneMode;
             sceneEventData.ClientsTimedOut = clientsThatTimedOut;
 
-            var message = new SceneEventMessage
+            if (NetworkManager.DistributedAuthorityMode)
             {
-                EventData = sceneEventData
-            };
-            var size = NetworkManager.ConnectionManager.SendMessage(ref message, k_DeliveryType, NetworkManager.ConnectedClientsIds);
+                SendSceneEventData(sceneEventData.SceneEventId, NetworkManager.ConnectedClientsIds.Where(c => c != NetworkManager.LocalClientId).ToArray());
+            }
+            else
+            {
+                var message = new SceneEventMessage
+                {
+                    EventData = sceneEventData
+                };
 
-            NetworkManager.NetworkMetrics.TrackSceneEventSent(
-                NetworkManager.ConnectedClientsIds,
-                (uint)sceneEventProgress.SceneEventType,
-                SceneNameFromHash(sceneEventProgress.SceneHash),
-                size);
+                var size = NetworkManager.ConnectionManager.SendMessage(ref message, k_DeliveryType, NetworkManager.ConnectedClientsIds);
+                NetworkManager.NetworkMetrics.TrackSceneEventSent(
+                    NetworkManager.ConnectedClientsIds,
+                    (uint)sceneEventProgress.SceneEventType,
+                    sceneEventProgress.SceneName,
+                    size);
+            }
 
-            // Send a local notification to the server that all clients are done loading or unloading
+            // Send a local notification to the session owner that all clients are done loading or unloading
             OnSceneEvent?.Invoke(new SceneEvent()
             {
                 SceneEventType = sceneEventProgress.SceneEventType,
-                SceneName = SceneNameFromHash(sceneEventProgress.SceneHash),
-                ClientId = NetworkManager.ServerClientId,
+                SceneName = sceneEventProgress.SceneName,
+                ClientId = NetworkManager.CurrentSessionOwner,
                 LoadSceneMode = sceneEventProgress.LoadSceneMode,
                 ClientsThatCompleted = clientsThatCompleted,
                 ClientsThatTimedOut = clientsThatTimedOut,
@@ -1136,11 +1182,11 @@ private bool OnSceneEventProgressCompleted(SceneEventProgress sceneEventProgress
 
             if (sceneEventData.SceneEventType == SceneEventType.LoadEventCompleted)
             {
-                OnLoadEventCompleted?.Invoke(SceneNameFromHash(sceneEventProgress.SceneHash), sceneEventProgress.LoadSceneMode, sceneEventData.ClientsCompleted, sceneEventData.ClientsTimedOut);
+                OnLoadEventCompleted?.Invoke(sceneEventProgress.SceneName, sceneEventProgress.LoadSceneMode, sceneEventData.ClientsCompleted, sceneEventData.ClientsTimedOut);
             }
             else
             {
-                OnUnloadEventCompleted?.Invoke(SceneNameFromHash(sceneEventProgress.SceneHash), sceneEventProgress.LoadSceneMode, sceneEventData.ClientsCompleted, sceneEventData.ClientsTimedOut);
+                OnUnloadEventCompleted?.Invoke(sceneEventProgress.SceneName, sceneEventProgress.LoadSceneMode, sceneEventData.ClientsCompleted, sceneEventData.ClientsTimedOut);
             }
 
             EndSceneEvent(sceneEventData.SceneEventId);
@@ -1152,13 +1198,14 @@ private bool OnSceneEventProgressCompleted(SceneEventProgress sceneEventProgress
         /// Unloads an additively loaded scene.  If you want to unload a <see cref="LoadSceneMode.Single"/> mode loaded scene load another <see cref="LoadSceneMode.Single"/> scene.
         /// When applicable, the <see cref="AsyncOperation"/> is delivered within the <see cref="SceneEvent"/> via the <see cref="OnSceneEvent"/>
         /// </summary>
-        /// <param name="scene"></param>
+        /// <param name="scene">The Unity Scene to be unloaded</param>
         /// <returns><see cref="SceneEventProgressStatus"/> (<see cref="SceneEventProgressStatus.Started"/> means it was successful)</returns>
         public SceneEventProgressStatus UnloadScene(Scene scene)
         {
             var sceneName = scene.name;
             var sceneHandle = scene.handle;
 
+
             if (!scene.isLoaded)
             {
                 Debug.LogWarning($"{nameof(UnloadScene)} was called, but the scene {scene.name} is not currently loaded!");
@@ -1177,6 +1224,14 @@ public SceneEventProgressStatus UnloadScene(Scene scene)
                 return SceneEventProgressStatus.InternalNetcodeError;
             }
 
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                if (ClientSceneHandleToServerSceneHandle.ContainsKey(sceneHandle))
+                {
+                    sceneHandle = ClientSceneHandleToServerSceneHandle[sceneHandle];
+                }
+            }
+
             // Any NetworkObjects marked to not be destroyed with a scene and reside within the scene about to be unloaded
             // should be migrated temporarily into the DDOL, once the scene is unloaded they will be migrated into the
             // currently active scene.
@@ -1186,17 +1241,31 @@ public SceneEventProgressStatus UnloadScene(Scene scene)
             var sceneEventData = BeginSceneEvent();
             sceneEventData.SceneEventProgressId = sceneEventProgress.Guid;
             sceneEventData.SceneEventType = SceneEventType.Unload;
-            sceneEventData.SceneHash = SceneHashFromNameOrPath(sceneName);
+            sceneEventData.SceneAsset = sceneName;
             sceneEventData.LoadSceneMode = LoadSceneMode.Additive; // The only scenes unloaded are scenes that were additively loaded
             sceneEventData.SceneHandle = sceneHandle;
 
             // This will be the message we send to everyone when this scene event sceneEventProgress is complete
             sceneEventProgress.SceneEventType = SceneEventType.UnloadEventCompleted;
 
-            ScenesLoaded.Remove(scene.handle);
             sceneEventProgress.SceneEventId = sceneEventData.SceneEventId;
             sceneEventProgress.OnSceneEventCompleted = OnSceneUnloaded;
-            var sceneUnload = SceneManagerHandler.UnloadSceneAsync(scene, sceneEventProgress);
+
+            if (!RemoveServerClientSceneHandle(sceneEventData.SceneHandle, scene.handle))
+            {
+                Debug.LogError($"Failed to remove {sceneEventData.SceneAsset} scene handles [Server ({sceneEventData.SceneHandle})][Local({scene.handle})]");
+            }
+
+            AsyncOperationHandle<SceneInstance> sceneUnload;
+            if (ScenesLoaded[sceneHandle].SceneInstance.HasValue)
+            {
+                sceneUnload = SceneManagerHandler.UnloadSceneAsync(ScenesLoaded[sceneHandle], sceneEventProgress);
+            }
+            else
+            {
+                throw new Exception("Fuuuuck");
+                sceneUnload = default;
+            }
             // Notify local server that a scene is going to be unloaded
             OnSceneEvent?.Invoke(new SceneEvent()
             {
@@ -1204,10 +1273,10 @@ public SceneEventProgressStatus UnloadScene(Scene scene)
                 SceneEventType = sceneEventData.SceneEventType,
                 LoadSceneMode = sceneEventData.LoadSceneMode,
                 SceneName = sceneName,
-                ClientId = NetworkManager.ServerClientId  // Server can only invoke this
+                ClientId = NetworkManager.LocalClientId  // Session owner can only invoke this
             });
 
-            OnUnload?.Invoke(NetworkManager.ServerClientId, sceneName, sceneUnload);
+            OnUnload?.Invoke(NetworkManager.LocalClientId, sceneName, sceneUnload);
 
             //Return the status
             return sceneEventProgress.Status;
@@ -1220,7 +1289,7 @@ public SceneEventProgressStatus UnloadScene(Scene scene)
         private void OnClientUnloadScene(uint sceneEventId)
         {
             var sceneEventData = SceneEventDataStore[sceneEventId];
-            var sceneName = SceneNameFromHash(sceneEventData.SceneHash);
+            var sceneName = sceneEventData.SceneAsset;
 
             if (!ServerSceneHandleToClientSceneHandle.ContainsKey(sceneEventData.SceneHandle))
             {
@@ -1244,16 +1313,29 @@ private void OnClientUnloadScene(uint sceneEventId)
             // should be migrated temporarily into the DDOL, once the scene is unloaded they will be migrated into the
             // currently active scene.
             var networkManager = NetworkManager;
-            SceneManagerHandler.MoveObjectsFromSceneToDontDestroyOnLoad(ref networkManager, scene);
-
+            SceneManagerHandler.MoveObjectsFromSceneToDontDestroyOnLoad(ref networkManager, scene.SceneReference);
             m_IsSceneEventActive = true;
             var sceneEventProgress = new SceneEventProgress(NetworkManager)
             {
                 SceneEventId = sceneEventData.SceneEventId,
-                OnSceneEventCompleted = OnSceneUnloaded
+                OnSceneEventCompleted = OnSceneUnloaded,
             };
-            var sceneUnload = SceneManagerHandler.UnloadSceneAsync(scene, sceneEventProgress);
 
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                SceneEventProgressTracking.Add(sceneEventData.SceneEventProgressId, sceneEventProgress);
+            }
+
+            AsyncOperationHandle<SceneInstance> sceneUnload;
+            if (ScenesLoaded[sceneHandle].SceneInstance.HasValue)
+            {
+                sceneUnload = SceneManagerHandler.UnloadSceneAsync(ScenesLoaded[sceneHandle], sceneEventProgress);
+            }
+            else
+            {
+                throw new Exception("Fuuuuck");
+                sceneUnload = default;
+            }
             SceneManagerHandler.StopTrackingScene(sceneHandle, sceneName, NetworkManager);
 
             // Remove our server to scene handle lookup
@@ -1280,32 +1362,39 @@ private void OnClientUnloadScene(uint sceneEventId)
         /// Server and Client:
         /// Invoked when an additively loaded scene is unloaded
         /// </summary>
-        private void OnSceneUnloaded(uint sceneEventId)
+        private void OnSceneUnloaded(uint sceneEventId, string sceneName)
         {
             // If we are shutdown or about to shutdown, then ignore this event
             if (!NetworkManager.IsListening || NetworkManager.ShutdownInProgress)
             {
+                EndSceneEvent(sceneEventId);
                 return;
             }
 
             // Migrate the NetworkObjects marked to not be destroyed with the scene into the currently active scene
             MoveObjectsFromDontDestroyOnLoadToScene(SceneManager.GetActiveScene());
-
             var sceneEventData = SceneEventDataStore[sceneEventId];
-            // First thing we do, if we are a server, is to send the unload scene event.
-            if (NetworkManager.IsServer)
+
+            if (HasSceneAuthority())
             {
+                var sessionOwner = NetworkManager.DistributedAuthorityMode ? NetworkManager.CurrentSessionOwner : NetworkManager.ServerClientId;
+
                 // Server sends the unload scene notification after unloading because it will despawn all scene relative in-scene NetworkObjects
                 // If we send this event to all clients before the server is finished unloading they will get warning about an object being
                 // despawned that no longer exists
-                SendSceneEventData(sceneEventId, NetworkManager.ConnectedClientsIds.Where(c => c != NetworkManager.ServerClientId).ToArray());
+                SendSceneEventData(sceneEventId, NetworkManager.ConnectedClientsIds.Where(c => c != sessionOwner).ToArray());
 
-                //Only if we are a host do we want register having loaded for the associated SceneEventProgress
-                if (SceneEventProgressTracking.ContainsKey(sceneEventData.SceneEventProgressId) && NetworkManager.IsHost)
+                //Only if we are session owner do we want register having loaded for the associated SceneEventProgress
+                if (SceneEventProgressTracking.ContainsKey(sceneEventData.SceneEventProgressId) && HasSceneAuthority())
                 {
-                    SceneEventProgressTracking[sceneEventData.SceneEventProgressId].ClientFinishedSceneEvent(NetworkManager.ServerClientId);
+                    SceneEventProgressTracking[sceneEventData.SceneEventProgressId].ClientFinishedSceneEvent(sessionOwner);
                 }
             }
+            else if (NetworkManager.DistributedAuthorityMode)
+            {
+                SceneEventProgressTracking.Remove(sceneEventData.SceneEventProgressId);
+                m_IsSceneEventActive = false;
+            }
 
             // Next we prepare to send local notifications for unload complete
             sceneEventData.SceneEventType = SceneEventType.UnloadComplete;
@@ -1315,24 +1404,32 @@ private void OnSceneUnloaded(uint sceneEventId)
             {
                 SceneEventType = sceneEventData.SceneEventType,
                 LoadSceneMode = sceneEventData.LoadSceneMode,
-                SceneName = SceneNameFromHash(sceneEventData.SceneHash),
-                ClientId = NetworkManager.IsServer ? NetworkManager.ServerClientId : NetworkManager.LocalClientId
+                SceneName = sceneEventData.SceneAsset,
+                ClientId = NetworkManager.LocalClientId,
             });
 
-            OnUnloadComplete?.Invoke(NetworkManager.LocalClientId, SceneNameFromHash(sceneEventData.SceneHash));
+            OnUnloadComplete?.Invoke(NetworkManager.LocalClientId, sceneEventData.SceneAsset);
 
-            // Clients send a notification back to the server they have completed the unload scene event
-            if (!NetworkManager.IsServer)
+            if (!HasSceneAuthority())
             {
-                SendSceneEventData(sceneEventId, new ulong[] { NetworkManager.ServerClientId });
+                sceneEventData.TargetClientId = NetworkManager.CurrentSessionOwner;
+                sceneEventData.SenderClientId = NetworkManager.LocalClientId;
+                var message = new SceneEventMessage
+                {
+                    EventData = sceneEventData,
+                };
+                // This might seem like it needs more logic to determine the target, but the only scenario where we send to the session owner is if the
+                // current instance is the DAHost.
+                var target = NetworkManager.DAHost ? NetworkManager.CurrentSessionOwner : NetworkManager.ServerClientId;
+                var size = NetworkManager.ConnectionManager.SendMessage(ref message, k_DeliveryType, target);
+                NetworkManager.NetworkMetrics.TrackSceneEventSent(target, (uint)sceneEventData.SceneEventType, sceneEventData.SceneAsset, size);
             }
-
             EndSceneEvent(sceneEventId);
             // This scene event is now considered "complete"
             m_IsSceneEventActive = false;
         }
 
-        private void EmptySceneUnloadedOperation(uint sceneEventId)
+        private void EmptySceneUnloadedOperation(uint sceneEventId, string sceneName)
         {
             // Do nothing (this is a stub call since it is only used to flush all additively loaded scenes)
         }
@@ -1350,15 +1447,25 @@ internal void UnloadAdditivelyLoadedScenes(uint sceneEventId)
             foreach (var keyHandleEntry in ScenesLoaded)
             {
                 // Validate the scene as well as ignore the DDOL (which will have a negative buildIndex)
-                if (currentActiveScene.name != keyHandleEntry.Value.name && keyHandleEntry.Value.buildIndex >= 0)
+                if (currentActiveScene.name != keyHandleEntry.Value.SceneReference.name && keyHandleEntry.Value.SceneReference != DontDestroyOnLoadScene)
                 {
                     var sceneEventProgress = new SceneEventProgress(NetworkManager)
                     {
                         SceneEventId = sceneEventId,
                         OnSceneEventCompleted = EmptySceneUnloadedOperation
                     };
+
+                    if (ClientSceneHandleToServerSceneHandle.TryGetValue(keyHandleEntry.Value.SceneReference.handle, out var serverSceneHandle))
+                    {
+                        ServerSceneHandleToClientSceneHandle.Remove(serverSceneHandle);
+                    }
+                    Log.Info(() => $"Remove ClientSceneHandleToServerSceneHandle {keyHandleEntry.Value.SceneReference.handle}");
+                    ClientSceneHandleToServerSceneHandle.Remove(keyHandleEntry.Value.SceneReference.handle);
+
                     var sceneUnload = SceneManagerHandler.UnloadSceneAsync(keyHandleEntry.Value, sceneEventProgress);
-                    SceneUnloadEventHandler.RegisterScene(this, keyHandleEntry.Value, LoadSceneMode.Additive, sceneUnload);
+
+                    SceneUnloadEventHandler.RegisterScene(this, keyHandleEntry.Value.SceneReference, LoadSceneMode.Additive, sceneUnload);
+
                 }
             }
             // clear out our scenes loaded list
@@ -1366,20 +1473,27 @@ internal void UnloadAdditivelyLoadedScenes(uint sceneEventId)
             SceneManagerHandler.ClearSceneTracking(NetworkManager);
         }
 
-        /// <summary>
-        /// <b>Server side:</b>
-        /// Loads the scene name in either additive or single loading mode.
-        /// When applicable, the <see cref="AsyncOperation"/> is delivered within the <see cref="SceneEvent"/> via <see cref="OnSceneEvent"/>
-        /// </summary>
-        /// <param name="sceneName">the name of the scene to be loaded</param>
-        /// <param name="loadSceneMode">how the scene will be loaded (single or additive mode)</param>
-        /// <returns><see cref="SceneEventProgressStatus"/> (<see cref="SceneEventProgressStatus.Started"/> means it was successful)</returns>
-        public SceneEventProgressStatus LoadScene(string sceneName, LoadSceneMode loadSceneMode)
+        public SceneEventProgress LoadAddressableScene(AssetReference sceneReference, LoadSceneMode loadSceneMode)
         {
+            var resourceAsync = Addressables.LoadResourceLocationsAsync(sceneReference);
+            resourceAsync.WaitForCompletion();
+
+            var sceneName = "";
+
+            if (resourceAsync.Status == AsyncOperationStatus.Succeeded)
+            {
+                var sceneKey = resourceAsync.Result[0].PrimaryKey;
+                sceneName = sceneKey;
+            }
+            else
+            {
+                throw new Exception($"Failed to load scene from resource {resourceAsync.OperationException}");
+            }
+
             var sceneEventProgress = ValidateSceneEventLoading(sceneName);
             if (sceneEventProgress.Status != SceneEventProgressStatus.Started)
             {
-                return sceneEventProgress.Status;
+                return sceneEventProgress;
             }
 
             // This will be the message we send to everyone when this scene event sceneEventProgress is complete
@@ -1391,26 +1505,20 @@ public SceneEventProgressStatus LoadScene(string sceneName, LoadSceneMode loadSc
             // Now set up the current scene event
             sceneEventData.SceneEventProgressId = sceneEventProgress.Guid;
             sceneEventData.SceneEventType = SceneEventType.Load;
-            sceneEventData.SceneHash = SceneHashFromNameOrPath(sceneName);
+            sceneEventData.SceneAsset = sceneName;
             sceneEventData.LoadSceneMode = loadSceneMode;
             var sceneEventId = sceneEventData.SceneEventId;
             // This both checks to make sure the scene is valid and if not resets the active scene event
-            m_IsSceneEventActive = ValidateSceneBeforeLoading(sceneEventData.SceneHash, loadSceneMode);
+            m_IsSceneEventActive = ValidateSceneBeforeLoading(sceneEventData.SceneAsset, loadSceneMode);
             if (!m_IsSceneEventActive)
             {
                 EndSceneEvent(sceneEventId);
-                return SceneEventProgressStatus.SceneFailedVerification;
+                sceneEventProgress.Status = SceneEventProgressStatus.SceneFailedVerification;
+                return sceneEventProgress;
             }
 
             if (sceneEventData.LoadSceneMode == LoadSceneMode.Single)
             {
-                // The Condition: While a scene is asynchronously loaded in single loading scene mode, if any new NetworkObjects are spawned
-                // they need to be moved into the do not destroy temporary scene
-                // When it is set: Just before starting the asynchronous loading call
-                // When it is unset: After the scene has loaded, the PopulateScenePlacedObjects is called, and all NetworkObjects in the do
-                // not destroy temporary scene are moved into the active scene
-                IsSpawnedObjectsPendingInDontDestroyOnLoad = true;
-
                 // Destroy current scene objects before switching.
                 NetworkManager.SpawnManager.ServerDestroySpawnedSceneObjects();
 
@@ -1428,6 +1536,7 @@ public SceneEventProgressStatus LoadScene(string sceneName, LoadSceneMode loadSc
             sceneEventProgress.SceneEventId = sceneEventId;
             sceneEventProgress.OnSceneEventCompleted = OnSceneLoaded;
             var sceneLoad = SceneManagerHandler.LoadSceneAsync(sceneName, loadSceneMode, sceneEventProgress);
+
             // Notify the local server that a scene loading event has begun
             OnSceneEvent?.Invoke(new SceneEvent()
             {
@@ -1441,26 +1550,124 @@ public SceneEventProgressStatus LoadScene(string sceneName, LoadSceneMode loadSc
             OnLoad?.Invoke(NetworkManager.ServerClientId, sceneName, sceneEventData.LoadSceneMode, sceneLoad);
 
             //Return our scene progress instance
-            return sceneEventProgress.Status;
+            return sceneEventProgress;
+        }
+
+
+        private static Dictionary<string, string> s_ResourceLocationsBySceneName = new();
+
+        public bool PrepareToLoadScene(string sceneName, Action<bool> loaded)
+        {
+            return false;
         }
 
         /// <summary>
-        /// Helper class used to handle "odd ball" scene unload event notification scenarios
-        /// when scene switching.
+        /// <b>Server side:</b>
+        /// Loads the scene name in either additive or single loading mode.
+        /// When applicable, the <see cref="AsyncOperation"/> is delivered within the <see cref="SceneEvent"/> via <see cref="OnSceneEvent"/>
         /// </summary>
-        internal class SceneUnloadEventHandler
+        /// <param name="sceneName">the name of the scene to be loaded</param>
+        /// <param name="loadSceneMode">how the scene will be loaded (single or additive mode)</param>
+        /// <returns><see cref="SceneEventProgressStatus"/> (<see cref="SceneEventProgressStatus.Started"/> means it was successful)</returns>
+        public SceneEventProgress LoadScene(string sceneName, LoadSceneMode loadSceneMode)
         {
-            private static Dictionary<NetworkManager, List<SceneUnloadEventHandler>> s_Instances = new Dictionary<NetworkManager, List<SceneUnloadEventHandler>>();
-
-            internal static void RegisterScene(NetworkSceneManager networkSceneManager, Scene scene, LoadSceneMode loadSceneMode, AsyncOperation asyncOperation = null)
+            // Debug.Log($"[NetworkSceneManager] LoadScene sceneName={sceneName}");
+            if (!s_ResourceLocationsBySceneName.TryGetValue(sceneName, out var found))
             {
-                var networkManager = networkSceneManager.NetworkManager;
-                if (!s_Instances.ContainsKey(networkManager))
+                var resourceLocationAsync = Addressables.LoadResourceLocationsAsync(sceneName);
+                if (!resourceLocationAsync.IsValid())
                 {
-                    s_Instances.Add(networkManager, new List<SceneUnloadEventHandler>());
+                    return null;
                 }
-                var clientId = networkManager.IsServer ? NetworkManager.ServerClientId : networkManager.LocalClientId;
-                s_Instances[networkManager].Add(new SceneUnloadEventHandler(networkSceneManager, scene, clientId, loadSceneMode, asyncOperation));
+            }
+
+            // Debug.Log($"[NetworkSceneManager] LoadScene Finished LoadResources sceneName={sceneName}");
+            var sceneEventProgress = ValidateSceneEventLoading(sceneName);
+            if (sceneEventProgress.Status != SceneEventProgressStatus.Started)
+            {
+                return sceneEventProgress;
+            }
+
+            // This will be the message we send to everyone when this scene event sceneEventProgress is complete
+            sceneEventProgress.SceneEventType = SceneEventType.LoadEventCompleted;
+            sceneEventProgress.LoadSceneMode = loadSceneMode;
+
+            var sceneEventData = BeginSceneEvent();
+
+            // Now set up the current scene event
+            sceneEventData.SceneEventProgressId = sceneEventProgress.Guid;
+            sceneEventData.SceneEventType = SceneEventType.Load;
+            sceneEventData.SceneAsset = sceneName;
+            sceneEventData.LoadSceneMode = loadSceneMode;
+            var sceneEventId = sceneEventData.SceneEventId;
+            // This both checks to make sure the scene is valid and if not resets the active scene event
+            m_IsSceneEventActive = ValidateSceneBeforeLoading(sceneEventData.SceneAsset, loadSceneMode);
+            if (!m_IsSceneEventActive)
+            {
+                EndSceneEvent(sceneEventId);
+                return new SceneEventProgress(NetworkManager.Singleton, SceneEventProgressStatus.SceneFailedVerification);
+            }
+
+            if (sceneEventData.LoadSceneMode == LoadSceneMode.Single)
+            {
+                // The Condition: While a scene is asynchronously loaded in single loading scene mode, if any new NetworkObjects are spawned
+                // they need to be moved into the do not destroy temporary scene
+                // When it is set: Just before starting the asynchronous loading call
+                // When it is unset: After the scene has loaded, the PopulateScenePlacedObjects is called, and all NetworkObjects in the do
+                // not destroy temporary scene are moved into the active scene
+                IsSpawnedObjectsPendingInDontDestroyOnLoad = true;
+
+                // Destroy current scene objects before switching.
+                NetworkManager.SpawnManager.ServerDestroySpawnedSceneObjects();
+
+                // Preserve the objects that should not be destroyed during the scene event
+                MoveObjectsToDontDestroyOnLoad();
+
+                // Now Unload all currently additively loaded scenes
+                UnloadAdditivelyLoadedScenes(sceneEventId);
+
+                // Register the active scene for unload scene event notifications
+                SceneUnloadEventHandler.RegisterScene(this, SceneManager.GetActiveScene(), LoadSceneMode.Single);
+            }
+
+            // Now start loading the scene
+            sceneEventProgress.SceneEventId = sceneEventId;
+            sceneEventProgress.OnSceneEventCompleted = OnSceneLoaded;
+            // Debug.Log($"[NetworkSceneManager] BEGIN SceneManagerHandler.LoadSceneAsync sceneName={sceneName} loadSceneMode={loadSceneMode}");
+            var sceneLoad = SceneManagerHandler.LoadSceneAsync(sceneName, loadSceneMode, sceneEventProgress);
+            // Debug.Log($"[NetworkSceneManager] END SceneManagerHandler.LoadSceneAsync sceneName={sceneName} loadSceneMode={loadSceneMode}");
+            // Notify the local server that a scene loading event has begun
+            OnSceneEvent?.Invoke(new SceneEvent()
+            {
+                AsyncOperation = sceneLoad,
+                SceneEventType = sceneEventData.SceneEventType,
+                LoadSceneMode = sceneEventData.LoadSceneMode,
+                SceneName = sceneName,
+                ClientId = NetworkManager.LocalClientId
+            });
+            OnLoad?.Invoke(NetworkManager.LocalClientId, sceneName, sceneEventData.LoadSceneMode, sceneLoad);
+
+            //Return our scene progress instance
+            return sceneEventProgress;
+        }
+
+        /// <summary>
+        /// Helper class used to handle "odd ball" scene unload event notification scenarios
+        /// when scene switching.
+        /// </summary>
+        internal class SceneUnloadEventHandler
+        {
+            private static Dictionary<NetworkManager, List<SceneUnloadEventHandler>> s_Instances = new Dictionary<NetworkManager, List<SceneUnloadEventHandler>>();
+
+            internal static void RegisterScene(NetworkSceneManager networkSceneManager, Scene scene, LoadSceneMode loadSceneMode, AsyncOperationHandle asyncOperation = default)
+            {
+                var networkManager = networkSceneManager.NetworkManager;
+                if (!s_Instances.ContainsKey(networkManager))
+                {
+                    s_Instances.Add(networkManager, new List<SceneUnloadEventHandler>());
+                }
+                var clientId = networkManager.LocalClientId;
+                s_Instances[networkManager].Add(new SceneUnloadEventHandler(networkSceneManager, scene, clientId, loadSceneMode, asyncOperation));
             }
 
             private static void SceneUnloadComplete(SceneUnloadEventHandler sceneUnloadEventHandler)
@@ -1497,7 +1704,7 @@ internal static void Shutdown()
             }
 
             private NetworkSceneManager m_NetworkSceneManager;
-            private AsyncOperation m_AsyncOperation;
+            private AsyncOperationHandle m_AsyncOperation;
             private LoadSceneMode m_LoadSceneMode;
             private ulong m_ClientId;
             private Scene m_Scene;
@@ -1530,7 +1737,7 @@ private void SceneUnloaded(Scene scene)
                 }
             }
 
-            private SceneUnloadEventHandler(NetworkSceneManager networkSceneManager, Scene scene, ulong clientId, LoadSceneMode loadSceneMode, AsyncOperation asyncOperation = null)
+            private SceneUnloadEventHandler(NetworkSceneManager networkSceneManager, Scene scene, ulong clientId, LoadSceneMode loadSceneMode, AsyncOperationHandle asyncOperation = default)
             {
                 m_LoadSceneMode = loadSceneMode;
                 m_AsyncOperation = asyncOperation;
@@ -1548,7 +1755,7 @@ private SceneUnloadEventHandler(NetworkSceneManager networkSceneManager, Scene s
                     ClientId = clientId
                 });
 
-                m_NetworkSceneManager.OnUnload?.Invoke(networkSceneManager.NetworkManager.LocalClientId, m_Scene.name, null);
+                m_NetworkSceneManager.OnUnload?.Invoke(networkSceneManager.NetworkManager.LocalClientId, m_Scene.name, default);
             }
         }
 
@@ -1560,10 +1767,10 @@ private SceneUnloadEventHandler(NetworkSceneManager networkSceneManager, Scene s
         private void OnClientSceneLoadingEvent(uint sceneEventId)
         {
             var sceneEventData = SceneEventDataStore[sceneEventId];
-            var sceneName = SceneNameFromHash(sceneEventData.SceneHash);
+            var sceneName = sceneEventData.SceneAsset;
 
             // Run scene validation before loading a scene
-            if (!ValidateSceneBeforeLoading(sceneEventData.SceneHash, sceneEventData.LoadSceneMode))
+            if (!ValidateSceneBeforeLoading(sceneEventData.SceneAsset, sceneEventData.LoadSceneMode))
             {
                 EndSceneEvent(sceneEventId);
                 return;
@@ -1594,8 +1801,15 @@ private void OnClientSceneLoadingEvent(uint sceneEventId)
             var sceneEventProgress = new SceneEventProgress(NetworkManager)
             {
                 SceneEventId = sceneEventId,
-                OnSceneEventCompleted = OnSceneLoaded
+                OnSceneEventCompleted = OnSceneLoaded,
+                Status = SceneEventProgressStatus.Started,
             };
+
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                SceneEventProgressTracking.Add(sceneEventData.SceneEventProgressId, sceneEventProgress);
+                m_IsSceneEventActive = true;
+            }
             var sceneLoad = SceneManagerHandler.LoadSceneAsync(sceneName, sceneEventData.LoadSceneMode, sceneEventProgress);
 
             OnSceneEvent?.Invoke(new SceneEvent()
@@ -1614,26 +1828,55 @@ private void OnClientSceneLoadingEvent(uint sceneEventId)
         /// Client and Server:
         /// Generic on scene loaded callback method to be called upon a scene loading
         /// </summary>
-        private void OnSceneLoaded(uint sceneEventId)
+        private void OnSceneLoaded(uint sceneEventId, string loadedSceneName)
         {
             // If we are shutdown or about to shutdown, then ignore this event
             if (!NetworkManager.IsListening || NetworkManager.ShutdownInProgress)
             {
+                EndSceneEvent(sceneEventId);
                 return;
             }
 
             var sceneEventData = SceneEventDataStore[sceneEventId];
-            var nextScene = GetAndAddNewlyLoadedSceneByName(SceneNameFromHash(sceneEventData.SceneHash));
-            if (!nextScene.isLoaded || !nextScene.IsValid())
+            var nextScene = GetAndAddNewlyLoadedSceneByName(loadedSceneName);
+            if (!nextScene.IsValid())
             {
                 throw new Exception($"Failed to find valid scene internal Unity.Netcode for {nameof(GameObject)}s error!");
             }
+            // If we async loaded a single scene, the active will activate it
 
             if (sceneEventData.LoadSceneMode == LoadSceneMode.Single)
             {
                 SceneManager.SetActiveScene(nextScene);
             }
 
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                var networkSceneHandle = nextScene.handle;
+                if (!HasSceneAuthority())
+                {
+                    networkSceneHandle = sceneEventData.SceneHandle;
+                }
+
+                // Update the server scene handle to client scene handle look up table
+                if (!UpdateServerClientSceneHandle(networkSceneHandle, nextScene.handle, nextScene))
+                {
+                    // If the exact same handle exists then there are problems with using handles
+                    Debug.LogWarning($"Server Scene Handle ({networkSceneHandle}) already exist!  Happened during scene load of {nextScene.name} with the local handle ({nextScene.handle})");
+                }
+            }
+            else if (NetworkManager.IsServer)
+            {
+                // Update the server scene handle to client scene handle look up table
+                if (!UpdateServerClientSceneHandle(nextScene.handle, nextScene.handle, nextScene))
+                {
+                    // If the exact same handle exists then there are problems with using handles
+                    Debug.LogWarning($"Server Scene Handle ({nextScene.handle}) already exist!  Happened during scene load of {nextScene.name} with the local handle ({nextScene.handle})");
+                }
+            }
+
+			Log.Info(() => "<color=orange>OnSceneLoaded</color>");
+
             //Get all NetworkObjects loaded by the scene
             PopulateScenePlacedObjects(nextScene);
 
@@ -1650,29 +1893,33 @@ private void OnSceneLoaded(uint sceneEventId)
             // not destroy temporary scene are moved into the active scene
             IsSpawnedObjectsPendingInDontDestroyOnLoad = false;
 
-            if (NetworkManager.IsServer)
+            if (HasSceneAuthority())
             {
-                OnServerLoadedScene(sceneEventId, nextScene);
+                OnSessionOwnerLoadedScene(sceneEventId, nextScene);
             }
             else
             {
-                // For the client, we make a server scene handle to client scene handle look up table
-                if (!UpdateServerClientSceneHandle(sceneEventData.SceneHandle, nextScene.handle, nextScene))
+                if (!NetworkManager.DistributedAuthorityMode)
                 {
-                    // If the exact same handle exists then there are problems with using handles
-                    throw new Exception($"Server Scene Handle ({sceneEventData.SceneHandle}) already exist!  Happened during scene load of {nextScene.name} with Client Handle ({nextScene.handle})");
+                    // For the client, we make a server scene handle to client scene handle look up table
+                    if (!UpdateServerClientSceneHandle(sceneEventData.SceneHandle, nextScene.handle, nextScene))
+                    {
+                        // If the exact same handle exists then there are problems with using handles
+                        throw new Exception($"Server Scene Handle ({sceneEventData.SceneHandle}) already exist!  Happened during scene load of {nextScene.name} with Client Handle ({nextScene.handle})");
+                    }
                 }
-
                 OnClientLoadedScene(sceneEventId, nextScene);
             }
         }
 
         /// <summary>
-        /// Server side:
+        /// Server/SessionOwner side:
         /// On scene loaded callback method invoked by OnSceneLoading only
         /// </summary>
-        private void OnServerLoadedScene(uint sceneEventId, Scene scene)
+        private void OnSessionOwnerLoadedScene(uint sceneEventId, Scene scene)
         {
+            // Debug.Log($"NetworkSceneManager - OnServerLoadedScene eventId:{sceneEventId} scene:{scene.name}");
+
             var sceneEventData = SceneEventDataStore[sceneEventId];
             // Register in-scene placed NetworkObjects with spawn manager
             foreach (var keyValuePairByGlobalObjectIdHash in ScenePlacedObjects)
@@ -1683,7 +1930,7 @@ private void OnServerLoadedScene(uint sceneEventId, Scene scene)
                     {
                         // All in-scene placed NetworkObjects default to being owned by the server
                         NetworkManager.SpawnManager.SpawnNetworkObjectLocally(keyValuePairBySceneHandle.Value,
-                            NetworkManager.SpawnManager.GetNetworkObjectId(), true, false, NetworkManager.ServerClientId, true);
+                            NetworkManager.SpawnManager.GetNetworkObjectId(), true, false, NetworkManager.LocalClientId, true);
                     }
                 }
             }
@@ -1705,39 +1952,34 @@ private void OnServerLoadedScene(uint sceneEventId, Scene scene)
             // Set the server's scene's handle so the client can build a look up table
             sceneEventData.SceneHandle = scene.handle;
 
+            var sessionOwner = NetworkManager.ServerClientId;
             // Send all clients the scene load event
-            for (int j = 0; j < NetworkManager.ConnectedClientsList.Count; j++)
+            if (NetworkManager.DistributedAuthorityMode)
             {
-                var clientId = NetworkManager.ConnectedClientsList[j].ClientId;
-                if (clientId != NetworkManager.ServerClientId)
-                {
-                    sceneEventData.TargetClientId = clientId;
-                    var message = new SceneEventMessage
-                    {
-                        EventData = sceneEventData
-                    };
-                    var size = NetworkManager.ConnectionManager.SendMessage(ref message, k_DeliveryType, clientId);
-                    NetworkManager.NetworkMetrics.TrackSceneEventSent(clientId, (uint)sceneEventData.SceneEventType, scene.name, size);
-                }
+                sessionOwner = NetworkManager.CurrentSessionOwner;
             }
 
+            SendSceneEventData(sceneEventData.SceneEventId, NetworkManager.ConnectedClientsIds.Where(c => c != sessionOwner).ToArray());
+
             m_IsSceneEventActive = false;
+
+            sceneEventData.SceneEventType = SceneEventType.LoadComplete;
             //First, notify local server that the scene was loaded
             OnSceneEvent?.Invoke(new SceneEvent()
             {
-                SceneEventType = SceneEventType.LoadComplete,
+                SceneEventType = sceneEventData.SceneEventType,
                 LoadSceneMode = sceneEventData.LoadSceneMode,
-                SceneName = SceneNameFromHash(sceneEventData.SceneHash),
+                SceneName = sceneEventData.SceneAsset,
                 ClientId = NetworkManager.ServerClientId,
                 Scene = scene,
             });
 
-            OnLoadComplete?.Invoke(NetworkManager.ServerClientId, SceneNameFromHash(sceneEventData.SceneHash), sceneEventData.LoadSceneMode);
+            OnLoadComplete?.Invoke(NetworkManager.ServerClientId, sceneEventData.SceneAsset, sceneEventData.LoadSceneMode);
 
             //Second, only if we are a host do we want register having loaded for the associated SceneEventProgress
-            if (SceneEventProgressTracking.ContainsKey(sceneEventData.SceneEventProgressId) && NetworkManager.IsHost)
+            if (SceneEventProgressTracking.ContainsKey(sceneEventData.SceneEventProgressId) && NetworkManager.IsClient)
             {
-                SceneEventProgressTracking[sceneEventData.SceneEventProgressId].ClientFinishedSceneEvent(NetworkManager.ServerClientId);
+                SceneEventProgressTracking[sceneEventData.SceneEventProgressId].ClientFinishedSceneEvent(NetworkManager.LocalClientId);
             }
             EndSceneEvent(sceneEventId);
         }
@@ -1752,23 +1994,46 @@ private void OnClientLoadedScene(uint sceneEventId, Scene scene)
             sceneEventData.DeserializeScenePlacedObjects();
 
             sceneEventData.SceneEventType = SceneEventType.LoadComplete;
-            SendSceneEventData(sceneEventId, new ulong[] { NetworkManager.ServerClientId });
+
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                sceneEventData.TargetClientId = NetworkManager.CurrentSessionOwner;
+                sceneEventData.SenderClientId = NetworkManager.LocalClientId;
+                var message = new SceneEventMessage
+                {
+                    EventData = sceneEventData,
+                };
+                var target = NetworkManager.DAHost ? NetworkManager.CurrentSessionOwner : NetworkManager.ServerClientId;
+                var size = NetworkManager.ConnectionManager.SendMessage(ref message, k_DeliveryType, target);
+                NetworkManager.NetworkMetrics.TrackSceneEventSent(target, (uint)sceneEventData.SceneEventType, sceneEventData.SceneAsset, size);
+            }
+            else
+            {
+                SendSceneEventData(sceneEventId, new ulong[] { NetworkManager.ServerClientId });
+            }
+
             m_IsSceneEventActive = false;
 
             // Process any pending create object messages that the client received while loading a scene
             ProcessDeferredCreateObjectMessages();
 
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                SceneEventProgressTracking.Remove(sceneEventData.SceneEventProgressId);
+                m_IsSceneEventActive = false;
+            }
+
             // Notify local client that the scene was loaded
             OnSceneEvent?.Invoke(new SceneEvent()
             {
                 SceneEventType = SceneEventType.LoadComplete,
                 LoadSceneMode = sceneEventData.LoadSceneMode,
-                SceneName = SceneNameFromHash(sceneEventData.SceneHash),
+                SceneName = sceneEventData.SceneAsset,
                 ClientId = NetworkManager.LocalClientId,
                 Scene = scene,
             });
 
-            OnLoadComplete?.Invoke(NetworkManager.LocalClientId, SceneNameFromHash(sceneEventData.SceneHash), sceneEventData.LoadSceneMode);
+            OnLoadComplete?.Invoke(NetworkManager.LocalClientId, sceneEventData.SceneAsset, sceneEventData.LoadSceneMode);
 
             EndSceneEvent(sceneEventId);
         }
@@ -1780,6 +2045,14 @@ private void OnClientLoadedScene(uint sceneEventId, Scene scene)
         /// </summary>
         internal Func<Scene, bool> ExcludeSceneFromSychronization;
 
+        /// <summary>
+        /// This is used for distributed authority sessions only and assures that
+        /// when many clients attempt to connect at the same time they will be
+        /// handled sequentially so as to not saturate the session owner's maximum
+        /// reliable messages.
+        /// </summary>
+        internal List<ulong> ClientConnectionQueue = new List<ulong>();
+
         /// <summary>
         /// Server Side:
         /// This is used for players that have just had their connection approved and will assure they are synchronized
@@ -1788,8 +2061,30 @@ private void OnClientLoadedScene(uint sceneEventId, Scene scene)
         /// synchronized.
         /// </summary>
         /// <param name="clientId">newly joined client identifier</param>
-        internal void SynchronizeNetworkObjects(ulong clientId)
+        /// <param name="synchronizingService">true only when invoked on a newly connected and approved client.</param>
+        internal void SynchronizeNetworkObjects(ulong clientId, bool synchronizingService = false)
         {
+            // If we are connected to a live service hosted session and we are not doing the initial synchronization for the service...
+            if (NetworkManager.CMBServiceConnection && !synchronizingService)
+            {
+                // then as long as this is a newly connecting client add it to the connecting client queue.
+                // Otherwise, if this is not a newly connecting client (i.e. it is already in the queue), then go ahead and synchronize
+                // that client.
+                if (!ClientConnectionQueue.Contains(clientId))
+                {
+                    ClientConnectionQueue.Add(clientId);
+                    // If we are already synchronizing one or more clients, exit early. This client will be synchronized later.
+                    if (ClientConnectionQueue.Count > 1)
+                    {
+                        if (NetworkManager.LogLevel <= LogLevel.Developer)
+                        {
+                            Debug.Log($"Deferring Client-{clientId} synchrnization.");
+                        }
+                        return;
+                    }
+                }
+            }
+
             // Update the clients
             NetworkManager.SpawnManager.UpdateObservedNetworkObjects(clientId);
 
@@ -1800,10 +2095,10 @@ internal void SynchronizeNetworkObjects(ulong clientId)
             sceneEventData.LoadSceneMode = ClientSynchronizationMode;
             var activeScene = SceneManager.GetActiveScene();
             sceneEventData.SceneEventType = SceneEventType.Synchronize;
-            if (BuildIndexToHash.ContainsKey(activeScene.buildIndex))
-            {
-                sceneEventData.ActiveSceneHash = BuildIndexToHash[activeScene.buildIndex];
-            }
+            // if (BuildIndexToHash.ContainsKey(activeScene.buildIndex))
+            // {
+            //     sceneEventData.ActiveSceneHash = BuildIndexToHash[activeScene.buildIndex];
+            // }
 
             // Organize how (and when) we serialize our NetworkObjects
             for (int i = 0; i < SceneManager.sceneCount; i++)
@@ -1817,6 +2112,7 @@ internal void SynchronizeNetworkObjects(ulong clientId)
                     continue;
                 }
 
+                var sceneHash = scene.name;
                 if (scene == DontDestroyOnLoadScene)
                 {
                     continue;
@@ -1826,30 +2122,58 @@ internal void SynchronizeNetworkObjects(ulong clientId)
                 // If we are the base scene, then we set the root scene index;
                 if (activeScene == scene)
                 {
-                    if (!ValidateSceneBeforeLoading(scene.buildIndex, scene.name, sceneEventData.LoadSceneMode))
+                    if (!ValidateSceneBeforeLoading(sceneHash, sceneEventData.LoadSceneMode))
                     {
                         continue;
                     }
-                    sceneEventData.SceneHash = SceneHashFromNameOrPath(scene.path);
-                    sceneEventData.SceneHandle = scene.handle;
+                    sceneEventData.SceneAsset = scene.name;
+
+                    // If we are just a normal client, then always use the server scene handle
+                    if (NetworkManager.DistributedAuthorityMode)
+                    {
+                        sceneEventData.SenderClientId = NetworkManager.LocalClientId;
+                        sceneEventData.SceneHandle = ClientSceneHandleToServerSceneHandle[scene.handle];
+                    }
+                    else
+                    {
+                        sceneEventData.SceneHandle = scene.handle;
+                    }
                 }
-                else if (!ValidateSceneBeforeLoading(scene.buildIndex, scene.name, LoadSceneMode.Additive))
+                else if (!ValidateSceneBeforeLoading(sceneHash, LoadSceneMode.Additive))
                 {
                     continue;
                 }
-                sceneEventData.AddSceneToSynchronize(SceneHashFromNameOrPath(scene.path), scene.handle);
+
+                // If we are just a normal client and in distributed authority mode, then always use the known server scene handle
+                if (NetworkManager.DistributedAuthorityMode && !NetworkManager.DAHost)
+                {
+                    sceneEventData.AddSceneToSynchronize(sceneHash, ClientSceneHandleToServerSceneHandle[scene.handle]);
+                }
+                else
+                {
+                    sceneEventData.AddSceneToSynchronize(sceneHash, scene.handle);
+                }
             }
 
             sceneEventData.AddSpawnedNetworkObjects();
             sceneEventData.AddDespawnedInSceneNetworkObjects();
-
             var message = new SceneEventMessage
             {
                 EventData = sceneEventData
             };
-            var size = NetworkManager.ConnectionManager.SendMessage(ref message, k_DeliveryType, clientId);
+
+            var size = 0;
+            if (NetworkManager.DistributedAuthorityMode && !NetworkManager.DAHost)
+            {
+                size = NetworkManager.ConnectionManager.SendMessage(ref message, k_DeliveryType, NetworkManager.ServerClientId);
+            }
+            else
+            {
+                size = NetworkManager.ConnectionManager.SendMessage(ref message, k_DeliveryType, clientId);
+            }
             NetworkManager.NetworkMetrics.TrackSceneEventSent(clientId, (uint)sceneEventData.SceneEventType, "", size);
 
+
             // Notify the local server that the client has been sent the synchronize event
             OnSceneEvent?.Invoke(new SceneEvent()
             {
@@ -1872,17 +2196,17 @@ private void OnClientBeginSync(uint sceneEventId)
             var sceneEventData = SceneEventDataStore[sceneEventId];
             var sceneHash = sceneEventData.GetNextSceneSynchronizationHash();
             var sceneHandle = sceneEventData.GetNextSceneSynchronizationHandle();
-            var sceneName = SceneNameFromHash(sceneHash);
+            var sceneName = sceneHash;
             var activeScene = SceneManager.GetActiveScene();
 
-            var loadSceneMode = sceneHash == sceneEventData.SceneHash ? sceneEventData.LoadSceneMode : LoadSceneMode.Additive;
+            var loadSceneMode = sceneHash == sceneEventData.SceneAsset ? sceneEventData.LoadSceneMode : LoadSceneMode.Additive;
 
             // Store the sceneHandle and hash
             sceneEventData.NetworkSceneHandle = sceneHandle;
-            sceneEventData.ClientSceneHash = sceneHash;
+            sceneEventData.SceneAsset = sceneHash;
 
             // If this is the beginning of the synchronization event, then send client a notification that synchronization has begun
-            if (sceneHash == sceneEventData.SceneHash)
+            if (sceneHash == sceneEventData.SceneAsset)
             {
                 OnSceneEvent?.Invoke(new SceneEvent()
                 {
@@ -1904,14 +2228,14 @@ private void OnClientBeginSync(uint sceneEventId)
                 return;
             }
 
-            var sceneLoad = (AsyncOperation)null;
+            var sceneLoad = (AsyncOperationHandle<SceneInstance>)default;
 
             // Determines if the client has the scene to be loaded already loaded, if so will return true and the client will skip loading this scene
             // For ClientSynchronizationMode LoadSceneMode.Single, we pass in whether the scene being loaded is the first/primary active scene and if it is already loaded
             // it should pass through to post load processing (ClientLoadedSynchronization).
             // For ClientSynchronizationMode LoadSceneMode.Additive, if the scene is already loaded or the active scene is the scene to be loaded (does not require it to
             // be the initial primary scene) then go ahead and pass through to post load processing (ClientLoadedSynchronization).
-            var shouldPassThrough = SceneManagerHandler.ClientShouldPassThrough(sceneName, sceneHash == sceneEventData.SceneHash, ClientSynchronizationMode, NetworkManager);
+            var shouldPassThrough = SceneManagerHandler.ClientShouldPassThrough(sceneName, sceneName == sceneEventData.SceneAsset, ClientSynchronizationMode, NetworkManager);
 
             if (!shouldPassThrough)
             {
@@ -1921,7 +2245,9 @@ private void OnClientBeginSync(uint sceneEventId)
                     SceneEventId = sceneEventId,
                     OnSceneEventCompleted = ClientLoadedSynchronization
                 };
+                // Debug.Log($"[NetworkSceneManager] OnClientBeginSync BEGIN SceneManagerHandler.LoadSceneAsync sceneName={sceneName} loadSceneMode={loadSceneMode}");
                 sceneLoad = SceneManagerHandler.LoadSceneAsync(sceneName, loadSceneMode, sceneEventProgress);
+                // Debug.Log($"[NetworkSceneManager] OnClientBeginSync END SceneManagerHandler.LoadSceneAsync sceneName={sceneName} loadSceneMode={loadSceneMode}");
 
                 // Notify local client that a scene load has begun
                 OnSceneEvent?.Invoke(new SceneEvent()
@@ -1938,7 +2264,7 @@ private void OnClientBeginSync(uint sceneEventId)
             else
             {
                 // If so, then pass through
-                ClientLoadedSynchronization(sceneEventId);
+                ClientLoadedSynchronization(sceneEventId, sceneName);
             }
         }
 
@@ -1947,10 +2273,9 @@ private void OnClientBeginSync(uint sceneEventId)
         /// This handles all of the in-scene and dynamically spawned NetworkObject synchronization
         /// </summary>
         /// <param name="sceneIndex">Netcode scene index that was loaded</param>
-        private void ClientLoadedSynchronization(uint sceneEventId)
+        private void ClientLoadedSynchronization(uint sceneEventId, string sceneName)
         {
             var sceneEventData = SceneEventDataStore[sceneEventId];
-            var sceneName = SceneNameFromHash(sceneEventData.ClientSceneHash);
             var nextScene = SceneManagerHandler.GetSceneFromLoadedScenes(sceneName, NetworkManager);
             if (!nextScene.IsValid())
             {
@@ -1962,7 +2287,7 @@ private void ClientLoadedSynchronization(uint sceneEventId)
                 throw new Exception($"Failed to find valid scene internal Unity.Netcode for {nameof(GameObject)}s error!");
             }
 
-            var loadSceneMode = (sceneEventData.ClientSceneHash == sceneEventData.SceneHash ? sceneEventData.LoadSceneMode : LoadSceneMode.Additive);
+            var loadSceneMode = (sceneEventData.ClientSceneName == sceneEventData.SceneAsset ? sceneEventData.LoadSceneMode : LoadSceneMode.Additive);
 
             // For now, during a synchronization event, we will make the first scene the "base/master" scene that denotes a "complete scene switch"
             if (loadSceneMode == LoadSceneMode.Single)
@@ -1977,6 +2302,8 @@ private void ClientLoadedSynchronization(uint sceneEventId)
                 throw new Exception($"Server Scene Handle ({sceneEventData.SceneHandle}) already exist!  Happened during scene load of {nextScene.name} with Client Handle ({nextScene.handle})");
             }
 
+			Log.Info(() => $"<color=orange>ClientLoadedSynchronization</color> sceneName={sceneName}");
+
             // Apply all in-scene placed NetworkObjects loaded by the scene
             PopulateScenePlacedObjects(nextScene, false);
 
@@ -1984,14 +2311,20 @@ private void ClientLoadedSynchronization(uint sceneEventId)
             var responseSceneEventData = BeginSceneEvent();
             responseSceneEventData.LoadSceneMode = loadSceneMode;
             responseSceneEventData.SceneEventType = SceneEventType.LoadComplete;
-            responseSceneEventData.SceneHash = sceneEventData.ClientSceneHash;
-
+            responseSceneEventData.SceneAsset = sceneEventData.ClientSceneName;
 
+            var target = NetworkManager.ServerClientId;
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                responseSceneEventData.SenderClientId = NetworkManager.LocalClientId;
+                responseSceneEventData.TargetClientId = NetworkManager.CurrentSessionOwner;
+                target = NetworkManager.DAHost ? NetworkManager.CurrentSessionOwner : NetworkManager.ServerClientId;
+            }
             var message = new SceneEventMessage
             {
                 EventData = responseSceneEventData
             };
-            var size = NetworkManager.ConnectionManager.SendMessage(ref message, k_DeliveryType, NetworkManager.ServerClientId);
+            var size = NetworkManager.ConnectionManager.SendMessage(ref message, k_DeliveryType, target);
 
             NetworkManager.NetworkMetrics.TrackSceneEventSent(NetworkManager.ServerClientId, (uint)responseSceneEventData.SceneEventType, sceneName, size);
 
@@ -2038,12 +2371,12 @@ private void SynchronizeNetworkObjectScene()
                         if (ScenesLoaded.ContainsKey(networkObject.SceneOriginHandle))
                         {
                             var scene = ScenesLoaded[networkObject.SceneOriginHandle];
-                            if (scene == DontDestroyOnLoadScene)
+                            if (scene.SceneReference == DontDestroyOnLoadScene)
                             {
                                 Debug.Log($"{networkObject.gameObject.name} migrating into DDOL!");
                             }
 
-                            SceneManager.MoveGameObjectToScene(networkObject.gameObject, scene);
+                            SceneManager.MoveGameObjectToScene(networkObject.gameObject, scene.SceneReference);
                         }
                         else if (NetworkManager.LogLevel <= LogLevel.Normal)
                         {
@@ -2067,19 +2400,17 @@ private void HandleClientSceneEvent(uint sceneEventId)
             {
                 case SceneEventType.ActiveSceneChanged:
                     {
-                        if (HashToBuildIndex.ContainsKey(sceneEventData.ActiveSceneHash))
+                        var scene = SceneManager.GetSceneByName(sceneEventData.ClientSceneName);
+                        if (scene.isLoaded)
                         {
-                            var scene = SceneManager.GetSceneByBuildIndex(HashToBuildIndex[sceneEventData.ActiveSceneHash]);
-                            if (scene.isLoaded)
-                            {
-                                SceneManager.SetActiveScene(scene);
-                            }
+                            SceneManager.SetActiveScene(scene);
                         }
+                        EndSceneEvent(sceneEventId);
                         break;
                     }
                 case SceneEventType.ObjectSceneChanged:
                     {
-                        MigrateNetworkObjectsIntoScenes();
+                        EndSceneEvent(sceneEventId);
                         break;
                     }
                 case SceneEventType.Load:
@@ -2100,17 +2431,16 @@ private void HandleClientSceneEvent(uint sceneEventId)
                         }
                         else
                         {
+							Log.Info(() => $"<color=orange>SceneEventType.Synchronize</color> sceneName={sceneEventData.ClientSceneName}");
+
                             // Include anything in the DDOL scene
                             PopulateScenePlacedObjects(DontDestroyOnLoadScene, false);
 
                             // If needed, set the currently active scene
-                            if (HashToBuildIndex.ContainsKey(sceneEventData.ActiveSceneHash))
+                            var targetActiveScene = SceneManager.GetSceneByName(sceneEventData.ClientSceneName);
+                            if (targetActiveScene.isLoaded && targetActiveScene.handle != SceneManager.GetActiveScene().handle)
                             {
-                                var targetActiveScene = SceneManager.GetSceneByBuildIndex(HashToBuildIndex[sceneEventData.ActiveSceneHash]);
-                                if (targetActiveScene.isLoaded && targetActiveScene.handle != SceneManager.GetActiveScene().handle)
-                                {
-                                    SceneManager.SetActiveScene(targetActiveScene);
-                                }
+                                SceneManager.SetActiveScene(targetActiveScene);
                             }
 
                             // Spawn and Synchronize all NetworkObjects
@@ -2123,20 +2453,55 @@ private void HandleClientSceneEvent(uint sceneEventId)
                             ProcessDeferredCreateObjectMessages();
 
                             sceneEventData.SceneEventType = SceneEventType.SynchronizeComplete;
-                            SendSceneEventData(sceneEventId, new ulong[] { NetworkManager.ServerClientId });
+                            if (NetworkManager.DistributedAuthorityMode)
+                            {
+                                if (NetworkManager.CMBServiceConnection)
+                                {
+                                    foreach (var clientId in NetworkManager.ConnectedClientsIds)
+                                    {
+                                        if (clientId == NetworkManager.LocalClientId)
+                                        {
+                                            continue;
+                                        }
+                                        sceneEventData.TargetClientId = clientId;
+                                        sceneEventData.SenderClientId = NetworkManager.LocalClientId;
+                                        var message = new SceneEventMessage
+                                        {
+                                            EventData = sceneEventData,
+                                        };
+                                        var target = NetworkManager.DAHost ? NetworkManager.CurrentSessionOwner : NetworkManager.ServerClientId;
+                                        var size = NetworkManager.ConnectionManager.SendMessage(ref message, k_DeliveryType, target);
+                                        NetworkManager.NetworkMetrics.TrackSceneEventSent(target, (uint)sceneEventData.SceneEventType, sceneEventData.SceneAsset, size);
+                                    }
+                                }
+                                else
+                                {
+                                    sceneEventData.TargetClientId = NetworkManager.CurrentSessionOwner;
+                                    sceneEventData.SenderClientId = NetworkManager.LocalClientId;
+                                    var message = new SceneEventMessage
+                                    {
+                                        EventData = sceneEventData,
+                                    };
+                                    var target = NetworkManager.DAHost ? NetworkManager.CurrentSessionOwner : NetworkManager.ServerClientId;
+                                    var size = NetworkManager.ConnectionManager.SendMessage(ref message, k_DeliveryType, target);
+                                    NetworkManager.NetworkMetrics.TrackSceneEventSent(target, (uint)sceneEventData.SceneEventType, sceneEventData.SceneAsset, size);
+                                }
+                            }
+                            else
+                            {
+                                SendSceneEventData(sceneEventId, new ulong[] { NetworkManager.ServerClientId });
+                            }
 
                             // All scenes are synchronized, let the server know we are done synchronizing
                             NetworkManager.IsConnectedClient = true;
 
-                            // Client is now synchronized and fully "connected".  This also means the client can send "RPCs" at this time
-                            NetworkManager.ConnectionManager.InvokeOnClientConnectedCallback(NetworkManager.LocalClientId);
-
-                            // Notify the client that they have finished synchronizing
-                            OnSceneEvent?.Invoke(new SceneEvent()
+                            // With distributed authority, either the client-side automatically spawns the default assigned player prefab or
+                            // if AutoSpawnPlayerPrefabClientSide is disabled the client-side will determine what player prefab to spawn and
+                            // when it gets spawned.
+                            if (NetworkManager.DistributedAuthorityMode && NetworkManager.AutoSpawnPlayerPrefabClientSide)
                             {
-                                SceneEventType = sceneEventData.SceneEventType,
-                                ClientId = NetworkManager.LocalClientId, // Client sent this to the server
-                            });
+                                NetworkManager.ConnectionManager.CreateAndSpawnPlayer(NetworkManager.LocalClientId);
+                            }
 
                             // Process any SceneEventType.ObjectSceneChanged messages that
                             // were deferred while synchronizing and migrate the associated
@@ -2151,12 +2516,29 @@ private void HandleClientSceneEvent(uint sceneEventId)
                                 SceneManagerHandler.UnloadUnassignedScenes(NetworkManager);
                             }
 
+                            // Client is now synchronized and fully "connected".  This also means the client can send "RPCs" at this time
+                            NetworkManager.ConnectionManager.InvokeOnClientConnectedCallback(NetworkManager.LocalClientId);
+
+                            // Notify the client that they have finished synchronizing
+                            OnSceneEvent?.Invoke(new SceneEvent()
+                            {
+                                SceneEventType = sceneEventData.SceneEventType,
+                                ClientId = NetworkManager.LocalClientId, // Client sent this to the server
+                            });
+
                             OnSynchronizeComplete?.Invoke(NetworkManager.LocalClientId);
 
+                            if (NetworkLog.CurrentLogLevel <= LogLevel.Developer)
+                            {
+                                NetworkLog.LogInfo($"[Client-{NetworkManager.LocalClientId}][Scene Management Enabled] Synchronization complete!");
+                            }
                             // For convenience, notify all NetworkBehaviours that synchronization is complete.
-                            foreach (var networkObject in NetworkManager.SpawnManager.SpawnedObjectsList)
+                            NetworkManager.SpawnManager.NotifyNetworkObjectsSynchronized();
+
+                            if (NetworkManager.DistributedAuthorityMode && HasSceneAuthority() && IsRestoringSession)
                             {
-                                networkObject.InternalNetworkSessionSynchronized();
+                                IsRestoringSession = false;
+                                PostSynchronizationSceneUnloading = m_OriginalPostSynchronizationSceneUnloading;
                             }
 
                             EndSceneEvent(sceneEventId);
@@ -2183,7 +2565,7 @@ private void HandleClientSceneEvent(uint sceneEventId)
                         {
                             SceneEventType = sceneEventData.SceneEventType,
                             LoadSceneMode = sceneEventData.LoadSceneMode,
-                            SceneName = SceneNameFromHash(sceneEventData.SceneHash),
+                            SceneName = sceneEventData.SceneAsset,
                             ClientId = NetworkManager.ServerClientId,
                             ClientsThatCompleted = sceneEventData.ClientsCompleted,
                             ClientsThatTimedOut = sceneEventData.ClientsTimedOut,
@@ -2191,11 +2573,11 @@ private void HandleClientSceneEvent(uint sceneEventId)
 
                         if (sceneEventData.SceneEventType == SceneEventType.LoadEventCompleted)
                         {
-                            OnLoadEventCompleted?.Invoke(SceneNameFromHash(sceneEventData.SceneHash), sceneEventData.LoadSceneMode, sceneEventData.ClientsCompleted, sceneEventData.ClientsTimedOut);
+                            OnLoadEventCompleted?.Invoke(sceneEventData.SceneAsset, sceneEventData.LoadSceneMode, sceneEventData.ClientsCompleted, sceneEventData.ClientsTimedOut);
                         }
                         else
                         {
-                            OnUnloadEventCompleted?.Invoke(SceneNameFromHash(sceneEventData.SceneHash), sceneEventData.LoadSceneMode, sceneEventData.ClientsCompleted, sceneEventData.ClientsTimedOut);
+                            OnUnloadEventCompleted?.Invoke(sceneEventData.SceneAsset, sceneEventData.LoadSceneMode, sceneEventData.ClientsCompleted, sceneEventData.ClientsTimedOut);
                         }
 
                         EndSceneEvent(sceneEventId);
@@ -2211,10 +2593,10 @@ private void HandleClientSceneEvent(uint sceneEventId)
         }
 
         /// <summary>
-        /// Server Side:
-        /// Handles incoming Scene_Event messages for host or server
+        /// Session Owner Side:
+        /// Handles incoming Scene_Event messages for the current session owner
         /// </summary>
-        private void HandleServerSceneEvent(uint sceneEventId, ulong clientId)
+        private void HandleSessionOwnerEvent(uint sceneEventId, ulong clientId)
         {
             var sceneEventData = SceneEventDataStore[sceneEventId];
             switch (sceneEventData.SceneEventType)
@@ -2226,11 +2608,11 @@ private void HandleServerSceneEvent(uint sceneEventId, ulong clientId)
                         {
                             SceneEventType = sceneEventData.SceneEventType,
                             LoadSceneMode = sceneEventData.LoadSceneMode,
-                            SceneName = SceneNameFromHash(sceneEventData.SceneHash),
+                            SceneName = sceneEventData.SceneAsset,
                             ClientId = clientId
                         });
 
-                        OnLoadComplete?.Invoke(clientId, SceneNameFromHash(sceneEventData.SceneHash), sceneEventData.LoadSceneMode);
+                        OnLoadComplete?.Invoke(clientId, sceneEventData.SceneAsset, sceneEventData.LoadSceneMode);
 
                         if (SceneEventProgressTracking.ContainsKey(sceneEventData.SceneEventProgressId))
                         {
@@ -2250,27 +2632,55 @@ private void HandleServerSceneEvent(uint sceneEventId, ulong clientId)
                         {
                             SceneEventType = sceneEventData.SceneEventType,
                             LoadSceneMode = sceneEventData.LoadSceneMode,
-                            SceneName = SceneNameFromHash(sceneEventData.SceneHash),
+                            SceneName = sceneEventData.SceneAsset,
                             ClientId = clientId
                         });
 
-                        OnUnloadComplete?.Invoke(clientId, SceneNameFromHash(sceneEventData.SceneHash));
+                        OnUnloadComplete?.Invoke(clientId, sceneEventData.SceneAsset);
 
                         EndSceneEvent(sceneEventId);
                         break;
                     }
                 case SceneEventType.SynchronizeComplete:
                     {
-                        // Notify the local server that a client has finished synchronizing
-                        OnSceneEvent?.Invoke(new SceneEvent()
+                        // At this point the client is considered fully "connected"
+                        if ((NetworkManager.DistributedAuthorityMode && NetworkManager.LocalClient.IsSessionOwner) || !NetworkManager.DistributedAuthorityMode)
                         {
-                            SceneEventType = sceneEventData.SceneEventType,
-                            SceneName = string.Empty,
-                            ClientId = clientId
-                        });
+                            // Notify the local server that a client has finished synchronizing
+                            OnSceneEvent?.Invoke(new SceneEvent()
+                            {
+                                SceneEventType = sceneEventData.SceneEventType,
+                                SceneName = string.Empty,
+                                ClientId = clientId
+                            });
+                            if (NetworkManager.ConnectedClients.ContainsKey(clientId))
+                            {
+                                NetworkManager.ConnectedClients[clientId].IsConnected = true;
+                            }
+                        }
+                        else
+                        {
+                            // Notify the local server that a client has finished synchronizing
+                            OnSceneEvent?.Invoke(new SceneEvent()
+                            {
+                                SceneEventType = sceneEventData.SceneEventType,
+                                SceneName = string.Empty,
+                                ClientId = clientId
+                            });
 
-                        // At this point the client is considered fully "connected"
-                        NetworkManager.ConnectedClients[clientId].IsConnected = true;
+                            // Show any NetworkObjects that are:
+                            // - Hidden from the session owner
+                            // - Owned by this client
+                            // - Has NetworkObject.SpawnWithObservers set to true (the default)
+                            NetworkManager.SpawnManager.ShowHiddenObjectsToNewlyJoinedClient(clientId);
+
+                            // DANGO-EXP TODO: Remove this once service distributes objects
+                            // Non-session owners receive this notification from newly connected clients and upon receiving
+                            // the event they will redistribute their NetworkObjects
+                            NetworkManager.SpawnManager.DistributeNetworkObjects(clientId);
+                            EndSceneEvent(sceneEventId);
+                            return;
+                        }
 
                         // All scenes are synchronized, let the server know we are done synchronizing
                         OnSynchronizeComplete?.Invoke(clientId);
@@ -2278,9 +2688,6 @@ private void HandleServerSceneEvent(uint sceneEventId, ulong clientId)
                         // At this time the client is fully synchronized with all loaded scenes and
                         // NetworkObjects and should be considered "fully connected". Send the
                         // notification that the client is connected.
-                        // TODO 2023: We should have a better name for this or have multiple states the
-                        // client progresses through (the name and associated legacy behavior/expected state
-                        // of the client was persisted since MLAPI)
                         NetworkManager.ConnectionManager.InvokeOnClientConnectedCallback(clientId);
 
                         if (NetworkManager.IsHost)
@@ -2302,7 +2709,47 @@ private void HandleServerSceneEvent(uint sceneEventId, ulong clientId)
                                 ClientId = clientId
                             });
                         }
+                        // DANGO-EXP TODO: Remove this once service distributes objects
+                        NetworkManager.SpawnManager.DistributeNetworkObjects(clientId);
                         EndSceneEvent(sceneEventId);
+
+                        // Exit early if not a distributed authority session or this is a DAHost
+                        // (DAHost has a unique connection per client, so no need to queue synchronization)
+                        if (!NetworkManager.DistributedAuthorityMode || NetworkManager.DAHost)
+                        {
+                            return;
+                        }
+
+                        // Otherwise, this is a session owner that could have pending clients to synchronize
+                        if (NetworkManager.DistributedAuthorityMode && NetworkManager.CMBServiceConnection)
+                        {
+                            // Remove the client that just synchronized
+                            ClientConnectionQueue.Remove(clientId);
+
+                            // If we have pending clients to synchronize, then make sure they are still connected
+                            while (ClientConnectionQueue.Count > 0)
+                            {
+                                // If the next client is no longer connected then remove it from the list
+                                if (!NetworkManager.ConnectedClientsIds.Contains(ClientConnectionQueue[0]))
+                                {
+                                    ClientConnectionQueue.RemoveAt(0);
+                                }
+                                else
+                                {
+                                    break;
+                                }
+                            }
+
+                            // If we still have any pending clients waiting, then synchronize the next one
+                            if (ClientConnectionQueue.Count > 0)
+                            {
+                                if (NetworkManager.LogLevel <= LogLevel.Developer)
+                                {
+                                    Debug.Log($"Synchronizing Client-{ClientConnectionQueue[0]}...");
+                                }
+                                SynchronizeNetworkObjects(ClientConnectionQueue[0]);
+                            }
+                        }
                         break;
                     }
                 default:
@@ -2313,6 +2760,13 @@ private void HandleServerSceneEvent(uint sceneEventId, ulong clientId)
             }
         }
 
+        /// <summary>
+        ///  Skips scene handling to be able to test CMB DA_NGO Codec tests
+        /// </summary>
+        internal bool SkipSceneHandling;
+
+        private bool m_OriginalPostSynchronizationSceneUnloading;
+
         /// <summary>
         /// Both Client and Server: Incoming scene event entry point
         /// </summary>
@@ -2323,11 +2777,61 @@ internal void HandleSceneEvent(ulong clientId, FastBufferReader reader)
             if (NetworkManager != null)
             {
                 var sceneEventData = BeginSceneEvent();
-
                 sceneEventData.Deserialize(reader);
+                if (SkipSceneHandling)
+                {
+                    return;
+                }
+
+                // DA HOST Will keep track of session owner and if it is not the scene owner it will forward the message
+                // to the current session owner
+                if (NetworkManager.DistributedAuthorityMode && NetworkManager.DAHost)
+                {
+                    // If the event is server directed
+                    if (!sceneEventData.IsSceneEventClientSide())
+                    {
+                        // If the DAHost is not the session owner, then forward the message to the current session owner
+                        if (NetworkManager.CurrentSessionOwner != NetworkManager.LocalClientId)
+                        {
+                            var message = new SceneEventMessage()
+                            {
+                                EventData = sceneEventData,
+                            };
+                            // Forward synchronization to client then exit early because DAHost is not the current session owner
+                            foreach (var client in NetworkManager.ConnectedClientsIds)
+                            {
+                                if (client == NetworkManager.LocalClientId)
+                                {
+                                    continue;
+                                }
+                                NetworkManager.MessageManager.SendMessage(ref message, NetworkDelivery.ReliableFragmentedSequenced, client);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        // DAHost will forward any messages not targeting the DAHost to the targeted client
+                        if (sceneEventData.TargetClientId != NetworkManager.LocalClientId)
+                        {
+                            if (NetworkManager.LogLevel == LogLevel.Developer)
+                            {
+                                NetworkLog.LogInfoServer($"[Forward To: Client-{sceneEventData.TargetClientId}][{Enum.GetName(typeof(SceneEventType), sceneEventData.SceneEventType)}]");
+                            }
+                            sceneEventData.ForwardSynchronization = sceneEventData.SceneEventType == SceneEventType.Synchronize;
+                            sceneEventData.IsForwarding = true;
+                            var message = new SceneEventMessage()
+                            {
+                                EventData = sceneEventData,
+                            };
+                            NetworkManager.MessageManager.SendMessage(ref message, NetworkDelivery.ReliableFragmentedSequenced, sceneEventData.TargetClientId);
+                            EndSceneEvent(sceneEventData.SceneEventId);
+                            return;
+                        }
+                    }
+                }
 
                 NetworkManager.NetworkMetrics.TrackSceneEventReceived(
-                   clientId, (uint)sceneEventData.SceneEventType, SceneNameFromHash(sceneEventData.SceneHash), reader.Length);
+                   clientId, (uint)sceneEventData.SceneEventType, sceneEventData.SceneAsset, reader.Length);
 
                 if (sceneEventData.IsSceneEventClientSide())
                 {
@@ -2341,6 +2845,12 @@ internal void HandleSceneEvent(ulong clientId, FastBufferReader reader)
                         // Only if ClientSynchronizationMode is Additive and the client receives a synchronize scene event
                         if (ClientSynchronizationMode == LoadSceneMode.Additive)
                         {
+                            if (NetworkManager.DistributedAuthorityMode && HasSceneAuthority() && IsRestoringSession && clientId == NetworkManager.ServerClientId)
+                            {
+                                m_OriginalPostSynchronizationSceneUnloading = PostSynchronizationSceneUnloading;
+                                PostSynchronizationSceneUnloading = true;
+                            }
+
                             // Check for scenes already loaded and create a table of scenes already loaded (SceneEntries) that will be
                             // used if the server is synchronizing the same scenes (i.e. if a matching scene is already loaded on the
                             // client side, then that scene will be used as opposed to loading another scene). This allows for clients
@@ -2352,7 +2862,12 @@ internal void HandleSceneEvent(ulong clientId, FastBufferReader reader)
                 }
                 else
                 {
-                    HandleServerSceneEvent(sceneEventData.SceneEventId, clientId);
+                    var sendingClient = clientId;
+                    if (NetworkManager.DistributedAuthorityMode)
+                    {
+                        sendingClient = sceneEventData.SenderClientId;
+                    }
+                    HandleSessionOwnerEvent(sceneEventData.SceneEventId, sendingClient);
                 }
             }
             else
@@ -2383,10 +2898,26 @@ internal void MoveObjectsToDontDestroyOnLoad()
                     // Only move dynamically spawned NetworkObjects with no parent as the children will follow
                     if (networkObject.gameObject.transform.parent == null && networkObject.IsSceneObject != null && !networkObject.IsSceneObject.Value)
                     {
-                        UnityEngine.Object.DontDestroyOnLoad(networkObject.gameObject);
+                        try
+                        {
+                            Object.DontDestroyOnLoad(networkObject.gameObject);
+                            // When temporarily migrating to the DDOL, adjust the network and origin scene handles so no messages are generated
+                            // about objects being moved to a new scene.
+                            networkObject.NetworkSceneHandle = ClientSceneHandleToServerSceneHandle[networkObject.gameObject.scene.handle];
+                            networkObject.SceneOriginHandle = networkObject.gameObject.scene.handle;
+                        }
+                        catch (Exception e)
+                        {
+                            string allEntities = "";
+                            foreach (var kvp in ClientSceneHandleToServerSceneHandle)
+                            {
+                                allEntities += $"{kvp.Key}={kvp.Value},";
+                            }
+                            Log.Error(() => $"Failed to move object={networkObject} to DDOL [{allEntities}] e={e}");
+                        }
                     }
                 }
-                else if (NetworkManager.IsServer)
+                else if (networkObject.HasAuthority)
                 {
                     networkObject.Despawn();
                 }
@@ -2405,6 +2936,7 @@ internal void MoveObjectsToDontDestroyOnLoad()
         /// </summary>
         internal void PopulateScenePlacedObjects(Scene sceneToFilterBy, bool clearScenePlacedObjects = true)
         {
+            Log.Info(() => "<color=orange>PopulateScenePlacedObjects</color>");
             if (clearScenePlacedObjects)
             {
                 ScenePlacedObjects.Clear();
@@ -2424,6 +2956,7 @@ internal void PopulateScenePlacedObjects(Scene sceneToFilterBy, bool clearSceneP
             {
                 var globalObjectIdHash = networkObjectInstance.GlobalObjectIdHash;
                 var sceneHandle = networkObjectInstance.gameObject.scene.handle;
+                Log.Info(() => $"PopulateScenePlacedObjects object={networkObjectInstance.gameObject} sceneHandle={sceneHandle} hash={globalObjectIdHash}");
                 // We check to make sure the NetworkManager instance is the same one to be "NetcodeIntegrationTestHelpers" compatible and filter the list on a per scene basis (for additive scenes)
                 if (networkObjectInstance.IsSceneObject != false && (networkObjectInstance.NetworkManager == NetworkManager ||
                     networkObjectInstance.NetworkManagerOwner == null) && sceneHandle == sceneToFilterBy.handle)
@@ -2439,6 +2972,7 @@ internal void PopulateScenePlacedObjects(Scene sceneToFilterBy, bool clearSceneP
                     }
                     else
                     {
+                        Log.Error(() => $"Duplicate hash ids from object={ScenePlacedObjects[globalObjectIdHash][sceneHandle].gameObject.NetworkGetScenePath()}");
                         var exitingEntryName = ScenePlacedObjects[globalObjectIdHash][sceneHandle] != null ? ScenePlacedObjects[globalObjectIdHash][sceneHandle].name : "Null Entry";
                         throw new Exception($"{networkObjectInstance.name} tried to registered with {nameof(ScenePlacedObjects)} which already contains " +
                             $"the same {nameof(NetworkObject.GlobalObjectIdHash)} value {globalObjectIdHash} for {exitingEntryName}!");
@@ -2466,6 +3000,21 @@ internal void MoveObjectsFromDontDestroyOnLoadToScene(Scene scene)
                     // back into the currently active scene
                     if (networkObject.gameObject.transform.parent == null && networkObject.IsSceneObject != null && !networkObject.IsSceneObject.Value)
                     {
+                        if (NetworkManager.DistributedAuthorityMode)
+                        {
+                            // When migrating out of the DDOL to the currently active scene, adjust the network and origin scene handles so no messages are generated
+                            // about objects being moved to a new scene.
+                            if (SceneManagerHandler.IsIntegrationTest() && SceneManager.GetActiveScene() == scene)
+                            {
+                                networkObject.NetworkSceneHandle = scene.handle;
+                            }
+                            else
+                            {
+                                networkObject.NetworkSceneHandle = ClientSceneHandleToServerSceneHandle[scene.handle];
+                            }
+                            networkObject.SceneOriginHandle = scene.handle;
+                        }
+
                         SceneManager.MoveGameObjectToScene(networkObject.gameObject, scene);
                     }
                 }
@@ -2476,7 +3025,24 @@ internal void MoveObjectsFromDontDestroyOnLoadToScene(Scene scene)
         /// Holds a list of scene handles (server-side relative) and NetworkObjects migrated into it
         /// during the current frame.
         /// </summary>
-        internal Dictionary<int, List<NetworkObject>> ObjectsMigratedIntoNewScene = new Dictionary<int, List<NetworkObject>>();
+        internal Dictionary<int, Dictionary<ulong, List<NetworkObject>>> ObjectsMigratedIntoNewScene = new Dictionary<int, Dictionary<ulong, List<NetworkObject>>>();
+
+        internal bool IsSceneEventInProgress()
+        {
+            if (!NetworkManager.NetworkConfig.EnableSceneManagement)
+            {
+                return false;
+            }
+
+            foreach (var sceneEventEntry in SceneEventProgressTracking)
+            {
+                if (!sceneEventEntry.Value.HasTimedOut() && sceneEventEntry.Value.SceneEventType != SceneEventType.Synchronize && sceneEventEntry.Value.Status == SceneEventProgressStatus.Started)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
 
         /// <summary>
         /// Handles notifying clients when a NetworkObject has been migrated into a new scene
@@ -2484,7 +3050,7 @@ internal void MoveObjectsFromDontDestroyOnLoadToScene(Scene scene)
         internal void NotifyNetworkObjectSceneChanged(NetworkObject networkObject)
         {
             // Really, this should never happen but in case it does
-            if (!NetworkManager.IsServer)
+            if (!networkObject.HasAuthority)
             {
                 if (NetworkManager.LogLevel == LogLevel.Developer)
                 {
@@ -2513,20 +3079,23 @@ internal void NotifyNetworkObjectSceneChanged(NetworkObject networkObject)
 
             // Don't notify if a scene event is in progress
             // Note: This does not apply to SceneEventType.Synchronize since synchronization isn't a global connected client event.
-            foreach (var sceneEventEntry in SceneEventProgressTracking)
+            if (IsSceneEventInProgress())
             {
-                if (!sceneEventEntry.Value.HasTimedOut() && sceneEventEntry.Value.Status == SceneEventProgressStatus.Started)
-                {
-                    return;
-                }
+                return;
             }
 
             // Otherwise, add the NetworkObject into the list of NetworkObjects who's scene has changed
-            if (!ObjectsMigratedIntoNewScene.ContainsKey(networkObject.gameObject.scene.handle))
+            if (!ObjectsMigratedIntoNewScene.ContainsKey(networkObject.NetworkSceneHandle))
+            {
+                ObjectsMigratedIntoNewScene.Add(networkObject.NetworkSceneHandle, new Dictionary<ulong, List<NetworkObject>>());
+            }
+
+            if (!ObjectsMigratedIntoNewScene[networkObject.NetworkSceneHandle].ContainsKey(NetworkManager.LocalClientId))
             {
-                ObjectsMigratedIntoNewScene.Add(networkObject.gameObject.scene.handle, new List<NetworkObject>());
+                ObjectsMigratedIntoNewScene[networkObject.NetworkSceneHandle].Add(NetworkManager.LocalClientId, new List<NetworkObject>());
             }
-            ObjectsMigratedIntoNewScene[networkObject.gameObject.scene.handle].Add(networkObject);
+
+            ObjectsMigratedIntoNewScene[networkObject.NetworkSceneHandle][NetworkManager.LocalClientId].Add(networkObject);
         }
 
         /// <summary>
@@ -2534,7 +3103,7 @@ internal void NotifyNetworkObjectSceneChanged(NetworkObject networkObject)
         /// or invoked by <see cref="SceneEventData.ProcessDeferredObjectSceneChangedEvents"/> when a client finishes
         /// synchronization.
         /// </summary>
-        internal void MigrateNetworkObjectsIntoScenes()
+        public void MigrateNetworkObjectsIntoScenes()
         {
             try
             {
@@ -2543,12 +3112,21 @@ internal void MigrateNetworkObjectsIntoScenes()
                     if (ServerSceneHandleToClientSceneHandle.ContainsKey(sceneEntry.Key))
                     {
                         var clientSceneHandle = ServerSceneHandleToClientSceneHandle[sceneEntry.Key];
-                        if (ScenesLoaded.ContainsKey(ServerSceneHandleToClientSceneHandle[sceneEntry.Key]))
+                        foreach (var ownerEntry in sceneEntry.Value)
                         {
-                            var scene = ScenesLoaded[clientSceneHandle];
-                            foreach (var networkObject in sceneEntry.Value)
+                            if (ownerEntry.Key == NetworkManager.LocalClientId)
                             {
-                                SceneManager.MoveGameObjectToScene(networkObject.gameObject, scene);
+                                continue;
+                            }
+                            if (ScenesLoaded.ContainsKey(clientSceneHandle))
+                            {
+                                var scene = ScenesLoaded[clientSceneHandle];
+                                foreach (var networkObject in ownerEntry.Value)
+                                {
+                                    SceneManager.MoveGameObjectToScene(networkObject.gameObject, scene.SceneReference);
+                                    networkObject.NetworkSceneHandle = sceneEntry.Key;
+                                    networkObject.SceneOriginHandle = scene.SceneReference.handle;
+                                }
                             }
                         }
                     }
@@ -2558,9 +3136,6 @@ internal void MigrateNetworkObjectsIntoScenes()
             {
                 NetworkLog.LogErrorServer($"{ex.Message}\n Stack Trace:\n {ex.StackTrace}");
             }
-
-            // Clear out the list once complete
-            ObjectsMigratedIntoNewScene.Clear();
         }
 
 
@@ -2572,21 +3147,28 @@ internal void MigrateNetworkObjectsIntoScenes()
         internal void CheckForAndSendNetworkObjectSceneChanged()
         {
             // Early exit if not the server or there is nothing pending
-            if (!NetworkManager.IsServer || ObjectsMigratedIntoNewScene.Count == 0)
+            if (ObjectsMigratedIntoNewScene.Count == 0)
             {
                 return;
             }
 
+            MigrateNetworkObjectsIntoScenes();
+
             // Double check that the NetworkObjects to migrate still exist
             m_ScenesToRemoveFromObjectMigration.Clear();
             foreach (var sceneEntry in ObjectsMigratedIntoNewScene)
             {
-                for (int i = sceneEntry.Value.Count - 1; i >= 0; i--)
+                if (!sceneEntry.Value.ContainsKey(NetworkManager.LocalClientId))
+                {
+                    continue;
+                }
+                var ownerSceneEntry = sceneEntry.Value[NetworkManager.LocalClientId];
+                for (int i = sceneEntry.Value[NetworkManager.LocalClientId].Count - 1; i >= 0; i--)
                 {
                     // Remove NetworkObjects that are no longer spawned
-                    if (!sceneEntry.Value[i].IsSpawned)
+                    if (!sceneEntry.Value[NetworkManager.LocalClientId][i].IsSpawned)
                     {
-                        sceneEntry.Value.RemoveAt(i);
+                        sceneEntry.Value[NetworkManager.LocalClientId].RemoveAt(i);
                     }
                 }
                 // If the scene entry no longer has any NetworkObjects to migrate
@@ -2598,22 +3180,35 @@ internal void CheckForAndSendNetworkObjectSceneChanged()
                 }
             }
 
-            // Remove sceneHandle entries that no longer have any NetworkObjects remaining
+            // Remove owner sceneHandle entries that no longer have any NetworkObjects remaining
             foreach (var sceneHandle in m_ScenesToRemoveFromObjectMigration)
             {
-                ObjectsMigratedIntoNewScene.Remove(sceneHandle);
+                ObjectsMigratedIntoNewScene[sceneHandle].Remove(NetworkManager.LocalClientId);
             }
 
-            // If there is nothing to send a migration notification for then exit
-            if (ObjectsMigratedIntoNewScene.Count == 0)
+            var localOwnerHasEntries = false;
+
+            foreach (var sceneEntry in ObjectsMigratedIntoNewScene)
+            {
+                if (sceneEntry.Value.ContainsKey(NetworkManager.LocalClientId))
+                {
+                    localOwnerHasEntries = true;
+                    break;
+                }
+            }
+
+            // If the local owner has no entries, then exit
+            if (!localOwnerHasEntries)
             {
+                ObjectsMigratedIntoNewScene.Clear();
                 return;
             }
 
             // Some NetworkObjects still exist, send the message
             var sceneEvent = BeginSceneEvent();
             sceneEvent.SceneEventType = SceneEventType.ObjectSceneChanged;
-            SendSceneEventData(sceneEvent.SceneEventId, NetworkManager.ConnectedClientsIds.Where(c => c != NetworkManager.ServerClientId).ToArray());
+            SendSceneEventData(sceneEvent.SceneEventId, NetworkManager.ConnectedClientsIds.Where(c => c != NetworkManager.LocalClientId).ToArray());
+            ObjectsMigratedIntoNewScene.Clear();
             EndSceneEvent(sceneEvent.SceneEventId);
         }
 
@@ -2621,6 +3216,7 @@ internal void CheckForAndSendNetworkObjectSceneChanged()
         // a client is synchronizing
         internal struct DeferredObjectsMovedEvent
         {
+            internal ulong OwnerId;
             internal Dictionary<int, List<ulong>> ObjectsMigratedTable;
         }
         internal List<DeferredObjectsMovedEvent> DeferredObjectsMovedEvents = new List<DeferredObjectsMovedEvent>();
@@ -2629,6 +3225,9 @@ internal struct DeferredObjectCreation
         {
             internal ulong SenderId;
             internal uint MessageSize;
+            // When we transfer session owner and we are using a DAHost, this will be pertinent (otherwise it is not when connected to a DA service)
+            internal ulong[] ObserverIds;
+            internal ulong[] NewObserverIds;
             internal NetworkObject.SceneObject SceneObject;
             internal FastBufferReader FastBufferReader;
         }
@@ -2636,12 +3235,15 @@ internal struct DeferredObjectCreation
         internal List<DeferredObjectCreation> DeferredObjectCreationList = new List<DeferredObjectCreation>();
         internal int DeferredObjectCreationCount;
 
-        internal void DeferCreateObject(ulong senderId, uint messageSize, NetworkObject.SceneObject sceneObject, FastBufferReader fastBufferReader)
+        // The added clientIds is specific to DAHost when session ownership changes and a normal client is controlling scene loading
+        internal void DeferCreateObject(ulong senderId, uint messageSize, NetworkObject.SceneObject sceneObject, FastBufferReader fastBufferReader, ulong[] observerIds, ulong[] newObserverIds)
         {
             var deferredObjectCreationEntry = new DeferredObjectCreation()
             {
                 SenderId = senderId,
                 MessageSize = messageSize,
+                ObserverIds = observerIds,
+                NewObserverIds = newObserverIds,
                 SceneObject = sceneObject,
             };
 
@@ -2662,12 +3264,133 @@ private void ProcessDeferredCreateObjectMessages()
             }
             var networkManager = NetworkManager;
             // Process all deferred create object messages.
-            foreach (var deferredObjectCreation in DeferredObjectCreationList)
+            for (int i = 0; i < DeferredObjectCreationList.Count; i++)
             {
-                CreateObjectMessage.CreateObject(ref networkManager, deferredObjectCreation.SenderId, deferredObjectCreation.MessageSize, deferredObjectCreation.SceneObject, deferredObjectCreation.FastBufferReader);
+                var deferredObjectCreation = DeferredObjectCreationList[i];
+                CreateObjectMessage.CreateObject(ref networkManager, ref deferredObjectCreation);
             }
             DeferredObjectCreationCount = DeferredObjectCreationList.Count;
             DeferredObjectCreationList.Clear();
         }
+
+        /// <summary>
+        /// The scene map type <see cref="SceneMap"/>.
+        /// </summary>
+        public enum MapTypes
+        {
+            /// <summary>
+            /// Denotes the server to client scene map type.
+            /// </summary>
+            ServerToClient,
+            /// <summary>
+            /// Denotes the client to server scene map type.
+            /// </summary>
+            ClientToServer
+        }
+
+        /// <summary>
+        /// Provides the status of a loaded scene
+        /// </summary>
+        public struct SceneMap : INetworkSerializable
+        {
+            /// <summary>
+            /// The scene mapping type <see cref="MapTypes"/>.
+            /// </summary>
+            public MapTypes MapType;
+            /// <summary>
+            /// The <see cref="UnityEngine.SceneManagement.Scene"/> struct of the scene mapped.
+            /// </summary>
+            public Scene Scene;
+            /// <summary>
+            /// When true, the scene is present.
+            /// </summary>
+            public bool ScenePresent;
+            /// <summary>
+            /// The name of the scene
+            /// </summary>
+            public string SceneName;
+            /// <summary>
+            /// The scene's server handle (a.k.a network scene handle)
+            /// </summary>
+            public int ServerHandle;
+            /// <summary>
+            /// The mapped handled. This could be the ServerHandle or LocalHandle depending upon context (client or server).
+            /// </summary>
+            public int MappedLocalHandle;
+            /// <summary>
+            /// The local handle of the scene.
+            /// </summary>
+            public int LocalHandle;
+
+            /// <inheritdoc cref="INetworkSerializable.NetworkSerialize{T}(BufferSerializer{T})"/>
+            public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReaderWriter
+            {
+                serializer.SerializeValue(ref MapType);
+                serializer.SerializeValue(ref ScenePresent);
+                if (serializer.IsReader)
+                {
+                    SceneName = "Not Present";
+                }
+                if (ScenePresent)
+                {
+                    serializer.SerializeValue(ref SceneName);
+                    serializer.SerializeValue(ref LocalHandle);
+
+                }
+                serializer.SerializeValue(ref ServerHandle);
+                serializer.SerializeValue(ref MappedLocalHandle);
+            }
+        }
+
+        /// <summary>
+        /// Returns the list of all scene mappings when scene management is enabled.
+        /// </summary>
+        /// <param name="mapType">The map type to return <see cref="MapTypes"/></param>
+        /// <returns>A list of <see cref="SceneMap"/> objects representing the scene mappings.</returns>
+        public List<SceneMap> GetSceneMapping(MapTypes mapType)
+        {
+            var mapping = new List<SceneMap>();
+            if (mapType == MapTypes.ServerToClient)
+            {
+                foreach (var entry in ServerSceneHandleToClientSceneHandle)
+                {
+                    var scene = ScenesLoaded[entry.Value].SceneReference;
+                    var sceneIsPresent = scene.IsValid() && scene.isLoaded;
+                    var sceneMap = new SceneMap()
+                    {
+                        MapType = mapType,
+                        ServerHandle = entry.Key,
+                        MappedLocalHandle = entry.Value,
+                        LocalHandle = scene.handle,
+                        Scene = scene,
+                        ScenePresent = sceneIsPresent,
+                        SceneName = sceneIsPresent ? scene.name : "NotPresent",
+                    };
+                    mapping.Add(sceneMap);
+                }
+            }
+            else
+            {
+                foreach (var entry in ClientSceneHandleToServerSceneHandle)
+                {
+                    var scene = ScenesLoaded[entry.Key].SceneReference;
+                    var sceneIsPresent = scene.IsValid() && scene.isLoaded;
+                    var sceneMap = new SceneMap()
+                    {
+                        MapType = mapType,
+                        ServerHandle = entry.Value,
+                        MappedLocalHandle = entry.Key,
+                        LocalHandle = scene.handle,
+                        Scene = scene,
+                        ScenePresent = sceneIsPresent,
+                        SceneName = sceneIsPresent ? scene.name : "NotPresent",
+                    };
+                    mapping.Add(sceneMap);
+                }
+            }
+
+            return mapping;
+        }
+
     }
 }
diff --git a/com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventData.cs b/com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventData.cs
index 712740ad59..d0eff4ee43 100644
--- a/com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventData.cs
+++ b/com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventData.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using Unity.Collections;
+using UnityEngine;
 using UnityEngine.SceneManagement;
 
 namespace Unity.Netcode
@@ -11,7 +13,7 @@ namespace Unity.Netcode
     /// Used by <see cref="NetworkSceneManager"/> for <see cref="SceneEventMessage"/> messages.<br/>
     /// <em>Note: This is only when <see cref="NetworkConfig.EnableSceneManagement"/> is enabled.</em><br/>
     /// See also: <br/>
-    /// <seealso cref="SceneEvent"/>
+    /// <see cref="SceneEvent"/>
     /// </summary>
     public enum SceneEventType : byte
     {
@@ -104,17 +106,20 @@ internal class SceneEventData : IDisposable
         internal ForceNetworkSerializeByMemcpy<Guid> SceneEventProgressId;
         internal uint SceneEventId;
 
-        internal uint ActiveSceneHash;
-        internal uint SceneHash;
+        internal string ActiveSceneAsset;
+        internal string SceneAsset;
         internal int SceneHandle;
 
         // Used by the client during synchronization
-        internal uint ClientSceneHash;
+        internal string ClientSceneName;
         internal int NetworkSceneHandle;
 
         /// Only used for <see cref="SceneEventType.Synchronize"/> scene events, this assures permissions when writing
         /// NetworkVariable information.  If that process changes, then we need to update this
+        /// In distributed authority mode this is used to route messages to the appropriate destination client
         internal ulong TargetClientId;
+        /// Only used with a DAHost
+        internal ulong SenderClientId;
 
         private Dictionary<uint, List<NetworkObject>> m_SceneNetworkObjects;
         private Dictionary<uint, long> m_SceneNetworkObjectDataOffsets;
@@ -146,7 +151,7 @@ internal class SceneEventData : IDisposable
         internal List<ulong> ClientsCompleted;
         internal List<ulong> ClientsTimedOut;
 
-        internal Queue<uint> ScenesToSynchronize;
+        internal Queue<string> ScenesToSynchronize;
         internal Queue<uint> SceneHandlesToSynchronize;
 
         internal LoadSceneMode ClientSynchronizationMode;
@@ -166,7 +171,7 @@ internal class SceneEventData : IDisposable
         /// </summary>
         /// <param name="sceneIndex"></param>
         /// <param name="sceneHandle"></param>
-        internal void AddSceneToSynchronize(uint sceneHash, int sceneHandle)
+        internal void AddSceneToSynchronize(string sceneHash, int sceneHandle)
         {
             ScenesToSynchronize.Enqueue(sceneHash);
             SceneHandlesToSynchronize.Enqueue((uint)sceneHandle);
@@ -177,7 +182,7 @@ internal void AddSceneToSynchronize(uint sceneHash, int sceneHandle)
         /// Gets the next scene hash to be loaded for approval and/or late joining
         /// </summary>
         /// <returns></returns>
-        internal uint GetNextSceneSynchronizationHash()
+        internal string GetNextSceneSynchronizationHash()
         {
             return ScenesToSynchronize.Dequeue();
         }
@@ -228,7 +233,7 @@ internal void InitializeForSynch()
 
             if (ScenesToSynchronize == null)
             {
-                ScenesToSynchronize = new Queue<uint>();
+                ScenesToSynchronize = new Queue<string>();
             }
             else
             {
@@ -243,6 +248,7 @@ internal void InitializeForSynch()
             {
                 SceneHandlesToSynchronize.Clear();
             }
+            ForwardSynchronization = false;
         }
 
         /// <summary>
@@ -315,14 +321,23 @@ private void SortParentedNetworkObjects()
         internal void AddSpawnedNetworkObjects()
         {
             m_NetworkObjectsSync.Clear();
+            // If distributed authority mode and sending to the service, then ignore observers
+            var distributedAuthoritySendingToService = m_NetworkManager.DistributedAuthorityMode && TargetClientId == NetworkManager.ServerClientId;
             foreach (var sobj in m_NetworkManager.SpawnManager.SpawnedObjectsList)
             {
-                if (sobj.Observers.Contains(TargetClientId))
+                if (sobj.Observers.Contains(TargetClientId) || distributedAuthoritySendingToService)
                 {
                     m_NetworkObjectsSync.Add(sobj);
                 }
             }
+            SortObjectsToSync();
+        }
 
+        /// <summary>
+        /// Used to order the object serialization for both synchronization and scene loading
+        /// </summary>
+        private void SortObjectsToSync()
+        {
             // Sort by INetworkPrefabInstanceHandler implementation before the
             // NetworkObjects spawned by the implementation
             m_NetworkObjectsSync.Sort(SortNetworkObjects);
@@ -334,7 +349,7 @@ internal void AddSpawnedNetworkObjects()
             // as well as the order in which they will be deserialized
             if (LogSerializationOrder && m_NetworkManager.LogLevel == LogLevel.Developer)
             {
-                var messageBuilder = new System.Text.StringBuilder(0xFFFF);
+                var messageBuilder = new StringBuilder(0xFFFF);
                 messageBuilder.AppendLine("[Server-Side Client-Synchronization] NetworkObject serialization order:");
                 foreach (var networkObject in m_NetworkObjectsSync)
                 {
@@ -429,6 +444,36 @@ private int SortNetworkObjects(NetworkObject first, NetworkObject second)
             return 0;
         }
 
+        internal bool EnableSerializationLogs = false;
+
+        private void LogArray(byte[] data, int start = 0, int stop = 0, StringBuilder builder = null)
+        {
+            var usingExternalBuilder = builder != null;
+            if (!usingExternalBuilder)
+            {
+                builder = new StringBuilder();
+            }
+
+            if (stop == 0)
+            {
+                stop = data.Length;
+            }
+
+            builder.AppendLine($"[Start Data Dump][Start = {start}][Stop = {stop}] Size ({stop - start})");
+            for (int i = start; i < stop; i++)
+            {
+                builder.Append($"{data[i]:X2} ");
+            }
+            builder.Append("\n");
+
+            if (!usingExternalBuilder)
+            {
+                UnityEngine.Debug.Log(builder.ToString());
+            }
+        }
+
+        internal bool ForwardSynchronization;
+
         /// <summary>
         /// Client and Server Side:
         /// Serializes data based on the SceneEvent type (<see cref="SceneEventType"/>)
@@ -439,9 +484,15 @@ internal void Serialize(FastBufferWriter writer)
             // Write the scene event type
             writer.WriteValueSafe(SceneEventType);
 
+            if (m_NetworkManager.DistributedAuthorityMode)
+            {
+                BytePacker.WriteValueBitPacked(writer, TargetClientId);
+                BytePacker.WriteValueBitPacked(writer, SenderClientId);
+            }
+
             if (SceneEventType == SceneEventType.ActiveSceneChanged)
             {
-                writer.WriteValueSafe(ActiveSceneHash);
+                writer.WriteValueSafe(ActiveSceneAsset);
                 return;
             }
 
@@ -465,20 +516,39 @@ internal void Serialize(FastBufferWriter writer)
             }
 
             // Write the scene index and handle
-            writer.WriteValueSafe(SceneHash);
+            var sceneName = SceneAsset ?? "";
+            writer.WriteValueSafe(sceneName);
             writer.WriteValueSafe(SceneHandle);
 
             switch (SceneEventType)
             {
                 case SceneEventType.Synchronize:
                     {
-                        writer.WriteValueSafe(ActiveSceneHash);
+                        if (ActiveSceneAsset == null)
+                        {
+                            Debug.LogError($"Synchronizing - ActiveSceneAsset but it hasn't been initialized yet");
+                            ActiveSceneAsset = "";
+                        }
+
+                        writer.WriteValueSafe(ActiveSceneAsset);
                         WriteSceneSynchronizationData(writer);
+
+                        if (EnableSerializationLogs)
+                        {
+                            LogArray(writer.ToArray(), 0, writer.Length);
+                        }
                         break;
                     }
                 case SceneEventType.Load:
                     {
-                        SerializeScenePlacedObjects(writer);
+                        if (m_NetworkManager.DistributedAuthorityMode && IsForwarding && m_NetworkManager.DAHost)
+                        {
+                            CopyInternalBuffer(ref writer);
+                        }
+                        else
+                        {
+                            SerializeScenePlacedObjects(writer);
+                        }
                         break;
                     }
                 case SceneEventType.SynchronizeComplete:
@@ -500,6 +570,11 @@ internal void Serialize(FastBufferWriter writer)
             }
         }
 
+        private unsafe void CopyInternalBuffer(ref FastBufferWriter writer)
+        {
+            writer.WriteBytesSafe(InternalBuffer.GetUnsafePtrAtCurrentPosition(), InternalBuffer.Length);
+        }
+
         /// <summary>
         /// Server Side:
         /// Called at the end of a <see cref="SceneEventType.Load"/> event once the scene is loaded and scene placed NetworkObjects
@@ -507,13 +582,35 @@ internal void Serialize(FastBufferWriter writer)
         /// </summary>
         internal void WriteSceneSynchronizationData(FastBufferWriter writer)
         {
+            var builder = (StringBuilder)null;
+            if (EnableSerializationLogs)
+            {
+                builder = new StringBuilder();
+                builder.AppendLine($"[Write][Synchronize-Start][WPos: {writer.Position}] Begin:");
+            }
             // Write the scenes we want to load, in the order we want to load them
-            writer.WriteValueSafe(ScenesToSynchronize.ToArray());
-            writer.WriteValueSafe(SceneHandlesToSynchronize.ToArray());
+            var valArray = ScenesToSynchronize.ToArray();
+            writer.WriteValueSafe(valArray.Length);
+            foreach (var v in valArray)
+            {
+                writer.WriteValueSafe(v);
+            }
 
+            writer.WriteValueSafe(SceneHandlesToSynchronize.ToArray());
             // Store our current position in the stream to come back and say how much data we have written
             var positionStart = writer.Position;
 
+            if (m_NetworkManager.DistributedAuthorityMode && ForwardSynchronization && m_NetworkManager.DAHost)
+            {
+                writer.WriteValueSafe(m_InternalBufferSize);
+                CopyInternalBuffer(ref writer);
+                if (EnableSerializationLogs)
+                {
+                    LogArray(writer.ToArray(), positionStart);
+                }
+                return;
+            }
+
             // Size Place Holder -- Start
             // !!NOTE!!: Since this is a placeholder to be set after we know how much we have written,
             // for stream offset purposes this MUST not be a packed value!
@@ -522,15 +619,34 @@ internal void WriteSceneSynchronizationData(FastBufferWriter writer)
 
             // Write the number of NetworkObjects we are serializing
             writer.WriteValueSafe(m_NetworkObjectsSync.Count);
+            if (EnableSerializationLogs)
+            {
+                builder.AppendLine($"[Synchronize Objects][positionStart: {positionStart}][WPos: {writer.Position}][NO-Count: {m_NetworkObjectsSync.Count}] Begin:");
+            }
+            var distributedAuthority = m_NetworkManager.DistributedAuthorityMode;
 
             // Serialize all NetworkObjects that are spawned
             for (var i = 0; i < m_NetworkObjectsSync.Count; ++i)
             {
+                var networkObject = m_NetworkObjectsSync[i];
                 var noStart = writer.Position;
-                var sceneObject = m_NetworkObjectsSync[i].GetMessageSceneObject(TargetClientId);
+                // In distributed authority mode, we send the currently known observers of each NetworkObject to the client being synchronized.
+                var sceneObject = m_NetworkObjectsSync[i].GetMessageSceneObject(TargetClientId, distributedAuthority);
+
                 sceneObject.Serialize(writer);
                 var noStop = writer.Position;
                 totalBytes += noStop - noStart;
+                if (EnableSerializationLogs)
+                {
+                    var offStart = noStart - (positionStart + sizeof(int));
+                    var offStop = noStop - (positionStart + sizeof(int));
+                    builder.AppendLine($"[Head: {offStart}][Tail: {offStop}][Size: {offStop - offStart}][{networkObject.name}][NID-{networkObject.NetworkObjectId}][Children: {networkObject.ChildNetworkBehaviours.Count}]");
+                    LogArray(writer.ToArray(), noStart, noStop, builder);
+                }
+            }
+            if (EnableSerializationLogs)
+            {
+                UnityEngine.Debug.Log(builder.ToString());
             }
 
             // Write the number of despawned in-scene placed NetworkObjects
@@ -552,6 +668,10 @@ internal void WriteSceneSynchronizationData(FastBufferWriter writer)
             // Write the total size written to the stream by NetworkObjects being serialized
             writer.WriteValueSafe(bytesWritten);
             writer.Seek(positionEnd);
+            if (EnableSerializationLogs)
+            {
+                LogArray(writer.ToArray(), positionStart);
+            }
         }
 
         /// <summary>
@@ -567,21 +687,35 @@ internal void SerializeScenePlacedObjects(FastBufferWriter writer)
 
             // Write our count place holder (must not be packed!)
             writer.WriteValueSafe((ushort)0);
+            var distributedAuthority = m_NetworkManager.DistributedAuthorityMode;
+            // If distributed authority mode and sending to the service, then ignore observers
+            var distributedAuthoritySendingToService = distributedAuthority && TargetClientId == NetworkManager.ServerClientId;
 
+            // Clear our objects to sync and build a list of the in-scene placed NetworkObjects instantiated and spawned locally
+            m_NetworkObjectsSync.Clear();
             foreach (var keyValuePairByGlobalObjectIdHash in m_NetworkManager.SceneManager.ScenePlacedObjects)
             {
                 foreach (var keyValuePairBySceneHandle in keyValuePairByGlobalObjectIdHash.Value)
                 {
-                    if (keyValuePairBySceneHandle.Value.Observers.Contains(TargetClientId))
+                    if (keyValuePairBySceneHandle.Value.Observers.Contains(TargetClientId) || distributedAuthoritySendingToService)
                     {
-                        // Serialize the NetworkObject
-                        var sceneObject = keyValuePairBySceneHandle.Value.GetMessageSceneObject(TargetClientId);
-                        sceneObject.Serialize(writer);
-                        numberOfObjects++;
+                        m_NetworkObjectsSync.Add(keyValuePairBySceneHandle.Value);
                     }
                 }
             }
 
+            // Sort the objects to sync based on parenting hierarchy
+            SortObjectsToSync();
+
+            // Serialize the sorted objects to sync.
+            foreach (var objectToSycn in m_NetworkObjectsSync)
+            {
+                // Serialize the NetworkObject
+                var sceneObject = objectToSycn.GetMessageSceneObject(TargetClientId, distributedAuthority);
+                sceneObject.Serialize(writer);
+                numberOfObjects++;
+            }
+
             // Write the number of despawned in-scene placed NetworkObjects
             writer.WriteValueSafe(m_DespawnedInSceneObjectsSync.Count);
             // Write the scene handle and GlobalObjectIdHash value
@@ -608,9 +742,15 @@ internal void SerializeScenePlacedObjects(FastBufferWriter writer)
         internal void Deserialize(FastBufferReader reader)
         {
             reader.ReadValueSafe(out SceneEventType);
+            if (m_NetworkManager.DistributedAuthorityMode)
+            {
+                ByteUnpacker.ReadValueBitPacked(reader, out TargetClientId);
+                ByteUnpacker.ReadValueBitPacked(reader, out SenderClientId);
+            }
+
             if (SceneEventType == SceneEventType.ActiveSceneChanged)
             {
-                reader.ReadValueSafe(out ActiveSceneHash);
+                reader.ReadValueSafe(out ActiveSceneAsset);
                 return;
             }
 
@@ -640,14 +780,18 @@ internal void Deserialize(FastBufferReader reader)
                 reader.ReadValueSafe(out ClientSynchronizationMode);
             }
 
-            reader.ReadValueSafe(out SceneHash);
+            reader.ReadValueSafe(out SceneAsset);
             reader.ReadValueSafe(out SceneHandle);
 
             switch (SceneEventType)
             {
                 case SceneEventType.Synchronize:
                     {
-                        reader.ReadValueSafe(out ActiveSceneHash);
+                        reader.ReadValueSafe(out ActiveSceneAsset);
+                        if (EnableSerializationLogs)
+                        {
+                            LogArray(reader.ToArray(), 0, reader.Length);
+                        }
                         CopySceneSynchronizationData(reader);
                         break;
                     }
@@ -682,6 +826,8 @@ internal void Deserialize(FastBufferReader reader)
             }
         }
 
+        private int m_InternalBufferSize;
+
         /// <summary>
         /// Client Side:
         /// Prepares for a scene synchronization event and copies the scene synchronization data
@@ -691,13 +837,21 @@ internal void Deserialize(FastBufferReader reader)
         internal void CopySceneSynchronizationData(FastBufferReader reader)
         {
             m_NetworkObjectsSync.Clear();
-            reader.ReadValueSafe(out uint[] scenesToSynchronize);
+            reader.ReadValueSafe(out int sceneCount);
+            ScenesToSynchronize = new Queue<string>();
+            for (int i = 0; i < sceneCount; i++)
+            {
+                reader.ReadValueSafe(out string s);
+                ScenesToSynchronize.Enqueue(s);
+            }
+
             reader.ReadValueSafe(out uint[] sceneHandlesToSynchronize);
-            ScenesToSynchronize = new Queue<uint>(scenesToSynchronize);
             SceneHandlesToSynchronize = new Queue<uint>(sceneHandlesToSynchronize);
 
             // is not packed!
             reader.ReadValueSafe(out int sizeToCopy);
+            m_InternalBufferSize = sizeToCopy;
+
             unsafe
             {
                 if (!reader.TryBeginRead(sizeToCopy))
@@ -708,6 +862,10 @@ internal void CopySceneSynchronizationData(FastBufferReader reader)
                 m_HasInternalBuffer = true;
                 // We use Allocator.Persistent since scene synchronization will most likely take longer than 4 frames
                 InternalBuffer = new FastBufferReader(reader.GetUnsafePtrAtCurrentPosition(), Allocator.Persistent, sizeToCopy);
+                if (EnableSerializationLogs)
+                {
+                    LogArray(InternalBuffer.ToArray());
+                }
             }
         }
 
@@ -969,12 +1127,24 @@ private void DeserializeDespawnedInScenePlacedNetworkObjects()
         /// <param name="networkManager"></param>
         internal void SynchronizeSceneNetworkObjects(NetworkManager networkManager)
         {
+            var builder = (StringBuilder)null;
+            if (EnableSerializationLogs)
+            {
+                builder = new StringBuilder();
+            }
+
             try
             {
                 // Process all spawned NetworkObjects for this network session
                 InternalBuffer.ReadValueSafe(out int newObjectsCount);
+                if (EnableSerializationLogs)
+                {
+                    builder.AppendLine($"[Read][Synchronize Objects][WPos: {InternalBuffer.Position}][NO-Count: {newObjectsCount}] Begin:");
+                }
+
                 for (int i = 0; i < newObjectsCount; i++)
                 {
+                    var noStart = InternalBuffer.Position;
                     var sceneObject = new NetworkObject.SceneObject();
                     sceneObject.Deserialize(InternalBuffer);
 
@@ -985,6 +1155,12 @@ internal void SynchronizeSceneNetworkObjects(NetworkManager networkManager)
                     }
                     var spawnedNetworkObject = NetworkObject.AddSceneObject(sceneObject, InternalBuffer, networkManager);
 
+                    var noStop = InternalBuffer.Position;
+                    if (EnableSerializationLogs)
+                    {
+                        builder.AppendLine($"[Head: {noStart}][Tail: {noStop}][Size: {noStop - noStart}][{spawnedNetworkObject.name}][NID-{spawnedNetworkObject.NetworkObjectId}][Children: {spawnedNetworkObject.ChildNetworkBehaviours.Count}]");
+                        LogArray(InternalBuffer.ToArray(), noStart, noStop, builder);
+                    }
                     // If we failed to deserialize the NetowrkObject then don't add null to the list
                     if (spawnedNetworkObject != null)
                     {
@@ -994,6 +1170,10 @@ internal void SynchronizeSceneNetworkObjects(NetworkManager networkManager)
                         }
                     }
                 }
+                if (EnableSerializationLogs)
+                {
+                    UnityEngine.Debug.Log(builder.ToString());
+                }
 
                 // Notify that all in-scene placed NetworkObjects have been spawned
                 foreach (var networkObject in m_NetworkObjectsSync)
@@ -1008,6 +1188,11 @@ internal void SynchronizeSceneNetworkObjects(NetworkManager networkManager)
                 DeserializeDespawnedInScenePlacedNetworkObjects();
 
             }
+            catch (Exception ex)
+            {
+                UnityEngine.Debug.LogException(ex);
+                UnityEngine.Debug.Log(builder.ToString());
+            }
             finally
             {
                 InternalBuffer.Dispose();
@@ -1061,24 +1246,38 @@ internal void ReadSceneEventProgressDone(FastBufferReader reader)
         /// Serialize scene handles and associated NetworkObjects that were migrated
         /// into a new scene.
         /// </summary>
+        internal bool IsForwarding;
+        private ulong m_OwnerId;
+
         private void SerializeObjectsMovedIntoNewScene(FastBufferWriter writer)
         {
             var sceneManager = m_NetworkManager.SceneManager;
+            var ownerId = m_NetworkManager.LocalClientId;
+            if (IsForwarding)
+            {
+                ownerId = m_OwnerId;
+            }
+
+            // Write the owner identifier
+            writer.WriteValueSafe(ownerId);
+
             // Write the number of scene handles
             writer.WriteValueSafe(sceneManager.ObjectsMigratedIntoNewScene.Count);
             foreach (var sceneHandleObjects in sceneManager.ObjectsMigratedIntoNewScene)
             {
+                if (!sceneManager.ObjectsMigratedIntoNewScene[sceneHandleObjects.Key].ContainsKey(ownerId))
+                {
+                    throw new Exception($"Trying to send object scene migration for Client-{ownerId} but the client has no entries to send!");
+                }
                 // Write the scene handle
                 writer.WriteValueSafe(sceneHandleObjects.Key);
                 // Write the number of NetworkObjectIds to expect
-                writer.WriteValueSafe(sceneHandleObjects.Value.Count);
-                foreach (var networkObject in sceneHandleObjects.Value)
+                writer.WriteValueSafe(sceneHandleObjects.Value[ownerId].Count);
+                foreach (var networkObject in sceneHandleObjects.Value[ownerId])
                 {
                     writer.WriteValueSafe(networkObject.NetworkObjectId);
                 }
             }
-            // Once we are done, clear the table
-            sceneManager.ObjectsMigratedIntoNewScene.Clear();
         }
 
         /// <summary>
@@ -1089,17 +1288,30 @@ private void DeserializeObjectsMovedIntoNewScene(FastBufferReader reader)
         {
             var sceneManager = m_NetworkManager.SceneManager;
             var spawnManager = m_NetworkManager.SpawnManager;
-            // Just always assure this has no entries
-            sceneManager.ObjectsMigratedIntoNewScene.Clear();
+
             var numberOfScenes = 0;
             var sceneHandle = 0;
             var objectCount = 0;
             var networkObjectId = (ulong)0;
+
+            var ownerID = (ulong)0;
+            reader.ReadValueSafe(out ownerID);
+            m_OwnerId = ownerID;
             reader.ReadValueSafe(out numberOfScenes);
+
             for (int i = 0; i < numberOfScenes; i++)
             {
                 reader.ReadValueSafe(out sceneHandle);
-                sceneManager.ObjectsMigratedIntoNewScene.Add(sceneHandle, new List<NetworkObject>());
+                if (!sceneManager.ObjectsMigratedIntoNewScene.ContainsKey(sceneHandle))
+                {
+                    sceneManager.ObjectsMigratedIntoNewScene.Add(sceneHandle, new Dictionary<ulong, List<NetworkObject>>());
+                }
+
+                if (!sceneManager.ObjectsMigratedIntoNewScene[sceneHandle].ContainsKey(ownerID))
+                {
+                    sceneManager.ObjectsMigratedIntoNewScene[sceneHandle].Add(ownerID, new List<NetworkObject>());
+                }
+
                 reader.ReadValueSafe(out objectCount);
                 for (int j = 0; j < objectCount; j++)
                 {
@@ -1109,9 +1321,9 @@ private void DeserializeObjectsMovedIntoNewScene(FastBufferReader reader)
                         NetworkLog.LogError($"[Object Scene Migration] Trying to synchronize NetworkObjectId ({networkObjectId}) but it was not spawned or no longer exists!!");
                         continue;
                     }
+                    var networkObject = spawnManager.SpawnedObjects[networkObjectId];
                     // Add NetworkObject scene migration to ObjectsMigratedIntoNewScene dictionary that is processed
-                    //
-                    sceneManager.ObjectsMigratedIntoNewScene[sceneHandle].Add(spawnManager.SpawnedObjects[networkObjectId]);
+                    sceneManager.ObjectsMigratedIntoNewScene[sceneHandle][ownerID].Add(networkObject);
                 }
             }
         }
@@ -1127,16 +1339,22 @@ private void DeferObjectsMovedIntoNewScene(FastBufferReader reader)
         {
             var sceneManager = m_NetworkManager.SceneManager;
             var spawnManager = m_NetworkManager.SpawnManager;
+            var ownerId = (ulong)0;
             var numberOfScenes = 0;
             var sceneHandle = 0;
             var objectCount = 0;
             var networkObjectId = (ulong)0;
 
+            reader.ReadValueSafe(out ownerId);
+
+
             var deferredObjectsMovedEvent = new NetworkSceneManager.DeferredObjectsMovedEvent()
             {
-                ObjectsMigratedTable = new Dictionary<int, List<ulong>>()
+                OwnerId = ownerId,
+                ObjectsMigratedTable = new Dictionary<int, List<ulong>>(),
             };
 
+
             reader.ReadValueSafe(out numberOfScenes);
             for (int i = 0; i < numberOfScenes; i++)
             {
@@ -1166,8 +1384,13 @@ internal void ProcessDeferredObjectSceneChangedEvents()
                 {
                     if (!sceneManager.ObjectsMigratedIntoNewScene.ContainsKey(keyEntry.Key))
                     {
-                        sceneManager.ObjectsMigratedIntoNewScene.Add(keyEntry.Key, new List<NetworkObject>());
+                        sceneManager.ObjectsMigratedIntoNewScene.Add(keyEntry.Key, new Dictionary<ulong, List<NetworkObject>>());
                     }
+                    if (!sceneManager.ObjectsMigratedIntoNewScene[keyEntry.Key].ContainsKey(objectsMovedEvent.OwnerId))
+                    {
+                        sceneManager.ObjectsMigratedIntoNewScene[keyEntry.Key].Add(objectsMovedEvent.OwnerId, new List<NetworkObject>());
+                    }
+
                     foreach (var objectId in keyEntry.Value)
                     {
                         if (!spawnManager.SpawnedObjects.ContainsKey(objectId))
@@ -1176,22 +1399,15 @@ internal void ProcessDeferredObjectSceneChangedEvents()
                             continue;
                         }
                         var networkObject = spawnManager.SpawnedObjects[objectId];
-                        if (!sceneManager.ObjectsMigratedIntoNewScene[keyEntry.Key].Contains(networkObject))
+                        if (!sceneManager.ObjectsMigratedIntoNewScene[keyEntry.Key][objectsMovedEvent.OwnerId].Contains(networkObject))
                         {
-                            sceneManager.ObjectsMigratedIntoNewScene[keyEntry.Key].Add(networkObject);
+                            sceneManager.ObjectsMigratedIntoNewScene[keyEntry.Key][objectsMovedEvent.OwnerId].Add(networkObject);
                         }
                     }
                 }
                 objectsMovedEvent.ObjectsMigratedTable.Clear();
             }
-
             sceneManager.DeferredObjectsMovedEvents.Clear();
-
-            // If there are any pending objects to migrate, then migrate them
-            if (sceneManager.ObjectsMigratedIntoNewScene.Count > 0)
-            {
-                sceneManager.MigrateNetworkObjectsIntoScenes();
-            }
         }
 
         /// <summary>
diff --git a/com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventProgress.cs b/com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventProgress.cs
index d50c6c73ea..5b1858b362 100644
--- a/com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventProgress.cs
+++ b/com.unity.netcode.gameobjects/Runtime/SceneManagement/SceneEventProgress.cs
@@ -1,7 +1,11 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Threading.Tasks;
+using TrollKing.Core;
 using UnityEngine;
+using UnityEngine.ResourceManagement.AsyncOperations;
+using UnityEngine.ResourceManagement.ResourceProviders;
 using UnityEngine.SceneManagement;
 using AsyncOperation = UnityEngine.AsyncOperation;
 
@@ -55,14 +59,20 @@ public enum SceneEventProgressStatus
         /// This is returned when a client attempts to perform a server only action
         /// </summary>
         ServerOnlyAction,
+        /// <summary>
+        /// This is returned when a client that is not the session owner attempts to perform a session owner only action
+        /// </summary>
+        SessionOwnerOnlyAction,
     }
 
     /// <summary>
     /// Server side only:
     /// This tracks the progress of clients during a load or unload scene event
     /// </summary>
-    internal class SceneEventProgress
+    public class SceneEventProgress
     {
+        private static NetworkLogScope Log = new NetworkLogScope(nameof(SceneEventProgress));
+
         /// <summary>
         /// List of clientIds of those clients that is done loading the scene.
         /// </summary>
@@ -77,14 +87,14 @@ internal class SceneEventProgress
         /// <summary>
         /// Delegate type for when the switch scene progress is completed. Either by all clients done loading the scene or by time out.
         /// </summary>
-        internal delegate bool OnCompletedDelegate(SceneEventProgress sceneEventProgress);
+        public delegate bool OnCompletedDelegate(SceneEventProgress sceneEventProgress);
 
         /// <summary>
         /// The callback invoked when the switch scene progress is completed. Either by all clients done loading the scene or by time out.
         /// </summary>
-        internal OnCompletedDelegate OnComplete;
+        public OnCompletedDelegate OnComplete;
 
-        internal Action<uint> OnSceneEventCompleted;
+        public Action<uint, string> OnSceneEventCompleted;
 
         /// <summary>
         /// This will make sure that we only have timed out if we never completed
@@ -97,17 +107,17 @@ internal bool HasTimedOut()
         /// <summary>
         /// The hash value generated from the full scene path
         /// </summary>
-        internal uint SceneHash { get; set; }
+        internal string SceneName { get; set; }
 
         internal Guid Guid { get; } = Guid.NewGuid();
         internal uint SceneEventId;
 
         private Coroutine m_TimeOutCoroutine;
-        private AsyncOperation m_AsyncOperation;
+        private AsyncOperationHandle<SceneInstance> m_AsyncOperation;
 
         private NetworkManager m_NetworkManager { get; }
 
-        internal SceneEventProgressStatus Status { get; set; }
+        public SceneEventProgressStatus Status { get; set; }
 
         internal SceneEventType SceneEventType { get; set; }
 
@@ -120,7 +130,7 @@ internal List<ulong> GetClientsWithStatus(bool completedSceneEvent)
             {
                 // If we are the host, then add the host-client to the list
                 // of clients that completed if the AsyncOperation is done.
-                if (m_NetworkManager.IsHost && m_AsyncOperation.isDone)
+                if (m_NetworkManager.IsHost && m_AsyncOperation.IsDone)
                 {
                     clients.Add(m_NetworkManager.LocalClientId);
                 }
@@ -139,7 +149,7 @@ internal List<ulong> GetClientsWithStatus(bool completedSceneEvent)
                 // If we are the host, then add the host-client to the list
                 // of clients that did not complete if the AsyncOperation is
                 // not done.
-                if (m_NetworkManager.IsHost && !m_AsyncOperation.isDone)
+                if (m_NetworkManager.IsHost && !m_AsyncOperation.IsDone)
                 {
                     clients.Add(m_NetworkManager.LocalClientId);
                 }
@@ -157,22 +167,20 @@ internal SceneEventProgress(NetworkManager networkManager, SceneEventProgressSta
             if (status == SceneEventProgressStatus.Started)
             {
                 m_NetworkManager = networkManager;
-
-                if (networkManager.IsServer)
+                WhenSceneEventHasTimedOut = networkManager.RealTimeProvider.RealTimeSinceStartup + networkManager.NetworkConfig.LoadSceneTimeOut;
+                if ((networkManager.IsServer && !networkManager.DistributedAuthorityMode) || (networkManager.DistributedAuthorityMode && networkManager.LocalClient.IsSessionOwner))
                 {
                     m_NetworkManager.OnClientDisconnectCallback += OnClientDisconnectCallback;
                     // Track the clients that were connected when we started this event
                     foreach (var connectedClientId in networkManager.ConnectedClientsIds)
                     {
-                        // Ignore the host client
-                        if (NetworkManager.ServerClientId == connectedClientId)
+                        // Ignore the host or session owner
+                        if ((!networkManager.DistributedAuthorityMode && NetworkManager.ServerClientId == connectedClientId) || (networkManager.DistributedAuthorityMode && networkManager.CurrentSessionOwner == connectedClientId))
                         {
                             continue;
                         }
                         ClientsProcessingSceneEvent.Add(connectedClientId, false);
                     }
-
-                    WhenSceneEventHasTimedOut = networkManager.RealTimeProvider.RealTimeSinceStartup + networkManager.NetworkConfig.LoadSceneTimeOut;
                     m_TimeOutCoroutine = m_NetworkManager.StartCoroutine(TimeOutSceneEventProgress());
                 }
             }
@@ -252,22 +260,65 @@ private bool HasFinished()
             // Note: Integration tests process scene loading through a queue
             // and the AsyncOperation could not be assigned for several
             // network tick periods. Return false if that is the case.
-            return m_AsyncOperation == null ? false : m_AsyncOperation.isDone;
+
+            // If we're async loading a scene that we tell not to activate, we need to check that the downstream scene has been activated before calling out
+            var initialValid = m_AsyncOperation.IsValid() && m_AsyncOperation.IsDone;
+            if (initialValid)
+            {
+                var res = m_AsyncOperation.Result;
+                return res.Scene.isLoaded;
+            }
+
+            return false;
+        }
+
+        public AsyncOperationHandle<SceneInstance> GetHandle()
+        {
+            return m_AsyncOperation;
         }
 
         /// <summary>
         /// Sets the AsyncOperation for the scene load/unload event
         /// </summary>
-        internal void SetAsyncOperation(AsyncOperation asyncOperation)
+        public void SetAsyncOperation(AsyncOperationHandle<SceneInstance> asyncOperation)
         {
+            if (!asyncOperation.IsValid())
+            {
+                Log.Error(() => $"Async Operation handle is invalid!");
+                return;
+            }
+
+            // Debug.Log($"[SceneEventProgress] SetAsyncOperation ");
             m_AsyncOperation = asyncOperation;
-            m_AsyncOperation.completed += new Action<AsyncOperation>(asyncOp2 =>
+            m_AsyncOperation.Completed += new Action<AsyncOperationHandle<SceneInstance>>(asyncOp2 =>
             {
                 // Don't invoke the callback if the network session is disconnected
                 // during a SceneEventProgress
-                if (IsNetworkSessionActive())
+                if (asyncOp2.Status == AsyncOperationStatus.Succeeded)
+                {
+                    var sceneInstance = asyncOp2.Result;
+                    if (!sceneInstance.Scene.isLoaded)
+                    {
+                        var asyncLoad = sceneInstance.ActivateAsync();
+                        asyncLoad.completed += operation =>
+                        {
+                            if (IsNetworkSessionActive())
+                            {
+                                OnSceneEventCompleted?.Invoke(SceneEventId, asyncOp2.Result.Scene.name);
+                            }
+                        };
+                    }
+                    else
+                    {
+                        if (IsNetworkSessionActive())
+                        {
+                            OnSceneEventCompleted?.Invoke(SceneEventId, asyncOp2.Result.Scene.name);
+                        }
+                    }
+                }
+                else
                 {
-                    OnSceneEventCompleted?.Invoke(SceneEventId);
+                    Debug.LogError($"Failed to load async scene: {asyncOp2.OperationException}");
                 }
 
                 // Go ahead and try finishing even if the network session is terminated/terminating
@@ -298,7 +349,7 @@ internal void TryFinishingSceneEventProgress()
                     m_NetworkManager.OnClientDisconnectCallback -= OnClientDisconnectCallback;
                 }
 
-                if (m_TimeOutCoroutine != null)
+                if (m_TimeOutCoroutine != null && m_NetworkManager != null)
                 {
                     m_NetworkManager.StopCoroutine(m_TimeOutCoroutine);
                 }
diff --git a/com.unity.netcode.gameobjects/Runtime/Serialization/BitWriter.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/BitWriter.cs
index 9eacd5601f..0e3ccfb7e3 100644
--- a/com.unity.netcode.gameobjects/Runtime/Serialization/BitWriter.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Serialization/BitWriter.cs
@@ -62,7 +62,7 @@ public void Dispose()
         /// When you know you will be writing multiple fields back-to-back and you know the total size,
         /// you can call TryBeginWriteBits() once on the total size, and then follow it with calls to
         /// WriteBit() or WriteBits().
-        /// 
+        ///
         /// Bitwise write operations will throw OverflowException in editor and development builds if you
         /// go past the point you've marked using TryBeginWriteBits(). In release builds, OverflowException will not be thrown
         /// for performance reasons, since the point of using TryBeginWrite is to avoid bounds checking in the following
diff --git a/com.unity.netcode.gameobjects/Runtime/Serialization/BufferSerializer.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/BufferSerializer.cs
index 85cc0909e0..faf4c960fa 100644
--- a/com.unity.netcode.gameobjects/Runtime/Serialization/BufferSerializer.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Serialization/BufferSerializer.cs
@@ -301,7 +301,6 @@ public void SerializeValue<T>(ref T value, FastBufferWriter.ForFixedStrings unus
         /// <typeparam name="T">The network serializable type</typeparam>
         /// <param name="value">The values to read/write</param>
         /// <param name="allocator">The allocator to use to construct the resulting NativeArray when reading</param>
-        /// <param name="unused">An unused parameter used for enabling overload resolution of FixedStrings</param>
         public void SerializeValue<T>(ref NativeArray<T> value, Allocator allocator)
             where T : unmanaged, INativeList<byte>, IUTF8Bytes => m_Implementation.SerializeValue(ref value, allocator);
 
@@ -311,7 +310,6 @@ public void SerializeValue<T>(ref NativeArray<T> value, Allocator allocator)
         /// </summary>
         /// <typeparam name="T">The network serializable type</typeparam>
         /// <param name="value">The values to read/write</param>
-        /// <param name="unused">An unused parameter used for enabling overload resolution of FixedStrings</param>
         public void SerializeValue<T>(ref NativeList<T> value)
             where T : unmanaged, INativeList<byte>, IUTF8Bytes => m_Implementation.SerializeValue(ref value);
 #endif
@@ -330,8 +328,8 @@ public void SerializeValue<T>(ref NativeList<T> value)
         /// SerializeValuePreChecked methods. But note that the benefit is small and only likely to be
         /// noticeable if serializing a very large number of items.
         /// </summary>
-        /// <param name="amount"></param>
-        /// <returns></returns>
+        /// <param name="amount">The number of values that will need to be read or written</param>
+        /// <returns>True if there is sufficient space available for the specified amount, false otherwise</returns>
         public bool PreCheck(int amount)
         {
             return m_Implementation.PreCheck(amount);
diff --git a/com.unity.netcode.gameobjects/Runtime/Serialization/BytePacker.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/BytePacker.cs
index 58b7ea1e33..b064f2dbce 100644
--- a/com.unity.netcode.gameobjects/Runtime/Serialization/BytePacker.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Serialization/BytePacker.cs
@@ -6,7 +6,7 @@ namespace Unity.Netcode
 {
     /// <summary>
     /// Utility class for packing values in serialization.
-    /// <seealso cref="ByteUnpacker"/> to unpack packed values.
+    /// <see cref="ByteUnpacker"/> to unpack packed values.
     /// </summary>
     public static class BytePacker
     {
diff --git a/com.unity.netcode.gameobjects/Runtime/Serialization/ByteUnpacker.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/ByteUnpacker.cs
index 2d2cd88716..2c84fff991 100644
--- a/com.unity.netcode.gameobjects/Runtime/Serialization/ByteUnpacker.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Serialization/ByteUnpacker.cs
@@ -7,7 +7,7 @@ namespace Unity.Netcode
     /// <summary>
     /// Byte Unpacking Helper Class
     /// Use this class to unpack values during deserialization for values that were packed.
-    /// <seealso cref="BytePacker"/> to pack unpacked values
+    /// <see cref="BytePacker"/> to pack unpacked values
     /// </summary>
     public static class ByteUnpacker
     {
@@ -282,7 +282,7 @@ public static void ReadValuePacked(FastBufferReader reader, out Quaternion rotat
         /// Reads a string in a packed format
         /// </summary>
         /// <param name="reader">The reader to read from</param>
-        /// <param name="s"></param>
+        /// <param name="s">string to read</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static unsafe void ReadValuePacked(FastBufferReader reader, out string s)
         {
diff --git a/com.unity.netcode.gameobjects/Runtime/Serialization/FastBufferReader.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/FastBufferReader.cs
index 8adcc98790..c856a6197b 100644
--- a/com.unity.netcode.gameobjects/Runtime/Serialization/FastBufferReader.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Serialization/FastBufferReader.cs
@@ -8,9 +8,9 @@ namespace Unity.Netcode
 {
     /// <summary>
     /// Optimized class used for reading values from a byte stream
-    /// <seealso cref="FastBufferWriter"/>
-    /// <seealso cref="BytePacker"/>
-    /// <seealso cref="ByteUnpacker"/>
+    /// <see cref="FastBufferWriter"/>
+    /// <see cref="BytePacker"/>
+    /// <see cref="ByteUnpacker"/>
     /// </summary>
     public struct FastBufferReader : IDisposable
     {
@@ -93,22 +93,22 @@ internal unsafe void CommitBitwiseReads(int amount)
         /// <summary>
         /// Create a FastBufferReader from a NativeArray.
         ///
-        /// A new buffer will be created using the given <param name="copyAllocator"></param> and the value will be copied in.
+        /// A new buffer will be created using the specified allocator and the value will be copied in.
         /// FastBufferReader will then own the data.
         ///
-        /// The exception to this is when the <param name="copyAllocator"></param> passed in is Allocator.None. In this scenario,
+        /// The exception to this is when the allocator passed in is Allocator.None. In this scenario,
         /// ownership of the data remains with the caller and the reader will point at it directly.
         /// When created with Allocator.None, FastBufferReader will allocate some internal data using
         /// Allocator.Temp so it should be treated as if it's a ref struct and not allowed to outlive
         /// the context in which it was created (it should neither be returned from that function nor
-        /// stored anywhere in heap memory). This is true, unless the <param name="internalAllocator"></param> param is explicitly set
+        /// stored anywhere in heap memory). This is true, unless the internal allocator param is explicitly set
         /// to i.e.: Allocator.Persistent in which case it would allow the internal data to Persist for longer, but the caller
         /// should manually call Dispose() when it is no longer needed.
         /// </summary>
-        /// <param name="buffer"></param>
+        /// <param name="buffer">The NativeArray to create the reader from</param>
         /// <param name="copyAllocator">The allocator type used for internal data when copying an existing buffer if other than Allocator.None is specified, that memory will be owned by this FastBufferReader instance</param>
-        /// <param name="length"></param>
-        /// <param name="offset"></param>
+        /// <param name="length">The number of bytes to read from the buffer. If set to -1, the entire buffer length will be used</param>
+        /// <param name="offset">The offset into the buffer to start reading from</param>
         /// <param name="internalAllocator">The allocator type used for internal data when this reader points directly at a buffer owned by someone else</param>
         public unsafe FastBufferReader(NativeArray<byte> buffer, Allocator copyAllocator, int length = -1, int offset = 0, Allocator internalAllocator = Allocator.Temp)
         {
@@ -140,6 +140,54 @@ public unsafe FastBufferReader(ArraySegment<byte> buffer, Allocator copyAllocato
             }
         }
 
+        /// <summary>
+        /// Create a FastBufferReader from an ArraySegment that uses the ArraySegment.Offset for the reader's offset.
+        ///
+        /// A new buffer will be created using the given allocator and the value will be copied in.
+        /// FastBufferReader will then own the data.
+        ///
+        /// Allocator.None is not supported for byte[]. If you need this functionality, use a fixed() block
+        /// and ensure the FastBufferReader isn't used outside that block.
+        /// </summary>
+        /// <param name="buffer">The buffer to copy from</param>
+        /// <param name="copyAllocator">The allocator type used for internal data when copying an existing buffer if other than Allocator.None is specified, that memory will be owned by this FastBufferReader instance</param>
+        /// <param name="length">The number of bytes to copy (all if this is -1)</param>
+        public unsafe FastBufferReader(ArraySegment<byte> buffer, Allocator copyAllocator, int length = -1)
+        {
+            if (copyAllocator == Allocator.None)
+            {
+                throw new NotSupportedException("Allocator.None cannot be used with managed source buffers.");
+            }
+            fixed (byte* data = buffer.Array)
+            {
+
+                Handle = CreateHandle(data, length == -1 ? buffer.Count : length, buffer.Offset, copyAllocator, Allocator.Temp);
+            }
+        }
+
+        /// <summary>
+        /// Create a FastBufferReader from an ArraySegment that uses the ArraySegment.Offset for the reader's offset and the ArraySegment.Count for the reader's length.
+        ///
+        /// A new buffer will be created using the given allocator and the value will be copied in.
+        /// FastBufferReader will then own the data.
+        ///
+        /// Allocator.None is not supported for byte[]. If you need this functionality, use a fixed() block
+        /// and ensure the FastBufferReader isn't used outside that block.
+        /// </summary>
+        /// <param name="buffer">The buffer to copy from</param>
+        /// <param name="copyAllocator">The allocator type used for internal data when copying an existing buffer if other than Allocator.None is specified, that memory will be owned by this FastBufferReader instance</param>
+        public unsafe FastBufferReader(ArraySegment<byte> buffer, Allocator copyAllocator)
+        {
+            if (copyAllocator == Allocator.None)
+            {
+                throw new NotSupportedException("Allocator.None cannot be used with managed source buffers.");
+            }
+            fixed (byte* data = buffer.Array)
+            {
+                Handle = CreateHandle(data, buffer.Count, buffer.Offset, copyAllocator, Allocator.Temp);
+            }
+        }
+
         /// <summary>
         /// Create a FastBufferReader from an existing byte array.
         ///
@@ -168,15 +216,15 @@ public unsafe FastBufferReader(byte[] buffer, Allocator copyAllocator, int lengt
         /// <summary>
         /// Create a FastBufferReader from an existing byte buffer.
         ///
-        /// A new buffer will be created using the given <param name="copyAllocator"></param> and the value will be copied in.
+        /// A new buffer will be created using the given specified allocator and the value will be copied in.
         /// FastBufferReader will then own the data.
         ///
-        /// The exception to this is when the <param name="copyAllocator"></param> passed in is Allocator.None. In this scenario,
+        /// The exception to this is when the specified allocator passed in is Allocator.None. In this scenario,
         /// ownership of the data remains with the caller and the reader will point at it directly.
         /// When created with Allocator.None, FastBufferReader will allocate some internal data using
         /// Allocator.Temp, so it should be treated as if it's a ref struct and not allowed to outlive
         /// the context in which it was created (it should neither be returned from that function nor
-        /// stored anywhere in heap memory). This is true, unless the <param name="internalAllocator"></param> param is explicitly set
+        /// stored anywhere in heap memory). This is true, unless the internal allocator param is explicitly set
         /// to i.e.: Allocator.Persistent in which case it would allow the internal data to Persist for longer, but the caller
         /// should manually call Dispose() when it is no longer needed.
         /// </summary>
@@ -193,15 +241,15 @@ public unsafe FastBufferReader(byte* buffer, Allocator copyAllocator, int length
         /// <summary>
         /// Create a FastBufferReader from a FastBufferWriter.
         ///
-        /// A new buffer will be created using the given <param name="copyAllocator"></param> and the value will be copied in.
+        /// A new buffer will be created using the given specified allocator  and the value will be copied in.
         /// FastBufferReader will then own the data.
         ///
-        /// The exception to this is when the <param name="copyAllocator"></param> passed in is Allocator.None. In this scenario,
+        /// The exception to this is when the specified allocator  passed in is Allocator.None. In this scenario,
         /// ownership of the data remains with the caller and the reader will point at it directly.
         /// When created with Allocator.None, FastBufferReader will allocate some internal data using
         /// Allocator.Temp, so it should be treated as if it's a ref struct and not allowed to outlive
         /// the context in which it was created (it should neither be returned from that function nor
-        /// stored anywhere in heap memory). This is true, unless the <param name="internalAllocator"></param> param is explicitly set
+        /// stored anywhere in heap memory). This is true, unless the internal Allocator param is explicitly set
         /// to i.e.: Allocator.Persistent in which case it would allow the internal data to Persist for longer, but the caller
         /// should manually call Dispose() when it is no longer needed.
         /// </summary>
@@ -220,10 +268,10 @@ public unsafe FastBufferReader(FastBufferWriter writer, Allocator copyAllocator,
         /// want to change the copyAllocator that a reader is allocated to - for example, upgrading a Temp reader to
         /// a Persistent one to be processed later.
         ///
-        /// A new buffer will be created using the given <param name="copyAllocator"></param> and the value will be copied in.
+        /// A new buffer will be created using the given specified allocator and the value will be copied in.
         /// FastBufferReader will then own the data.
         ///
-        /// The exception to this is when the <param name="copyAllocator"></param> passed in is Allocator.None. In this scenario,
+        /// The exception to this is when the specified allocator passed in is Allocator.None. In this scenario,
         /// ownership of the data remains with the caller and the reader will point at it directly.
         /// When created with Allocator.None, FastBufferReader will allocate some internal data using
         /// Allocator.Temp, so it should be treated as if it's a ref struct and not allowed to outlive
@@ -245,6 +293,11 @@ public unsafe FastBufferReader(FastBufferReader reader, Allocator copyAllocator,
         /// </summary>
         public unsafe void Dispose()
         {
+            if (Handle == null)
+            {
+                return;
+            }
+
             UnsafeUtility.Free(Handle, Handle->Allocator);
             Handle = null;
         }
@@ -435,9 +488,9 @@ public unsafe byte[] ToArray()
         /// <summary>
         /// Read an INetworkSerializable
         /// </summary>
-        /// <typeparam name="T"></typeparam>
+        /// <typeparam name="T">The type that implements INetworkSerializable and can be deserialized</typeparam>
         /// <param name="value">INetworkSerializable instance</param>
-        /// <exception cref="NotImplementedException"></exception>
+        /// <exception cref="NotImplementedException">Thrown if the type T does not properly implement NetworkSerialize</exception>
         public void ReadNetworkSerializable<T>(out T value) where T : INetworkSerializable, new()
         {
             value = new T();
@@ -449,8 +502,8 @@ public unsafe byte[] ToArray()
         /// Read an array of INetworkSerializables
         /// </summary>
         /// <param name="value">INetworkSerializable instance</param>
-        /// <typeparam name="T">the array to read the values of type `T` into</typeparam>
-        /// <exception cref="NotImplementedException"></exception>
+        /// <typeparam name="T">the array to read the values of type `T` from</typeparam>
+        /// <exception cref="NotImplementedException">Thrown if the type T does not properly implement NetworkSerialize</exception>
         public void ReadNetworkSerializable<T>(out T[] value) where T : INetworkSerializable, new()
         {
             ReadValueSafe(out int size);
@@ -466,8 +519,8 @@ public unsafe byte[] ToArray()
         /// </summary>
         /// <param name="value">INetworkSerializable instance</param>
         /// <param name="allocator">The allocator to use to construct the resulting NativeArray</param>
-        /// <typeparam name="T">the array to read the values of type `T` into</typeparam>
-        /// <exception cref="NotImplementedException"></exception>
+        /// <typeparam name="T">the array to read the values of type `T` from</typeparam>
+        /// <exception cref="NotImplementedException">Thrown if the type T does not properly implement NetworkSerialize</exception>
         public void ReadNetworkSerializable<T>(out NativeArray<T> value, Allocator allocator) where T : unmanaged, INetworkSerializable
         {
             ReadValueSafe(out int size);
@@ -484,8 +537,8 @@ public void ReadNetworkSerializable<T>(out NativeArray<T> value, Allocator alloc
         /// Read a NativeList of INetworkSerializables
         /// </summary>
         /// <param name="value">INetworkSerializable instance</param>
-        /// <typeparam name="T">the array to read the values of type `T` into</typeparam>
-        /// <exception cref="NotImplementedException"></exception>
+        /// <typeparam name="T">the array to read the values of type `T` from</typeparam>
+        /// <exception cref="NotImplementedException">Thrown if the type T does not properly implement NetworkSerialize</exception>
         public void ReadNetworkSerializableInPlace<T>(ref NativeList<T> value) where T : unmanaged, INetworkSerializable
         {
             ReadValueSafe(out int size);
@@ -501,9 +554,9 @@ public void ReadNetworkSerializableInPlace<T>(ref NativeList<T> value) where T :
         /// Read an INetworkSerializable in-place, without constructing a new one
         /// Note that this will NOT check for null before calling NetworkSerialize
         /// </summary>
-        /// <typeparam name="T"></typeparam>
+        /// <typeparam name="T">The type that implements INetworkSerializable and can be deserialized</typeparam>
         /// <param name="value">INetworkSerializable instance</param>
-        /// <exception cref="NotImplementedException"></exception>
+        /// <exception cref="NotImplementedException">hrown if the type T does not properly implement NetworkSerialize</exception>
         public void ReadNetworkSerializableInPlace<T>(ref T value) where T : INetworkSerializable
         {
             var bufferSerializer = new BufferSerializer<BufferSerializerReader>(new BufferSerializerReader(this));
@@ -518,8 +571,8 @@ public void ReadNetworkSerializableInPlace<T>(ref T value) where T : INetworkSer
         /// <param name="oneByteChars">Whether or not to use one byte per character. This will only allow ASCII</param>
         public unsafe void ReadValue(out string s, bool oneByteChars = false)
         {
-            ReadValue(out uint length);
-            s = "".PadRight((int)length);
+            ReadLength(out int length);
+            s = "".PadRight(length);
             int target = s.Length;
             fixed (char* native = s)
             {
@@ -557,18 +610,18 @@ public unsafe void ReadValueSafe(out string s, bool oneByteChars = false)
             }
 #endif
 
-            if (!TryBeginReadInternal(sizeof(uint)))
+            if (!TryBeginReadInternal(SizeOfLengthField()))
             {
                 throw new OverflowException("Reading past the end of the buffer");
             }
 
-            ReadValue(out uint length);
+            ReadLength(out int length);
 
-            if (!TryBeginReadInternal((int)length * (oneByteChars ? 1 : sizeof(char))))
+            if (!TryBeginReadInternal(length * (oneByteChars ? 1 : sizeof(char))))
             {
                 throw new OverflowException("Reading past the end of the buffer");
             }
-            s = "".PadRight((int)length);
+            s = "".PadRight(length);
             int target = s.Length;
             fixed (char* native = s)
             {
@@ -587,15 +640,42 @@ public unsafe void ReadValueSafe(out string s, bool oneByteChars = false)
             }
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static int SizeOfLengthField() => sizeof(uint);
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void ReadLengthSafe(out uint length) => ReadUnmanagedSafe(out length);
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void ReadLength(out uint length) => ReadUnmanaged(out length);
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void ReadLengthSafe(out int length)
+        {
+            ReadLengthSafe(out uint temp);
+            if (temp > int.MaxValue)
+            {
+                throw new InvalidCastException("length value outside of int32 range");
+            }
+            length = (int)temp;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void ReadLength(out int length)
+        {
+            ReadLength(out uint temp);
+            length = (int)temp;
+        }
+
         /// <summary>
         /// Read a partial value. The value is zero-initialized and then the specified number of bytes is read into it.
         /// </summary>
         /// <param name="value">Value to read</param>
-        /// <param name="bytesToRead">Number of bytes</param>
-        /// <param name="offsetBytes">Offset into the value to write the bytes</param>
-        /// <typeparam name="T">the type value to read the value into</typeparam>
-        /// <exception cref="InvalidOperationException"></exception>
-        /// <exception cref="OverflowException"></exception>
+        /// <param name="bytesToRead">The number of bytes to read from the buffer into the value</param>
+        /// <param name="offsetBytes">The offset in bytes from the start of the value where the read bytes will be written</param>
+        /// <typeparam name="T">The unmanaged type to read into. Must be unmanaged to allow direct memory access</typeparam>
+        /// <exception cref="InvalidOperationException">Thrown when attempting to use BufferReader in bytewise mode while in a bitwise context</exception>
+        /// <exception cref="OverflowException">Thrown when attempting to read without first calling TryBeginRead() or when reading beyond the allowed read mark</exception>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public unsafe void ReadPartialValue<T>(out T value, int bytesToRead, int offsetBytes = 0) where T : unmanaged
         {
@@ -772,7 +852,7 @@ internal unsafe void ReadUnmanagedSafe<T>(out T value) where T : unmanaged
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal unsafe void ReadUnmanaged<T>(out T[] value) where T : unmanaged
         {
-            ReadUnmanaged(out int sizeInTs);
+            ReadLength(out int sizeInTs);
             int sizeInBytes = sizeInTs * sizeof(T);
             value = new T[sizeInTs];
             fixed (T* ptr = value)
@@ -784,7 +864,7 @@ internal unsafe void ReadUnmanaged<T>(out T[] value) where T : unmanaged
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal unsafe void ReadUnmanagedSafe<T>(out T[] value) where T : unmanaged
         {
-            ReadUnmanagedSafe(out int sizeInTs);
+            ReadLengthSafe(out int sizeInTs);
             int sizeInBytes = sizeInTs * sizeof(T);
             value = new T[sizeInTs];
             fixed (T* ptr = value)
@@ -796,7 +876,7 @@ internal unsafe void ReadUnmanagedSafe<T>(out T[] value) where T : unmanaged
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal unsafe void ReadUnmanaged<T>(out NativeArray<T> value, Allocator allocator) where T : unmanaged
         {
-            ReadUnmanaged(out int sizeInTs);
+            ReadLength(out int sizeInTs);
             int sizeInBytes = sizeInTs * sizeof(T);
             value = new NativeArray<T>(sizeInTs, allocator);
             byte* bytes = (byte*)value.GetUnsafePtr();
@@ -805,7 +885,7 @@ internal unsafe void ReadUnmanaged<T>(out NativeArray<T> value, Allocator alloca
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal unsafe void ReadUnmanagedSafe<T>(out NativeArray<T> value, Allocator allocator) where T : unmanaged
         {
-            ReadUnmanagedSafe(out int sizeInTs);
+            ReadLengthSafe(out int sizeInTs);
             int sizeInBytes = sizeInTs * sizeof(T);
             value = new NativeArray<T>(sizeInTs, allocator);
             byte* bytes = (byte*)value.GetUnsafePtr();
@@ -815,7 +895,7 @@ internal unsafe void ReadUnmanagedSafe<T>(out NativeArray<T> value, Allocator al
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal unsafe void ReadUnmanagedInPlace<T>(ref NativeList<T> value) where T : unmanaged
         {
-            ReadUnmanaged(out int sizeInTs);
+            ReadLength(out int sizeInTs);
             int sizeInBytes = sizeInTs * sizeof(T);
             value.Resize(sizeInTs, NativeArrayOptions.UninitializedMemory);
             byte* bytes = (byte*)value.GetUnsafePtr();
@@ -824,7 +904,7 @@ internal unsafe void ReadUnmanagedInPlace<T>(ref NativeList<T> value) where T :
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal unsafe void ReadUnmanagedSafeInPlace<T>(ref NativeList<T> value) where T : unmanaged
         {
-            ReadUnmanagedSafe(out int sizeInTs);
+            ReadLengthSafe(out int sizeInTs);
             int sizeInBytes = sizeInTs * sizeof(T);
             value.Resize(sizeInTs, NativeArrayOptions.UninitializedMemory);
             byte* bytes = (byte*)value.GetUnsafePtr();
@@ -1073,7 +1153,7 @@ public void ReadValueSafeInPlace<T>(ref NativeList<T> value, FastBufferWriter.Fo
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal void ReadValueSafeInPlace<T>(ref NativeHashSet<T> value) where T : unmanaged, IEquatable<T>
         {
-            ReadUnmanagedSafe(out int length);
+            ReadLengthSafe(out int length);
             value.Clear();
             for (var i = 0; i < length; ++i)
             {
@@ -1088,7 +1168,7 @@ internal void ReadValueSafeInPlace<TKey, TVal>(ref NativeHashMap<TKey, TVal> val
             where TKey : unmanaged, IEquatable<TKey>
             where TVal : unmanaged
         {
-            ReadUnmanagedSafe(out int length);
+            ReadLengthSafe(out int length);
             value.Clear();
             for (var i = 0; i < length; ++i)
             {
@@ -1548,7 +1628,7 @@ internal void ReadValueSafeInPlace<TKey, TVal>(ref NativeHashMap<TKey, TVal> val
         /// This method is a little difficult to use, since you have to know the size of the string before
         /// reading it, but is useful when the string is a known, fixed size. Note that the size of the
         /// string is also encoded, so the size to call TryBeginRead on is actually the fixed size (in bytes)
-        /// plus sizeof(int)
+        /// plus sizeof(uint)
         /// </summary>
         /// <param name="value">the value to read</param>
         /// <param name="unused">An unused parameter used for enabling overload resolution based on generic constraints</param>
@@ -1557,7 +1637,7 @@ internal void ReadValueSafeInPlace<TKey, TVal>(ref NativeHashMap<TKey, TVal> val
         public unsafe void ReadValue<T>(out T value, FastBufferWriter.ForFixedStrings unused = default)
             where T : unmanaged, INativeList<byte>, IUTF8Bytes
         {
-            ReadUnmanaged(out int length);
+            ReadLength(out int length);
             value = new T
             {
                 Length = length
@@ -1579,7 +1659,7 @@ public unsafe void ReadValue<T>(out T value, FastBufferWriter.ForFixedStrings un
         public unsafe void ReadValueSafe<T>(out T value, FastBufferWriter.ForFixedStrings unused = default)
             where T : unmanaged, INativeList<byte>, IUTF8Bytes
         {
-            ReadUnmanagedSafe(out int length);
+            ReadLengthSafe(out int length);
             value = new T
             {
                 Length = length
@@ -1601,7 +1681,7 @@ public unsafe void ReadValueSafe<T>(out T value, FastBufferWriter.ForFixedString
         public unsafe void ReadValueSafeInPlace<T>(ref T value, FastBufferWriter.ForFixedStrings unused = default)
             where T : unmanaged, INativeList<byte>, IUTF8Bytes
         {
-            ReadUnmanagedSafe(out int length);
+            ReadLengthSafe(out int length);
             value.Length = length;
             ReadBytesSafe(value.GetUnsafePtr(), length);
         }
@@ -1614,13 +1694,12 @@ public unsafe void ReadValueSafeInPlace<T>(ref T value, FastBufferWriter.ForFixe
         /// </summary>
         /// <param name="value">the value to read</param>
         /// <param name="allocator">The allocator to use to construct the resulting NativeArray</param>
-        /// <param name="unused">An unused parameter used for enabling overload resolution based on generic constraints</param>
         /// <typeparam name="T">The type being serialized</typeparam>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public unsafe void ReadValueSafe<T>(out NativeArray<T> value, Allocator allocator)
             where T : unmanaged, INativeList<byte>, IUTF8Bytes
         {
-            ReadUnmanagedSafe(out int length);
+            ReadLengthSafe(out int length);
             value = new NativeArray<T>(length, allocator);
             var ptr = (T*)value.GetUnsafePtr();
             for (var i = 0; i < length; ++i)
@@ -1636,13 +1715,12 @@ public unsafe void ReadValueSafe<T>(out NativeArray<T> value, Allocator allocato
         /// for multiple reads at once by calling TryBeginRead.
         /// </summary>
         /// <param name="value">the value to read</param>
-        /// <param name="unused">An unused parameter used for enabling overload resolution based on generic constraints</param>
         /// <typeparam name="T">The type being serialized</typeparam>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public unsafe void ReadValueSafeTemp<T>(out NativeArray<T> value)
             where T : unmanaged, INativeList<byte>, IUTF8Bytes
         {
-            ReadUnmanagedSafe(out int length);
+            ReadLengthSafe(out int length);
             value = new NativeArray<T>(length, Allocator.Temp);
             var ptr = (T*)value.GetUnsafePtr();
             for (var i = 0; i < length; ++i)
@@ -1664,7 +1742,7 @@ public unsafe void ReadValueSafeTemp<T>(out NativeArray<T> value)
         public void ReadValueSafe<T>(out T[] value, FastBufferWriter.ForFixedStrings unused = default)
             where T : unmanaged, INativeList<byte>, IUTF8Bytes
         {
-            ReadUnmanagedSafe(out int length);
+            ReadLengthSafe(out int length);
             value = new T[length];
             for (var i = 0; i < length; ++i)
             {
@@ -1680,13 +1758,12 @@ public void ReadValueSafe<T>(out T[] value, FastBufferWriter.ForFixedStrings unu
         /// for multiple reads at once by calling TryBeginRead.
         /// </summary>
         /// <param name="value">the value to read</param>
-        /// <param name="unused">An unused parameter used for enabling overload resolution based on generic constraints</param>
         /// <typeparam name="T">The type being serialized</typeparam>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void ReadValueSafeInPlace<T>(ref NativeList<T> value)
             where T : unmanaged, INativeList<byte>, IUTF8Bytes
         {
-            ReadUnmanagedSafe(out int length);
+            ReadLengthSafe(out int length);
             value.Resize(length, NativeArrayOptions.UninitializedMemory);
             for (var i = 0; i < length; ++i)
             {
diff --git a/com.unity.netcode.gameobjects/Runtime/Serialization/FastBufferWriter.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/FastBufferWriter.cs
index 5fb5ca7be4..381c92f625 100644
--- a/com.unity.netcode.gameobjects/Runtime/Serialization/FastBufferWriter.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Serialization/FastBufferWriter.cs
@@ -8,9 +8,9 @@ namespace Unity.Netcode
 {
     /// <summary>
     /// Optimized class used for writing values into a byte stream
-    /// <seealso cref="FastBufferReader"/>
-    /// <seealso cref="BytePacker"/>
-    /// <seealso cref="ByteUnpacker"/>
+    /// <see cref="FastBufferReader"/>
+    /// <see cref="BytePacker"/>
+    /// <see cref="ByteUnpacker"/>
     /// </summary>
     public struct FastBufferWriter : IDisposable
     {
@@ -314,9 +314,9 @@ public unsafe bool TryBeginWriteValue<T>(in T value) where T : unmanaged
         /// Internal version of TryBeginWrite.
         /// Differs from TryBeginWrite only in that it won't ever move the AllowedWriteMark backward.
         /// </summary>
-        /// <param name="bytes"></param>
-        /// <returns></returns>
-        /// <exception cref="InvalidOperationException"></exception>
+        /// <param name="bytes">The number of bytes to check for write availability</param>
+        /// <returns>True if the specified number of bytes can be written, false if there isn't enough space</returns>
+        /// <exception cref="InvalidOperationException">Thrown when attempting to use BufferWriter in bytewise mode while in a bitwise context</exception>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public unsafe bool TryBeginWriteInternal(int bytes)
         {
@@ -356,7 +356,7 @@ public unsafe bool TryBeginWriteInternal(int bytes)
         /// Returns an array representation of the underlying byte buffer.
         /// !!Allocates a new array!!
         /// </summary>
-        /// <returns></returns>
+        /// <returns>A new byte array containing a copy of the buffer's contents.</returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public unsafe byte[] ToArray()
         {
@@ -395,7 +395,7 @@ internal unsafe ArraySegment<byte> ToTempByteArray()
         /// <summary>
         /// Gets a direct pointer to the underlying buffer
         /// </summary>
-        /// <returns></returns>
+        /// <returns>An unsafe pointer to the start of the underlying buffer memory</returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public unsafe byte* GetUnsafePtr()
         {
@@ -405,7 +405,7 @@ internal unsafe ArraySegment<byte> ToTempByteArray()
         /// <summary>
         /// Gets a direct pointer to the underlying buffer at the current read position
         /// </summary>
-        /// <returns></returns>
+        /// <returns>An unsafe pointer to the underlying buffer memory offset by the current position</returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public unsafe byte* GetUnsafePtrAtCurrentPosition()
         {
@@ -417,18 +417,18 @@ internal unsafe ArraySegment<byte> ToTempByteArray()
         /// </summary>
         /// <param name="s">The string to write</param>
         /// <param name="oneByteChars">Whether or not to use one byte per character. This will only allow ASCII</param>
-        /// <returns></returns>
+        /// <returns>The total number of bytes required to write the string, including the length field</returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static int GetWriteSize(string s, bool oneByteChars = false)
         {
-            return sizeof(int) + s.Length * (oneByteChars ? sizeof(byte) : sizeof(char));
+            return SizeOfLengthField() + s.Length * (oneByteChars ? sizeof(byte) : sizeof(char));
         }
 
         /// <summary>
         /// Write an INetworkSerializable
         /// </summary>
         /// <param name="value">The value to write</param>
-        /// <typeparam name="T"></typeparam>
+        /// <typeparam name="T">The type of the value</typeparam>
         public void WriteNetworkSerializable<T>(in T value) where T : INetworkSerializable
         {
             var bufferSerializer = new BufferSerializer<BufferSerializerWriter>(new BufferSerializerWriter(this));
@@ -438,14 +438,14 @@ public void WriteNetworkSerializable<T>(in T value) where T : INetworkSerializab
         /// <summary>
         /// Write an array of INetworkSerializables
         /// </summary>
-        /// <param name="array">The value to write</param>
-        /// <param name="count"></param>
-        /// <param name="offset"></param>
-        /// <typeparam name="T"></typeparam>
+        /// <param name="array">The array of objects to write</param>
+        /// <param name="count">The number of elements to write. If set to -1, will write all elements from offset to end</param>
+        /// <param name="offset">The starting position in the array from which to begin writing</param>
+        /// <typeparam name="T">The type of the value</typeparam>
         public void WriteNetworkSerializable<T>(T[] array, int count = -1, int offset = 0) where T : INetworkSerializable
         {
             int sizeInTs = count != -1 ? count : array.Length - offset;
-            WriteValueSafe(sizeInTs);
+            WriteLengthSafe(sizeInTs);
             foreach (var item in array)
             {
                 WriteNetworkSerializable(item);
@@ -455,14 +455,14 @@ public void WriteNetworkSerializable<T>(T[] array, int count = -1, int offset =
         /// <summary>
         /// Write a NativeArray of INetworkSerializables
         /// </summary>
-        /// <param name="array">The value to write</param>
-        /// <param name="count"></param>
-        /// <param name="offset"></param>
-        /// <typeparam name="T"></typeparam>
+        /// <param name="array">The NativeArray containing the values to write</param>
+        /// <param name="count">The number of elements to write. If -1 (default), writes array.Length - offset elements</param>
+        /// <param name="offset">The starting position in the array. Defaults to 0</param>
+        /// <typeparam name="T">The type of the value</typeparam>
         public void WriteNetworkSerializable<T>(NativeArray<T> array, int count = -1, int offset = 0) where T : unmanaged, INetworkSerializable
         {
             int sizeInTs = count != -1 ? count : array.Length - offset;
-            WriteValueSafe(sizeInTs);
+            WriteLengthSafe(sizeInTs);
             foreach (var item in array)
             {
                 WriteNetworkSerializable(item);
@@ -473,14 +473,14 @@ public void WriteNetworkSerializable<T>(NativeArray<T> array, int count = -1, in
         /// <summary>
         /// Write a NativeList of INetworkSerializables
         /// </summary>
-        /// <param name="array">The value to write</param>
-        /// <param name="count"></param>
-        /// <param name="offset"></param>
-        /// <typeparam name="T"></typeparam>
+        /// <param name="array">The NativeArray containing the values to write</param>
+        /// <param name="count">The number of elements to write. If -1 (default), writes array.Length - offset elements</param>
+        /// <param name="offset">The starting position in the array. Defaults to 0/param>
+        /// <typeparam name="T">The type of the value</typeparam>
         public void WriteNetworkSerializable<T>(NativeList<T> array, int count = -1, int offset = 0) where T : unmanaged, INetworkSerializable
         {
             int sizeInTs = count != -1 ? count : array.Length - offset;
-            WriteValueSafe(sizeInTs);
+            WriteLengthSafe(sizeInTs);
             foreach (var item in array)
             {
                 WriteNetworkSerializable(item);
@@ -495,7 +495,7 @@ public void WriteNetworkSerializable<T>(NativeList<T> array, int count = -1, int
         /// <param name="oneByteChars">Whether or not to use one byte per character. This will only allow ASCII</param>
         public unsafe void WriteValue(string s, bool oneByteChars = false)
         {
-            WriteValue((uint)s.Length);
+            WriteLength((uint)s.Length);
             int target = s.Length;
             if (oneByteChars)
             {
@@ -538,7 +538,7 @@ public unsafe void WriteValueSafe(string s, bool oneByteChars = false)
                 throw new OverflowException("Writing past the end of the buffer");
             }
 
-            WriteValue((uint)s.Length);
+            WriteLength((uint)s.Length);
             int target = s.Length;
             if (oneByteChars)
             {
@@ -562,14 +562,14 @@ public unsafe void WriteValueSafe(string s, bool oneByteChars = false)
         /// <param name="array">The array to write</param>
         /// <param name="count">The amount of elements to write</param>
         /// <param name="offset">Where in the array to start</param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns></returns>
+        /// <typeparam name="T">The type of elements in the array, must be unmanaged</typeparam>
+        /// <returns>The total number of bytes required to write the array, including the length field</returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static unsafe int GetWriteSize<T>(T[] array, int count = -1, int offset = 0) where T : unmanaged
         {
             int sizeInTs = count != -1 ? count : array.Length - offset;
             int sizeInBytes = sizeInTs * sizeof(T);
-            return sizeof(int) + sizeInBytes;
+            return SizeOfLengthField() + sizeInBytes;
         }
 
         /// <summary>
@@ -578,14 +578,14 @@ public static unsafe int GetWriteSize<T>(T[] array, int count = -1, int offset =
         /// <param name="array">The array to write</param>
         /// <param name="count">The amount of elements to write</param>
         /// <param name="offset">Where in the array to start</param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns></returns>
+        /// <typeparam name="T">The type of elements in the array, must be unmanaged</typeparam>
+        /// <returns>The total number of bytes required to write the array, including the length field</returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static unsafe int GetWriteSize<T>(NativeArray<T> array, int count = -1, int offset = 0) where T : unmanaged
         {
             int sizeInTs = count != -1 ? count : array.Length - offset;
             int sizeInBytes = sizeInTs * sizeof(T);
-            return sizeof(int) + sizeInBytes;
+            return SizeOfLengthField() + sizeInBytes;
         }
 
 #if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
@@ -595,14 +595,14 @@ public static unsafe int GetWriteSize<T>(NativeArray<T> array, int count = -1, i
         /// <param name="array">The array to write</param>
         /// <param name="count">The amount of elements to write</param>
         /// <param name="offset">Where in the array to start</param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns></returns>
+        /// <typeparam name="T">The type of elements in the array, must be unmanaged</typeparam>
+        /// <returns>The total number of bytes required to write the array, including the length field</returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static unsafe int GetWriteSize<T>(NativeList<T> array, int count = -1, int offset = 0) where T : unmanaged
         {
             int sizeInTs = count != -1 ? count : array.Length - offset;
             int sizeInBytes = sizeInTs * sizeof(T);
-            return sizeof(int) + sizeInBytes;
+            return SizeOfLengthField() + sizeInBytes;
         }
 #endif
 
@@ -612,9 +612,9 @@ public static unsafe int GetWriteSize<T>(NativeList<T> array, int count = -1, in
         /// <param name="value">Value to write</param>
         /// <param name="bytesToWrite">Number of bytes</param>
         /// <param name="offsetBytes">Offset into the value to begin reading the bytes</param>
-        /// <typeparam name="T"></typeparam>
-        /// <exception cref="InvalidOperationException"></exception>
-        /// <exception cref="OverflowException"></exception>
+        /// <typeparam name="T">The type of elements in the array, must be unmanaged</typeparam>
+        /// <exception cref="InvalidOperationException">Thrown when attempting to use BufferWriter in bytewise mode while in a bitwise context</exception>
+        /// <exception cref="OverflowException">Thrown when attempting to write without first calling TryBeginWrite() or when writing beyond the allowed write mark</exception>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public unsafe void WritePartialValue<T>(T value, int bytesToWrite, int offsetBytes = 0) where T : unmanaged
         {
@@ -772,11 +772,7 @@ public unsafe void WriteBytes(NativeArray<byte> value, int size = -1, int offset
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public unsafe void WriteBytes(NativeList<byte> value, int size = -1, int offset = 0)
         {
-#if UTP_TRANSPORT_2_0_ABOVE
             byte* ptr = value.GetUnsafePtr();
-#else
-            byte* ptr = (byte*)value.GetUnsafePtr();
-#endif
             WriteBytes(ptr, size == -1 ? value.Length : size, offset);
         }
 
@@ -820,11 +816,7 @@ public unsafe void WriteBytesSafe(NativeArray<byte> value, int size = -1, int of
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public unsafe void WriteBytesSafe(NativeList<byte> value, int size = -1, int offset = 0)
         {
-#if UTP_TRANSPORT_2_0_ABOVE
             byte* ptr = value.GetUnsafePtr();
-#else
-            byte* ptr = (byte*)value.GetUnsafePtr();
-#endif
             WriteBytesSafe(ptr, size == -1 ? value.Length : size, offset);
         }
 
@@ -857,10 +849,10 @@ public unsafe void CopyFrom(FastBufferWriter other)
         /// The ForStructs value here makes this the lowest-priority overload so other versions
         /// will be prioritized over this if they match
         /// </summary>
-        /// <param name="value"></param>
-        /// <param name="unused"></param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns></returns>
+        /// <param name="value">The unmanaged value to calculate the size for</param>
+        /// <param name="unused">Unused parameter for overload resolution</param>
+        /// <typeparam name="T">The type of the value, must be unmanaged</typeparam>
+        /// <returns>The size in bytes required to write the value</returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static unsafe int GetWriteSize<T>(in T value, ForStructs unused = default) where T : unmanaged
         {
@@ -870,28 +862,28 @@ public static unsafe int GetWriteSize<T>(in T value, ForStructs unused = default
         /// <summary>
         /// Get the write size for a FixedString
         /// </summary>
-        /// <param name="value"></param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns></returns>
+        /// <param name="value">The FixedString value to calculate the size for</param>
+        /// <typeparam name="T">The specific FixedString type, must implement INativeList{byte} and IUTF8Bytes</typeparam>
+        /// <returns>The size in bytes required to write the value</returns>
         public static int GetWriteSize<T>(in T value)
             where T : unmanaged, INativeList<byte>, IUTF8Bytes
         {
-            return value.Length + sizeof(int);
+            return SizeOfLengthField() + value.Length;
         }
 
         /// <summary>
         /// Get the write size for an array of FixedStrings
         /// </summary>
-        /// <param name="value"></param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns></returns>
+        /// <param name="value">The NativeArray of FixedStrings to calculate the size for</param>
+        /// <typeparam name="T">The specific FixedString type, must implement INativeList{byte} and IUTF8Bytes</typeparam>
+        /// <returns>The total size in bytes required to write all strings, including all length fields</returns>
         public static int GetWriteSize<T>(in NativeArray<T> value)
             where T : unmanaged, INativeList<byte>, IUTF8Bytes
         {
-            var size = sizeof(int);
+            var size = SizeOfLengthField();
             foreach (var item in value)
             {
-                size += sizeof(int) + item.Length;
+                size += SizeOfLengthField() + item.Length;
             }
 
             return size;
@@ -901,16 +893,16 @@ public static int GetWriteSize<T>(in NativeArray<T> value)
         /// <summary>
         /// Get the write size for an array of FixedStrings
         /// </summary>
-        /// <param name="value"></param>
-        /// <typeparam name="T"></typeparam>
-        /// <returns></returns>
+        /// <param name="value">The NativeList of FixedStrings to calculate the size for</param>
+        /// <typeparam name="T">The specific FixedString type, must implement INativeList{byte} and IUTF8Bytes</typeparam>
+        /// <returns>The total size in bytes required to write all strings, including all length fields</returns>
         public static int GetWriteSize<T>(in NativeList<T> value)
             where T : unmanaged, INativeList<byte>, IUTF8Bytes
         {
-            var size = sizeof(int);
+            var size = SizeOfLengthField();
             foreach (var item in value)
             {
-                size += sizeof(int) + item.Length;
+                size += SizeOfLengthField() + item.Length;
             }
 
             return size;
@@ -920,8 +912,8 @@ public static int GetWriteSize<T>(in NativeList<T> value)
         /// <summary>
         /// Get the size required to write an unmanaged value of type T
         /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <returns></returns>
+        /// <typeparam name="T">The type to calculate the size for, must be unmanaged</typeparam>
+        /// <returns>The size in bytes required to write a value of type T</returns>
         public static unsafe int GetWriteSize<T>() where T : unmanaged
         {
             return sizeof(T);
@@ -946,10 +938,32 @@ internal unsafe void WriteUnmanagedSafe<T>(in T value) where T : unmanaged
             }
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private static int SizeOfLengthField() => sizeof(uint);
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void WriteLengthSafe(uint length) => WriteUnmanagedSafe(length);
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void WriteLength(uint length) => WriteUnmanaged(length);
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void WriteLengthSafe(int length)
+        {
+            if (length < 0)
+            {
+                throw new InvalidCastException("Cannot write negative length");
+            }
+            WriteLengthSafe((uint)length);
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void WriteLength(int length) => WriteLength((uint)length);
+
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal unsafe void WriteUnmanaged<T>(T[] value) where T : unmanaged
         {
-            WriteUnmanaged(value.Length);
+            WriteLength(value.Length);
             fixed (T* ptr = value)
             {
                 byte* bytes = (byte*)ptr;
@@ -959,7 +973,7 @@ internal unsafe void WriteUnmanaged<T>(T[] value) where T : unmanaged
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal unsafe void WriteUnmanagedSafe<T>(T[] value) where T : unmanaged
         {
-            WriteUnmanagedSafe(value.Length);
+            WriteLengthSafe(value.Length);
             fixed (T* ptr = value)
             {
                 byte* bytes = (byte*)ptr;
@@ -970,7 +984,7 @@ internal unsafe void WriteUnmanagedSafe<T>(T[] value) where T : unmanaged
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal unsafe void WriteUnmanaged<T>(NativeArray<T> value) where T : unmanaged
         {
-            WriteUnmanaged(value.Length);
+            WriteLength(value.Length);
             var ptr = (T*)value.GetUnsafePtr();
             {
                 byte* bytes = (byte*)ptr;
@@ -980,7 +994,7 @@ internal unsafe void WriteUnmanaged<T>(NativeArray<T> value) where T : unmanaged
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal unsafe void WriteUnmanagedSafe<T>(NativeArray<T> value) where T : unmanaged
         {
-            WriteUnmanagedSafe(value.Length);
+            WriteLengthSafe(value.Length);
             var ptr = (T*)value.GetUnsafePtr();
             {
                 byte* bytes = (byte*)ptr;
@@ -992,13 +1006,8 @@ internal unsafe void WriteUnmanagedSafe<T>(NativeArray<T> value) where T : unman
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal unsafe void WriteUnmanaged<T>(NativeList<T> value) where T : unmanaged
         {
-            WriteUnmanaged(value.Length);
-
-#if UTP_TRANSPORT_2_0_ABOVE
+            WriteLength(value.Length);
             var ptr = value.GetUnsafePtr();
-#else
-            var ptr = (T*)value.GetUnsafePtr();
-#endif
             {
                 byte* bytes = (byte*)ptr;
                 WriteBytes(bytes, sizeof(T) * value.Length);
@@ -1007,12 +1016,8 @@ internal unsafe void WriteUnmanaged<T>(NativeList<T> value) where T : unmanaged
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal unsafe void WriteUnmanagedSafe<T>(NativeList<T> value) where T : unmanaged
         {
-            WriteUnmanagedSafe(value.Length);
-#if UTP_TRANSPORT_2_0_ABOVE
+            WriteLengthSafe(value.Length);
             var ptr = value.GetUnsafePtr();
-#else
-            var ptr = (T*)value.GetUnsafePtr();
-#endif
             {
                 byte* bytes = (byte*)ptr;
                 WriteBytesSafe(bytes, sizeof(T) * value.Length);
@@ -1210,11 +1215,7 @@ public void WriteValue<T>(NativeList<T> value, ForGeneric unused = default) wher
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         internal void WriteValueSafe<T>(NativeHashSet<T> value) where T : unmanaged, IEquatable<T>
         {
-#if UTP_TRANSPORT_2_0_ABOVE
-            WriteUnmanagedSafe(value.Count);
-#else
-            WriteUnmanagedSafe(value.Count());
-#endif
+            WriteLengthSafe(value.Count);
             foreach (var item in value)
             {
                 var iReffable = item;
@@ -1227,11 +1228,7 @@ internal void WriteValueSafe<TKey, TVal>(NativeHashMap<TKey, TVal> value)
             where TKey : unmanaged, IEquatable<TKey>
             where TVal : unmanaged
         {
-#if UTP_TRANSPORT_2_0_ABOVE
-            WriteUnmanagedSafe(value.Count);
-#else
-            WriteUnmanagedSafe(value.Count());
-#endif
+            WriteLengthSafe(value.Count);
             foreach (var item in value)
             {
                 (var key, var val) = (item.Key, item.Value);
@@ -1766,7 +1763,8 @@ public void WriteValueSafe<T>(NativeList<T> value, ForGeneric unused = default)
         public unsafe void WriteValue<T>(in T value, ForFixedStrings unused = default)
             where T : unmanaged, INativeList<byte>, IUTF8Bytes
         {
-            WriteUnmanaged(value.Length);
+            // BytePacker.WriteValuePacked(this, value.Length);
+            WriteLength(value.Length);
             // This avoids a copy on the string, which could be costly for FixedString4096Bytes
             // Otherwise, GetUnsafePtr() is an impure function call and will result in a copy
             // for `in` parameters.
@@ -1788,7 +1786,7 @@ public unsafe void WriteValue<T>(in T value, ForFixedStrings unused = default)
         public void WriteValue<T>(T[] value, ForFixedStrings unused = default)
             where T : unmanaged, INativeList<byte>, IUTF8Bytes
         {
-            WriteUnmanaged(value.Length);
+            WriteLength(value.Length);
             foreach (var str in value)
             {
                 WriteValue(str);
@@ -1807,7 +1805,7 @@ public void WriteValue<T>(T[] value, ForFixedStrings unused = default)
         public void WriteValue<T>(in NativeArray<T> value, ForFixedStrings unused = default)
             where T : unmanaged, INativeList<byte>, IUTF8Bytes
         {
-            WriteUnmanaged(value.Length);
+            WriteLength(value.Length);
             foreach (var str in value)
             {
                 WriteValue(str);
@@ -1827,7 +1825,7 @@ public void WriteValue<T>(in NativeArray<T> value, ForFixedStrings unused = defa
         public void WriteValue<T>(in NativeList<T> value, ForFixedStrings unused = default)
             where T : unmanaged, INativeList<byte>, IUTF8Bytes
         {
-            WriteUnmanaged(value.Length);
+            WriteLength(value.Length);
             foreach (var str in value)
             {
                 WriteValue(str);
@@ -1849,7 +1847,7 @@ public void WriteValue<T>(in NativeList<T> value, ForFixedStrings unused = defau
         public void WriteValueSafe<T>(in T value, ForFixedStrings unused = default)
             where T : unmanaged, INativeList<byte>, IUTF8Bytes
         {
-            if (!TryBeginWriteInternal(sizeof(int) + value.Length))
+            if (!TryBeginWriteInternal(SizeOfLengthField() + value.Length))
             {
                 throw new OverflowException("Writing past the end of the buffer");
             }
@@ -1872,7 +1870,7 @@ public void WriteValueSafe<T>(T[] value, ForFixedStrings unused = default)
             {
                 throw new OverflowException("Writing past the end of the buffer");
             }
-            WriteUnmanaged(value.Length);
+            WriteLength(value.Length);
             foreach (var str in value)
             {
                 WriteValue(str);
@@ -1885,7 +1883,6 @@ public void WriteValueSafe<T>(T[] value, ForFixedStrings unused = default)
         /// for multiple writes at once by calling TryBeginWrite.
         /// </summary>
         /// <param name="value">the value to write</param>
-        /// <param name="unused">An unused parameter used for enabling overload resolution based on generic constraints</param>
         /// <typeparam name="T">The type being serialized</typeparam>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void WriteValueSafe<T>(in NativeArray<T> value)
@@ -1895,7 +1892,7 @@ public void WriteValueSafe<T>(in NativeArray<T> value)
             {
                 throw new OverflowException("Writing past the end of the buffer");
             }
-            WriteUnmanaged(value.Length);
+            WriteLength(value.Length);
             foreach (var str in value)
             {
                 WriteValue(str);
@@ -1909,7 +1906,6 @@ public void WriteValueSafe<T>(in NativeArray<T> value)
         /// for multiple writes at once by calling TryBeginWrite.
         /// </summary>
         /// <param name="value">the value to write</param>
-        /// <param name="unused">An unused parameter used for enabling overload resolution based on generic constraints</param>
         /// <typeparam name="T">The type being serialized</typeparam>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void WriteValueSafe<T>(in NativeList<T> value)
@@ -1919,7 +1915,7 @@ public void WriteValueSafe<T>(in NativeList<T> value)
             {
                 throw new OverflowException("Writing past the end of the buffer");
             }
-            WriteUnmanaged(value.Length);
+            WriteLength(value.Length);
             foreach (var str in value)
             {
                 WriteValue(str);
diff --git a/com.unity.netcode.gameobjects/Runtime/Serialization/ForceNetworkSerializeByMemcpy.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/ForceNetworkSerializeByMemcpy.cs
index 64cdf755a5..7282db3601 100644
--- a/com.unity.netcode.gameobjects/Runtime/Serialization/ForceNetworkSerializeByMemcpy.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Serialization/ForceNetworkSerializeByMemcpy.cs
@@ -6,7 +6,7 @@ namespace Unity.Netcode
     /// This is a wrapper that adds `INetworkSerializeByMemcpy` support to existing structs that the developer
     /// doesn't have the ability to modify (for example, external structs like `Guid`).
     /// </summary>
-    /// <typeparam name="T"></typeparam>
+    /// <typeparam name="T">The type to be wrapped, must be unmanaged and implement IEquatable{T}</typeparam>
     public struct ForceNetworkSerializeByMemcpy<T> : INetworkSerializeByMemcpy, IEquatable<ForceNetworkSerializeByMemcpy<T>> where T : unmanaged, IEquatable<T>
     {
         /// <summary>
diff --git a/com.unity.netcode.gameobjects/Runtime/Serialization/IReaderWriter.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/IReaderWriter.cs
index bdddec4924..2ec4f7b95d 100644
--- a/com.unity.netcode.gameobjects/Runtime/Serialization/IReaderWriter.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Serialization/IReaderWriter.cs
@@ -145,7 +145,6 @@ void SerializeValue<T>(ref T value, FastBufferWriter.ForFixedStrings unused = de
         /// </summary>
         /// <param name="value">The value to read/write</param>
         /// <param name="allocator">The allocator to use to construct the resulting NativeArray when reading</param>
-        /// <param name="unused">An unused parameter used for enabling overload resolution based on generic constraints</param>
         /// <typeparam name="T">The type being serialized</typeparam>
         void SerializeValue<T>(ref NativeArray<T> value, Allocator allocator)
             where T : unmanaged, INativeList<byte>, IUTF8Bytes;
@@ -155,7 +154,6 @@ void SerializeValue<T>(ref NativeArray<T> value, Allocator allocator)
         /// Read or write a NativeList of FixedString values
         /// </summary>
         /// <param name="value">The value to read/write</param>
-        /// <param name="unused">An unused parameter used for enabling overload resolution based on generic constraints</param>
         /// <typeparam name="T">The type being serialized</typeparam>
         void SerializeValue<T>(ref NativeList<T> value)
             where T : unmanaged, INativeList<byte>, IUTF8Bytes;
@@ -295,8 +293,11 @@ void SerializeValue<T>(ref NativeList<T> value)
         /// SerializeValuePreChecked methods. But note that the benefit is small and only likely to be
         /// noticeable if serializing a very large number of items.
         /// </summary>
-        /// <param name="amount"></param>
-        /// <returns></returns>
+        /// <param name="amount">The number of bytes to check for availability in the buffer</param>
+        /// <returns>
+        /// True if there is sufficient space for the specified amount of bytes.
+        /// False if there isn't enough space available.
+        /// </returns>
         bool PreCheck(int amount);
 
         /// <summary>
diff --git a/com.unity.netcode.gameobjects/Runtime/Serialization/NetworkBehaviourReference.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/NetworkBehaviourReference.cs
index 70c4b5e87a..19cecefc48 100644
--- a/com.unity.netcode.gameobjects/Runtime/Serialization/NetworkBehaviourReference.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Serialization/NetworkBehaviourReference.cs
@@ -5,9 +5,7 @@ namespace Unity.Netcode
 {
     /// <summary>
     /// A helper struct for serializing <see cref="NetworkBehaviour"/>s over the network. Can be used in RPCs and <see cref="NetworkVariable{T}"/>.
-    /// Network IDs get recycled by the NetworkManager after a while, so using a NetworkBehaviourReference for too long may result in a
-    /// different NetworkBehaviour being returned for the assigned NetworkBehaviourId. NetworkBehaviourReferences are best for short-term
-    /// use when receieved via RPC or custom message, rather than for long-term references to NetworkBehaviours.
+    /// Note: network ids get recycled by the NetworkManager after a while. So a reference pointing to
     /// </summary>
     public struct NetworkBehaviourReference : INetworkSerializable, IEquatable<NetworkBehaviourReference>
     {
@@ -15,11 +13,12 @@ public struct NetworkBehaviourReference : INetworkSerializable, IEquatable<Netwo
         private ushort m_NetworkBehaviourId;
         private static ushort s_NullId = ushort.MaxValue;
 
+
         /// <summary>
         /// Creates a new instance of the <see cref="NetworkBehaviourReference{T}"/> struct.
         /// </summary>
         /// <param name="networkBehaviour">The <see cref="NetworkBehaviour"/> to reference.</param>
-        /// <exception cref="ArgumentException"></exception>
+        /// <exception cref="ArgumentException">Thrown when the provided NetworkBehaviour does not have an associated NetworkObject. This can happen if the behaviour is not properly attached to a networked GameObject.</exception>
         public NetworkBehaviourReference(NetworkBehaviour networkBehaviour)
         {
             if (networkBehaviour == null)
@@ -69,6 +68,7 @@ private static NetworkBehaviour GetInternal(NetworkBehaviourReference networkBeh
             {
                 return null;
             }
+
             if (networkBehaviourRef.m_NetworkObjectReference.TryGet(out NetworkObject networkObject, networkManager))
             {
                 return networkObject.GetNetworkBehaviourAtOrderIndex(networkBehaviourRef.m_NetworkBehaviourId);
diff --git a/com.unity.netcode.gameobjects/Runtime/Serialization/NetworkObjectReference.cs b/com.unity.netcode.gameobjects/Runtime/Serialization/NetworkObjectReference.cs
index c2f1ba46f1..32ab0ed162 100644
--- a/com.unity.netcode.gameobjects/Runtime/Serialization/NetworkObjectReference.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Serialization/NetworkObjectReference.cs
@@ -25,7 +25,8 @@ public ulong NetworkObjectId
         /// Creates a new instance of the <see cref="NetworkObjectReference"/> struct.
         /// </summary>
         /// <param name="networkObject">The <see cref="NetworkObject"/> to reference.</param>
-        /// <exception cref="ArgumentException"></exception>
+        /// <exception cref="ArgumentNullException">Thrown when networkObject is null (creates a null reference instead of throwing)</exception>
+        /// <exception cref="ArgumentException">Thrown when the NetworkObject is not spawned. NetworkObjectReference can only be created from spawned NetworkObjects</exception>
         public NetworkObjectReference(NetworkObject networkObject)
         {
             if (networkObject == null)
@@ -46,7 +47,8 @@ public NetworkObjectReference(NetworkObject networkObject)
         /// Creates a new instance of the <see cref="NetworkObjectReference"/> struct.
         /// </summary>
         /// <param name="gameObject">The GameObject from which the <see cref="NetworkObject"/> component will be referenced.</param>
-        /// <exception cref="ArgumentException"></exception>
+        /// <exception cref="ArgumentNullException">Thrown when networkObject is null (creates a null reference instead of throwing)</exception>
+        /// <exception cref="ArgumentException">Thrown when the NetworkObject is not spawned. NetworkObjectReference can only be created from spawned NetworkObjects</exception>
         public NetworkObjectReference(GameObject gameObject)
         {
             if (gameObject == null)
@@ -60,6 +62,7 @@ public NetworkObjectReference(GameObject gameObject)
             {
                 throw new ArgumentException($"Cannot create {nameof(NetworkObjectReference)} from {nameof(GameObject)} without a {nameof(NetworkObject)} component.");
             }
+
             if (networkObject.IsSpawned == false)
             {
                 throw new ArgumentException($"{nameof(NetworkObjectReference)} can only be created from spawned {nameof(NetworkObject)}s.");
diff --git a/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkPrefabHandler.cs b/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkPrefabHandler.cs
index bb0afc4f3a..3b39eb8938 100644
--- a/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkPrefabHandler.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkPrefabHandler.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using TrollKing.Core;
 using UnityEngine;
 
 namespace Unity.Netcode
@@ -24,7 +25,7 @@ public interface INetworkPrefabInstanceHandler
         /// <param name="ownerClientId">the owner for the <see cref="NetworkObject"/> to be instantiated</param>
         /// <param name="position">the initial/default position for the <see cref="NetworkObject"/> to be instantiated</param>
         /// <param name="rotation">the initial/default rotation for the <see cref="NetworkObject"/> to be instantiated</param>
-        /// <returns></returns>
+        /// <returns>The instantiated NetworkObject instance. Returns null if instantiation fails.</returns>
         NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaternion rotation);
 
         /// <summary>
@@ -50,6 +51,8 @@ public interface INetworkPrefabInstanceHandler
     /// </summary>
     public class NetworkPrefabHandler
     {
+        private static readonly NetworkLogScope k_Log = new NetworkLogScope(nameof(NetworkPrefabHandler));
+
         private NetworkManager m_NetworkManager;
 
         /// <summary>
@@ -81,7 +84,7 @@ public bool AddHandler(GameObject networkPrefabAsset, INetworkPrefabInstanceHand
         /// </summary>
         /// <param name="prefabAssetNetworkObject"> the <see cref="NetworkObject"/> of the network prefab asset to be overridden</param>
         /// <param name="instanceHandler">the class that implements the <see cref="INetworkPrefabInstanceHandler"/> interface to be registered</param>
-        /// <returns></returns>
+        /// <returns>true (registered) false (failed to register)</returns>
         public bool AddHandler(NetworkObject prefabAssetNetworkObject, INetworkPrefabInstanceHandler instanceHandler)
         {
             return AddHandler(prefabAssetNetworkObject.GlobalObjectIdHash, instanceHandler);
@@ -92,7 +95,7 @@ public bool AddHandler(NetworkObject prefabAssetNetworkObject, INetworkPrefabIns
         /// </summary>
         /// <param name="globalObjectIdHash"> the <see cref="NetworkObject.GlobalObjectIdHash"/> value of the network prefab asset being overridden</param>
         /// <param name="instanceHandler">a class that implements the <see cref="INetworkPrefabInstanceHandler"/> interface</param>
-        /// <returns></returns>
+        /// <returns>true (registered) false (failed to register)</returns>
         public bool AddHandler(uint globalObjectIdHash, INetworkPrefabInstanceHandler instanceHandler)
         {
             if (!m_PrefabAssetToPrefabHandler.ContainsKey(globalObjectIdHash))
@@ -315,7 +318,12 @@ public GameObject GetNetworkPrefabOverride(GameObject gameObject)
                         case NetworkPrefabOverride.Hash:
                         case NetworkPrefabOverride.Prefab:
                             {
-                                return m_NetworkManager.NetworkConfig.Prefabs.NetworkPrefabOverrideLinks[networkObject.GlobalObjectIdHash].OverridingTargetPrefab;
+                                var res = m_NetworkManager.NetworkConfig.Prefabs.NetworkPrefabOverrideLinks[networkObject.GlobalObjectIdHash].OverridingTargetPrefab;
+                                k_Log.Debug(() => $"NetworkPrefabHandler GetNetworkPrefabOverride [gameObject={gameObject.name}] [networkPrefab={networkObject.GlobalObjectIdHash}]" +
+                                          $"[overrideType={m_NetworkManager.NetworkConfig.Prefabs.NetworkPrefabOverrideLinks[networkObject.GlobalObjectIdHash].Override}]" +
+                                          $"[overrideObj={m_NetworkManager.NetworkConfig.Prefabs.NetworkPrefabOverrideLinks[networkObject.GlobalObjectIdHash].OverridingTargetPrefab}]");
+
+                                return res;
                             }
                     }
                 }
@@ -343,8 +351,8 @@ public GameObject GetNetworkPrefabOverride(GameObject gameObject)
         /// should not be relied on and code shouldn't be written around it - your code should be written so that
         /// the asset is expected to be loaded before it's needed.
         /// </summary>
-        /// <param name="prefab"></param>
-        /// <exception cref="Exception"></exception>
+        /// <param name="prefab">The GameObject with NetworkObject component to add as a network prefab</param>
+        /// <exception cref="Exception">Thrown when adding prefabs after startup with ForceSamePrefabs is enabled or prefab doesn't have a NetworkObject component</exception>
         public void AddNetworkPrefab(GameObject prefab)
         {
             if (m_NetworkManager.IsListening && m_NetworkManager.NetworkConfig.ForceSamePrefabs)
@@ -360,12 +368,18 @@ public void AddNetworkPrefab(GameObject prefab)
 
             var networkPrefab = new NetworkPrefab { Prefab = prefab };
             bool added = m_NetworkManager.NetworkConfig.Prefabs.Add(networkPrefab);
+            k_Log.Debug(() => $"NetworkPrefabHandler AddNetworkPrefab prefab={prefab.name} hash={networkObject.GlobalObjectIdHash}");
             if (m_NetworkManager.IsListening && added)
             {
                 m_NetworkManager.DeferredMessageManager.ProcessTriggers(IDeferredNetworkMessageManager.TriggerType.OnAddPrefab, networkObject.GlobalObjectIdHash);
             }
         }
 
+        public IReadOnlyList<NetworkPrefab> GetPrefabs()
+        {
+            return m_NetworkManager.NetworkConfig.Prefabs.Prefabs;
+        }
+
         /// <summary>
         /// Remove a prefab from the prefab list.
         /// As with AddNetworkPrefab, this is specific to the client it's called on -
@@ -375,7 +389,8 @@ public void AddNetworkPrefab(GameObject prefab)
         /// Like AddNetworkPrefab, when NetworkConfig.ForceSamePrefabs is enabled,
         /// this cannot be called after connecting.
         /// </summary>
-        /// <param name="prefab"></param>
+        /// <param name="prefab">The GameObject to remove from the network prefab list</param>
+        /// <exception cref="Exception">Thrown when attempting to remove prefabs after startup with ForceSamePrefabs enabled</exception>
         public void RemoveNetworkPrefab(GameObject prefab)
         {
             if (m_NetworkManager.IsListening && m_NetworkManager.NetworkConfig.ForceSamePrefabs)
@@ -405,6 +420,7 @@ internal void RegisterPlayerPrefab()
                     //In the event there is no NetworkPrefab entry (i.e. no override for default player prefab)
                     if (!networkConfig.Prefabs.NetworkPrefabOverrideLinks.ContainsKey(playerPrefabNetworkObject.GlobalObjectIdHash))
                     {
+                        k_Log.Debug(() => $"[NetworkPrefabHandler] RegisterPlayerPrefab - PlayerPrefab={networkConfig.PlayerPrefab.name} hash={playerPrefabNetworkObject.GlobalObjectIdHash}");
                         //Then add a new entry for the player prefab
                         AddNetworkPrefab(networkConfig.PlayerPrefab);
                     }
diff --git a/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs b/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs
index 8c1c3ac3d2..86a116ee0d 100644
--- a/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Spawning/NetworkSpawnManager.cs
@@ -1,7 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using System.Text;
 using UnityEngine;
+using TrollKing.Core;
 
 namespace Unity.Netcode
 {
@@ -10,9 +13,12 @@ namespace Unity.Netcode
     /// </summary>
     public class NetworkSpawnManager
     {
+        private static readonly NetworkLogScope Log = new NetworkLogScope(nameof(NetworkSpawnManager));
         // Stores the objects that need to be shown at end-of-frame
         internal Dictionary<ulong, List<NetworkObject>> ObjectsToShowToClient = new Dictionary<ulong, List<NetworkObject>>();
 
+        internal Dictionary<NetworkObject, List<ulong>> ClientsToShowObject = new Dictionary<NetworkObject, List<ulong>>();
+
         /// <summary>
         /// The currently spawned objects
         /// </summary>
@@ -40,6 +46,122 @@ public class NetworkSpawnManager
         /// </summary>
         private Dictionary<ulong, ulong> m_ObjectToOwnershipTable = new Dictionary<ulong, ulong>();
 
+        /// <summary>
+        /// In distributed authority mode, a list of known spawned player NetworkObject instance is maintained by each client.
+        /// </summary>
+        public IReadOnlyList<NetworkObject> PlayerObjects => m_PlayerObjects;
+        // Since NetworkSpawnManager is destroyed when NetworkManager shuts down, it will always be an empty list for each new network session.
+        // DANGO-TODO: We need to add something like a ConnectionStateMessage that is sent by either the DAHost or CMBService to each client when a client
+        // is connected and synchronized or when a cient disconnects (but the player objects list we should keep as it is useful to have).
+        private List<NetworkObject> m_PlayerObjects = new List<NetworkObject>();
+
+        private Dictionary<ulong, List<NetworkObject>> m_PlayerObjectsTable = new Dictionary<ulong, List<NetworkObject>>();
+
+        /// <summary>
+        /// Returns the connect client identifiers
+        /// </summary>
+        /// <returns>connected client identifier list</returns>
+        public List<ulong> GetConnectedPlayers()
+        {
+            return m_PlayerObjectsTable.Keys.ToList();
+        }
+
+        /// <summary>
+        /// Adds a player object and updates all other players' observers list
+        /// </summary>
+        private void AddPlayerObject(NetworkObject playerObject)
+        {
+            if (!playerObject.IsPlayerObject)
+            {
+                if (NetworkManager.LogLevel == LogLevel.Normal)
+                {
+                    NetworkLog.LogError($"Attempting to register a {nameof(NetworkObject)} as a player object but {nameof(NetworkObject.IsPlayerObject)} is not set!");
+                    return;
+                }
+            }
+
+            foreach (var player in m_PlayerObjects)
+            {
+                // If the player's SpawnWithObservers is not set then do not add the new player object's owner as an observer.
+                if (player.SpawnWithObservers)
+                {
+                    player.Observers.Add(playerObject.OwnerClientId);
+                }
+
+                // If the new player object's SpawnWithObservers is not set then do not add this player as an observer to the new player object.
+                if (playerObject.SpawnWithObservers)
+                {
+                    playerObject.Observers.Add(player.OwnerClientId);
+                }
+            }
+
+            // Only if spawn with observers is set or we are using a distributed authority network topology and this is the client's player should we add
+            // the owner as an observer.
+            if (playerObject.SpawnWithObservers || (NetworkManager.DistributedAuthorityMode && NetworkManager.LocalClientId == playerObject.OwnerClientId))
+            {
+                playerObject.Observers.Add(playerObject.OwnerClientId);
+            }
+
+            m_PlayerObjects.Add(playerObject);
+            if (!m_PlayerObjectsTable.ContainsKey(playerObject.OwnerClientId))
+            {
+                m_PlayerObjectsTable.Add(playerObject.OwnerClientId, new List<NetworkObject>());
+            }
+            m_PlayerObjectsTable[playerObject.OwnerClientId].Add(playerObject);
+        }
+
+        internal void UpdateNetworkClientPlayer(NetworkObject playerObject)
+        {
+            // If the player's client does not already have a NetworkClient entry
+            if (!NetworkManager.ConnectionManager.ConnectedClients.ContainsKey(playerObject.OwnerClientId))
+            {
+                // Add the player's client
+                NetworkManager.ConnectionManager.AddClient(playerObject.OwnerClientId);
+            }
+            var playerNetworkClient = NetworkManager.ConnectionManager.ConnectedClients[playerObject.OwnerClientId];
+
+            // If a client changes their player object, then we should adjust for the client's new player
+            if (playerNetworkClient.PlayerObject != null && m_PlayerObjects.Contains(playerNetworkClient.PlayerObject))
+            {
+                // Just remove the previous player object but keep the assigned observers of the NetworkObject
+                RemovePlayerObject(playerNetworkClient.PlayerObject);
+            }
+
+            // Now update the associated NetworkClient's player object
+            NetworkManager.ConnectionManager.ConnectedClients[playerObject.OwnerClientId].AssignPlayerObject(ref playerObject);
+            AddPlayerObject(playerObject);
+        }
+
+        /// <summary>
+        /// Removes a player object and updates all other players' observers list
+        /// </summary>
+        private void RemovePlayerObject(NetworkObject playerObject, bool destroyingObject = false)
+        {
+            if (!playerObject.IsPlayerObject)
+            {
+                if (NetworkManager.LogLevel == LogLevel.Normal)
+                {
+                    NetworkLog.LogError($"Attempting to deregister a {nameof(NetworkObject)} as a player object but {nameof(NetworkObject.IsPlayerObject)} is not set!");
+                    return;
+                }
+            }
+            playerObject.IsPlayerObject = false;
+            m_PlayerObjects.Remove(playerObject);
+            if (m_PlayerObjectsTable.ContainsKey(playerObject.OwnerClientId))
+            {
+                m_PlayerObjectsTable[playerObject.OwnerClientId].Remove(playerObject);
+                if (m_PlayerObjectsTable[playerObject.OwnerClientId].Count == 0)
+                {
+                    m_PlayerObjectsTable.Remove(playerObject.OwnerClientId);
+                }
+            }
+
+            if (NetworkManager.ConnectionManager.ConnectedClients.ContainsKey(playerObject.OwnerClientId) && destroyingObject)
+            {
+                NetworkManager.ConnectionManager.ConnectedClients[playerObject.OwnerClientId].PlayerObject = null;
+            }
+        }
+
         internal void MarkObjectForShowingTo(NetworkObject networkObject, ulong clientId)
         {
             if (!ObjectsToShowToClient.ContainsKey(clientId))
@@ -47,11 +169,30 @@ internal void MarkObjectForShowingTo(NetworkObject networkObject, ulong clientId
                 ObjectsToShowToClient.Add(clientId, new List<NetworkObject>());
             }
             ObjectsToShowToClient[clientId].Add(networkObject);
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                if (!ClientsToShowObject.ContainsKey(networkObject))
+                {
+                    ClientsToShowObject.Add(networkObject, new List<ulong>());
+                }
+                ClientsToShowObject[networkObject].Add(clientId);
+            }
         }
 
         // returns whether any matching objects would have become visible and were returned to hidden state
         internal bool RemoveObjectFromShowingTo(NetworkObject networkObject, ulong clientId)
         {
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                if (ClientsToShowObject.ContainsKey(networkObject))
+                {
+                    ClientsToShowObject[networkObject].Remove(clientId);
+                    if (ClientsToShowObject[networkObject].Count == 0)
+                    {
+                        ClientsToShowObject.Remove(networkObject);
+                    }
+                }
+            }
             var ret = false;
             if (!ObjectsToShowToClient.ContainsKey(clientId))
             {
@@ -95,6 +236,11 @@ internal void UpdateOwnershipTable(NetworkObject networkObject, ulong newOwner,
                 }
                 else
                 {
+                    // If we already had this owner in our table then just exit
+                    if (NetworkManager.DistributedAuthorityMode && previousOwner == newOwner)
+                    {
+                        return;
+                    }
                     m_ObjectToOwnershipTable[networkObject.NetworkObjectId] = newOwner;
                 }
             }
@@ -142,24 +288,24 @@ internal void UpdateOwnershipTable(NetworkObject networkObject, ulong newOwner,
             {
                 OwnershipToObjectsTable[previousOwner].Remove(networkObject.NetworkObjectId);
             }
-            else if (NetworkManager.LogLevel == LogLevel.Developer)
+            else if (NetworkManager.LogLevel == LogLevel.Developer && previousOwner == newOwner)
             {
                 NetworkLog.LogWarning($"Setting ownership twice? Client-ID {previousOwner} already owns NetworkObject ID {networkObject.NetworkObjectId}!");
             }
         }
 
         /// <summary>
-        /// Returns a list of all NetworkObjects that belong to a client.
+        /// Returns an array of all NetworkObjects that belong to a client.
         /// </summary>
-        /// <param name="clientId">the client's id  <see cref="NetworkManager.LocalClientId"/></param>
-        /// <returns>returns the list of <see cref="NetworkObject"/>s owned by the client</returns>
-        public List<NetworkObject> GetClientOwnedObjects(ulong clientId)
+        /// <param name="clientId">the client's id <see cref="NetworkManager.LocalClientId"/></param>
+        /// <returns>returns an array of the <see cref="NetworkObject"/>s owned by the client</returns>
+        public NetworkObject[] GetClientOwnedObjects(ulong clientId)
         {
             if (!OwnershipToObjectsTable.ContainsKey(clientId))
             {
                 OwnershipToObjectsTable.Add(clientId, new Dictionary<ulong, NetworkObject>());
             }
-            return OwnershipToObjectsTable[clientId].Values.ToList();
+            return OwnershipToObjectsTable[clientId].Values.ToArray();
         }
 
         /// <summary>
@@ -182,7 +328,8 @@ internal ulong GetNetworkObjectId()
 
             m_NetworkObjectIdCounter++;
 
-            return m_NetworkObjectIdCounter;
+            // DANGO-TODO: Need a more robust solution here.
+            return m_NetworkObjectIdCounter + (NetworkManager.LocalClientId * 10000);
         }
 
         /// <summary>
@@ -194,6 +341,19 @@ public NetworkObject GetLocalPlayerObject()
             return GetPlayerNetworkObject(NetworkManager.LocalClientId);
         }
 
+        /// <summary>
+        /// Returns all <see cref="NetworkObject"/> instances assigned to the client identifier
+        /// </summary>
+        /// <param name="clientId">the client identifier of the player</param>
+        /// <returns>A list of <see cref="NetworkObject"/> instances (if more than one are assigned)</returns>
+        public List<NetworkObject> GetPlayerNetworkObjects(ulong clientId)
+        {
+            if (m_PlayerObjectsTable.ContainsKey(clientId))
+            {
+                return m_PlayerObjectsTable[clientId];
+            }
+            return null;
+        }
 
         /// <summary>
         /// Returns the player object with a given clientId or null if one does not exist. This is only valid server side.
@@ -202,14 +362,23 @@ public NetworkObject GetLocalPlayerObject()
         /// <returns>The player object with a given clientId or null if one does not exist</returns>
         public NetworkObject GetPlayerNetworkObject(ulong clientId)
         {
-            if (!NetworkManager.IsServer && NetworkManager.LocalClientId != clientId)
+            if (!NetworkManager.DistributedAuthorityMode)
             {
-                throw new NotServerException("Only the server can find player objects from other clients.");
+                if (!NetworkManager.IsServer && NetworkManager.LocalClientId != clientId)
+                {
+                    throw new NotServerException("Only the server can find player objects from other clients.");
+                }
+                if (TryGetNetworkClient(clientId, out NetworkClient networkClient))
+                {
+                    return networkClient.PlayerObject;
+                }
             }
-
-            if (TryGetNetworkClient(clientId, out NetworkClient networkClient))
+            else
             {
-                return networkClient.PlayerObject;
+                if (m_PlayerObjectsTable.ContainsKey(clientId))
+                {
+                    return m_PlayerObjectsTable[clientId].First();
+                }
             }
 
             return null;
@@ -240,14 +409,111 @@ private bool TryGetNetworkClient(ulong clientId, out NetworkClient networkClient
             return false;
         }
 
+        /// <summary>
+        /// Not used.
+        /// </summary>
+        /// <param name="perviousOwner">not used</param>
+        /// <param name="newOwner">not used</param>
+        protected virtual void InternalOnOwnershipChanged(ulong perviousOwner, ulong newOwner)
+        {
+
+        }
+
         internal void RemoveOwnership(NetworkObject networkObject)
         {
-            ChangeOwnership(networkObject, NetworkManager.ServerClientId);
+            if (NetworkManager.DistributedAuthorityMode && !NetworkManager.ShutdownInProgress)
+            {
+                Debug.LogError($"Removing ownership is invalid in Distributed Authority Mode. Use {nameof(ChangeOwnership)} instead.");
+                return;
+            }
+            ChangeOwnership(networkObject, NetworkManager.ServerClientId, true);
         }
 
-        internal void ChangeOwnership(NetworkObject networkObject, ulong clientId)
+        private Dictionary<ulong, float> m_LastChangeInOwnership = new Dictionary<ulong, float>();
+        private const int k_MaximumTickOwnershipChangeMultiplier = 6;
+
+        internal void ChangeOwnership(NetworkObject networkObject, ulong clientId, bool isAuthorized, bool isRequestApproval = false)
         {
-            if (!NetworkManager.IsServer)
+            if (clientId == networkObject.OwnerClientId)
+            {
+                if (NetworkManager.LogLevel <= LogLevel.Developer)
+                {
+                    Debug.LogWarning($"[{nameof(NetworkSpawnManager)}][{nameof(ChangeOwnership)}] Attempting to change ownership to Client-{clientId} when the owner is already {networkObject.OwnerClientId}! (Ignoring)");
+                }
+                return;
+            }
+
+            // For client-server:
+            // If ownership changes faster than the latency between the client-server and there are NetworkVariables being updated during ownership changes,
+            // then notify the user they could potentially lose state updates if developer logging is enabled.
+            if (NetworkManager.LogLevel == LogLevel.Developer && !NetworkManager.DistributedAuthorityMode && m_LastChangeInOwnership.ContainsKey(networkObject.NetworkObjectId) && m_LastChangeInOwnership[networkObject.NetworkObjectId] > Time.realtimeSinceStartup)
+            {
+                for (int i = 0; i < networkObject.ChildNetworkBehaviours.Count; i++)
+                {
+                    if (networkObject.ChildNetworkBehaviours[i].NetworkVariableFields.Count > 0)
+                    {
+                        NetworkLog.LogWarningServer($"[Rapid Ownership Change Detected][Potential Loss in State] Detected a rapid change in ownership that exceeds a frequency less than {k_MaximumTickOwnershipChangeMultiplier}x the current network tick rate! Provide at least {k_MaximumTickOwnershipChangeMultiplier}x the current network tick rate between ownership changes to avoid NetworkVariable state loss.");
+                        break;
+                    }
+                }
+            }
+
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                // Ensure only the session owner can change ownership (i.e. acquire) and that the session owner is not trying to assign a non-session owner client
+                // ownership of a NetworkObject with SessionOwner permissions.
+                if (networkObject.IsOwnershipSessionOwner && (!NetworkManager.LocalClient.IsSessionOwner || clientId != NetworkManager.CurrentSessionOwner))
+                {
+                    if (NetworkManager.LogLevel <= LogLevel.Developer)
+                    {
+                        NetworkLog.LogErrorServer($"[{networkObject.name}][Session Owner Only] You cannot change ownership of a {nameof(NetworkObject)} that has the {NetworkObject.OwnershipStatus.SessionOwner} flag set!");
+                    }
+                    networkObject.OnOwnershipPermissionsFailure?.Invoke(NetworkObject.OwnershipPermissionsFailureStatus.SessionOwnerOnly);
+                    return;
+                }
+
+                // If are not authorized and this is not an approved ownership change, then check to see if we can change ownership
+                if (!isAuthorized && !isRequestApproval)
+                {
+                    if (networkObject.IsOwnershipLocked)
+                    {
+                        if (NetworkManager.LogLevel <= LogLevel.Developer)
+                        {
+                            NetworkLog.LogErrorServer($"[{networkObject.name}][Locked] You cannot change ownership while a {nameof(NetworkObject)} is locked!");
+                        }
+                        networkObject.OnOwnershipPermissionsFailure?.Invoke(NetworkObject.OwnershipPermissionsFailureStatus.Locked);
+                        return;
+                    }
+                    if (networkObject.IsRequestInProgress)
+                    {
+                        if (NetworkManager.LogLevel <= LogLevel.Developer)
+                        {
+                            NetworkLog.LogErrorServer($"[{networkObject.name}][Request Pending] You cannot change ownership while a {nameof(NetworkObject)} has a pending ownership request!");
+                        }
+                        networkObject.OnOwnershipPermissionsFailure?.Invoke(NetworkObject.OwnershipPermissionsFailureStatus.RequestInProgress);
+                        return;
+                    }
+                    if (networkObject.IsOwnershipRequestRequired)
+                    {
+                        if (NetworkManager.LogLevel <= LogLevel.Developer)
+                        {
+                            NetworkLog.LogErrorServer($"[{networkObject.name}][Request Required] You cannot change ownership directly if a {nameof(NetworkObject)} has the {NetworkObject.OwnershipStatus.RequestRequired} flag set!");
+                        }
+                        networkObject.OnOwnershipPermissionsFailure?.Invoke(NetworkObject.OwnershipPermissionsFailureStatus.RequestRequired);
+                        return;
+                    }
+                    if (!networkObject.IsOwnershipTransferable)
+                    {
+                        if (NetworkManager.LogLevel <= LogLevel.Developer)
+                        {
+                            NetworkLog.LogErrorServer($"[{networkObject.name}][Not transferrable] You cannot change ownership of a {nameof(NetworkObject)} that does not have the {NetworkObject.OwnershipStatus.Transferable} flag set!");
+                        }
+                        networkObject.OnOwnershipPermissionsFailure?.Invoke(NetworkObject.OwnershipPermissionsFailureStatus.NotTransferrable);
+                        return;
+                    }
+                }
+            }
+            else if (!isAuthorized)
             {
                 throw new NotServerException("Only the server can change ownership");
             }
@@ -257,34 +523,103 @@ internal void ChangeOwnership(NetworkObject networkObject, ulong clientId)
                 throw new SpawnStateException("Object is not spawned");
             }
 
-            var previous = networkObject.OwnerClientId;
+            if (networkObject.OwnerClientId == clientId && networkObject.PreviousOwnerId == clientId)
+            {
+                if (NetworkManager.LogLevel == LogLevel.Developer)
+                {
+                    NetworkLog.LogWarningServer($"[Already Owner] Unnecessary ownership change for {networkObject.name} as it is already the owned by client-{clientId}");
+                }
+                return;
+            }
+
+            if (!networkObject.Observers.Contains(clientId))
+            {
+                if (NetworkManager.LogLevel == LogLevel.Developer)
+                {
+                    NetworkLog.LogWarningServer($"[Invalid Owner] Cannot send Ownership change as client-{clientId} cannot see {networkObject.name}! Use {nameof(NetworkObject.NetworkShow)} first.");
+                }
+                return;
+            }
+
+            // Save the previous owner to work around a bit of a nasty issue with assuring NetworkVariables are serialized when ownership changes
+            var originalPreviousOwnerId = networkObject.PreviousOwnerId;
+            var originalOwner = networkObject.OwnerClientId;
+
+            // Used to distinguish whether a new owner should receive any currently dirty NetworkVariable updates
+            networkObject.PreviousOwnerId = networkObject.OwnerClientId;
+
             // Assign the new owner
             networkObject.OwnerClientId = clientId;
 
             // Always notify locally on the server when ownership is lost
             networkObject.InvokeBehaviourOnLostOwnership();
 
-            networkObject.MarkVariablesDirty(true);
-            NetworkManager.BehaviourUpdater.AddForUpdate(networkObject);
-
-            // Server adds entries for all client ownership
+            // Authority adds entries for all client ownership
             UpdateOwnershipTable(networkObject, networkObject.OwnerClientId);
 
             // Always notify locally on the server when a new owner is assigned
             networkObject.InvokeBehaviourOnGainedOwnership();
 
-            var message = new ChangeOwnershipMessage
+            // If we are the original owner, then we want to synchronize owner read & write NetworkVariables.
+            if (originalOwner == NetworkManager.LocalClientId)
             {
-                NetworkObjectId = networkObject.NetworkObjectId,
-                OwnerClientId = networkObject.OwnerClientId
-            };
+                networkObject.SynchronizeOwnerNetworkVariables(originalOwner, originalPreviousOwnerId);
+            }
 
-            foreach (var client in NetworkManager.ConnectedClients)
+            var size = 0;
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                var message = new ChangeOwnershipMessage
+                {
+                    NetworkObjectId = networkObject.NetworkObjectId,
+                    OwnerClientId = networkObject.OwnerClientId,
+                    DistributedAuthorityMode = NetworkManager.DistributedAuthorityMode,
+                    RequestApproved = isRequestApproval,
+                    OwnershipIsChanging = true,
+                    RequestClientId = networkObject.PreviousOwnerId,
+                    OwnershipFlags = (ushort)networkObject.Ownership,
+                };
+                // If we are connected to the CMB service or not the DAHost (i.e. pure DA-Clients only)
+                if (NetworkManager.CMBServiceConnection || !NetworkManager.DAHost)
+                {
+                    // Always update the network properties in distributed authority mode for the client gaining ownership
+                    for (int i = 0; i < networkObject.ChildNetworkBehaviours.Count; i++)
+                    {
+                        networkObject.ChildNetworkBehaviours[i].UpdateNetworkProperties();
+                    }
+                    size = NetworkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableSequenced, NetworkManager.ServerClientId);
+                    NetworkManager.NetworkMetrics.TrackOwnershipChangeSent(NetworkManager.LocalClientId, networkObject, size);
+                }
+                else // We are the DAHost so broadcast the ownership change
+                {
+                    foreach (var client in NetworkManager.ConnectedClients)
+                    {
+                        if (client.Value.ClientId == NetworkManager.ServerClientId)
+                        {
+                            continue;
+                        }
+                        if (networkObject.IsNetworkVisibleTo(client.Value.ClientId))
+                        {
+                            size = NetworkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableSequenced, client.Value.ClientId);
+                            NetworkManager.NetworkMetrics.TrackOwnershipChangeSent(client.Key, networkObject, size);
+                        }
+                    }
+                }
+            }
+            else // Normal Client-Server mode
             {
-                if (networkObject.IsNetworkVisibleTo(client.Value.ClientId))
+                var message = new ChangeOwnershipMessage
+                {
+                    NetworkObjectId = networkObject.NetworkObjectId,
+                    OwnerClientId = networkObject.OwnerClientId,
+                };
+                foreach (var client in NetworkManager.ConnectedClients)
                 {
-                    var size = NetworkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableSequenced, client.Value.ClientId);
-                    NetworkManager.NetworkMetrics.TrackOwnershipChangeSent(client.Key, networkObject, size);
+                    if (networkObject.IsNetworkVisibleTo(client.Value.ClientId))
+                    {
+                        size = NetworkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableSequenced, client.Value.ClientId);
+                        NetworkManager.NetworkMetrics.TrackOwnershipChangeSent(client.Key, networkObject, size);
+                    }
                 }
             }
 
@@ -292,7 +627,18 @@ internal void ChangeOwnership(NetworkObject networkObject, ulong clientId)
             /// !!Important!!
             /// This gets called specifically *after* sending the ownership message so any additional messages that need to proceed an ownership
             /// change can be sent from NetworkBehaviours that override the <see cref="NetworkBehaviour.OnOwnershipChanged"></see>
-            networkObject.InvokeOwnershipChanged(previous, clientId);
+            networkObject.InvokeOwnershipChanged(networkObject.PreviousOwnerId, clientId);
+
+            // Keep track of the ownership change frequency to assure a user is not exceeding changes faster than 2x the current Tick Rate.
+            if (!NetworkManager.DistributedAuthorityMode)
+            {
+                if (!m_LastChangeInOwnership.ContainsKey(networkObject.NetworkObjectId))
+                {
+                    m_LastChangeInOwnership.Add(networkObject.NetworkObjectId, 0.0f);
+                }
+                var tickFrequency = 1.0f / NetworkManager.NetworkConfig.TickRate;
+                m_LastChangeInOwnership[networkObject.NetworkObjectId] = Time.realtimeSinceStartup + (tickFrequency * k_MaximumTickOwnershipChangeMultiplier);
+            }
         }
 
         internal bool HasPrefab(NetworkObject.SceneObject sceneObject)
@@ -367,7 +713,9 @@ public NetworkObject InstantiateAndSpawn(NetworkObject networkPrefab, ulong owne
                 return null;
             }
 
-            if (!NetworkManager.IsServer)
+            ownerClientId = NetworkManager.DistributedAuthorityMode ? NetworkManager.LocalClientId : ownerClientId;
+            // We only need to check for authority when running in client-server mode
+            if (!NetworkManager.IsServer && !NetworkManager.DistributedAuthorityMode)
             {
                 Debug.LogError(InstantiateAndSpawnErrors[InstantiateAndSpawnErrorTypes.NotAuthority]);
                 return null;
@@ -394,13 +742,21 @@ public NetworkObject InstantiateAndSpawn(NetworkObject networkPrefab, ulong owne
         /// </summary>
         internal NetworkObject InstantiateAndSpawnNoParameterChecks(NetworkObject networkPrefab, ulong ownerClientId = NetworkManager.ServerClientId, bool destroyWithScene = false, bool isPlayerObject = false, bool forceOverride = false, Vector3 position = default, Quaternion rotation = default)
         {
-
             var networkObject = networkPrefab;
-            // Host spawns the ovveride and server spawns the original prefab unless forceOverride is set to true where both server or host will spawn the override.
-            if (forceOverride || NetworkManager.IsHost)
+            // - Host and clients always instantiate the override if one exists.
+            // - Server instantiates the original prefab unless:
+            // -- forceOverride is set to true =or=
+            // -- The prefab has a registered prefab handler, then we let user code determine what to spawn.
+            // - Distributed authority mode always spawns the override if one exists.
+            if (forceOverride || NetworkManager.IsClient || NetworkManager.DistributedAuthorityMode || NetworkManager.PrefabHandler.ContainsHandler(networkPrefab.GlobalObjectIdHash))
             {
                 networkObject = GetNetworkObjectToSpawn(networkPrefab.GlobalObjectIdHash, ownerClientId, position, rotation);
             }
+            else // Under this case, server instantiate the prefab passed in.
+            {
+                networkObject = InstantiateNetworkPrefab(networkPrefab.gameObject, networkPrefab.GlobalObjectIdHash, position, rotation);
+            }
+
             if (networkObject == null)
             {
                 Debug.LogError($"Failed to instantiate and spawn {networkPrefab.name}!");
@@ -409,12 +765,20 @@ internal NetworkObject InstantiateAndSpawnNoParameterChecks(NetworkObject networ
             networkObject.IsPlayerObject = isPlayerObject;
             networkObject.transform.position = position;
             networkObject.transform.rotation = rotation;
-            networkObject.SpawnWithOwnership(ownerClientId, destroyWithScene);
+            // If spawning as a player, then invoke SpawnAsPlayerObject
+            if (isPlayerObject)
+            {
+                networkObject.SpawnAsPlayerObject(ownerClientId, destroyWithScene);
+            }
+            else // Otherwise just spawn with ownership
+            {
+                networkObject.SpawnWithOwnership(ownerClientId, destroyWithScene);
+            }
             return networkObject;
         }
 
         /// <summary>
-        /// Gets the right NetworkObject prefab instance to spawn. If a handler is registered or there is an override assigned to the 
+        /// Gets the right NetworkObject prefab instance to spawn. If a handler is registered or there is an override assigned to the
         /// passed in globalObjectIdHash value, then that is what will be instantiated, spawned, and returned.
         /// </summary>
         internal NetworkObject GetNetworkObjectToSpawn(uint globalObjectIdHash, ulong ownerId, Vector3? position, Quaternion? rotation, bool isScenePlaced = false)
@@ -446,8 +810,8 @@ internal NetworkObject GetNetworkObjectToSpawn(uint globalObjectIdHash, ulong ow
                         case NetworkPrefabOverride.Hash:
                         case NetworkPrefabOverride.Prefab:
                             {
-                                // When scene management is disabled and this is an in-scene placed NetworkObject, we want to always use the 
-                                // SourcePrefabToOverride and not any possible prefab override as a user might want to spawn overrides dynamically 
+                                // When scene management is disabled and this is an in-scene placed NetworkObject, we want to always use the
+                                // SourcePrefabToOverride and not any possible prefab override as a user might want to spawn overrides dynamically
                                 // but might want to use the same source network prefab as an in-scene placed NetworkObject.
                                 // (When scene management is enabled, clients don't delete their in-scene placed NetworkObjects prior to dynamically
                                 // spawning them so the original prefab placed is preserved and this is not needed)
@@ -474,17 +838,38 @@ internal NetworkObject GetNetworkObjectToSpawn(uint globalObjectIdHash, ulong ow
                 }
                 else
                 {
-                    // Create prefab instance
-                    networkObject = UnityEngine.Object.Instantiate(networkPrefabReference).GetComponent<NetworkObject>();
-                    networkObject.transform.position = position ?? networkObject.transform.position;
-                    networkObject.transform.rotation = rotation ?? networkObject.transform.rotation;
-                    networkObject.NetworkManagerOwner = NetworkManager;
-                    networkObject.PrefabGlobalObjectIdHash = globalObjectIdHash;
+                    // Create prefab instance while applying any pre-assigned position and rotation values
+                    networkObject = InstantiateNetworkPrefab(networkPrefabReference, globalObjectIdHash, position, rotation);
                 }
             }
             return networkObject;
         }
 
+        /// <summary>
+        /// Instantiates a network prefab instance, assigns the base prefab <see cref="NetworkObject.GlobalObjectIdHash"/>, positions, and orients
+        /// the instance.
+        /// !!! Should only be invoked by <see cref="GetNetworkObjectToSpawn"/> unless used by an integration test !!!
+        /// </summary>
+        /// <remarks>
+        /// <param name="prefabGlobalObjectIdHash"> should be the base prefab <see cref="NetworkObject.GlobalObjectIdHash"/> value and not the
+        /// overrided value.
+        /// (Can be used for integration testing)
+        /// </remarks>
+        /// <param name="networkPrefab">prefab to instantiate</param>
+        /// <param name="prefabGlobalObjectIdHash"><see cref="NetworkObject.GlobalObjectIdHash"/> of the base prefab instance</param>
+        /// <param name="position">conditional position in place of the network prefab's default position</param>
+        /// <param name="rotation">conditional rotation in place of the network prefab's default rotation</param>
+        /// <returns>the instance of the <see cref="NetworkObject"/></returns>
+        internal NetworkObject InstantiateNetworkPrefab(GameObject networkPrefab, uint prefabGlobalObjectIdHash, Vector3? position, Quaternion? rotation)
+        {
+            var networkObject = UnityEngine.Object.Instantiate(networkPrefab).GetComponent<NetworkObject>();
+            networkObject.transform.position = position ?? networkObject.transform.position;
+            networkObject.transform.rotation = rotation ?? networkObject.transform.rotation;
+            networkObject.NetworkManagerOwner = NetworkManager;
+            networkObject.PrefabGlobalObjectIdHash = prefabGlobalObjectIdHash;
+            return networkObject;
+        }
+
         /// <summary>
         /// Creates a local NetowrkObject to be spawned.
         /// </summary>
@@ -501,7 +886,6 @@ internal NetworkObject CreateLocalNetworkObject(NetworkObject.SceneObject sceneO
             var scale = sceneObject.HasTransform ? sceneObject.Transform.Scale : default;
             var parentNetworkId = sceneObject.HasParent ? sceneObject.ParentObjectId : default;
             var worldPositionStays = (!sceneObject.HasParent) || sceneObject.WorldPositionStays;
-            var isSpawnedByPrefabHandler = false;
 
             // If scene management is disabled or the NetworkObject was dynamically spawned
             if (!NetworkManager.NetworkConfig.EnableSceneManagement || !sceneObject.IsSceneObject)
@@ -511,7 +895,6 @@ internal NetworkObject CreateLocalNetworkObject(NetworkObject.SceneObject sceneO
             else // Get the in-scene placed NetworkObject
             {
                 networkObject = NetworkManager.SceneManager.GetSceneRelativeInSceneNetworkObject(globalObjectIdHash, sceneObject.NetworkSceneHandle);
-
                 if (networkObject == null)
                 {
                     if (NetworkLog.CurrentLogLevel <= LogLevel.Error)
@@ -532,34 +915,44 @@ internal NetworkObject CreateLocalNetworkObject(NetworkObject.SceneObject sceneO
             {
                 networkObject.DestroyWithScene = sceneObject.DestroyWithScene;
                 networkObject.NetworkSceneHandle = sceneObject.NetworkSceneHandle;
-
+                networkObject.DontDestroyWithOwner = sceneObject.DontDestroyWithOwner;
+                networkObject.Ownership = (NetworkObject.OwnershipStatus)sceneObject.OwnershipFlags;
 
                 var nonNetworkObjectParent = false;
                 // SPECIAL CASE FOR IN-SCENE PLACED:  (only when the parent has a NetworkObject)
                 // This is a special case scenario where a late joining client has joined and loaded one or
                 // more scenes that contain nested in-scene placed NetworkObject children yet the server's
-                // synchronization information does not indicate the NetworkObject in question has a parent.
-                // Under this scenario, we want to remove the parent before spawning and setting the transform values.
+                // synchronization information does not indicate the NetworkObject in question has a parent =or=
+                // the parent has changed.
+                // For this we will want to remove the parent before spawning and setting the transform values based
+                // on several possible scenarios.
                 if (sceneObject.IsSceneObject && networkObject.transform.parent != null)
                 {
                     var parentNetworkObject = networkObject.transform.parent.GetComponent<NetworkObject>();
-                    // if the in-scene placed NetworkObject has a parent NetworkObject but the synchronization information does not
-                    // include parenting, then we need to force the removal of that parent
-                    if (!sceneObject.HasParent && parentNetworkObject)
-                    {
-                        // remove the parent
-                        networkObject.ApplyNetworkParenting(true, true);
-                    }
-                    else if (sceneObject.HasParent && !parentNetworkObject)
+
+                    // special case to handle being parented under a GameObject with no NetworkObject
+                    nonNetworkObjectParent = !parentNetworkObject && sceneObject.HasParent;
+
+                    // If the in-scene placed NetworkObject has a parent NetworkObject...
+                    if (parentNetworkObject)
                     {
-                        nonNetworkObjectParent = true;
+                        // Then remove the parent only if:
+                        // - The authority says we don't have a parent (but locally we do).
+                        // - The auhtority says we have a parent but either of the two are true:
+                        // -- It isn't the same parent.
+                        // -- It was parented using world position stays.
+                        if (!sceneObject.HasParent || (sceneObject.IsLatestParentSet
+                            && (sceneObject.LatestParent.Value != parentNetworkObject.NetworkObjectId || sceneObject.WorldPositionStays)))
+                        {
+                            // If parenting without notifications then we are temporarily removing the parent to set the transform
+                            // values before reparenting under the current parent.
+                            networkObject.ApplyNetworkParenting(true, true, enableNotification: !sceneObject.HasParent);
+                        }
                     }
                 }
 
-                // Set the transform unless we were spawned by a prefab handler
-                // Note: prefab handlers are provided the position and rotation
-                // but it is up to the user to set those values
-                if (sceneObject.HasTransform && !isSpawnedByPrefabHandler)
+                // Set the transform only if the sceneObject includes transform information.
+                if (sceneObject.HasTransform)
                 {
                     // If world position stays is true or we have auto object parent synchronization disabled
                     // then we want to apply the position and rotation values world space relative
@@ -602,7 +995,6 @@ internal NetworkObject CreateLocalNetworkObject(NetworkObject.SceneObject sceneO
                     networkObject.SetNetworkParenting(parentId, worldPositionStays);
                 }
 
-
                 // Dynamically spawned NetworkObjects that occur during a LoadSceneMode.Single load scene event are migrated into the DDOL
                 // until the scene is loaded. They are then migrated back into the newly loaded and currently active scene.
                 if (!sceneObject.IsSceneObject && NetworkSceneManager.IsSpawnedObjectsPendingInDontDestroyOnLoad)
@@ -614,11 +1006,18 @@ internal NetworkObject CreateLocalNetworkObject(NetworkObject.SceneObject sceneO
         }
 
         /// <summary>
-        /// Invoked when spawning locally
+        /// Invoked from:
+        /// - ConnectionManager after instantiating a player prefab when running in client-server.
+        /// - NetworkObject when spawning a newly instantiated NetworkObject for the first time.
+        /// - NetworkSceneManager after a server/session-owner has loaded a scene to locally spawn the newly instantiated in-scene placed NetworkObjects.
+        /// - NetworkSpawnManager when spawning any already loaded in-scene placed NetworkObjects (client-server or session owner).
+        ///
+        /// Client-Server:
+        /// Server is the only instance that invokes this method.
+        ///
+        /// Distributed Authority:
+        /// DAHost client and standard DA clients invoke this method.
         /// </summary>
-        /// <remarks>
-        /// Pre and Post spawn methods *CAN* be invoked prior to invoking <see cref="SpawnNetworkObjectLocallyCommon"/>
-        /// </remarks>
         internal void SpawnNetworkObjectLocally(NetworkObject networkObject, ulong networkId, bool sceneObject, bool playerObject, ulong ownerClientId, bool destroyWithScene)
         {
             if (networkObject == null)
@@ -628,7 +1027,8 @@ internal void SpawnNetworkObjectLocally(NetworkObject networkObject, ulong netwo
 
             if (networkObject.IsSpawned)
             {
-                throw new SpawnStateException("Object is already spawned");
+                Debug.LogError($"{networkObject.name} is already spawned!");
+                return;
             }
 
             if (!sceneObject)
@@ -642,6 +1042,44 @@ internal void SpawnNetworkObjectLocally(NetworkObject networkObject, ulong netwo
             // Invoke NetworkBehaviour.OnPreSpawn methods
             networkObject.InvokeBehaviourNetworkPreSpawn();
 
+            // DANGO-TODO: It would be nice to allow users to specify which clients are observers prior to spawning
+            // For now, this is the best place I could find to add all connected clients as observers for newly
+            // instantiated and spawned NetworkObjects on the authoritative side.
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                if (NetworkManager.NetworkConfig.EnableSceneManagement && sceneObject)
+                {
+                    networkObject.SceneOriginHandle = networkObject.gameObject.scene.handle;
+                    networkObject.NetworkSceneHandle = NetworkManager.SceneManager.ClientSceneHandleToServerSceneHandle[networkObject.gameObject.scene.handle];
+                }
+
+                // Always add the owner/authority even if SpawnWithObservers is false
+                // (authority should not take into consideration networkObject.CheckObjectVisibility when SpawnWithObservers is false)
+                if (!networkObject.SpawnWithObservers)
+                {
+                    networkObject.Observers.Add(ownerClientId);
+                }
+                else
+                {
+                    foreach (var clientId in NetworkManager.ConnectedClientsIds)
+                    {
+                        // If SpawnWithObservers is enabled, then authority does take networkObject.CheckObjectVisibility into consideration
+                        if (networkObject.CheckObjectVisibility != null && !networkObject.CheckObjectVisibility.Invoke(clientId))
+                        {
+                            continue;
+                        }
+                        networkObject.Observers.Add(clientId);
+                    }
+
+                    // Sanity check to make sure the owner is always included
+                    // Itentionally checking as opposed to just assigning in order to generate notification.
+                    if (!networkObject.Observers.Contains(ownerClientId))
+                    {
+                        Debug.LogError($"Client-{ownerClientId} is the owner of {networkObject.name} but is not an observer! Adding owner, but there is a bug in observer synchronization!");
+                        networkObject.Observers.Add(ownerClientId);
+                    }
+                }
+            }
             SpawnNetworkObjectLocallyCommon(networkObject, networkId, sceneObject, playerObject, ownerClientId, destroyWithScene);
 
             // Invoke NetworkBehaviour.OnPostSpawn methods
@@ -649,7 +1087,8 @@ internal void SpawnNetworkObjectLocally(NetworkObject networkObject, ulong netwo
         }
 
         /// <summary>
-        /// Invoked from AddSceneObject
+        /// This is only invoked to instantiate a serialized NetworkObject via
+        /// <see cref="NetworkObject.AddSceneObject(in NetworkObject.SceneObject, FastBufferReader, NetworkManager, bool)"/>
         /// </summary>
         /// <remarks>
         /// IMPORTANT: Pre spawn methods need to be invoked from within <see cref="NetworkObject.AddSceneObject"/>.
@@ -663,7 +1102,7 @@ internal void SpawnNetworkObjectLocally(NetworkObject networkObject, in NetworkO
 
             if (networkObject.IsSpawned)
             {
-                throw new SpawnStateException("Object is already spawned");
+                throw new SpawnStateException($"[{networkObject.name}] Object-{networkObject.NetworkObjectId} is already spawned!");
             }
 
             // Do not invoke Pre spawn here (SynchronizeNetworkBehaviours needs to be invoked prior to this)
@@ -677,7 +1116,7 @@ private void SpawnNetworkObjectLocallyCommon(NetworkObject networkObject, ulong
         {
             if (SpawnedObjects.ContainsKey(networkId))
             {
-                Debug.LogWarning($"Trying to spawn {nameof(NetworkObject.NetworkObjectId)} {networkId} that already exists!");
+                Debug.LogWarning($"[{NetworkManager.name}] Trying to spawn {networkObject.name} with a {nameof(NetworkObject.NetworkObjectId)} of {networkId} but it is already in the spawned list!");
                 return;
             }
 
@@ -702,55 +1141,48 @@ private void SpawnNetworkObjectLocallyCommon(NetworkObject networkObject, ulong
 
             networkObject.DestroyWithScene = sceneObject || destroyWithScene;
 
+            networkObject.IsPlayerObject = playerObject;
+
             networkObject.OwnerClientId = ownerClientId;
 
-            networkObject.IsPlayerObject = playerObject;
+            // When spawned, previous owner is always the first assigned owner
+            networkObject.PreviousOwnerId = ownerClientId;
 
+            // If this the player and the client is the owner, then lock ownership by default
+            if (NetworkManager.DistributedAuthorityMode && NetworkManager.LocalClientId == ownerClientId && playerObject)
+            {
+                networkObject.SetOwnershipLock();
+            }
             SpawnedObjects.Add(networkObject.NetworkObjectId, networkObject);
             SpawnedObjectsList.Add(networkObject);
 
-            if (NetworkManager.IsServer)
-            {
-                if (playerObject)
-                {
-                    // If there was an already existing player object for this player, then mark it as no longer
-                    // a player object.
-                    if (NetworkManager.ConnectedClients[ownerClientId].PlayerObject != null)
-                    {
-                        NetworkManager.ConnectedClients[ownerClientId].PlayerObject.IsPlayerObject = false;
-                    }
-                    NetworkManager.ConnectedClients[ownerClientId].PlayerObject = networkObject;
-                }
-            }
-            else if (ownerClientId == NetworkManager.LocalClientId)
+            // If we are not running in DA mode, this is the server, and the NetworkObject has SpawnWithObservers set,
+            // then add all connected clients as observers
+            if (!NetworkManager.DistributedAuthorityMode && NetworkManager.IsServer && networkObject.SpawnWithObservers)
             {
-                if (playerObject)
+                // If running as a server only, then make sure to always add the server's client identifier
+                if (!NetworkManager.IsHost)
                 {
-                    // If there was an already existing player object for this player, then mark it as no longer a player object.
-                    if (NetworkManager.LocalClient.PlayerObject != null)
-                    {
-                        NetworkManager.LocalClient.PlayerObject.IsPlayerObject = false;
-                    }
-                    NetworkManager.LocalClient.PlayerObject = networkObject;
+                    networkObject.Observers.Add(NetworkManager.LocalClientId);
                 }
-            }
 
-            // If we are the server and should spawn with observers
-            if (NetworkManager.IsServer && networkObject.SpawnWithObservers)
-            {
                 // Add client observers
-                for (int i = 0; i < NetworkManager.ConnectedClientsList.Count; i++)
+                for (int i = 0; i < NetworkManager.ConnectedClientsIds.Count; i++)
                 {
-                    if (networkObject.CheckObjectVisibility == null || networkObject.CheckObjectVisibility(NetworkManager.ConnectedClientsList[i].ClientId))
+                    // If CheckObjectVisibility has a callback, then allow that method determine who the observers are.
+                    if (networkObject.CheckObjectVisibility != null && !networkObject.CheckObjectVisibility(NetworkManager.ConnectedClientsIds[i]))
                     {
-                        networkObject.Observers.Add(NetworkManager.ConnectedClientsList[i].ClientId);
+                        continue;
                     }
+                    networkObject.Observers.Add(NetworkManager.ConnectedClientsIds[i]);
                 }
             }
 
             networkObject.ApplyNetworkParenting();
             NetworkObject.CheckOrphanChildren();
 
+            AddNetworkObjectToSceneChangedUpdates(networkObject);
+
             networkObject.InvokeBehaviourNetworkSpawn();
 
             NetworkManager.DeferredMessageManager.ProcessTriggers(IDeferredNetworkMessageManager.TriggerType.OnSpawn, networkId);
@@ -773,6 +1205,11 @@ private void SpawnNetworkObjectLocallyCommon(NetworkObject networkObject, ulong
                 networkObject.SubscribeToActiveSceneForSynch();
             }
 
+            if (networkObject.IsPlayerObject)
+            {
+                UpdateNetworkClientPlayer(networkObject);
+            }
+
             // If we are an in-scene placed NetworkObject and our InScenePlacedSourceGlobalObjectIdHash is set
             // then assign this to the PrefabGlobalObjectIdHash
             if (networkObject.IsSceneObject.Value && networkObject.InScenePlacedSourceGlobalObjectIdHash != 0)
@@ -781,22 +1218,100 @@ private void SpawnNetworkObjectLocallyCommon(NetworkObject networkObject, ulong
             }
         }
 
-        internal void SendSpawnCallForObject(ulong clientId, NetworkObject networkObject)
+        internal Dictionary<ulong, NetworkObject> NetworkObjectsToSynchronizeSceneChanges = new Dictionary<ulong, NetworkObject>();
+
+        // Pre-allocating to avoid the initial constructor hit
+        internal Stack<ulong> CleanUpDisposedObjects = new Stack<ulong>();
+
+        internal void AddNetworkObjectToSceneChangedUpdates(NetworkObject networkObject)
         {
-            // If we are a host and sending to the host's client id, then we can skip sending ourselves the spawn message.
-            if (clientId == NetworkManager.ServerClientId)
+            if ((networkObject.SceneMigrationSynchronization && NetworkManager.NetworkConfig.EnableSceneManagement) &&
+                !NetworkObjectsToSynchronizeSceneChanges.ContainsKey(networkObject.NetworkObjectId))
             {
-                return;
+                if (networkObject.UpdateForSceneChanges())
+                {
+                    NetworkObjectsToSynchronizeSceneChanges.Add(networkObject.NetworkObjectId, networkObject);
+                }
             }
+        }
 
-            var message = new CreateObjectMessage
+        internal void RemoveNetworkObjectFromSceneChangedUpdates(NetworkObject networkObject)
+        {
+            if ((networkObject.SceneMigrationSynchronization && NetworkManager.NetworkConfig.EnableSceneManagement) &&
+                NetworkObjectsToSynchronizeSceneChanges.ContainsKey(networkObject.NetworkObjectId))
             {
-                ObjectInfo = networkObject.GetMessageSceneObject(clientId)
-            };
-            var size = NetworkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableFragmentedSequenced, clientId);
+                NetworkObjectsToSynchronizeSceneChanges.Remove(networkObject.NetworkObjectId);
+            }
+        }
+
+        internal unsafe void UpdateNetworkObjectSceneChanges()
+        {
+            foreach (var entry in NetworkObjectsToSynchronizeSceneChanges)
+            {
+                // If it fails the first update then don't add for updates
+                if (!entry.Value.UpdateForSceneChanges())
+                {
+                    CleanUpDisposedObjects.Push(entry.Key);
+                }
+            }
+
+            // Clean up any NetworkObjects that no longer exist (destroyed before they should be or the like)
+            while (CleanUpDisposedObjects.Count > 0)
+            {
+                NetworkObjectsToSynchronizeSceneChanges.Remove(CleanUpDisposedObjects.Pop());
+            }
+        }
+
+        internal void SendSpawnCallForObject(ulong clientId, NetworkObject networkObject)
+        {
+            // If we are a host and sending to the host's client id, then we can skip sending ourselves the spawn message.
+            var updateObservers = NetworkManager.DistributedAuthorityMode && networkObject.SpawnWithObservers;
+
+            // Only skip if distributed authority mode is not enabled
+            if (clientId == NetworkManager.ServerClientId && !NetworkManager.DistributedAuthorityMode)
+            {
+                return;
+            }
+
+            var message = new CreateObjectMessage
+            {
+                ObjectInfo = networkObject.GetMessageSceneObject(clientId, NetworkManager.DistributedAuthorityMode),
+                IncludesSerializedObject = true,
+                UpdateObservers = NetworkManager.DistributedAuthorityMode,
+                ObserverIds = NetworkManager.DistributedAuthorityMode ? networkObject.Observers.ToArray() : null,
+            };
+            var size = NetworkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableFragmentedSequenced, clientId);
             NetworkManager.NetworkMetrics.TrackObjectSpawnSent(clientId, networkObject, size);
         }
 
+        /// <summary>
+        /// Only used to update object visibility/observers.
+        /// ** Clients are the only instances that use this method **
+        /// </summary>
+        internal void SendSpawnCallForObserverUpdate(ulong[] newObservers, NetworkObject networkObject)
+        {
+            if (!NetworkManager.DistributedAuthorityMode)
+            {
+                throw new Exception("[SendSpawnCallForObserverUpdate] Invoking a distributed authority only method when distributed authority is not enabled!");
+            }
+
+            var message = new CreateObjectMessage
+            {
+                ObjectInfo = networkObject.GetMessageSceneObject(),
+                ObserverIds = networkObject.Observers.ToArray(),
+                NewObserverIds = newObservers.ToArray(),
+                IncludesSerializedObject = true,
+                UpdateObservers = true,
+                UpdateNewObservers = true,
+            };
+            var size = NetworkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableFragmentedSequenced, NetworkManager.ServerClientId);
+            foreach (var clientId in newObservers)
+            {
+                // TODO: We might want to track observer update sent as well?
+                NetworkManager.NetworkMetrics.TrackObjectSpawnSent(clientId, networkObject, size);
+            }
+        }
+
         internal ulong? GetSpawnParentId(NetworkObject networkObject)
         {
             NetworkObject parentNetworkObject = null;
@@ -814,19 +1329,29 @@ internal void SendSpawnCallForObject(ulong clientId, NetworkObject networkObject
             return parentNetworkObject.NetworkObjectId;
         }
 
-        internal void DespawnObject(NetworkObject networkObject, bool destroyObject = false)
+        internal void DespawnObject(NetworkObject networkObject, bool destroyObject = false, bool playerDisconnect = false)
         {
             if (!networkObject.IsSpawned)
             {
-                throw new SpawnStateException("Object is not spawned");
+                NetworkLog.LogErrorServer("Object is not spawned!");
+                return;
             }
 
-            if (!NetworkManager.IsServer)
+            if (!NetworkManager.IsServer && !NetworkManager.DistributedAuthorityMode)
             {
-                throw new NotServerException("Only server can despawn objects");
+                NetworkLog.LogErrorServer("Only server can despawn objects");
+                return;
             }
 
-            OnDespawnObject(networkObject, destroyObject);
+            if (NetworkManager.DistributedAuthorityMode && networkObject.OwnerClientId != NetworkManager.LocalClientId)
+            {
+                if (!NetworkManager.DAHost || NetworkManager.DAHost && !playerDisconnect)
+                {
+                    NetworkLog.LogErrorServer($"In distributed authority mode, only the owner of the NetworkObject can despawn it! Local Client is ({NetworkManager.LocalClientId}) while the owner is ({networkObject.OwnerClientId})");
+                    return;
+                }
+            }
+            OnDespawnObject(networkObject, destroyObject, playerDisconnect);
         }
 
         // Makes scene objects ready to be reused
@@ -910,7 +1435,7 @@ internal void DespawnAndDestroyNetworkObjects()
                             }
                         }
 
-                        // If spawned, then despawn and potentially destroy. 
+                        // If spawned, then despawn and potentially destroy.
                         if (networkObjects[i].IsSpawned)
                         {
                             OnDespawnObject(networkObjects[i], shouldDestroy);
@@ -941,11 +1466,15 @@ internal void DestroySceneObjects()
                     {
                         if (NetworkManager.PrefabHandler.ContainsHandler(networkObjects[i]))
                         {
-                            NetworkManager.PrefabHandler.HandleNetworkPrefabDestroy(networkObjects[i]);
                             if (SpawnedObjects.ContainsKey(networkObjects[i].NetworkObjectId))
                             {
+                                // This method invokes HandleNetworkPrefabDestroy, we only want to handle this once.
                                 OnDespawnObject(networkObjects[i], false);
                             }
+                            else // If not spawned, then just invoke the handler
+                            {
+                                NetworkManager.PrefabHandler.HandleNetworkPrefabDestroy(networkObjects[i]);
+                            }
                         }
                         else
                         {
@@ -964,21 +1493,36 @@ internal void ServerSpawnSceneObjectsOnStartSweep()
             var networkObjects = UnityEngine.Object.FindObjectsOfType<NetworkObject>();
 #endif
             var networkObjectsToSpawn = new List<NetworkObject>();
-
             for (int i = 0; i < networkObjects.Length; i++)
             {
                 if (networkObjects[i].NetworkManager == NetworkManager)
                 {
+                    // This used to be two loops.
+                    // The first added all NetworkObjects to a list and the second spawned all NetworkObjects in the list.
+                    // Now, a parent will set its children's IsSceneObject value when spawned, so we check for null or for true.
                     if (networkObjects[i].IsSceneObject == null || (networkObjects[i].IsSceneObject.HasValue && networkObjects[i].IsSceneObject.Value))
                     {
+                        var ownerId = networkObjects[i].OwnerClientId;
+                        if (NetworkManager.DistributedAuthorityMode)
+                        {
+                            ownerId = NetworkManager.LocalClientId;
+                        }
+
+                        SpawnNetworkObjectLocally(networkObjects[i], GetNetworkObjectId(), true, false, ownerId, true);
                         networkObjectsToSpawn.Add(networkObjects[i]);
                     }
                 }
             }
 
-            foreach (var networkObject in networkObjectsToSpawn)
+            Log.Info(() => "<color=orange>ServerSpawnSceneObjectsOnStartSweep</color>");
+
+            // Since we are spawing in-scene placed NetworkObjects for already loaded scenes,
+            // we need to add any in-scene placed NetworkObject to our tracking table
+            var clearFirst = true;
+            foreach (var sceneLoaded in NetworkManager.SceneManager.ScenesLoaded)
             {
-                SpawnNetworkObjectLocally(networkObject, GetNetworkObjectId(), true, false, networkObject.OwnerClientId, true);
+                NetworkManager.SceneManager.PopulateScenePlacedObjects(sceneLoaded.Value.SceneReference, clearFirst);
+                clearFirst = false;
             }
 
             // Notify all in-scene placed NetworkObjects have been spawned
@@ -986,17 +1530,33 @@ internal void ServerSpawnSceneObjectsOnStartSweep()
             {
                 networkObject.InternalInSceneNetworkObjectsSpawned();
             }
+            networkObjectsToSpawn.Clear();
+        }
+
+        /// <summary>
+        /// Called when destroying an object after receiving a <see cref="DestroyObjectMessage"/>.
+        /// Processes logic for how to destroy objects on the non-authority client.
+        /// </summary>
+        internal void OnDespawnNonAuthorityObject([NotNull] NetworkObject networkObject)
+        {
+            if (networkObject.HasAuthority)
+            {
+                NetworkLog.LogError($"OnDespawnNonAuthorityObject called on object {networkObject.NetworkObjectId} when is current client {NetworkManager.LocalClientId} has authority on this object.");
+            }
+
+            // On the non-authority, never destroy the game object when InScenePlaced, otherwise always destroy on non-authority side
+            OnDespawnObject(networkObject, networkObject.IsSceneObject == false);
         }
 
-        internal void OnDespawnObject(NetworkObject networkObject, bool destroyGameObject)
+        internal void OnDespawnObject(NetworkObject networkObject, bool destroyGameObject, bool modeDestroy = false)
         {
-            if (NetworkManager == null)
+            if (!NetworkManager)
             {
                 return;
             }
 
             // We have to do this check first as subsequent checks assume we can access NetworkObjectId.
-            if (networkObject == null)
+            if (!networkObject)
             {
                 Debug.LogWarning($"Trying to destroy network object but it is null");
                 return;
@@ -1005,43 +1565,64 @@ internal void OnDespawnObject(NetworkObject networkObject, bool destroyGameObjec
             // Removal of spawned object
             if (!SpawnedObjects.ContainsKey(networkObject.NetworkObjectId))
             {
-                Debug.LogWarning($"Trying to destroy object {networkObject.NetworkObjectId} but it doesn't seem to exist anymore!");
+                if (!NetworkManager.ShutdownInProgress)
+                {
+                    Debug.LogWarning($"Trying to destroy object {networkObject.NetworkObjectId} but it doesn't seem to exist anymore!");
+                }
                 return;
             }
 
             // If we are shutting down the NetworkManager, then ignore resetting the parent
             // and only attempt to remove the child's parent on the server-side
-            if (!NetworkManager.ShutdownInProgress && NetworkManager.IsServer)
+            var distributedAuthority = NetworkManager.DistributedAuthorityMode;
+            if (!NetworkManager.ShutdownInProgress && (NetworkManager.IsServer || distributedAuthority))
             {
+                // Get all child NetworkObjects
+                var objectsToRemoveParent = networkObject.GetComponentsInChildren<NetworkObject>();
+
                 // Move child NetworkObjects to the root when parent NetworkObject is destroyed
-                foreach (var spawnedNetObj in SpawnedObjectsList)
+                foreach (var spawnedNetObj in objectsToRemoveParent)
                 {
+                    if (spawnedNetObj == networkObject)
+                    {
+                        continue;
+                    }
                     var latestParent = spawnedNetObj.GetNetworkParenting();
-                    if (latestParent.HasValue && latestParent.Value == networkObject.NetworkObjectId)
+                    // Only deparent the first generation children of the NetworkObject being spawned.
+                    // Ignore any nested children under first generation children.
+                    if (latestParent.HasValue && latestParent.Value != networkObject.NetworkObjectId)
+                    {
+                        continue;
+                    }
+                    // For mixed authority hierarchies, if the parent is despawned then any removal of children
+                    // is considered "authority approved". If we don't have authority over the object and we are
+                    // in distributed authority mode, then set the AuthorityAppliedParenting flag.
+                    spawnedNetObj.AuthorityAppliedParenting = distributedAuthority && !spawnedNetObj.HasAuthority;
+
+                    // Try to remove the parent using the cached WorldPositionStays value
+                    // Note: WorldPositionStays will still default to true if this was an
+                    // in-scene placed NetworkObject and parenting was predefined in the
+                    // scene via the editor.
+                    if (!spawnedNetObj.TryRemoveParentCachedWorldPositionStays())
                     {
-                        // Try to remove the parent using the cached WorldPositioNStays value
-                        // Note: WorldPositionStays will still default to true if this was an
-                        // in-scene placed NetworkObject and parenting was predefined in the
-                        // scene via the editor.
-                        if (!spawnedNetObj.TryRemoveParentCachedWorldPositionStays())
-                        {
-                            if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
-                            {
-                                NetworkLog.LogError($"{nameof(NetworkObject)} #{spawnedNetObj.NetworkObjectId} could not be moved to the root when its parent {nameof(NetworkObject)} #{networkObject.NetworkObjectId} was being destroyed");
-                            }
-                        }
-
                         if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
                         {
-                            NetworkLog.LogWarning($"{nameof(NetworkObject)} #{spawnedNetObj.NetworkObjectId} moved to the root because its parent {nameof(NetworkObject)} #{networkObject.NetworkObjectId} is destroyed");
+                            NetworkLog.LogError($"{nameof(NetworkObject)} #{spawnedNetObj.NetworkObjectId} could not be moved to the root when its parent {nameof(NetworkObject)} #{networkObject.NetworkObjectId} was being destroyed");
                         }
                     }
+                    else
+                    if (NetworkLog.CurrentLogLevel <= LogLevel.Developer)
+                    {
+                        NetworkLog.LogWarning($"{nameof(NetworkObject)} #{spawnedNetObj.NetworkObjectId} moved to the root because its parent {nameof(NetworkObject)} #{networkObject.NetworkObjectId} is destroyed");
+                    }
                 }
             }
 
             networkObject.InvokeBehaviourNetworkDespawn();
 
-            if (NetworkManager != null && NetworkManager.IsServer)
+            if (NetworkManager != null && ((NetworkManager.IsServer && (!distributedAuthority ||
+                (distributedAuthority && modeDestroy))) ||
+                (distributedAuthority && networkObject.OwnerClientId == NetworkManager.LocalClientId)))
             {
                 if (NetworkManager.NetworkConfig.RecycleNetworkIds)
                 {
@@ -1051,45 +1632,69 @@ internal void OnDespawnObject(NetworkObject networkObject, bool destroyGameObjec
                         ReleaseTime = NetworkManager.RealTimeProvider.UnscaledTime
                     });
                 }
+                m_TargetClientIds.Clear();
 
-                if (networkObject != null)
+                // If clients are not allowed to spawn locally then go ahead and send the despawn message or if we are in distributed authority mode, we are the server, we own this NetworkObject
+                // send the despawn message, and as long as we have any remaining clients, then notify of the object being destroy.
+                if (NetworkManager.IsServer && NetworkManager.ConnectedClientsList.Count > 0 && (!distributedAuthority ||
+                    (NetworkManager.DAHost && distributedAuthority &&
+                    (networkObject.OwnerClientId == NetworkManager.LocalClientId || modeDestroy))))
                 {
-                    // As long as we have any remaining clients, then notify of the object being destroy.
-                    if (NetworkManager.ConnectedClientsList.Count > 0)
+                    // We keep only the client for which the object is visible
+                    // as the other clients have them already despawned
+                    foreach (var clientId in NetworkManager.ConnectedClientsIds)
                     {
-                        m_TargetClientIds.Clear();
-
-                        // We keep only the client for which the object is visible
-                        // as the other clients have them already despawned
-                        foreach (var clientId in NetworkManager.ConnectedClientsIds)
+                        if ((distributedAuthority && clientId == networkObject.OwnerClientId) || clientId == NetworkManager.LocalClientId)
                         {
-                            if (networkObject.IsNetworkVisibleTo(clientId))
-                            {
-                                m_TargetClientIds.Add(clientId);
-                            }
+                            continue;
                         }
-
-                        var message = new DestroyObjectMessage
-                        {
-                            NetworkObjectId = networkObject.NetworkObjectId,
-                            DestroyGameObject = networkObject.IsSceneObject != false ? destroyGameObject : true
-                        };
-                        var size = NetworkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableSequenced, m_TargetClientIds);
-                        foreach (var targetClientId in m_TargetClientIds)
+                        if (networkObject.IsNetworkVisibleTo(clientId))
                         {
-                            NetworkManager.NetworkMetrics.TrackObjectDestroySent(targetClientId, networkObject, size);
+                            m_TargetClientIds.Add(clientId);
                         }
                     }
                 }
+                else // DANGO-TODO: If we are not the server, distributed authority mode is enabled, and we are the owner then inform the DAHost to despawn the NetworkObject
+                if (!NetworkManager.IsServer && distributedAuthority && networkObject.OwnerClientId == NetworkManager.LocalClientId)
+                {
+                    // DANGO-TODO: If a shutdown is not in progress or a shutdown is in progress and we can destroy with the owner then notify the DAHost
+                    if (!NetworkManager.ShutdownInProgress || (NetworkManager.ShutdownInProgress && !networkObject.DontDestroyWithOwner))
+                    {
+                        m_TargetClientIds.Add(NetworkManager.ServerClientId);
+                    }
+                }
+
+                if (m_TargetClientIds.Count > 0 && !NetworkManager.ShutdownInProgress)
+                {
+                    var message = new DestroyObjectMessage
+                    {
+                        NetworkObjectId = networkObject.NetworkObjectId,
+                        DeferredDespawnTick = networkObject.DeferredDespawnTick,
+                        DestroyGameObject = destroyGameObject,
+                        IsTargetedDestroy = false,
+                        IsDistributedAuthority = distributedAuthority,
+                    };
+                    foreach (var clientId in m_TargetClientIds)
+                    {
+                        var size = NetworkManager.ConnectionManager.SendMessage(ref message, NetworkDelivery.ReliableSequenced, clientId);
+                        NetworkManager.NetworkMetrics.TrackObjectDestroySent(clientId, networkObject, size);
+                    }
+                }
             }
 
             networkObject.IsSpawned = false;
+            networkObject.DeferredDespawnTick = 0;
 
             if (SpawnedObjects.Remove(networkObject.NetworkObjectId))
             {
                 SpawnedObjectsList.Remove(networkObject);
             }
 
+            if (networkObject.IsPlayerObject)
+            {
+                RemovePlayerObject(networkObject, destroyGameObject);
+            }
+
             // Always clear out the observers list when despawned
             networkObject.Observers.Clear();
 
@@ -1108,7 +1713,7 @@ internal void OnDespawnObject(NetworkObject networkObject, bool destroyGameObjec
         }
 
         /// <summary>
-        /// Updates all spawned <see cref="NetworkObject.Observers"/> for the specified newly connected client 
+        /// Updates all spawned <see cref="NetworkObject.Observers"/> for the specified newly connected client
         /// Note: if the clientId is the server then it is observable to all spawned <see cref="NetworkObject"/>'s
         /// </summary>
         /// <remarks>
@@ -1122,8 +1727,8 @@ internal void UpdateObservedNetworkObjects(ulong clientId)
                 // If the NetworkObject has no visibility check then prepare to add this client as an observer
                 if (sobj.CheckObjectVisibility == null)
                 {
-                    // If the client is not part of the observers and spawn with observers is enabled on this instance or the clientId is the server
-                    if (sobj.SpawnWithObservers || clientId == NetworkManager.ServerClientId)
+                    // If the client is not part of the observers and spawn with observers is enabled on this instance or the clientId is the server/host/DAHost
+                    if (!sobj.Observers.Contains(clientId) && (sobj.SpawnWithObservers || clientId == NetworkManager.ServerClientId))
                     {
                         sobj.Observers.Add(clientId);
                     }
@@ -1148,18 +1753,41 @@ internal void UpdateObservedNetworkObjects(ulong clientId)
         /// </summary>
         internal void HandleNetworkObjectShow()
         {
-            // Handle NetworkObjects to show
+            // In distributed authority mode, we send a single message that is broadcasted to all clients
+            // that will be shown the object (i.e. 1 message to service that then broadcasts that to the
+            // targeted clients). When using a DAHost, we skip this and send like we do in client-server
+            if (NetworkManager.DistributedAuthorityMode && !NetworkManager.DAHost)
+            {
+                foreach (var entry in ClientsToShowObject)
+                {
+                    if (entry.Key != null && entry.Key.IsSpawned)
+                    {
+                        try
+                        {
+                            SendSpawnCallForObserverUpdate(entry.Value.ToArray(), entry.Key);
+                        }
+                        catch (Exception ex)
+                        {
+                            if (NetworkManager.LogLevel <= LogLevel.Developer)
+                            {
+                                Debug.LogException(ex);
+                            }
+                        }
+                    }
+                }
+                ClientsToShowObject.Clear();
+                ObjectsToShowToClient.Clear();
+                return;
+            }
+
+            // Server or Host handling of NetworkObjects to show
             foreach (var client in ObjectsToShowToClient)
             {
                 ulong clientId = client.Key;
                 foreach (var networkObject in client.Value)
                 {
-                    // Ignore if null or not spawned (v1.x.x the server should only show what is spawned)
                     if (networkObject != null && networkObject.IsSpawned)
                     {
-                        // Prevent exceptions from interrupting this iteration
-                        // so the ObjectsToShowToClient list will be fully processed
-                        // and cleard.
                         try
                         {
                             SendSpawnCallForObject(clientId, networkObject);
@@ -1181,5 +1809,441 @@ internal NetworkSpawnManager(NetworkManager networkManager)
         {
             NetworkManager = networkManager;
         }
+
+        /// <summary>
+        /// Finalizer that ensures proper cleanup of spawn manager resources
+        /// </summary>
+        ~NetworkSpawnManager()
+        {
+            Shutdown();
+        }
+
+        internal void Shutdown()
+        {
+            NetworkObjectsToSynchronizeSceneChanges.Clear();
+            CleanUpDisposedObjects.Clear();
+        }
+
+        /// <summary>
+        /// DANGO-TODO: Until we have the CMB Server end-to-end with all features verified working via integration tests,
+        /// I am keeping this debug toggle available. (NSS)
+        /// </summary>
+        internal bool EnableDistributeLogging = false;
+
+        /// <summary>
+        /// Fills the first table passed in with the current distribution of prefab types relative to their owners
+        /// Fills the second table passed in with the total number of spawned objects of that particular type.
+        /// The second table allows us to calculate how many objects per client there should be in order to determine
+        /// how many of that type should be distributed.
+        /// </summary>
+        /// <param name="objectByTypeAndOwner">the table to populate</param>
+        /// <param name="objectTypeCount">the total number of the specific object type to distribute</param>
+        internal void GetObjectDistribution(ulong clientId, ref Dictionary<uint, Dictionary<ulong, List<NetworkObject>>> objectByTypeAndOwner, ref Dictionary<uint, int> objectTypeCount)
+        {
+            // DANGO-TODO-MVP: Remove this once the service handles object distribution
+            var onlyIncludeOwnedObjects = NetworkManager.CMBServiceConnection;
+
+            foreach (var networkObject in NetworkManager.SpawnManager.SpawnedObjectsList)
+            {
+                if (networkObject.IsOwnershipSessionOwner)
+                {
+                    continue;
+                }
+
+                // We first check for a parent and then if the parent is a NetworkObject
+                if (networkObject.transform.parent != null)
+                {
+                    // If the parent is a NetworkObject, has the same owner, and this NetworkObject has the distributable =or= transferable permission
+                    // then skip this child (NetworkObjects are always parented directly under other NetworkObjects)
+                    // (later we determine if all children with the same owner will be transferred together as a group)
+                    var parentNetworkObject = networkObject.transform.parent.GetComponent<NetworkObject>();
+                    if (parentNetworkObject != null && parentNetworkObject.OwnerClientId == networkObject.OwnerClientId
+                        && (networkObject.IsOwnershipDistributable || networkObject.IsOwnershipTransferable))
+                    {
+                        continue;
+                    }
+                }
+
+                // At this point we only allow things marked with the distributable permission and is not locked to be distributed
+                if (networkObject.IsOwnershipDistributable && !networkObject.IsOwnershipLocked)
+                {
+                    // Don't include anything that is not visible to the new client
+                    if (!networkObject.Observers.Contains(clientId))
+                    {
+                        continue;
+                    }
+
+                    // We have to check if it is an in-scene placed NetworkObject and if it is get the source prefab asset GlobalObjectIdHash value of the in-scene placed instance
+                    // since all in-scene placed instances use unique GlobalObjectIdHash values.
+                    var globalOjectIdHash = networkObject.IsSceneObject.HasValue && networkObject.IsSceneObject.Value ? networkObject.InScenePlacedSourceGlobalObjectIdHash : networkObject.GlobalObjectIdHash;
+
+                    if (!objectTypeCount.ContainsKey(globalOjectIdHash))
+                    {
+                        objectTypeCount.Add(globalOjectIdHash, 0);
+                    }
+                    objectTypeCount[globalOjectIdHash] += 1;
+
+                    // DANGO-TODO-MVP: Remove this once the service handles object distribution
+                    if (onlyIncludeOwnedObjects && !networkObject.IsOwner)
+                    {
+                        continue;
+                    }
+
+
+                    // Divide up by prefab type (GlobalObjectIdHash) to get a better distribution of object types
+                    if (!objectByTypeAndOwner.ContainsKey(globalOjectIdHash))
+                    {
+                        objectByTypeAndOwner.Add(globalOjectIdHash, new Dictionary<ulong, List<NetworkObject>>());
+                    }
+
+                    // Sub-divide each type by owner
+                    if (!objectByTypeAndOwner[globalOjectIdHash].ContainsKey(networkObject.OwnerClientId))
+                    {
+                        objectByTypeAndOwner[globalOjectIdHash].Add(networkObject.OwnerClientId, new List<NetworkObject>());
+                    }
+
+                    // Add to the client's spawned object list
+                    objectByTypeAndOwner[globalOjectIdHash][networkObject.OwnerClientId].Add(networkObject);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Distributes an even portion of spawned NetworkObjects to the given client.
+        /// This is called as part of the client connection process to ensure that all clients have a fair share of the spawned NetworkObjects.
+        /// DANGO-TODO: This will be handled by the CMB Service in the future.
+        /// </summary>
+        /// <param name="clientId">Client to distribute NetworkObjects to</param>
+        internal void DistributeNetworkObjects(ulong clientId)
+        {
+            if (!NetworkManager.DistributedAuthorityMode)
+            {
+                return;
+            }
+
+            if (NetworkManager.SessionConfig.ServiceSideDistribution)
+            {
+                return;
+            }
+
+            // DA-NGO CMB SERVICE NOTES:
+            // The most basic object distribution should be broken up into a table of spawned object types
+            // where each type contains a list of each client's owned objects of that type that can be
+            // distributed.
+            // The table format:
+            // [GlobalObjectIdHashValue][ClientId][List of Owned Objects]
+            var distributedNetworkObjects = new Dictionary<uint, Dictionary<ulong, List<NetworkObject>>>();
+
+            // DA-NGO CMB SERVICE NOTES:
+            // This is optional, but I found it easier to get the total count of spawned objects for each prefab
+            // type contained in the previous table in order to be able to calculate the targeted object distribution
+            // count of that type per client.
+            var objectTypeCount = new Dictionary<uint, int>();
+
+            // Get all spawned objects by type and then by client owner that are spawned and can be distributed
+            GetObjectDistribution(clientId, ref distributedNetworkObjects, ref objectTypeCount);
+
+            var clientCount = NetworkManager.ConnectedClientsIds.Count;
+
+            // Cycle through each prefab type
+            foreach (var objectTypeEntry in distributedNetworkObjects)
+            {
+                // Calculate the number of objects that should be distributed amongst the clients
+                var totalObjectsToDistribute = objectTypeCount[objectTypeEntry.Key];
+                var objPerClientF = totalObjectsToDistribute * (1.0f / clientCount);
+                var floorValue = (int)Math.Floor(objPerClientF);
+                var fractional = objPerClientF - floorValue;
+                var objPerClient = 0;
+                if (fractional >= 0.556f)
+                {
+                    objPerClient = (int)Math.Round(totalObjectsToDistribute * (1.0f / clientCount));
+                }
+                else
+                {
+                    objPerClient = floorValue;
+                }
+
+                // If the object per client count is zero, then move to the next type.
+                if (objPerClient <= 0)
+                {
+                    continue;
+                }
+
+                // Evenly distribute this object type amongst the clients
+                foreach (var ownerList in objectTypeEntry.Value)
+                {
+                    if (ownerList.Value.Count <= 1)
+                    {
+                        continue;
+                    }
+
+                    var maxDistributeCount = Mathf.Max(ownerList.Value.Count - objPerClient, 1);
+                    var distributed = 0;
+                    // For now when we have more players then distributed NetworkObjects that
+                    // a specific client owns, just assign half of the NetworkObjects to the new client
+                    var offsetCount = Mathf.Max((int)Math.Round((float)(ownerList.Value.Count / objPerClient)), 1);
+                    if (EnableDistributeLogging)
+                    {
+                        Debug.Log($"[{objPerClient} of {totalObjectsToDistribute}][Client-{ownerList.Key}] Count: {ownerList.Value.Count} | ObjPerClient: {objPerClient} | maxD: {maxDistributeCount} | Offset: {offsetCount}");
+                    }
+
+                    for (int i = 0; i < ownerList.Value.Count; i++)
+                    {
+                        if ((i % offsetCount) == 0)
+                        {
+                            var children = ownerList.Value[i].GetComponentsInChildren<NetworkObject>();
+                            // Since the ownerList.Value[i] has to be distributable, then transfer all child NetworkObjects
+                            // with the same owner clientId and are marked as distributable also to the same client to keep
+                            // the owned distributable parent with the owned distributable children
+                            foreach (var child in children)
+                            {
+                                // Ignore any child that does not have the same owner, that is already owned by the currently targeted client, or that doesn't have the targeted client as an observer
+                                if (child == ownerList.Value[i] || child.OwnerClientId != ownerList.Value[i].OwnerClientId || child.OwnerClientId == clientId || !child.Observers.Contains(clientId))
+                                {
+                                    continue;
+                                }
+                                if (!child.IsOwnershipDistributable || !child.IsOwnershipTransferable)
+                                {
+                                    NetworkLog.LogWarning($"Sibling {child.name} of root parent {ownerList.Value[i].name} is neither transferable or distributable! Object distribution skipped and could lead to a potentially un-owned or owner-mismatched {nameof(NetworkObject)}!");
+                                    continue;
+                                }
+                                // Transfer ownership of all distributable =or= transferable children with the same owner to the same client to preserve the sibling ownership tree.
+                                ChangeOwnership(child, clientId, true);
+                                // Note: We don't increment the distributed count for these children as they are skipped when getting the object distribution
+                            }
+                            // Finally, transfer ownership of the root parent
+                            ChangeOwnership(ownerList.Value[i], clientId, true);
+                            if (EnableDistributeLogging)
+                            {
+                                Debug.Log($"[Client-{ownerList.Key}][NetworkObjectId-{ownerList.Value[i].NetworkObjectId} Distributed to Client-{clientId}");
+                            }
+                            distributed++;
+                        }
+                        if (distributed == maxDistributeCount)
+                        {
+                            break;
+                        }
+                    }
+                }
+            }
+
+            // If EnableDistributeLogging is enabled, log the object type distribution counts per client
+            if (EnableDistributeLogging)
+            {
+                var builder = new StringBuilder();
+                distributedNetworkObjects.Clear();
+                objectTypeCount.Clear();
+                GetObjectDistribution(clientId, ref distributedNetworkObjects, ref objectTypeCount);
+                builder.AppendLine($"Client Relative Distributed Object Count: (distribution follows)");
+                // Cycle through each prefab type
+                foreach (var objectTypeEntry in distributedNetworkObjects)
+                {
+                    builder.AppendLine($"[GID: {objectTypeEntry.Key} | {objectTypeEntry.Value.First().Value.First().name}][Total Count: {objectTypeCount[objectTypeEntry.Key]}]");
+                    builder.AppendLine($"[GID: {objectTypeEntry.Key} | {objectTypeEntry.Value.First().Value.First().name}] Distribution:");
+                    // Evenly distribute this type amongst clients
+                    foreach (var ownerList in objectTypeEntry.Value)
+                    {
+                        builder.AppendLine($"[Client-{ownerList.Key}] Count: {ownerList.Value.Count}");
+                    }
+                }
+                Debug.Log(builder.ToString());
+            }
+        }
+
+        internal struct DeferredDespawnObject
+        {
+            public int TickToDespawn;
+            public bool HasDeferredDespawnCheck;
+            public ulong NetworkObjectId;
+        }
+
+        internal List<DeferredDespawnObject> DeferredDespawnObjects = new List<DeferredDespawnObject>();
+
+        /// <summary>
+        /// Adds a deferred despawn entry to be processed
+        /// </summary>
+        /// <param name="networkObjectId">associated NetworkObject</param>
+        /// <param name="tickToDespawn">when to despawn the NetworkObject</param>
+        /// <param name="hasDeferredDespawnCheck">if true, user script is to be invoked to determine when to despawn</param>
+        internal void DeferDespawnNetworkObject(ulong networkObjectId, int tickToDespawn, bool hasDeferredDespawnCheck)
+        {
+            var deferredDespawnObject = new DeferredDespawnObject()
+            {
+                TickToDespawn = tickToDespawn,
+                HasDeferredDespawnCheck = hasDeferredDespawnCheck,
+                NetworkObjectId = networkObjectId,
+            };
+            DeferredDespawnObjects.Add(deferredDespawnObject);
+        }
+
+        /// <summary>
+        /// Processes any deferred despawn entries
+        /// </summary>
+        internal void DeferredDespawnUpdate(NetworkTime serverTime)
+        {
+            // Exit early if there is nothing to process
+            if (DeferredDespawnObjects.Count == 0)
+            {
+                return;
+            }
+            var currentTick = serverTime.Tick;
+            var deferredDespawnCount = DeferredDespawnObjects.Count;
+            // Loop forward and to process user callbacks and update despawn ticks
+            for (int i = 0; i < deferredDespawnCount; i++)
+            {
+                var deferredObjectEntry = DeferredDespawnObjects[i];
+                if (!deferredObjectEntry.HasDeferredDespawnCheck)
+                {
+                    continue;
+                }
+
+                if (!SpawnedObjects.TryGetValue(deferredObjectEntry.NetworkObjectId, out var networkObject))
+                {
+                    continue;
+                }
+
+                // Double check to make sure user did not remove the callback
+                if (networkObject.OnDeferredDespawnComplete != null)
+                {
+                    // If the user callback returns true, then we despawn it this tick
+                    if (networkObject.OnDeferredDespawnComplete.Invoke())
+                    {
+                        deferredObjectEntry.TickToDespawn = currentTick;
+                    }
+                    else
+                    {
+                        // If the user callback does not verify the NetworkObject can be despawned,
+                        // continue setting this value in the event user script adjusts it.
+                        deferredObjectEntry.TickToDespawn = networkObject.DeferredDespawnTick;
+                    }
+                }
+                else
+                {
+                    // If it was removed, then in case it is being left to defer naturally exclude it
+                    // from the next query.
+                    deferredObjectEntry.HasDeferredDespawnCheck = false;
+                }
+            }
+
+            // Parse backwards so we can remove objects as we parse through them
+            for (int i = deferredDespawnCount - 1; i >= 0; i--)
+            {
+                var deferredObjectEntry = DeferredDespawnObjects[i];
+                if (deferredObjectEntry.TickToDespawn >= currentTick)
+                {
+                    continue;
+                }
+
+                if (SpawnedObjects.TryGetValue(deferredObjectEntry.NetworkObjectId, out var networkObject))
+                {
+                    // Local instance despawns the instance
+                    OnDespawnNonAuthorityObject(networkObject);
+                }
+
+                DeferredDespawnObjects.RemoveAt(i);
+            }
+        }
+
+        internal void NotifyNetworkObjectsSynchronized()
+        {
+            // Users could spawn NetworkObjects during these notifications.
+            // Create a separate list from the hashset to avoid list modification errors.
+            var spawnedObjects = SpawnedObjectsList.ToList();
+            foreach (var networkObject in spawnedObjects)
+            {
+                networkObject.InternalNetworkSessionSynchronized();
+            }
+        }
+
+        /// <summary>
+        /// Distributed Authority Only
+        /// Should be invoked on non-session owner clients when a newly joined client is finished
+        /// synchronizing in order to "show" (spawn) anything that might be currently hidden from
+        /// the session owner.
+        /// </summary>
+        /// <remarks>
+        /// Replacement is: SynchronizeObjectsToNewlyJoinedClient
+        /// </remarks>
+        internal void ShowHiddenObjectsToNewlyJoinedClient(ulong newClientId)
+        {
+            if (NetworkManager == null || NetworkManager.ShutdownInProgress && NetworkManager.LogLevel <= LogLevel.Developer)
+            {
+                Debug.LogWarning($"[Internal Error] {nameof(ShowHiddenObjectsToNewlyJoinedClient)} invoked while shutdown is in progress!");
+                return;
+            }
+
+            if (!NetworkManager.DistributedAuthorityMode)
+            {
+                Debug.LogError($"[Internal Error] {nameof(ShowHiddenObjectsToNewlyJoinedClient)} should only be invoked when using a distributed authority network topology!");
+                return;
+            }
+
+            if (NetworkManager.LocalClient.IsSessionOwner)
+            {
+                Debug.LogError($"[Internal Error] {nameof(ShowHiddenObjectsToNewlyJoinedClient)} should only be invoked on a non-session owner client!");
+                return;
+            }
+            var localClientId = NetworkManager.LocalClient.ClientId;
+            var sessionOwnerId = NetworkManager.CurrentSessionOwner;
+            foreach (var networkObject in SpawnedObjectsList)
+            {
+                if (networkObject.SpawnWithObservers && networkObject.OwnerClientId == localClientId && !networkObject.Observers.Contains(sessionOwnerId))
+                {
+                    if (networkObject.Observers.Contains(newClientId))
+                    {
+                        if (NetworkManager.LogLevel <= LogLevel.Developer)
+                        {
+                            // Track if there is some other location where the client is being added to the observers list when the object is hidden from the session owner
+                            Debug.LogWarning($"[{networkObject.name}] Has new client as an observer but it is hidden from the session owner!");
+                        }
+                        // For now, remove the client (impossible for the new client to have an instance since the session owner doesn't) to make sure newly added
+                        // code to handle this edge case works.
+                        networkObject.Observers.Remove(newClientId);
+                    }
+                    networkObject.NetworkShow(newClientId);
+                }
+            }
+        }
+
+        internal void SynchronizeObjectsToNewlyJoinedClient(ulong newClientId)
+        {
+            if (NetworkManager == null || NetworkManager.ShutdownInProgress && NetworkManager.LogLevel <= LogLevel.Developer)
+            {
+                Debug.LogWarning($"[Internal Error] {nameof(SynchronizeObjectsToNewlyJoinedClient)} invoked while shutdown is in progress!");
+                return;
+            }
+
+            if (!NetworkManager.DistributedAuthorityMode)
+            {
+                Debug.LogError($"[Internal Error] {nameof(SynchronizeObjectsToNewlyJoinedClient)} should only be invoked when using a distributed authority network topology!");
+                return;
+            }
+
+            if (NetworkManager.NetworkConfig.EnableSceneManagement)
+            {
+                Debug.LogError($"[Internal Error] {nameof(SynchronizeObjectsToNewlyJoinedClient)} should only be invoked when scene management is disabled!");
+                return;
+            }
+
+            var localClientId = NetworkManager.LocalClient.ClientId;
+            foreach (var networkObject in SpawnedObjectsList)
+            {
+                if (networkObject.SpawnWithObservers && networkObject.OwnerClientId == localClientId)
+                {
+                    if (networkObject.Observers.Contains(newClientId))
+                    {
+                        if (NetworkManager.LogLevel <= LogLevel.Developer)
+                        {
+                            // Temporary tracking to make sure we are not showing something already visibile (should never be the case for this)
+                            Debug.LogWarning($"[{nameof(SynchronizeObjectsToNewlyJoinedClient)}][{networkObject.name}] New client as already an observer!");
+                        }
+                        // For now, remove the client (impossible for the new client to have an instance since the session owner doesn't) to make sure newly added
+                        // code to handle this edge case works.
+                        networkObject.Observers.Remove(newClientId);
+                    }
+                    networkObject.NetworkShow(newClientId);
+                }
+            }
+        }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Runtime/Timing/AnticipationSystem.cs.meta b/com.unity.netcode.gameobjects/Runtime/Timing/AnticipationSystem.cs.meta
index 3bdf3f18b0..9dc824ca41 100644
--- a/com.unity.netcode.gameobjects/Runtime/Timing/AnticipationSystem.cs.meta
+++ b/com.unity.netcode.gameobjects/Runtime/Timing/AnticipationSystem.cs.meta
@@ -1,3 +1,2 @@
-fileFormatVersion: 2
-guid: 21e6ae0a82f945458519aee4ee119cab
-timeCreated: 1707845625
\ No newline at end of file
+fileFormatVersion: 2
+guid: 4a75eccede7ecf1408f61dd55c338e06
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Runtime/Timing/IRealTimeProvider.cs b/com.unity.netcode.gameobjects/Runtime/Timing/IRealTimeProvider.cs
index 07740c8702..e6a32afa29 100644
--- a/com.unity.netcode.gameobjects/Runtime/Timing/IRealTimeProvider.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Timing/IRealTimeProvider.cs
@@ -6,5 +6,6 @@ internal interface IRealTimeProvider
         float UnscaledTime { get; }
         float UnscaledDeltaTime { get; }
         float DeltaTime { get; }
+        float FixedDeltaTime { get; }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Runtime/Timing/NetworkTime.cs b/com.unity.netcode.gameobjects/Runtime/Timing/NetworkTime.cs
index 7c624c48fb..c37c29fa75 100644
--- a/com.unity.netcode.gameobjects/Runtime/Timing/NetworkTime.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Timing/NetworkTime.cs
@@ -45,11 +45,19 @@ public struct NetworkTime
         public double FixedTime => m_CachedTick * m_TickInterval;
 
         /// <summary>
-        /// Gets the fixed delta time. This value is based on the <see cref="TickRate"/> and stays constant.
-        /// Similar to <see cref="Time.fixedUnscaledTime"/> There is no equivalent to <see cref="Time.deltaTime"/>.
+        /// Gets the fixed delta time. This value is calculated by dividing 1.0 by the <see cref="TickRate"/> and stays constant.
         /// </summary>
+        /// <remarks>
+        /// This could result in a potential floating point precision variance on different systems. <br />
+        /// See <see cref="FixedDeltaTimeAsDouble"/> for a more precise value.
+        /// </remarks>
         public float FixedDeltaTime => (float)m_TickInterval;
 
+        /// <summary>
+        /// Gets the fixed delta time as a double. This value is calculated by dividing 1.0 by the <see cref="TickRate"/> and stays constant.
+        /// </summary>
+        public double FixedDeltaTimeAsDouble => m_TickInterval;
+
         /// <summary>
         /// Gets the amount of network ticks which have passed until reaching the current time value.
         /// </summary>
@@ -70,7 +78,7 @@ public NetworkTime(uint tickRate)
             Assert.IsTrue(tickRate > 0, "Tickrate must be a positive value.");
 
             m_TickRate = tickRate;
-            m_TickInterval = 1f / m_TickRate; // potential floating point precision issue, could result in different interval on different machines
+            m_TickInterval = 1.0 / m_TickRate;
             m_CachedTickOffset = 0;
             m_CachedTick = 0;
             m_TimeSec = 0;
@@ -114,13 +122,14 @@ public NetworkTime ToFixedTime()
         }
 
         /// <summary>
-        /// Returns the time a number of ticks in the past.
+        /// Calculates a NetworkTime value representing a point in the past relative to the current time (few ticks in the past)
         /// </summary>
-        /// <param name="ticks">The number of ticks ago we're querying the time</param>
-        /// <returns></returns>
-        public NetworkTime TimeTicksAgo(int ticks)
+        /// <param name="ticks">The number of ticks ago we're querying the time.</param>
+        /// <param name="offset">Optional parameter to specify a tick offset (fractional) value.</param>
+        /// <returns>A NetworkTime value representing the calculated past time point</returns>
+        public NetworkTime TimeTicksAgo(int ticks, float offset = 0.0f)
         {
-            return this - new NetworkTime(TickRate, ticks);
+            return this - new NetworkTime(TickRate, ticks, offset);
         }
 
         private void UpdateCache()
diff --git a/com.unity.netcode.gameobjects/Runtime/Timing/NetworkTimeSystem.cs b/com.unity.netcode.gameobjects/Runtime/Timing/NetworkTimeSystem.cs
index 4dbd85a046..652b59cc09 100644
--- a/com.unity.netcode.gameobjects/Runtime/Timing/NetworkTimeSystem.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Timing/NetworkTimeSystem.cs
@@ -1,5 +1,6 @@
 using System;
 using Unity.Profiling;
+using UnityEngine;
 
 namespace Unity.Netcode
 {
@@ -35,7 +36,7 @@ public class NetworkTimeSystem
 #if DEVELOPMENT_BUILD || UNITY_EDITOR
         private static ProfilerMarker s_SyncTime = new ProfilerMarker($"{nameof(NetworkManager)}.SyncTime");
 #endif
-
+        private double m_PreviousTimeSec;
         private double m_TimeSec;
         private double m_CurrentLocalTimeOffset;
         private double m_DesiredLocalTimeOffset;
@@ -75,13 +76,32 @@ public class NetworkTimeSystem
         /// </summary>
         public double ServerTime => m_TimeSec + m_CurrentServerTimeOffset;
 
+        private float m_TickLatencyAverage = 2.0f;
+
+        /// <summary>
+        /// The averaged latency in network ticks between a client and server.
+        /// </summary>
+        /// <remarks>
+        /// For a distributed authority network topology, this latency is between the client and the
+        /// distributed authority service instance.<br />
+        /// Note: <see cref="Components.NetworkTransform"/> uses this value plus an additional global
+        /// offset <see cref="Components.NetworkTransform.InterpolationBufferTickOffset"/> when interpolation
+        /// is enabled. <br />
+        /// To see the current <see cref="Components.NetworkTransform"/> tick latency: <br />
+        /// - <see cref="Components.NetworkTransform.GetTickLatency"/> <br />
+        /// - <see cref="Components.NetworkTransform.GetTickLatencyInSeconds"/> <br />
+        /// </remarks>
+        public int TickLatency = 1;
+
         internal double LastSyncedServerTimeSec { get; private set; }
         internal double LastSyncedRttSec { get; private set; }
+        internal double LastSyncedHalfRttSec { get; private set; }
 
         private NetworkConnectionManager m_ConnectionManager;
         private NetworkTransport m_NetworkTransport;
         private NetworkTickSystem m_NetworkTickSystem;
         private NetworkManager m_NetworkManager;
+        private double m_TickFrequency;
 
         /// <summary>
         /// <see cref="k_TimeSyncFrequency"/>
@@ -101,6 +121,7 @@ public NetworkTimeSystem(double localBufferSec, double serverBufferSec = k_Defau
             ServerBufferSec = serverBufferSec;
             HardResetThresholdSec = hardResetThresholdSec;
             AdjustmentRatio = adjustmentRatio;
+            m_TickLatencyAverage = 2;
         }
 
         /// <summary>
@@ -113,6 +134,7 @@ internal NetworkTickSystem Initialize(NetworkManager networkManager)
             m_NetworkTransport = networkManager.NetworkConfig.NetworkTransport;
             m_TimeSyncFrequencyTicks = (int)(k_TimeSyncFrequency * networkManager.NetworkConfig.TickRate);
             m_NetworkTickSystem = new NetworkTickSystem(networkManager.NetworkConfig.TickRate, 0, 0);
+            m_TickFrequency = 1.0 / networkManager.NetworkConfig.TickRate;
             // Only the server side needs to register for tick based time synchronization
             if (m_ConnectionManager.LocalClient.IsServer)
             {
@@ -200,10 +222,17 @@ public static NetworkTimeSystem ServerTimeSystem()
         /// Advances the time system by a certain amount of time. Should be called once per frame with Time.unscaledDeltaTime or similar.
         /// </summary>
         /// <param name="deltaTimeSec">The amount of time to advance. The delta time which passed since Advance was last called.</param>
-        /// <returns></returns>
+        /// <returns>True if a hard reset of the time system occurred due to large time offset differences. False if normal time advancement occurred</returns>
         public bool Advance(double deltaTimeSec)
         {
+            m_PreviousTimeSec = m_TimeSec;
             m_TimeSec += deltaTimeSec;
+            // TODO: For client-server, we need a latency message sent by clients to tell us their tick latency
+            if (LastSyncedRttSec > 0.0f)
+            {
+                m_TickLatencyAverage = Mathf.Lerp(m_TickLatencyAverage, (float)((LastSyncedRttSec + deltaTimeSec) / m_TickFrequency), (float)deltaTimeSec);
+                TickLatency = (int)Mathf.Max(2.0f, Mathf.Round(m_TickLatencyAverage));
+            }
 
             if (Math.Abs(m_DesiredLocalTimeOffset - m_CurrentLocalTimeOffset) > HardResetThresholdSec || Math.Abs(m_DesiredServerTimeOffset - m_CurrentServerTimeOffset) > HardResetThresholdSec)
             {
@@ -234,7 +263,7 @@ public void Reset(double serverTimeSec, double rttSec)
             Sync(serverTimeSec, rttSec);
             Advance(0);
         }
-
+        internal int SyncCount;
         /// <summary>
         /// Synchronizes the time system with up-to-date network statistics but does not change any time values or advance the time.
         /// </summary>
@@ -243,12 +272,18 @@ public void Reset(double serverTimeSec, double rttSec)
         public void Sync(double serverTimeSec, double rttSec)
         {
             LastSyncedRttSec = rttSec;
+            LastSyncedHalfRttSec = (rttSec * 0.5d);
             LastSyncedServerTimeSec = serverTimeSec;
 
             var timeDif = serverTimeSec - m_TimeSec;
 
             m_DesiredServerTimeOffset = timeDif - ServerBufferSec;
-            m_DesiredLocalTimeOffset = timeDif + rttSec + LocalBufferSec;
+            // We adjust our desired local time offset to be half RTT since the delivery of
+            // the TimeSyncMessage should only take half of the RTT time (legacy was using 1 full RTT)
+            m_DesiredLocalTimeOffset = timeDif + LastSyncedHalfRttSec + LocalBufferSec;
         }
+
+        internal double ServerTimeOffset => m_DesiredServerTimeOffset;
+        internal double LocalTimeOffset => m_DesiredLocalTimeOffset;
     }
 }
diff --git a/com.unity.netcode.gameobjects/Runtime/Timing/RealTimeProvider.cs b/com.unity.netcode.gameobjects/Runtime/Timing/RealTimeProvider.cs
index 840180d580..51a2044f7b 100644
--- a/com.unity.netcode.gameobjects/Runtime/Timing/RealTimeProvider.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Timing/RealTimeProvider.cs
@@ -8,5 +8,6 @@ internal class RealTimeProvider : IRealTimeProvider
         public float UnscaledTime => Time.unscaledTime;
         public float UnscaledDeltaTime => Time.unscaledDeltaTime;
         public float DeltaTime => Time.deltaTime;
+        public float FixedDeltaTime => Time.fixedDeltaTime;
     }
 }
diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/NetworkTransport.cs b/com.unity.netcode.gameobjects/Runtime/Transports/NetworkTransport.cs
index 9de70aff65..b8784fcfb3 100644
--- a/com.unity.netcode.gameobjects/Runtime/Transports/NetworkTransport.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Transports/NetworkTransport.cs
@@ -6,7 +6,7 @@ namespace Unity.Netcode
     /// <summary>
     /// The generic transport class all Netcode for GameObjects network transport implementations
     /// derive from.  Use this class to add a custom transport.
-    /// <seealso cref="Transports.UTP.UnityTransport"> for an example of how a transport is integrated</seealso>
+    /// <see cref="Transports.UTP.UnityTransport"/> for an example of how a transport is integrated
     /// </summary>
     public abstract class NetworkTransport : MonoBehaviour
     {
@@ -28,6 +28,10 @@ public abstract class NetworkTransport : MonoBehaviour
         /// <summary>
         /// Delegate for transport network events
         /// </summary>
+        /// <param name="eventType">The type of network event that occurred</param>
+        /// <param name="clientId">The ID of the client associated with this event</param>
+        /// <param name="payload">The data payload received with this event</param>
+        /// <param name="receiveTime">The time when this event was received</param>
         public delegate void TransportEventDelegate(NetworkEvent eventType, ulong clientId, ArraySegment<byte> payload, float receiveTime);
 
         /// <summary>
@@ -104,8 +108,80 @@ protected void InvokeOnTransportEvent(NetworkEvent eventType, ulong clientId, Ar
         /// <summary>
         /// Initializes the transport
         /// </summary>
-        /// /// <param name="networkManager">optionally pass in NetworkManager</param>
+        /// <param name="networkManager">optionally pass in NetworkManager</param>
         public abstract void Initialize(NetworkManager networkManager = null);
+
+        /// <summary>
+        /// Invoked by NetworkManager at the beginning of its EarlyUpdate.
+        /// For order of operations see: <see cref="NetworkManager.NetworkUpdate(NetworkUpdateStage)"/>
+        /// </summary>
+        /// <remarks>
+        /// Useful to handle processing any transport-layer events such as processing inbound messages or changes in connection state(s).
+        /// </remarks>
+        protected virtual void OnEarlyUpdate()
+        {
+
+        }
+
+        /// <summary>
+        /// Invoked by NetworkManager at the beginning of its EarlyUpdate
+        /// </summary>
+        internal void EarlyUpdate()
+        {
+            OnEarlyUpdate();
+        }
+
+        /// <summary>
+        /// Invoked by NetworkManager towards the end of the PostLateUpdate.
+        /// For order of operations see: <see cref="NetworkManager.NetworkUpdate(NetworkUpdateStage)"/>
+        /// </summary>
+        /// <remarks>
+        /// Useful to handle any end of frame transport tasks such as sending queued transport messages.
+        /// </remarks>
+        protected virtual void OnPostLateUpdate()
+        {
+
+        }
+
+        /// <summary>
+        /// Invoked by NetworkManager towards the end of the PostLateUpdate
+        /// </summary>
+        internal void PostLateUpdate()
+        {
+            OnPostLateUpdate();
+        }
+
+        /// <summary>
+        /// Invoked to acquire the network topology for the current network session.
+        /// </summary>
+        /// <returns><see cref="NetworkTopologyTypes"/></returns>
+        protected virtual NetworkTopologyTypes OnCurrentTopology()
+        {
+            return NetworkTopologyTypes.ClientServer;
+        }
+
+        internal NetworkTopologyTypes CurrentTopology()
+        {
+            return OnCurrentTopology();
+        }
+    }
+
+    /// <summary>
+    /// The two network topology types supported by Netcode for GameObjects.
+    /// </summary>
+    /// <remarks>
+    /// <see cref="DistributedAuthority"/> is only supported using <see cref="Transports.UTP.UnityTransport"/>.
+    /// </remarks>
+    public enum NetworkTopologyTypes
+    {
+        /// <summary>
+        /// The traditional client-server network topology.
+        /// </summary>
+        ClientServer,
+        /// <summary>
+        /// The distributed authorityy network topology only supported by <see cref="Transports.UTP.UnityTransport"/>.
+        /// </summary>
+        DistributedAuthority
     }
 
 #if UNITY_INCLUDE_TESTS
diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/BatchedReceiveQueue.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/BatchedReceiveQueue.cs
index e0cdeebb49..5551c8062f 100644
--- a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/BatchedReceiveQueue.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/BatchedReceiveQueue.cs
@@ -1,9 +1,7 @@
 using System;
-using Unity.Networking.Transport;
-#if UTP_TRANSPORT_2_0_ABOVE
 using Unity.Collections;
 using Unity.Collections.LowLevel.Unsafe;
-#endif
+using Unity.Networking.Transport;
 
 namespace Unity.Netcode.Transports.UTP
 {
@@ -29,11 +27,7 @@ public BatchedReceiveQueue(DataStreamReader reader)
             {
                 fixed (byte* dataPtr = m_Data)
                 {
-#if UTP_TRANSPORT_2_0_ABOVE
                     reader.ReadBytesUnsafe(dataPtr, reader.Length);
-#else
-                    reader.ReadBytes(dataPtr, reader.Length);
-#endif
                 }
             }
 
@@ -70,11 +64,7 @@ public void PushReader(DataStreamReader reader)
             {
                 fixed (byte* dataPtr = m_Data)
                 {
-#if UTP_TRANSPORT_2_0_ABOVE
                     reader.ReadBytesUnsafe(dataPtr + m_Offset + m_Length, reader.Length);
-#else
-                    reader.ReadBytes(dataPtr + m_Offset + m_Length, reader.Length);
-#endif
                 }
             }
 
diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/BatchedSendQueue.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/BatchedSendQueue.cs
index b1bd3fa98f..cb56bf0026 100644
--- a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/BatchedSendQueue.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/BatchedSendQueue.cs
@@ -94,11 +94,7 @@ public void Dispose()
         /// <summary>Write a raw buffer to a DataStreamWriter.</summary>
         private unsafe void WriteBytes(ref DataStreamWriter writer, byte* data, int length)
         {
-#if UTP_TRANSPORT_2_0_ABOVE
             writer.WriteBytesUnsafe(data, length);
-#else
-            writer.WriteBytes(data, length);
-#endif
         }
 
         /// <summary>Append data at the tail of the queue. No safety checks.</summary>
@@ -106,7 +102,7 @@ private void AppendDataAtTail(ArraySegment<byte> data)
         {
             unsafe
             {
-                var writer = new DataStreamWriter((byte*)m_Data.GetUnsafePtr() + TailIndex, Capacity - TailIndex);
+                var writer = new DataStreamWriter(m_Data.GetUnsafePtr() + TailIndex, Capacity - TailIndex);
 
                 writer.WriteInt(data.Count);
 
@@ -145,7 +141,7 @@ public bool PushMessage(ArraySegment<byte> message)
             {
                 unsafe
                 {
-                    UnsafeUtility.MemMove(m_Data.GetUnsafePtr(), (byte*)m_Data.GetUnsafePtr() + HeadIndex, Length);
+                    UnsafeUtility.MemMove(m_Data.GetUnsafePtr(), m_Data.GetUnsafePtr() + HeadIndex, Length);
                 }
 
                 TailIndex = Length;
@@ -231,7 +227,7 @@ public int FillWriterWithMessages(ref DataStreamWriter writer, int softMaxBytes
                 if (bytesToWrite > softMaxBytes && bytesToWrite <= writer.Capacity)
                 {
                     writer.WriteInt(messageLength);
-                    WriteBytes(ref writer, (byte*)m_Data.GetUnsafePtr() + reader.GetBytesRead(), messageLength);
+                    WriteBytes(ref writer, m_Data.GetUnsafePtr() + reader.GetBytesRead(), messageLength);
 
                     return bytesToWrite;
                 }
@@ -248,7 +244,7 @@ public int FillWriterWithMessages(ref DataStreamWriter writer, int softMaxBytes
                         if (bytesWritten + bytesToWrite <= softMaxBytes)
                         {
                             writer.WriteInt(messageLength);
-                            WriteBytes(ref writer, (byte*)m_Data.GetUnsafePtr() + reader.GetBytesRead(), messageLength);
+                            WriteBytes(ref writer, m_Data.GetUnsafePtr() + reader.GetBytesRead(), messageLength);
 
                             readerOffset += bytesToWrite;
                             bytesWritten += bytesToWrite;
@@ -292,7 +288,7 @@ public int FillWriterWithBytes(ref DataStreamWriter writer, int maxBytes = 0)
 
             unsafe
             {
-                WriteBytes(ref writer, (byte*)m_Data.GetUnsafePtr() + HeadIndex, copyLength);
+                WriteBytes(ref writer, m_Data.GetUnsafePtr() + HeadIndex, copyLength);
             }
 
             return copyLength;
diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs
index 984da63ee8..210d7f660b 100644
--- a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs
+++ b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs
@@ -7,23 +7,19 @@
 
 using System;
 using System.Collections.Generic;
-using UnityEngine;
-using NetcodeNetworkEvent = Unity.Netcode.NetworkEvent;
-using TransportNetworkEvent = Unity.Networking.Transport.NetworkEvent;
 using Unity.Burst;
-using Unity.Collections.LowLevel.Unsafe;
 using Unity.Collections;
+using Unity.Collections.LowLevel.Unsafe;
 using Unity.Jobs;
 using Unity.Networking.Transport;
 using Unity.Networking.Transport.Relay;
-using Unity.Networking.Transport.Utilities;
-#if UTP_TRANSPORT_2_0_ABOVE
 using Unity.Networking.Transport.TLS;
-#endif
+using Unity.Networking.Transport.Utilities;
+using UnityEngine;
 
-#if !UTP_TRANSPORT_2_0_ABOVE
-using NetworkEndpoint = Unity.Networking.Transport.NetworkEndPoint;
-#endif
+using NetcodeEvent = Unity.Netcode.NetworkEvent;
+using TransportError = Unity.Networking.Transport.Error.StatusCode;
+using TransportEvent = Unity.Networking.Transport.NetworkEvent.Type;
 
 namespace Unity.Netcode.Transports.UTP
 {
@@ -48,56 +44,6 @@ void CreateDriver(
             out NetworkPipeline reliableSequencedPipeline);
     }
 
-    /// <summary>
-    /// Helper utility class to convert <see cref="Networking.Transport"/> error codes to human readable error messages.
-    /// </summary>
-    public static class ErrorUtilities
-    {
-        private static readonly FixedString128Bytes k_NetworkSuccess = "Success";
-        private static readonly FixedString128Bytes k_NetworkIdMismatch = "Invalid connection ID {0}.";
-        private static readonly FixedString128Bytes k_NetworkVersionMismatch = "Connection ID is invalid. Likely caused by sending on stale connection {0}.";
-        private static readonly FixedString128Bytes k_NetworkStateMismatch = "Connection state is invalid. Likely caused by sending on connection {0} which is stale or still connecting.";
-        private static readonly FixedString128Bytes k_NetworkPacketOverflow = "Packet is too large to be allocated by the transport.";
-        private static readonly FixedString128Bytes k_NetworkSendQueueFull = "Unable to queue packet in the transport. Likely caused by send queue size ('Max Send Queue Size') being too small.";
-
-        /// <summary>
-        /// Convert a UTP error code to human-readable error message.
-        /// </summary>
-        /// <param name="error">UTP error code.</param>
-        /// <param name="connectionId">ID of the connection on which the error occurred.</param>
-        /// <returns>Human-readable error message.</returns>
-        public static string ErrorToString(Networking.Transport.Error.StatusCode error, ulong connectionId)
-        {
-            return ErrorToString((int)error, connectionId);
-        }
-
-        internal static string ErrorToString(int error, ulong connectionId)
-        {
-            return ErrorToFixedString(error, connectionId).ToString();
-        }
-
-        internal static FixedString128Bytes ErrorToFixedString(int error, ulong connectionId)
-        {
-            switch ((Networking.Transport.Error.StatusCode)error)
-            {
-                case Networking.Transport.Error.StatusCode.Success:
-                    return k_NetworkSuccess;
-                case Networking.Transport.Error.StatusCode.NetworkIdMismatch:
-                    return FixedString.Format(k_NetworkIdMismatch, connectionId);
-                case Networking.Transport.Error.StatusCode.NetworkVersionMismatch:
-                    return FixedString.Format(k_NetworkVersionMismatch, connectionId);
-                case Networking.Transport.Error.StatusCode.NetworkStateMismatch:
-                    return FixedString.Format(k_NetworkStateMismatch, connectionId);
-                case Networking.Transport.Error.StatusCode.NetworkPacketOverflow:
-                    return k_NetworkPacketOverflow;
-                case Networking.Transport.Error.StatusCode.NetworkSendQueueFull:
-                    return k_NetworkSendQueueFull;
-                default:
-                    return FixedString.Format("Unknown error code {0}.", error);
-            }
-        }
-    }
-
     /// <summary>
     /// The Netcode for GameObjects NetworkTransport for UnityTransport.
     /// Note: This is highly recommended to use over UNet.
@@ -120,13 +66,6 @@ public enum ProtocolType
             RelayUnityTransport,
         }
 
-        private enum State
-        {
-            Disconnected,
-            Listening,
-            Connected,
-        }
-
         /// <summary>
         /// The default maximum (receive) packet queue size
         /// </summary>
@@ -166,29 +105,30 @@ private enum State
         [SerializeField]
         private ProtocolType m_ProtocolType;
 
-#if UTP_TRANSPORT_2_0_ABOVE
         [Tooltip("Per default the client/server will communicate over UDP. Set to true to communicate with WebSocket.")]
         [SerializeField]
         private bool m_UseWebSockets = false;
 
+        /// <summary>Whether to use WebSockets as the protocol of communication. Default is UDP.</summary>
         public bool UseWebSockets
         {
             get => m_UseWebSockets;
             set => m_UseWebSockets = value;
         }
 
-        /// <summary>
-        /// Per default the client/server communication will not be encrypted. Select true to enable DTLS for UDP and TLS for Websocket.
-        /// </summary>
         [Tooltip("Per default the client/server communication will not be encrypted. Select true to enable DTLS for UDP and TLS for Websocket.")]
         [SerializeField]
         private bool m_UseEncryption = false;
+
+        /// <summary>
+        /// Whether to use encryption (default is false). Note that unless using Unity Relay, encryption requires
+        /// providing certificate information with <see cref="SetClientSecrets"/> and <see cref="SetServerSecrets"/>.
+        /// </summary>
         public bool UseEncryption
         {
             get => m_UseEncryption;
             set => m_UseEncryption = value;
         }
-#endif
 
         [Tooltip("The maximum amount of packets that can be in the internal send/receive queues. Basically this is how many packets can be sent/received in a single update/frame.")]
         [SerializeField]
@@ -202,12 +142,11 @@ public int MaxPacketQueueSize
             set => m_MaxPacketQueueSize = value;
         }
 
-        [Tooltip("The maximum size of an unreliable payload that can be handled by the transport. The memory for MaxPayloadSize is allocated once per connection and is released when the connection is closed.")]
+        [Tooltip("The maximum size of an unreliable payload that can be handled by the transport.")]
         [SerializeField]
         private int m_MaxPayloadSize = InitialMaxPayloadSize;
 
         /// <summary>The maximum size of an unreliable payload that can be handled by the transport.</summary>
-        /// <remarks>The memory for MaxPayloadSize is allocated once per connection and is released when the connection is closed.</remarks>
         public int MaxPayloadSize
         {
             get => m_MaxPayloadSize;
@@ -358,6 +297,9 @@ public NetworkEndpoint ListenEndPoint
                 }
             }
 
+            /// <summary>
+            /// Returns true if the end point address is of type <see cref="NetworkFamily.Ipv6"/>.
+            /// </summary>
             public bool IsIpv6 => !string.IsNullOrEmpty(Address) && ParseNetworkEndpoint(Address, Port, true).Family == NetworkFamily.Ipv6;
         }
 
@@ -404,9 +346,8 @@ public struct SimulatorParameters
         /// - packet drop rate (packet loss)
         /// </summary>
 
-#if UTP_TRANSPORT_2_0_ABOVE
         [Obsolete("DebugSimulator is no longer supported and has no effect. Use Network Simulator from the Multiplayer Tools package.", false)]
-#endif
+        [HideInInspector]
         public SimulatorParameters DebugSimulator = new SimulatorParameters
         {
             PacketDelayMS = 0,
@@ -425,12 +366,39 @@ private struct PacketLossCache
 
         internal static event Action<int, NetworkDriver> TransportInitialized;
         internal static event Action<int> TransportDisposed;
-        internal NetworkDriver NetworkDriver => m_Driver;
+
+        /// <summary>
+        /// Provides access to the <see cref="NetworkDriver"/> for this instance.
+        /// </summary>
+        protected NetworkDriver m_Driver;
+
+        /// <summary>
+        /// Gets a reference to the <see cref="NetworkDriver"/>.
+        /// </summary>
+        /// <returns>ref <see cref="NetworkDriver"/></returns>
+        public ref NetworkDriver GetNetworkDriver()
+        {
+            return ref m_Driver;
+        }
+
+        /// <summary>
+        /// Gets the local sytem's <see cref="NetworkEndpoint"/> that is assigned for the current network session.
+        /// </summary>
+        /// <remarks>
+        /// If the driver is not created it will return an invalid <see cref="NetworkEndpoint"/>.
+        /// </remarks>
+        /// <returns><see cref="NetworkEndpoint"/></returns>
+        public NetworkEndpoint GetLocalEndpoint()
+        {
+            if (m_Driver.IsCreated)
+            {
+                return m_Driver.GetLocalEndpoint();
+            }
+            return new NetworkEndpoint();
+        }
 
         private PacketLossCache m_PacketLossCache = new PacketLossCache();
 
-        private State m_State = State.Disconnected;
-        private NetworkDriver m_Driver;
         private NetworkSettings m_NetworkSettings;
         private ulong m_ServerClientId;
 
@@ -450,7 +418,10 @@ private struct PacketLossCache
 
         private RelayServerData m_RelayServerData;
 
-        internal NetworkManager NetworkManager;
+        /// <summary>
+        /// NetworkManager associated to this transport instance
+        /// </summary>
+        protected NetworkManager m_NetworkManager;
 
         private IRealTimeProvider m_RealTimeProvider;
 
@@ -473,7 +444,7 @@ private void InitDriver()
                 out m_UnreliableSequencedFragmentedPipeline,
                 out m_ReliableSequencedPipeline);
 
-            TransportInitialized?.Invoke(GetInstanceID(), NetworkDriver);
+            TransportInitialized?.Invoke(GetInstanceID(), m_Driver);
         }
 
         private void DisposeInternals()
@@ -555,12 +526,21 @@ private bool ClientBindAndConnect()
                 return false;
             }
 
-            var serverConnection = m_Driver.Connect(serverEndpoint);
-            m_ServerClientId = ParseClientId(serverConnection);
+            Connect(serverEndpoint);
 
             return true;
         }
 
+        /// <summary>
+        /// Virtual method that is invoked during <see cref="StartClient"/>.
+        /// </summary>
+        /// <param name="serverEndpoint">The <see cref="NetworkEndpoint"/> that the client is connecting to.</param>
+        /// <returns>A <see cref="NetworkConnection"/> representing the connection to the server, or an invalid connection if the connection attempt fails.</returns>
+        protected virtual NetworkConnection Connect(NetworkEndpoint serverEndpoint)
+        {
+            return m_Driver.Connect(serverEndpoint);
+        }
+
         private bool ServerBindAndListen(NetworkEndpoint endPoint)
         {
             // Verify the endpoint is valid before proceeding
@@ -586,7 +566,6 @@ private bool ServerBindAndListen(NetworkEndpoint endPoint)
                 return false;
             }
 
-            m_State = State.Listening;
             return true;
         }
 
@@ -687,11 +666,7 @@ public void SetConnectionData(NetworkEndpoint endPoint, NetworkEndpoint listenEn
         /// <param name="packetDelay">Packet delay in milliseconds.</param>
         /// <param name="packetJitter">Packet jitter in milliseconds.</param>
         /// <param name="dropRate">Packet drop percentage.</param>
-
-#if UTP_TRANSPORT_2_0_ABOVE
         [Obsolete("SetDebugSimulatorParameters is no longer supported and has no effect. Use Network Simulator from the Multiplayer Tools package.", false)]
-#endif
-
         public void SetDebugSimulatorParameters(int packetDelay, int packetJitter, int dropRate)
         {
             if (m_Driver.IsCreated)
@@ -742,9 +717,9 @@ public void Execute()
                 while (!Queue.IsEmpty)
                 {
                     var result = Driver.BeginSend(pipeline, connection, out var writer);
-                    if (result != (int)Networking.Transport.Error.StatusCode.Success)
+                    if (result != (int)TransportError.Success)
                     {
-                        Debug.LogError($"Error sending message: {ErrorUtilities.ErrorToFixedString(result, clientId)}");
+                        Debug.LogError($"Send error on connection {clientId}: {ErrorUtilities.ErrorToFixedString(result)}");
                         return;
                     }
 
@@ -769,9 +744,9 @@ public void Execute()
                         // and we'll retry sending them later). Otherwise log the error and remove the
                         // message from the queue (we don't want to resend it again since we'll likely
                         // just get the same error again).
-                        if (result != (int)Networking.Transport.Error.StatusCode.NetworkSendQueueFull)
+                        if (result != (int)TransportError.NetworkSendQueueFull)
                         {
-                            Debug.LogError($"Error sending the message: {ErrorUtilities.ErrorToFixedString(result, clientId)}");
+                            Debug.LogError($"Send error on connection {clientId}: {ErrorUtilities.ErrorToFixedString(result)}");
                             Queue.Consume(written);
                         }
 
@@ -790,10 +765,10 @@ private void SendBatchedMessages(SendTarget sendTarget, BatchedSendQueue queue)
             }
 
             var mtu = 0;
-            if (NetworkManager)
+            if (m_NetworkManager)
             {
-                var ngoClientId = NetworkManager.ConnectionManager.TransportIdToClientId(sendTarget.ClientId);
-                mtu = NetworkManager.GetPeerMTU(ngoClientId);
+                var ngoClientId = m_NetworkManager.ConnectionManager.TransportIdToClientId(sendTarget.ClientId);
+                mtu = m_NetworkManager.GetPeerMTU(ngoClientId);
             }
 
             new SendBatchedMessagesJob
@@ -815,7 +790,7 @@ private bool AcceptConnection()
                 return false;
             }
 
-            InvokeOnTransportEvent(NetcodeNetworkEvent.Connect,
+            InvokeOnTransportEvent(NetcodeEvent.Connect,
                 ParseClientId(connection),
                 default,
                 m_RealTimeProvider.RealTimeSinceStartup);
@@ -853,7 +828,7 @@ private void ReceiveMessages(ulong clientId, NetworkPipeline pipeline, DataStrea
                     break;
                 }
 
-                InvokeOnTransportEvent(NetcodeNetworkEvent.Data, clientId, message, m_RealTimeProvider.RealTimeSinceStartup);
+                InvokeOnTransportEvent(NetcodeEvent.Data, clientId, message, m_RealTimeProvider.RealTimeSinceStartup);
             }
         }
 
@@ -864,44 +839,38 @@ private bool ProcessEvent()
 
             switch (eventType)
             {
-                case TransportNetworkEvent.Type.Connect:
+                case TransportEvent.Connect:
                     {
-                        InvokeOnTransportEvent(NetcodeNetworkEvent.Connect,
+                        InvokeOnTransportEvent(NetcodeEvent.Connect,
                             clientId,
                             default,
                             m_RealTimeProvider.RealTimeSinceStartup);
 
-                        m_State = State.Connected;
+                        m_ServerClientId = clientId;
                         return true;
                     }
-                case TransportNetworkEvent.Type.Disconnect:
+                case TransportEvent.Disconnect:
                     {
-                        // Handle cases where we're a client receiving a Disconnect event. The
-                        // meaning of the event depends on our current state. If we were connected
-                        // then it means we got disconnected. If we were disconnected means that our
-                        // connection attempt has failed.
-                        if (m_State == State.Connected)
-                        {
-                            m_State = State.Disconnected;
-                            m_ServerClientId = default;
-                        }
-                        else if (m_State == State.Disconnected)
+                        // If we're a client and had not yet set the server client ID, it means
+                        // our connection to the server failed to be established. Any other case
+                        // means a clean disconnect that doesn't require logging.
+                        if (!m_Driver.Listening && m_ServerClientId == default)
                         {
                             Debug.LogError("Failed to connect to server.");
-                            m_ServerClientId = default;
                         }
 
+                        m_ServerClientId = default;
                         m_ReliableReceiveQueues.Remove(clientId);
                         ClearSendQueuesForClientId(clientId);
 
-                        InvokeOnTransportEvent(NetcodeNetworkEvent.Disconnect,
+                        InvokeOnTransportEvent(NetcodeEvent.Disconnect,
                             clientId,
                             default,
                             m_RealTimeProvider.RealTimeSinceStartup);
 
                         return true;
                     }
-                case TransportNetworkEvent.Type.Data:
+                case TransportEvent.Data:
                     {
                         ReceiveMessages(clientId, pipeline, reader);
                         return true;
@@ -911,43 +880,63 @@ private bool ProcessEvent()
             return false;
         }
 
-        private void Update()
+        /// <summary>
+        /// Handles accepting new connections and processing transport events.
+        /// </summary>
+        protected override void OnEarlyUpdate()
         {
             if (m_Driver.IsCreated)
             {
-                foreach (var kvp in m_SendQueue)
-                {
-                    SendBatchedMessages(kvp.Key, kvp.Value);
-                }
-
-                m_Driver.ScheduleUpdate().Complete();
-
                 if (m_ProtocolType == ProtocolType.RelayUnityTransport && m_Driver.GetRelayConnectionStatus() == RelayConnectionStatus.AllocationInvalid)
                 {
                     Debug.LogError("Transport failure! Relay allocation needs to be recreated, and NetworkManager restarted. " +
                         "Use NetworkManager.OnTransportFailure to be notified of such events programmatically.");
 
-                    InvokeOnTransportEvent(NetcodeNetworkEvent.TransportFailure, 0, default, m_RealTimeProvider.RealTimeSinceStartup);
+                    InvokeOnTransportEvent(NetcodeEvent.TransportFailure, 0, default, m_RealTimeProvider.RealTimeSinceStartup);
                     return;
                 }
 
+                m_Driver.ScheduleUpdate().Complete();
+
+                // Process any new connections
                 while (AcceptConnection() && m_Driver.IsCreated)
                 {
                     ;
                 }
 
+                // Process any transport events (i.e. connect, disconnect, data, etc)
                 while (ProcessEvent() && m_Driver.IsCreated)
                 {
                     ;
                 }
+            }
+            base.OnEarlyUpdate();
+        }
+
+        /// <summary>
+        /// Handles sending any queued batched messages.
+        /// </summary>
+        protected override void OnPostLateUpdate()
+        {
+            if (m_Driver.IsCreated)
+            {
+                foreach (var kvp in m_SendQueue)
+                {
+                    SendBatchedMessages(kvp.Key, kvp.Value);
+                }
+
+                // Schedule a flush send as the last transport action for the
+                // current frame.
+                m_Driver.ScheduleFlushSend(default).Complete();
 
 #if MULTIPLAYER_TOOLS_1_0_0_PRE_7
-                if (NetworkManager)
+                if (m_NetworkManager)
                 {
                     ExtractNetworkMetrics();
                 }
 #endif
             }
+            base.OnPostLateUpdate();
         }
 
         private void OnDestroy()
@@ -958,16 +947,16 @@ private void OnDestroy()
 #if MULTIPLAYER_TOOLS_1_0_0_PRE_7
         private void ExtractNetworkMetrics()
         {
-            if (NetworkManager.IsServer)
+            if (m_NetworkManager.IsServer)
             {
-                var ngoConnectionIds = NetworkManager.ConnectedClients.Keys;
+                var ngoConnectionIds = m_NetworkManager.ConnectedClients.Keys;
                 foreach (var ngoConnectionId in ngoConnectionIds)
                 {
-                    if (ngoConnectionId == 0 && NetworkManager.IsHost)
+                    if (ngoConnectionId == 0 && m_NetworkManager.IsHost)
                     {
                         continue;
                     }
-                    var transportClientId = NetworkManager.ConnectionManager.ClientIdToTransportId(ngoConnectionId);
+                    var transportClientId = m_NetworkManager.ConnectionManager.ClientIdToTransportId(ngoConnectionId);
                     ExtractNetworkMetricsForClient(transportClientId);
                 }
             }
@@ -987,10 +976,10 @@ private void ExtractNetworkMetricsForClient(ulong transportClientId)
             ExtractNetworkMetricsFromPipeline(m_UnreliableSequencedFragmentedPipeline, networkConnection);
             ExtractNetworkMetricsFromPipeline(m_ReliableSequencedPipeline, networkConnection);
 
-            var rttValue = NetworkManager.IsServer ? 0 : ExtractRtt(networkConnection);
+            var rttValue = m_NetworkManager.IsServer ? 0 : ExtractRtt(networkConnection);
             NetworkMetrics.UpdateRttToServer(rttValue);
 
-            var packetLoss = NetworkManager.IsServer ? 0 : ExtractPacketLoss(networkConnection);
+            var packetLoss = m_NetworkManager.IsServer ? 0 : ExtractPacketLoss(networkConnection);
             NetworkMetrics.UpdatePacketLoss(packetLoss);
         }
 
@@ -1003,11 +992,7 @@ private void ExtractNetworkMetricsFromPipeline(NetworkPipeline pipeline, Network
 
             //Don't need to dispose of the buffers, they are filled with data pointers.
             m_Driver.GetPipelineBuffers(pipeline,
-#if UTP_TRANSPORT_2_0_ABOVE
                 NetworkPipelineStageId.Get<NetworkMetricsPipelineStage>(),
-#else
-                NetworkPipelineStageCollection.GetStageId(typeof(NetworkMetricsPipelineStage)),
-#endif
                 networkConnection,
                 out _,
                 out _,
@@ -1034,11 +1019,7 @@ private int ExtractRtt(NetworkConnection networkConnection)
             }
 
             m_Driver.GetPipelineBuffers(m_ReliableSequencedPipeline,
-#if UTP_TRANSPORT_2_0_ABOVE
                 NetworkPipelineStageId.Get<ReliableSequencedPipelineStage>(),
-#else
-                NetworkPipelineStageCollection.GetStageId(typeof(ReliableSequencedPipelineStage)),
-#endif
                 networkConnection,
                 out _,
                 out _,
@@ -1060,11 +1041,7 @@ private float ExtractPacketLoss(NetworkConnection networkConnection)
             }
 
             m_Driver.GetPipelineBuffers(m_ReliableSequencedPipeline,
-#if UTP_TRANSPORT_2_0_ABOVE
                 NetworkPipelineStageId.Get<ReliableSequencedPipelineStage>(),
-#else
-                NetworkPipelineStageCollection.GetStageId(typeof(ReliableSequencedPipelineStage)),
-#endif
                 networkConnection,
                 out _,
                 out _,
@@ -1138,13 +1115,13 @@ private void FlushSendQueuesForClientId(ulong clientId)
         /// </summary>
         public override void DisconnectLocalClient()
         {
-            if (m_State == State.Connected)
+            if (m_ServerClientId != default)
             {
                 FlushSendQueuesForClientId(m_ServerClientId);
 
                 if (m_Driver.Disconnect(ParseClientId(m_ServerClientId)) == 0)
                 {
-                    m_State = State.Disconnected;
+                    m_ServerClientId = default;
 
                     m_ReliableReceiveQueues.Remove(m_ServerClientId);
                     ClearSendQueuesForClientId(m_ServerClientId);
@@ -1152,7 +1129,7 @@ public override void DisconnectLocalClient()
                     // If we successfully disconnect we dispatch a local disconnect message
                     // this how uNET and other transports worked and so this is just keeping with the old behavior
                     // should be also noted on the client this will call shutdown on the NetworkManager and the Transport
-                    InvokeOnTransportEvent(NetcodeNetworkEvent.Disconnect,
+                    InvokeOnTransportEvent(NetcodeEvent.Disconnect,
                         m_ServerClientId,
                         default,
                         m_RealTimeProvider.RealTimeSinceStartup);
@@ -1166,9 +1143,15 @@ public override void DisconnectLocalClient()
         /// <param name="clientId">The client to disconnect</param>
         public override void DisconnectRemoteClient(ulong clientId)
         {
-            Debug.Assert(m_State == State.Listening, "DisconnectRemoteClient should be called on a listening server");
+#if DEBUG
+            if (!m_Driver.IsCreated)
+            {
+                Debug.LogWarning($"{nameof(DisconnectRemoteClient)} should only be called on a listening server!");
+                return;
+            }
+#endif
 
-            if (m_State == State.Listening)
+            if (m_Driver.IsCreated)
             {
                 FlushSendQueuesForClientId(clientId);
 
@@ -1194,9 +1177,9 @@ public override ulong GetCurrentRtt(ulong clientId)
             // use the transport client ID) or from a user (which will be using the NGO client ID).
             // So we just try both cases (ExtractRtt returns 0 for invalid connections).
 
-            if (NetworkManager != null)
+            if (m_NetworkManager != null)
             {
-                var transportId = NetworkManager.ConnectionManager.ClientIdToTransportId(clientId);
+                var transportId = m_NetworkManager.ConnectionManager.ClientIdToTransportId(clientId);
 
                 var rtt = ExtractRtt(ParseClientId(transportId));
                 if (rtt > 0)
@@ -1208,22 +1191,52 @@ public override ulong GetCurrentRtt(ulong clientId)
             return (ulong)ExtractRtt(ParseClientId(clientId));
         }
 
+        /// <summary>
+        /// Provides the <see cref="NetworkEndpoint"/> for the NGO client identifier specified.
+        /// </summary>
+        /// <remarks>
+        /// - This is only really useful for direct connections.
+        /// - Relay connections and clients connected using a distributed authority network topology will not provide the client's actual endpoint information.
+        /// - For LAN topologies this should work as long as it is a direct connection and not a relay connection.
+        /// </remarks>
+        /// <param name="clientId">NGO client identifier to get endpoint information about.</param>
+        /// <returns><see cref="NetworkEndpoint"/></returns>
+        public NetworkEndpoint GetEndpoint(ulong clientId)
+        {
+            if (m_Driver.IsCreated && m_NetworkManager != null && m_NetworkManager.IsListening)
+            {
+                var transportId = m_NetworkManager.ConnectionManager.ClientIdToTransportId(clientId);
+                var networkConnection = ParseClientId(transportId);
+                if (m_Driver.GetConnectionState(networkConnection) == NetworkConnection.State.Connected)
+                {
+                    return m_Driver.GetRemoteEndpoint(networkConnection);
+                }
+            }
+            return new NetworkEndpoint();
+        }
+
         /// <summary>
         /// Initializes the transport
         /// </summary>
         /// <param name="networkManager">The NetworkManager that initialized and owns the transport</param>
         public override void Initialize(NetworkManager networkManager = null)
         {
-            Debug.Assert(sizeof(ulong) == UnsafeUtility.SizeOf<NetworkConnection>(), "Netcode connection id size does not match UTP connection id size");
+#if DEBUG
+            if (sizeof(ulong) != UnsafeUtility.SizeOf<NetworkConnection>())
+            {
+                Debug.LogWarning($"Netcode connection id size {sizeof(ulong)} does not match UTP connection id size {UnsafeUtility.SizeOf<NetworkConnection>()}!");
+                return;
+            }
+#endif
 
-            NetworkManager = networkManager;
+            m_NetworkManager = networkManager;
 
-            if (NetworkManager && NetworkManager.PortOverride.Overidden)
+            if (m_NetworkManager && m_NetworkManager.PortOverride.Overidden)
             {
-                ConnectionData.Port = NetworkManager.PortOverride.Value;
+                ConnectionData.Port = m_NetworkManager.PortOverride.Value;
             }
 
-            m_RealTimeProvider = NetworkManager ? NetworkManager.RealTimeProvider : new RealTimeProvider();
+            m_RealTimeProvider = m_NetworkManager ? m_NetworkManager.RealTimeProvider : new RealTimeProvider();
 
             m_NetworkSettings = new NetworkSettings(Allocator.Persistent);
 
@@ -1241,18 +1254,9 @@ public override void Initialize(NetworkManager networkManager = null)
             // we sometimes notice a lot of useless resends, especially if using Relay. (We can
             // only do this with UTP 2.0 because 1.X doesn't support that parameter.)
             m_NetworkSettings.WithReliableStageParameters(
-                windowSize: 64
-#if UTP_TRANSPORT_2_0_ABOVE
-                ,
+                windowSize: 64,
                 maximumResendTime: m_ProtocolType == ProtocolType.RelayUnityTransport ? 750 : 500
-#endif
             );
-
-#if !UTP_TRANSPORT_2_0_ABOVE && !UNITY_WEBGL
-            m_NetworkSettings.WithBaselibNetworkInterfaceParameters(
-                receiveQueueCapacity: m_MaxPacketQueueSize,
-                sendQueueCapacity: m_MaxPacketQueueSize);
-#endif
         }
 
         /// <summary>
@@ -1262,12 +1266,12 @@ public override void Initialize(NetworkManager networkManager = null)
         /// <param name="payload">The incoming data payload</param>
         /// <param name="receiveTime">The time the event was received, as reported by m_RealTimeProvider.RealTimeSinceStartup.</param>
         /// <returns>Returns the event type</returns>
-        public override NetcodeNetworkEvent PollEvent(out ulong clientId, out ArraySegment<byte> payload, out float receiveTime)
+        public override NetcodeEvent PollEvent(out ulong clientId, out ArraySegment<byte> payload, out float receiveTime)
         {
             clientId = default;
             payload = default;
             receiveTime = default;
-            return NetcodeNetworkEvent.Nothing;
+            return NetcodeEvent.Nothing;
         }
 
         /// <summary>
@@ -1278,8 +1282,13 @@ public override NetcodeNetworkEvent PollEvent(out ulong clientId, out ArraySegme
         /// <param name="networkDelivery">The delivery type (QoS) to send data with</param>
         public override void Send(ulong clientId, ArraySegment<byte> payload, NetworkDelivery networkDelivery)
         {
-            var pipeline = SelectSendPipeline(networkDelivery);
+            var connection = ParseClientId(clientId);
+            if (!m_Driver.IsCreated || m_Driver.GetConnectionState(connection) != NetworkConnection.State.Connected)
+            {
+                return;
+            }
 
+            var pipeline = SelectSendPipeline(networkDelivery);
             if (pipeline != m_ReliableSequencedPipeline && payload.Count > m_MaxPayloadSize)
             {
                 Debug.LogError($"Unreliable payload of size {payload.Count} larger than configured 'Max Payload Size' ({m_MaxPayloadSize}).");
@@ -1317,7 +1326,7 @@ public override void Send(ulong clientId, ArraySegment<byte> payload, NetworkDel
                     // provide any reliability guarantees anymore. Disconnect the client since at
                     // this point they're bound to become desynchronized.
 
-                    var ngoClientId = NetworkManager?.ConnectionManager.TransportIdToClientId(clientId) ?? clientId;
+                    var ngoClientId = m_NetworkManager?.ConnectionManager.TransportIdToClientId(clientId) ?? clientId;
                     Debug.LogError($"Couldn't add payload of size {payload.Count} to reliable send queue. " +
                         $"Closing connection {ngoClientId} as reliability guarantees can't be maintained.");
 
@@ -1330,7 +1339,7 @@ public override void Send(ulong clientId, ArraySegment<byte> payload, NetworkDel
                         DisconnectRemoteClient(clientId);
 
                         // DisconnectRemoteClient doesn't notify SDK of disconnection.
-                        InvokeOnTransportEvent(NetcodeNetworkEvent.Disconnect,
+                        InvokeOnTransportEvent(NetcodeEvent.Disconnect,
                             clientId,
                             default(ArraySegment<byte>),
                             m_RealTimeProvider.RealTimeSinceStartup);
@@ -1417,8 +1426,18 @@ public override bool StartServer()
         /// </summary>
         public override void Shutdown()
         {
+            if (m_NetworkManager && !m_NetworkManager.ShutdownInProgress)
+            {
+                Debug.LogWarning("Directly calling `UnityTransport.Shutdown()` results in unexpected shutdown behaviour. All pending events will be lost. Use `NetworkManager.Shutdown()` instead.");
+            }
+
             if (m_Driver.IsCreated)
             {
+                while (ProcessEvent() && m_Driver.IsCreated)
+                {
+                    ;
+                }
+
                 // Flush all send queues to the network. NGO can be configured to flush its message
                 // queue on shutdown. But this only calls the Send() method, which doesn't actually
                 // get anything to the network.
@@ -1438,11 +1457,10 @@ public override void Shutdown()
             m_ReliableReceiveQueues.Clear();
 
             // We must reset this to zero because UTP actually re-uses clientIds if there is a clean disconnect
-            m_ServerClientId = 0;
+            m_ServerClientId = default;
         }
 
-#if UTP_TRANSPORT_2_0_ABOVE
-        private void ConfigureSimulatorForUtp2()
+        private void ConfigureSimulator()
         {
             // As DebugSimulator is deprecated, the 'packetDelayMs', 'packetJitterMs' and 'packetDropPercentage'
             // parameters are set to the default and are supposed to be changed using Network Simulator tool instead.
@@ -1458,19 +1476,12 @@ private void ConfigureSimulatorForUtp2()
 
             m_NetworkSettings.WithNetworkSimulatorParameters();
         }
-#else
-        private void ConfigureSimulatorForUtp1()
+
+        /// <inheritdoc cref="NetworkTransport.OnCurrentTopology"/>
+        protected override NetworkTopologyTypes OnCurrentTopology()
         {
-            m_NetworkSettings.WithSimulatorStageParameters(
-                maxPacketCount: 300, // TODO Is there any way to compute a better value?
-                maxPacketSize: NetworkParameterConstants.MTU,
-                packetDelayMs: DebugSimulator.PacketDelayMS,
-                packetJitterMs: DebugSimulator.PacketJitterMS,
-                packetDropPercentage: DebugSimulator.PacketDropRate,
-                randomSeed: DebugSimulatorRandomSeed ?? (uint)System.Diagnostics.Stopwatch.GetTimestamp()
-            );
+            return m_NetworkManager != null ? m_NetworkManager.NetworkConfig.NetworkTopology : NetworkTopologyTypes.ClientServer;
         }
-#endif
 
         private string m_ServerPrivateKey;
         private string m_ServerCertificate;
@@ -1524,34 +1535,39 @@ public void CreateDriver(UnityTransport transport, out NetworkDriver driver,
             out NetworkPipeline unreliableSequencedFragmentedPipeline,
             out NetworkPipeline reliableSequencedPipeline)
         {
-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7 && !UTP_TRANSPORT_2_0_ABOVE
-            NetworkPipelineStageCollection.RegisterPipelineStage(new NetworkMetricsPipelineStage());
-#endif
-
-#if UTP_TRANSPORT_2_0_ABOVE && UNITY_MP_TOOLS_NETSIM_IMPLEMENTATION_ENABLED
-            ConfigureSimulatorForUtp2();
-#elif !UTP_TRANSPORT_2_0_ABOVE && (UNITY_EDITOR || DEVELOPMENT_BUILD)
-            ConfigureSimulatorForUtp1();
+#if UNITY_MP_TOOLS_NETSIM_IMPLEMENTATION_ENABLED
+            ConfigureSimulator();
 #endif
-
             m_NetworkSettings.WithNetworkConfigParameters(
                 maxConnectAttempts: transport.m_MaxConnectAttempts,
                 connectTimeoutMS: transport.m_ConnectTimeoutMS,
                 disconnectTimeoutMS: transport.m_DisconnectTimeoutMS,
-#if UTP_TRANSPORT_2_0_ABOVE
                 sendQueueCapacity: m_MaxPacketQueueSize,
                 receiveQueueCapacity: m_MaxPacketQueueSize,
-#endif
                 heartbeatTimeoutMS: transport.m_HeartbeatTimeoutMS);
 
 #if UNITY_WEBGL && !UNITY_EDITOR
-            if (NetworkManager.IsServer && m_ProtocolType != ProtocolType.RelayUnityTransport)
+            if (m_NetworkManager.IsServer && m_ProtocolType != ProtocolType.RelayUnityTransport)
             {
                 throw new Exception("WebGL as a server is not supported by Unity Transport, outside the Editor.");
             }
 #endif
 
-#if UTP_TRANSPORT_2_0_ABOVE
+#if UNITY_SERVER
+            if (m_ProtocolType == ProtocolType.RelayUnityTransport)
+            {
+                if (m_UseWebSockets)
+                {
+                    Debug.LogError("Transport is configured to use Websockets, but websockets are not available on server builds. Ensure that the \"Use WebSockets\" checkbox is checked under \"Unity Transport\" component.");
+                }
+
+                if (m_RelayServerData.IsWebSocket != 0)
+                {
+                    Debug.LogError("Relay server data indicates usage of WebSockets, but websockets are not available on server builds. Be sure to use \"dtls\" or \"udp\" as the connection type when creating the server data");
+                }
+            }
+#endif
+
             if (m_UseEncryption)
             {
                 if (m_ProtocolType == ProtocolType.RelayUnityTransport)
@@ -1567,7 +1583,7 @@ public void CreateDriver(UnityTransport transport, out NetworkDriver driver,
                 }
                 else
                 {
-                    if (NetworkManager.IsServer)
+                    if (m_NetworkManager.IsServer)
                     {
                         if (string.IsNullOrEmpty(m_ServerCertificate) || string.IsNullOrEmpty(m_ServerPrivateKey))
                         {
@@ -1593,9 +1609,7 @@ public void CreateDriver(UnityTransport transport, out NetworkDriver driver,
                     }
                 }
             }
-#endif
 
-#if UTP_TRANSPORT_2_1_ABOVE
             if (m_ProtocolType == ProtocolType.RelayUnityTransport)
             {
                 if (m_UseWebSockets && m_RelayServerData.IsWebSocket == 0)
@@ -1608,9 +1622,7 @@ public void CreateDriver(UnityTransport transport, out NetworkDriver driver,
                     Debug.LogError("Relay server data indicates usage of WebSockets, but \"Use WebSockets\" checkbox isn't checked under \"Unity Transport\" component.");
                 }
             }
-#endif
 
-#if UTP_TRANSPORT_2_0_ABOVE
             if (m_UseWebSockets)
             {
                 driver = NetworkDriver.Create(new WebSocketNetworkInterface(), m_NetworkSettings);
@@ -1624,88 +1636,18 @@ public void CreateDriver(UnityTransport transport, out NetworkDriver driver,
                 driver = NetworkDriver.Create(new UDPNetworkInterface(), m_NetworkSettings);
 #endif
             }
-#else
-            driver = NetworkDriver.Create(m_NetworkSettings);
-#endif
 
-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7 && UTP_TRANSPORT_2_0_ABOVE
+#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
             driver.RegisterPipelineStage(new NetworkMetricsPipelineStage());
 #endif
 
-#if !UTP_TRANSPORT_2_0_ABOVE
-            SetupPipelinesForUtp1(driver,
-                out unreliableFragmentedPipeline,
-                out unreliableSequencedFragmentedPipeline,
-                out reliableSequencedPipeline);
-#else
-            SetupPipelinesForUtp2(driver,
+            SetupPipelines(driver,
                 out unreliableFragmentedPipeline,
                 out unreliableSequencedFragmentedPipeline,
                 out reliableSequencedPipeline);
-#endif
         }
 
-#if !UTP_TRANSPORT_2_0_ABOVE
-        private void SetupPipelinesForUtp1(NetworkDriver driver,
-            out NetworkPipeline unreliableFragmentedPipeline,
-            out NetworkPipeline unreliableSequencedFragmentedPipeline,
-            out NetworkPipeline reliableSequencedPipeline)
-        {
-#if UNITY_EDITOR || DEVELOPMENT_BUILD
-            if (DebugSimulator.PacketDelayMS > 0 || DebugSimulator.PacketDropRate > 0)
-            {
-                unreliableFragmentedPipeline = driver.CreatePipeline(
-                    typeof(FragmentationPipelineStage),
-                    typeof(SimulatorPipelineStage),
-                    typeof(SimulatorPipelineStageInSend)
-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
-                    , typeof(NetworkMetricsPipelineStage)
-#endif
-                );
-                unreliableSequencedFragmentedPipeline = driver.CreatePipeline(
-                    typeof(FragmentationPipelineStage),
-                    typeof(UnreliableSequencedPipelineStage),
-                    typeof(SimulatorPipelineStage),
-                    typeof(SimulatorPipelineStageInSend)
-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
-                    , typeof(NetworkMetricsPipelineStage)
-#endif
-                );
-                reliableSequencedPipeline = driver.CreatePipeline(
-                    typeof(ReliableSequencedPipelineStage),
-                    typeof(SimulatorPipelineStage),
-                    typeof(SimulatorPipelineStageInSend)
-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
-                    , typeof(NetworkMetricsPipelineStage)
-#endif
-                );
-            }
-            else
-#endif
-            {
-                unreliableFragmentedPipeline = driver.CreatePipeline(
-                    typeof(FragmentationPipelineStage)
-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
-                    , typeof(NetworkMetricsPipelineStage)
-#endif
-                );
-                unreliableSequencedFragmentedPipeline = driver.CreatePipeline(
-                    typeof(FragmentationPipelineStage),
-                    typeof(UnreliableSequencedPipelineStage)
-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
-                    , typeof(NetworkMetricsPipelineStage)
-#endif
-                );
-                reliableSequencedPipeline = driver.CreatePipeline(
-                    typeof(ReliableSequencedPipelineStage)
-#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
-                    , typeof(NetworkMetricsPipelineStage)
-#endif
-                );
-            }
-        }
-#else
-        private void SetupPipelinesForUtp2(NetworkDriver driver,
+        private void SetupPipelines(NetworkDriver driver,
             out NetworkPipeline unreliableFragmentedPipeline,
             out NetworkPipeline unreliableSequencedFragmentedPipeline,
             out NetworkPipeline reliableSequencedPipeline)
@@ -1742,9 +1684,8 @@ private void SetupPipelinesForUtp2(NetworkDriver driver,
 #endif
             );
         }
-#endif
-        // -------------- Utility Types -------------------------------------------------------------------------------
 
+        // -------------- Utility Types -------------------------------------------------------------------------------
 
         /// <summary>
         /// Cached information about reliability mode with a certain client
@@ -1779,4 +1720,37 @@ public override int GetHashCode()
             }
         }
     }
+
+    /// <summary>
+    /// Utility class to convert Unity Transport error codes to human-readable error messages.
+    /// </summary>
+    public static class ErrorUtilities
+    {
+        /// <summary>
+        /// Convert a Unity Transport error code to human-readable error message.
+        /// </summary>
+        /// <param name="error">Unity Transport error code.</param>
+        /// <param name="connectionId">ID of connection on which error occurred (unused).</param>
+        /// <returns>Human-readable error message.</returns>
+        public static string ErrorToString(TransportError error, ulong connectionId)
+        {
+            return ErrorToFixedString((int)error).ToString();
+        }
+
+        internal static FixedString128Bytes ErrorToFixedString(int error)
+        {
+            switch ((TransportError)error)
+            {
+                case TransportError.NetworkVersionMismatch:
+                case TransportError.NetworkStateMismatch:
+                    return "invalid connection state (likely stale/closed connection)";
+                case TransportError.NetworkPacketOverflow:
+                    return "packet is too large for the transport (likely need to increase MTU)";
+                case TransportError.NetworkSendQueueFull:
+                    return "send queue full (need to increase 'Max Send Queue Size' parameter)";
+                default:
+                    return FixedString.Format("unexpected error code {0}", error);
+            }
+        }
+    }
 }
diff --git a/com.unity.netcode.gameobjects/Runtime/com.unity.netcode.runtime.asmdef b/com.unity.netcode.gameobjects/Runtime/com.unity.netcode.runtime.asmdef
index 3b673da866..ba65fbd7f2 100644
--- a/com.unity.netcode.gameobjects/Runtime/com.unity.netcode.runtime.asmdef
+++ b/com.unity.netcode.gameobjects/Runtime/com.unity.netcode.runtime.asmdef
@@ -13,9 +13,17 @@
         "Unity.Networking.Transport",
         "Unity.Collections",
         "Unity.Burst",
-        "Unity.Mathematics"
+        "Unity.Mathematics",
+        "Unity.ResourceManager",
+        "Unity.Addressables"
     ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
     "allowUnsafeCode": true,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
     "versionDefines": [
         {
             "name": "com.unity.multiplayer.tools",
@@ -33,19 +41,35 @@
             "define": "MULTIPLAYER_TOOLS_1_0_0_PRE_7"
         },
         {
-            "name": "com.unity.transport",
-            "expression": "2.0.0-exp",
-            "define": "UTP_TRANSPORT_2_0_ABOVE"
+            "name": "Unity",
+            "expression": "2023",
+            "define": "UNITY_DEDICATED_SERVER_ARGUMENTS_PRESENT"
+        },
+        {
+            "name": "com.unity.modules.animation",
+            "expression": "",
+            "define": "COM_UNITY_MODULES_ANIMATION"
         },
         {
-            "name": "com.unity.transport",
-            "expression": "2.1.0",
-            "define": "UTP_TRANSPORT_2_1_ABOVE"
+            "name": "com.unity.modules.physics",
+            "expression": "",
+            "define": "COM_UNITY_MODULES_PHYSICS"
+        },
+        {
+            "name": "com.unity.modules.physics2d",
+            "expression": "",
+            "define": "COM_UNITY_MODULES_PHYSICS2D"
+        },
+        {
+            "name": "com.unity.services.multiplayer",
+            "expression": "0.2.0",
+            "define": "MULTIPLAYER_SERVICES_SDK_INSTALLED"
         },
         {
             "name": "Unity",
-            "expression": "2023",
-            "define": "UNITY_DEDICATED_SERVER_ARGUMENTS_PRESENT"
+            "expression": "6000.0.11f1",
+            "define": "COM_UNITY_MODULES_PHYSICS2D_LINEAR"
         }
-    ]
-}
+    ],
+    "noEngineReferences": false
+}
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Samples/Bootstrap/.sample.json b/com.unity.netcode.gameobjects/Samples/Bootstrap/.sample.json
deleted file mode 100644
index f62cf3082d..0000000000
--- a/com.unity.netcode.gameobjects/Samples/Bootstrap/.sample.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "displayName": "Bootstrap",
-    "description": "A lightweight sample to get started"
-}
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Samples/Bootstrap.meta b/com.unity.netcode.gameobjects/Samples~/Bootstrap.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Samples/Bootstrap.meta
rename to com.unity.netcode.gameobjects/Samples~/Bootstrap.meta
diff --git a/com.unity.netcode.gameobjects/Samples/Bootstrap/Prefabs.meta b/com.unity.netcode.gameobjects/Samples~/Bootstrap/Prefabs.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Samples/Bootstrap/Prefabs.meta
rename to com.unity.netcode.gameobjects/Samples~/Bootstrap/Prefabs.meta
diff --git a/com.unity.netcode.gameobjects/Samples/Bootstrap/Prefabs/BootstrapPlayer.prefab b/com.unity.netcode.gameobjects/Samples~/Bootstrap/Prefabs/BootstrapPlayer.prefab
similarity index 87%
rename from com.unity.netcode.gameobjects/Samples/Bootstrap/Prefabs/BootstrapPlayer.prefab
rename to com.unity.netcode.gameobjects/Samples~/Bootstrap/Prefabs/BootstrapPlayer.prefab
index 5b7b44713f..34fd335d94 100644
--- a/com.unity.netcode.gameobjects/Samples/Bootstrap/Prefabs/BootstrapPlayer.prefab
+++ b/com.unity.netcode.gameobjects/Samples~/Bootstrap/Prefabs/BootstrapPlayer.prefab
@@ -29,12 +29,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3439633038736912633}
+  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_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &3439633038736913157
 MeshFilter:
@@ -55,11 +56,15 @@ MeshRenderer:
   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:
@@ -93,9 +98,17 @@ SphereCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3439633038736912633}
   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
+  serializedVersion: 3
   m_Radius: 0.5
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!114 &3439633038736912634
@@ -110,8 +123,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 951099334
+  GlobalObjectIdHash: 2131729030
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
 --- !u!114 &2776227185612554462
@@ -138,9 +155,12 @@ MonoBehaviour:
   PositionThreshold: 0
   RotAngleThreshold: 0
   ScaleThreshold: 0
+  UseQuaternionSynchronization: 0
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 0
   InLocalSpace: 0
   Interpolate: 1
-  FixedSendsPerSecond: 30
+  SlerpPosition: 0
 --- !u!114 &6046305264893698362
 MonoBehaviour:
   m_ObjectHideFlags: 0
diff --git a/com.unity.netcode.gameobjects/Samples/Bootstrap/Prefabs/BootstrapPlayer.prefab.meta b/com.unity.netcode.gameobjects/Samples~/Bootstrap/Prefabs/BootstrapPlayer.prefab.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Samples/Bootstrap/Prefabs/BootstrapPlayer.prefab.meta
rename to com.unity.netcode.gameobjects/Samples~/Bootstrap/Prefabs/BootstrapPlayer.prefab.meta
diff --git a/com.unity.netcode.gameobjects/Samples/Bootstrap/Scenes.meta b/com.unity.netcode.gameobjects/Samples~/Bootstrap/Scenes.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Samples/Bootstrap/Scenes.meta
rename to com.unity.netcode.gameobjects/Samples~/Bootstrap/Scenes.meta
diff --git a/com.unity.netcode.gameobjects/Samples/Bootstrap/Scenes/Bootstrap.unity b/com.unity.netcode.gameobjects/Samples~/Bootstrap/Scenes/Bootstrap.unity
similarity index 100%
rename from com.unity.netcode.gameobjects/Samples/Bootstrap/Scenes/Bootstrap.unity
rename to com.unity.netcode.gameobjects/Samples~/Bootstrap/Scenes/Bootstrap.unity
diff --git a/com.unity.netcode.gameobjects/Samples/Bootstrap/Scenes/Bootstrap.unity.meta b/com.unity.netcode.gameobjects/Samples~/Bootstrap/Scenes/Bootstrap.unity.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Samples/Bootstrap/Scenes/Bootstrap.unity.meta
rename to com.unity.netcode.gameobjects/Samples~/Bootstrap/Scenes/Bootstrap.unity.meta
diff --git a/com.unity.netcode.gameobjects/Samples/Bootstrap/Scripts.meta b/com.unity.netcode.gameobjects/Samples~/Bootstrap/Scripts.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Samples/Bootstrap/Scripts.meta
rename to com.unity.netcode.gameobjects/Samples~/Bootstrap/Scripts.meta
diff --git a/com.unity.netcode.gameobjects/Samples/Bootstrap/Scripts/Bootstrap.asmdef b/com.unity.netcode.gameobjects/Samples~/Bootstrap/Scripts/Bootstrap.asmdef
similarity index 80%
rename from com.unity.netcode.gameobjects/Samples/Bootstrap/Scripts/Bootstrap.asmdef
rename to com.unity.netcode.gameobjects/Samples~/Bootstrap/Scripts/Bootstrap.asmdef
index 07a8ac0096..54cb675609 100644
--- a/com.unity.netcode.gameobjects/Samples/Bootstrap/Scripts/Bootstrap.asmdef
+++ b/com.unity.netcode.gameobjects/Samples~/Bootstrap/Scripts/Bootstrap.asmdef
@@ -1,7 +1,7 @@
 {
-	"name": "Bootstrap",
+    "name": "Bootstrap",
     "rootNamespace": "Unity.Netcode.Samples",
     "references": [
         "Unity.Netcode.Runtime"
     ]
-}
+}
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Samples/Bootstrap/Scripts/Bootstrap.asmdef.meta b/com.unity.netcode.gameobjects/Samples~/Bootstrap/Scripts/Bootstrap.asmdef.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Samples/Bootstrap/Scripts/Bootstrap.asmdef.meta
rename to com.unity.netcode.gameobjects/Samples~/Bootstrap/Scripts/Bootstrap.asmdef.meta
diff --git a/com.unity.netcode.gameobjects/Samples/Bootstrap/Scripts/BootstrapManager.cs b/com.unity.netcode.gameobjects/Samples~/Bootstrap/Scripts/BootstrapManager.cs
similarity index 100%
rename from com.unity.netcode.gameobjects/Samples/Bootstrap/Scripts/BootstrapManager.cs
rename to com.unity.netcode.gameobjects/Samples~/Bootstrap/Scripts/BootstrapManager.cs
diff --git a/com.unity.netcode.gameobjects/Samples/Bootstrap/Scripts/BootstrapManager.cs.meta b/com.unity.netcode.gameobjects/Samples~/Bootstrap/Scripts/BootstrapManager.cs.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Samples/Bootstrap/Scripts/BootstrapManager.cs.meta
rename to com.unity.netcode.gameobjects/Samples~/Bootstrap/Scripts/BootstrapManager.cs.meta
diff --git a/com.unity.netcode.gameobjects/Samples/Bootstrap/Scripts/BootstrapPlayer.cs b/com.unity.netcode.gameobjects/Samples~/Bootstrap/Scripts/BootstrapPlayer.cs
similarity index 100%
rename from com.unity.netcode.gameobjects/Samples/Bootstrap/Scripts/BootstrapPlayer.cs
rename to com.unity.netcode.gameobjects/Samples~/Bootstrap/Scripts/BootstrapPlayer.cs
diff --git a/com.unity.netcode.gameobjects/Samples/Bootstrap/Scripts/BootstrapPlayer.cs.meta b/com.unity.netcode.gameobjects/Samples~/Bootstrap/Scripts/BootstrapPlayer.cs.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Samples/Bootstrap/Scripts/BootstrapPlayer.cs.meta
rename to com.unity.netcode.gameobjects/Samples~/Bootstrap/Scripts/BootstrapPlayer.cs.meta
diff --git a/com.unity.netcode.gameobjects/TestHelpers/Runtime/AssemblyInfo.cs b/com.unity.netcode.gameobjects/TestHelpers/Runtime/AssemblyInfo.cs
index b21e378297..e880ab216e 100644
--- a/com.unity.netcode.gameobjects/TestHelpers/Runtime/AssemblyInfo.cs
+++ b/com.unity.netcode.gameobjects/TestHelpers/Runtime/AssemblyInfo.cs
@@ -4,6 +4,7 @@
 [assembly: InternalsVisibleTo("Unity.Netcode.RuntimeTests")]
 [assembly: InternalsVisibleTo("TestProject.RuntimeTests")]
 #if UNITY_EDITOR
+[assembly: InternalsVisibleTo("Unity.Netcode.Editor")]
 [assembly: InternalsVisibleTo("TestProject.EditorTests")]
 #endif // UNITY_EDITOR
 #if MULTIPLAYER_TOOLS
diff --git a/com.unity.netcode.gameobjects/TestHelpers/Runtime/IntegrationTestSceneHandler.cs b/com.unity.netcode.gameobjects/TestHelpers/Runtime/IntegrationTestSceneHandler.cs
index a9784a9b5b..a97454a5d3 100644
--- a/com.unity.netcode.gameobjects/TestHelpers/Runtime/IntegrationTestSceneHandler.cs
+++ b/com.unity.netcode.gameobjects/TestHelpers/Runtime/IntegrationTestSceneHandler.cs
@@ -3,6 +3,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
+using UnityEngine.AddressableAssets;
+using UnityEngine.ResourceManagement.AsyncOperations;
+using UnityEngine.ResourceManagement.ResourceProviders;
 using UnityEngine.SceneManagement;
 using Object = UnityEngine.Object;
 
@@ -23,6 +26,8 @@ internal struct SceneEntry
             public Scene Scene;
         }
 
+        public bool IsIntegrationTest() { return true; }
+
         internal static Dictionary<NetworkManager, Dictionary<string, Dictionary<int, SceneEntry>>> SceneNameToSceneHandles = new Dictionary<NetworkManager, Dictionary<string, Dictionary<int, SceneEntry>>>();
 
         // All IntegrationTestSceneHandler instances register their associated NetworkManager
@@ -57,7 +62,7 @@ public enum JobTypes
             }
             public JobTypes JobType;
             public string SceneName;
-            public Scene Scene;
+            public SceneInstance Scene;
             public SceneEventProgress SceneEventProgress;
             public IntegrationTestSceneHandler IntegrationTestSceneHandler;
         }
@@ -116,7 +121,8 @@ internal static IEnumerator ProcessLoadingSceneJob(QueuedSceneJob queuedSceneJob
 
             SceneManager.sceneLoaded += SceneManager_sceneLoaded;
             // We always load additively for all scenes during integration tests
-            var asyncOperation = SceneManager.LoadSceneAsync(queuedSceneJob.SceneName, LoadSceneMode.Additive);
+            var asyncOperation = Addressables.LoadSceneAsync(queuedSceneJob.SceneName, LoadSceneMode.Additive);
+
             queuedSceneJob.SceneEventProgress.SetAsyncOperation(asyncOperation);
 
             // Wait for it to finish
@@ -206,9 +212,9 @@ internal static IEnumerator ProcessUnloadingSceneJob(QueuedSceneJob queuedSceneJ
             }
 
             SceneManager.sceneUnloaded += SceneManager_sceneUnloaded;
-            if (queuedSceneJob.Scene.IsValid() && queuedSceneJob.Scene.isLoaded && !queuedSceneJob.Scene.name.Contains(NetcodeIntegrationTestHelpers.FirstPartOfTestRunnerSceneName))
+            if (queuedSceneJob.Scene.Scene.IsValid() && queuedSceneJob.Scene.Scene.isLoaded && !queuedSceneJob.Scene.Scene.name.Contains(NetcodeIntegrationTestHelpers.FirstPartOfTestRunnerSceneName))
             {
-                var asyncOperation = SceneManager.UnloadSceneAsync(queuedSceneJob.Scene);
+                var asyncOperation = Addressables.UnloadSceneAsync(queuedSceneJob.Scene);
                 queuedSceneJob.SceneEventProgress.SetAsyncOperation(asyncOperation);
             }
             else
@@ -228,7 +234,7 @@ internal static IEnumerator ProcessUnloadingSceneJob(QueuedSceneJob queuedSceneJ
         /// </summary>
         private static void SceneManager_sceneUnloaded(Scene scene)
         {
-            if (CurrentQueuedSceneJob.JobType != QueuedSceneJob.JobTypes.Completed && CurrentQueuedSceneJob.Scene.name == scene.name)
+            if (CurrentQueuedSceneJob.JobType != QueuedSceneJob.JobTypes.Completed && CurrentQueuedSceneJob.Scene.Scene.name == scene.name)
             {
                 SceneManager.sceneUnloaded -= SceneManager_sceneUnloaded;
 
@@ -278,15 +284,15 @@ private void AddJobToQueue(QueuedSceneJob queuedSceneJob)
         /// <summary>
         /// Server always loads like it normally would
         /// </summary>
-        public AsyncOperation GenericLoadSceneAsync(string sceneName, LoadSceneMode loadSceneMode, SceneEventProgress sceneEventProgress)
+        public AsyncOperationHandle<SceneInstance> GenericLoadSceneAsync(string sceneName, LoadSceneMode loadSceneMode, SceneEventProgress sceneEventProgress)
         {
             m_ServerSceneBeingLoaded = sceneName;
             if (NetcodeIntegrationTest.IsRunning)
             {
                 SceneManager.sceneLoaded += Sever_SceneLoaded;
             }
-            var operation = SceneManager.LoadSceneAsync(sceneName, loadSceneMode);
-            sceneEventProgress.SetAsyncOperation(operation);
+            var operation = Addressables.LoadSceneAsync(sceneName, loadSceneMode);
+            // sceneEventProgress.SetAsyncOperation(operation);
             return operation;
         }
 
@@ -302,42 +308,42 @@ private void Sever_SceneLoaded(Scene scene, LoadSceneMode arg1)
         /// <summary>
         /// Server always unloads like it normally would
         /// </summary>
-        public AsyncOperation GenericUnloadSceneAsync(Scene scene, SceneEventProgress sceneEventProgress)
+        public AsyncOperationHandle<SceneInstance> GenericUnloadSceneAsync(SceneInstance scene, SceneEventProgress sceneEventProgress)
         {
-            var operation = SceneManager.UnloadSceneAsync(scene);
+            var operation = Addressables.UnloadSceneAsync(scene);
             sceneEventProgress.SetAsyncOperation(operation);
             return operation;
         }
 
 
-        public AsyncOperation LoadSceneAsync(string sceneName, LoadSceneMode loadSceneMode, SceneEventProgress sceneEventProgress)
+        public AsyncOperationHandle<SceneInstance> LoadSceneAsync(string sceneAssetKey, LoadSceneMode loadSceneMode, SceneEventProgress sceneEventProgress)
         {
             // Server and non NetcodeIntegrationTest tests use the generic load scene method
             if (!NetcodeIntegrationTest.IsRunning)
             {
-                return GenericLoadSceneAsync(sceneName, loadSceneMode, sceneEventProgress);
+                return GenericLoadSceneAsync(sceneAssetKey, loadSceneMode, sceneEventProgress);
             }
             else // NetcodeIntegrationTest Clients always get added to the jobs queue
             {
-                AddJobToQueue(new QueuedSceneJob() { IntegrationTestSceneHandler = this, SceneName = sceneName, SceneEventProgress = sceneEventProgress, JobType = QueuedSceneJob.JobTypes.Loading });
+                AddJobToQueue(new QueuedSceneJob() { IntegrationTestSceneHandler = this, SceneName = sceneAssetKey, SceneEventProgress = sceneEventProgress, JobType = QueuedSceneJob.JobTypes.Loading });
             }
 
-            return null;
+            return default;
         }
 
-        public AsyncOperation UnloadSceneAsync(Scene scene, SceneEventProgress sceneEventProgress)
+        public AsyncOperationHandle<SceneInstance> UnloadSceneAsync(NetworkSceneManager.SceneData scene, SceneEventProgress sceneEventProgress)
         {
             // Server and non NetcodeIntegrationTest tests use the generic unload scene method
             if (!NetcodeIntegrationTest.IsRunning)
             {
-                return GenericUnloadSceneAsync(scene, sceneEventProgress);
+                return GenericUnloadSceneAsync(scene.SceneInstance.Value, sceneEventProgress);
             }
             else // NetcodeIntegrationTest Clients always get added to the jobs queue
             {
-                AddJobToQueue(new QueuedSceneJob() { IntegrationTestSceneHandler = this, Scene = scene, SceneEventProgress = sceneEventProgress, JobType = QueuedSceneJob.JobTypes.Unloading });
+                AddJobToQueue(new QueuedSceneJob() { IntegrationTestSceneHandler = this, Scene = scene.SceneInstance.Value, SceneEventProgress = sceneEventProgress, JobType = QueuedSceneJob.JobTypes.Unloading });
             }
             // This is OK to return a "nothing" AsyncOperation since we are simulating client loading
-            return null;
+            return default;
         }
 
         /// <summary>
@@ -379,7 +385,7 @@ internal Scene GetAndAddNewlyLoadedSceneByName(string sceneName)
                         {
                             continue;
                         }
-                        NetworkManager.SceneManager.ScenesLoaded.Add(sceneLoaded.handle, sceneLoaded);
+                        NetworkManager.SceneManager.ScenesLoaded.Add(sceneLoaded.handle, new NetworkSceneManager.SceneData(null, sceneLoaded));
                         StartTrackingScene(sceneLoaded, true, NetworkManager);
                         return sceneLoaded;
                     }
@@ -592,7 +598,7 @@ public Scene GetSceneFromLoadedScenes(string sceneName, NetworkManager networkMa
             return m_InvalidScene;
         }
 
-        public void PopulateLoadedScenes(ref Dictionary<int, Scene> scenesLoaded, NetworkManager networkManager)
+        public void PopulateLoadedScenes(ref Dictionary<int, NetworkSceneManager.SceneData> scenesLoaded, NetworkManager networkManager)
         {
             if (!SceneNameToSceneHandles.ContainsKey(networkManager))
             {
@@ -630,7 +636,7 @@ public void PopulateLoadedScenes(ref Dictionary<int, Scene> scenesLoaded, Networ
                     SceneNameToSceneHandles[networkManager][scene.name].Add(scene.handle, sceneEntry);
                     if (!scenesLoaded.ContainsKey(scene.handle))
                     {
-                        scenesLoaded.Add(scene.handle, scene);
+                        scenesLoaded.Add(scene.handle, new NetworkSceneManager.SceneData(null, scene));
                     }
                 }
                 else
@@ -798,8 +804,9 @@ public void SetClientSynchronizationMode(ref NetworkManager networkManager, Load
 
             var sceneManager = networkManager.SceneManager;
 
-            // Don't let client's set this value
-            if (!networkManager.IsServer)
+            // In client-server, we don't let client's set this value.
+            // In dsitributed authority, since session owner can be promoted clients can set this value
+            if (!networkManager.DistributedAuthorityMode && !networkManager.IsServer)
             {
                 if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
                 {
@@ -807,7 +814,7 @@ public void SetClientSynchronizationMode(ref NetworkManager networkManager, Load
                 }
                 return;
             }
-            else if (networkManager.ConnectedClientsIds.Count > (networkManager.IsHost ? 1 : 0) && sceneManager.ClientSynchronizationMode != mode)
+            else if (!networkManager.DistributedAuthorityMode && networkManager.ConnectedClientsIds.Count > (networkManager.IsHost ? 1 : 0) && sceneManager.ClientSynchronizationMode != mode)
             {
                 if (NetworkLog.CurrentLogLevel <= LogLevel.Normal)
                 {
@@ -858,7 +865,7 @@ public void SetClientSynchronizationMode(ref NetworkManager networkManager, Load
                     if (!sceneManager.ScenesLoaded.ContainsKey(scene.handle))
                     {
                         StartTrackingScene(scene, true, networkManager);
-                        sceneManager.ScenesLoaded.Add(scene.handle, scene);
+                        sceneManager.ScenesLoaded.Add(scene.handle, new NetworkSceneManager.SceneData(null, scene));
                     }
                 }
             }
diff --git a/com.unity.netcode.gameobjects/TestHelpers/Runtime/IntegrationTestWithApproximation.cs b/com.unity.netcode.gameobjects/TestHelpers/Runtime/IntegrationTestWithApproximation.cs
index 462fd74f76..89b1e89e53 100644
--- a/com.unity.netcode.gameobjects/TestHelpers/Runtime/IntegrationTestWithApproximation.cs
+++ b/com.unity.netcode.gameobjects/TestHelpers/Runtime/IntegrationTestWithApproximation.cs
@@ -1,12 +1,24 @@
+using System;
 using System.Runtime.CompilerServices;
 using UnityEngine;
+using Random = UnityEngine.Random;
 
 
 namespace Unity.Netcode.TestHelpers.Runtime
 {
     public abstract class IntegrationTestWithApproximation : NetcodeIntegrationTest
     {
-        private const float k_AproximateDeltaVariance = 0.01f;
+        private const float k_AproximateDeltaVariance = 0.016f;
+
+        protected string GetVector3Values(ref Vector3 vector3)
+        {
+            return $"({vector3.x:F6},{vector3.y:F6},{vector3.z:F6})";
+        }
+
+        protected string GetVector3Values(Vector3 vector3)
+        {
+            return GetVector3Values(ref vector3);
+        }
 
         protected virtual float GetDeltaVarianceThreshold()
         {
@@ -40,17 +52,17 @@ protected bool Approximately(float a, float b)
         protected bool Approximately(Vector2 a, Vector2 b)
         {
             var deltaVariance = GetDeltaVarianceThreshold();
-            return Mathf.Abs(a.x - b.x) <= deltaVariance &&
-                Mathf.Abs(a.y - b.y) <= deltaVariance;
+            return Math.Round(Mathf.Abs(a.x - b.x), 2) <= deltaVariance &&
+                Math.Round(Mathf.Abs(a.y - b.y), 2) <= deltaVariance;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         protected bool Approximately(Vector3 a, Vector3 b)
         {
             var deltaVariance = GetDeltaVarianceThreshold();
-            return Mathf.Abs(a.x - b.x) <= deltaVariance &&
-                Mathf.Abs(a.y - b.y) <= deltaVariance &&
-                Mathf.Abs(a.z - b.z) <= deltaVariance;
+            return Math.Round(Mathf.Abs(a.x - b.x), 2) <= deltaVariance &&
+                Math.Round(Mathf.Abs(a.y - b.y), 2) <= deltaVariance &&
+                Math.Round(Mathf.Abs(a.z - b.z), 2) <= deltaVariance;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -75,5 +87,12 @@ protected Vector3 GetRandomVector3(float min, float max)
             return new Vector3(Random.Range(min, max), Random.Range(min, max), Random.Range(min, max));
         }
 
+        public IntegrationTestWithApproximation(NetworkTopologyTypes networkTopologyType, HostOrServer hostOrServer) : base(networkTopologyType, hostOrServer) { }
+
+        public IntegrationTestWithApproximation(NetworkTopologyTypes networkTopologyType) : base(networkTopologyType) { }
+
+        public IntegrationTestWithApproximation(HostOrServer hostOrServer) : base(hostOrServer) { }
+
+        public IntegrationTestWithApproximation() : base() { }
     }
 }
diff --git a/com.unity.netcode.gameobjects/TestHelpers/Runtime/Metrics/WaitForMetricValues.cs b/com.unity.netcode.gameobjects/TestHelpers/Runtime/Metrics/WaitForMetricValues.cs
index 01013851a4..10e8c6b8c5 100644
--- a/com.unity.netcode.gameobjects/TestHelpers/Runtime/Metrics/WaitForMetricValues.cs
+++ b/com.unity.netcode.gameobjects/TestHelpers/Runtime/Metrics/WaitForMetricValues.cs
@@ -21,7 +21,7 @@ public WaitForMetricValues(IMetricDispatcher dispatcher, DirectionalMetricInfo d
             dispatcher.RegisterObserver(this);
         }
 
-        abstract public void Observe(MetricCollection collection);
+        public abstract void Observe(MetricCollection collection);
 
         public void AssertMetricValuesHaveNotBeenFound()
         {
diff --git a/com.unity.netcode.gameobjects/TestHelpers/Runtime/MockTimeProvider.cs b/com.unity.netcode.gameobjects/TestHelpers/Runtime/MockTimeProvider.cs
index f97b5dca26..daf2709a38 100644
--- a/com.unity.netcode.gameobjects/TestHelpers/Runtime/MockTimeProvider.cs
+++ b/com.unity.netcode.gameobjects/TestHelpers/Runtime/MockTimeProvider.cs
@@ -7,6 +7,9 @@ public class MockTimeProvider : IRealTimeProvider
         public float UnscaledDeltaTime => (float)s_DoubleDelta;
         public float DeltaTime => (float)s_DoubleDelta;
 
+        // DANGO-EXP TODO: Figure out how we want to handle time travel with fixed delta time.
+        public float FixedDeltaTime => (float)s_DoubleDelta;
+
         public static float StaticRealTimeSinceStartup => (float)s_DoubleRealTime;
         public static float StaticUnscaledTime => (float)s_DoubleRealTime;
         public static float StaticUnscaledDeltaTime => (float)s_DoubleDelta;
diff --git a/com.unity.netcode.gameobjects/TestHelpers/Runtime/MockTransport.cs b/com.unity.netcode.gameobjects/TestHelpers/Runtime/MockTransport.cs
index 0f29377bc5..587f2990a3 100644
--- a/com.unity.netcode.gameobjects/TestHelpers/Runtime/MockTransport.cs
+++ b/com.unity.netcode.gameobjects/TestHelpers/Runtime/MockTransport.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Unity.Collections;
 using Random = UnityEngine.Random;
 
 namespace Unity.Netcode.TestHelpers.Runtime
@@ -10,107 +9,61 @@ internal class MockTransport : NetworkTransport
         private struct MessageData
         {
             public ulong FromClientId;
-            public FastBufferReader Payload;
+            public ArraySegment<byte> Payload;
             public NetworkEvent Event;
             public float AvailableTime;
-            public int Sequence;
-            public NetworkDelivery Delivery;
         }
 
-        private static Dictionary<ulong, List<MessageData>> s_MessageQueue = new Dictionary<ulong, List<MessageData>>();
+        private static Dictionary<ulong, Queue<MessageData>> s_MessageQueue = new Dictionary<ulong, Queue<MessageData>>();
 
         public override ulong ServerClientId { get; } = 0;
 
         public static ulong HighTransportId = 0;
         public ulong TransportId = 0;
-
         public float SimulatedLatencySeconds;
         public float PacketDropRate;
         public float LatencyJitter;
 
-        public Dictionary<ulong, int> LastSentSequence = new Dictionary<ulong, int>();
-        public Dictionary<ulong, int> LastReceivedSequence = new Dictionary<ulong, int>();
-
         public NetworkManager NetworkManager;
 
         public override void Send(ulong clientId, ArraySegment<byte> payload, NetworkDelivery networkDelivery)
         {
-            if ((networkDelivery == NetworkDelivery.Unreliable || networkDelivery == NetworkDelivery.UnreliableSequenced) && Random.Range(0, 1) < PacketDropRate)
+            if (Random.Range(0, 1) < PacketDropRate)
             {
                 return;
             }
-
-            if (!LastSentSequence.ContainsKey(clientId))
-            {
-                LastSentSequence[clientId] = 1;
-            }
-
-            var reader = new FastBufferReader(payload, Allocator.TempJob);
-            s_MessageQueue[clientId].Add(new MessageData
+            var copy = new byte[payload.Array.Length];
+            Array.Copy(payload.Array, copy, payload.Array.Length);
+            s_MessageQueue[clientId].Enqueue(new MessageData
             {
                 FromClientId = TransportId,
-                Payload = reader,
+                Payload = new ArraySegment<byte>(copy, payload.Offset, payload.Count),
                 Event = NetworkEvent.Data,
-                AvailableTime = NetworkManager.RealTimeProvider.UnscaledTime + SimulatedLatencySeconds + Random.Range(-LatencyJitter, LatencyJitter),
-                Sequence = ++LastSentSequence[clientId],
-                Delivery = networkDelivery
+                AvailableTime =
+                NetworkManager.RealTimeProvider.UnscaledTime + SimulatedLatencySeconds + Random.Range(-LatencyJitter, LatencyJitter)
             });
-            s_MessageQueue[clientId].Sort(((a, b) => a.AvailableTime.CompareTo(b.AvailableTime)));
         }
 
         public override NetworkEvent PollEvent(out ulong clientId, out ArraySegment<byte> payload, out float receiveTime)
         {
             if (s_MessageQueue[TransportId].Count > 0)
             {
-                MessageData data;
-                for (; ; )
-                {
-                    data = s_MessageQueue[TransportId][0];
-                    if (data.AvailableTime > NetworkManager.RealTimeProvider.UnscaledTime)
-                    {
-                        clientId = 0;
-                        payload = new ArraySegment<byte>();
-                        receiveTime = 0;
-                        return NetworkEvent.Nothing;
-                    }
-
-                    s_MessageQueue[TransportId].RemoveAt(0);
-                    clientId = data.FromClientId;
-                    if (data.Event == NetworkEvent.Data && data.Delivery == NetworkDelivery.UnreliableSequenced && LastReceivedSequence.ContainsKey(clientId) && data.Sequence <= LastReceivedSequence[clientId])
-                    {
-                        continue;
-                    }
-
-                    break;
-                }
-
-                if (data.Delivery == NetworkDelivery.UnreliableSequenced)
-                {
-                    LastReceivedSequence[clientId] = data.Sequence;
-                }
-
-                payload = new ArraySegment<byte>();
-                if (data.Event == NetworkEvent.Data)
+                var data = s_MessageQueue[TransportId].Peek();
+                if (data.AvailableTime > NetworkManager.RealTimeProvider.UnscaledTime)
                 {
-                    payload = data.Payload.ToArray();
-                    data.Payload.Dispose();
+                    clientId = 0;
+                    payload = new ArraySegment<byte>();
+                    receiveTime = 0;
+                    return NetworkEvent.Nothing;
                 }
 
+                s_MessageQueue[TransportId].Dequeue();
+                clientId = data.FromClientId;
+                payload = data.Payload;
                 receiveTime = NetworkManager.RealTimeProvider.RealTimeSinceStartup;
                 if (NetworkManager.IsServer && data.Event == NetworkEvent.Connect)
                 {
-                    if (!LastSentSequence.ContainsKey(data.FromClientId))
-                    {
-                        LastSentSequence[data.FromClientId] = 1;
-                    }
-                    s_MessageQueue[data.FromClientId].Add(
-                        new MessageData
-                        {
-                            Event = NetworkEvent.Connect,
-                            FromClientId = ServerClientId,
-                            AvailableTime = NetworkManager.RealTimeProvider.UnscaledTime + SimulatedLatencySeconds + Random.Range(-LatencyJitter, LatencyJitter),
-                            Sequence = ++LastSentSequence[data.FromClientId]
-                        });
+                    s_MessageQueue[data.FromClientId].Enqueue(new MessageData { Event = NetworkEvent.Connect, FromClientId = ServerClientId, Payload = new ArraySegment<byte>() });
                 }
                 return data.Event;
             }
@@ -123,80 +76,54 @@ public override NetworkEvent PollEvent(out ulong clientId, out ArraySegment<byte
         public override bool StartClient()
         {
             TransportId = ++HighTransportId;
-            s_MessageQueue[TransportId] = new List<MessageData>();
-            s_MessageQueue[ServerClientId].Add(
-                new MessageData
-                {
-                    Event = NetworkEvent.Connect,
-                    FromClientId = TransportId,
-                });
+            s_MessageQueue[TransportId] = new Queue<MessageData>();
+            s_MessageQueue[ServerClientId].Enqueue(new MessageData { Event = NetworkEvent.Connect, FromClientId = TransportId, Payload = new ArraySegment<byte>() });
             return true;
         }
 
         public override bool StartServer()
         {
-            s_MessageQueue[ServerClientId] = new List<MessageData>();
+            s_MessageQueue[ServerClientId] = new Queue<MessageData>();
             return true;
         }
 
         public override void DisconnectRemoteClient(ulong clientId)
         {
-            s_MessageQueue[clientId].Add(
-                new MessageData
-                {
-                    Event = NetworkEvent.Disconnect,
-                    FromClientId = TransportId,
-                });
+            s_MessageQueue[clientId].Enqueue(new MessageData { Event = NetworkEvent.Disconnect, FromClientId = TransportId, Payload = new ArraySegment<byte>() });
         }
 
         public override void DisconnectLocalClient()
         {
-            s_MessageQueue[ServerClientId].Add(
-                new MessageData
-                {
-                    Event = NetworkEvent.Disconnect,
-                    FromClientId = TransportId,
-                });
+            s_MessageQueue[ServerClientId].Enqueue(new MessageData { Event = NetworkEvent.Disconnect, FromClientId = TransportId, Payload = new ArraySegment<byte>() });
         }
 
         public override ulong GetCurrentRtt(ulong clientId)
         {
-            return (ulong)(SimulatedLatencySeconds * 1000);
+            return 0;
         }
 
         public override void Shutdown()
         {
         }
 
-        public override void Initialize(NetworkManager networkManager = null)
+        protected override NetworkTopologyTypes OnCurrentTopology()
         {
-            NetworkManager = networkManager;
+            return NetworkManager != null ? NetworkManager.NetworkConfig.NetworkTopology : NetworkTopologyTypes.ClientServer;
         }
 
-        protected static void DisposeQueueItems()
+        public override void Initialize(NetworkManager networkManager = null)
         {
-            foreach (var kvp in s_MessageQueue)
-            {
-                foreach (var value in kvp.Value)
-                {
-                    if (value.Event == NetworkEvent.Data)
-                    {
-                        value.Payload.Dispose();
-                    }
-                }
-            }
+            NetworkManager = networkManager;
         }
 
         public static void Reset()
         {
-            DisposeQueueItems();
             s_MessageQueue.Clear();
             HighTransportId = 0;
         }
 
         public static void ClearQueues()
         {
-            DisposeQueueItems();
             foreach (var kvp in s_MessageQueue)
             {
                 kvp.Value.Clear();
diff --git a/com.unity.netcode.gameobjects/TestHelpers/Runtime/NetcodeIntegrationTest.cs b/com.unity.netcode.gameobjects/TestHelpers/Runtime/NetcodeIntegrationTest.cs
index e5a9aa649d..b518f26583 100644
--- a/com.unity.netcode.gameobjects/TestHelpers/Runtime/NetcodeIntegrationTest.cs
+++ b/com.unity.netcode.gameobjects/TestHelpers/Runtime/NetcodeIntegrationTest.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using System.Text;
 using NUnit.Framework;
 using Unity.Netcode.RuntimeTests;
 using Unity.Netcode.Transports.UTP;
@@ -23,12 +24,21 @@ public abstract class NetcodeIntegrationTest
         /// Used to determine if a NetcodeIntegrationTest is currently running to
         /// determine how clients will load scenes
         /// </summary>
+        protected const float k_DefaultTimeoutPeriod = 8.0f;
+        protected const float k_TickFrequency = 1.0f / k_DefaultTickRate;
         internal static bool IsRunning { get; private set; }
-
-        protected static TimeoutHelper s_GlobalTimeoutHelper = new TimeoutHelper(8.0f);
-        protected static WaitForSecondsRealtime s_DefaultWaitForTick = new WaitForSecondsRealtime(1.0f / k_DefaultTickRate);
+        protected static TimeoutHelper s_GlobalTimeoutHelper = new TimeoutHelper(k_DefaultTimeoutPeriod);
+        protected static WaitForSecondsRealtime s_DefaultWaitForTick = new WaitForSecondsRealtime(k_TickFrequency);
 
         public NetcodeLogAssert NetcodeLogAssert;
+        public enum SceneManagementState
+        {
+            SceneManagementEnabled,
+            SceneManagementDisabled
+        }
+
+        private StringBuilder m_InternalErrorLog = new StringBuilder();
+        internal StringBuilder VerboseDebugLog = new StringBuilder();
 
         /// <summary>
         /// Registered list of all NetworkObjects spawned.
@@ -112,7 +122,8 @@ public enum NetworkManagerInstatiationMode
         public enum HostOrServer
         {
             Host,
-            Server
+            Server,
+            DAHost
         }
 
         protected GameObject m_PlayerPrefab;
@@ -129,6 +140,26 @@ public enum HostOrServer
         protected Dictionary<ulong, Dictionary<ulong, NetworkObject>> m_PlayerNetworkObjects = new Dictionary<ulong, Dictionary<ulong, NetworkObject>>();
 
         protected bool m_UseHost = true;
+        protected bool m_DistributedAuthority;
+        protected NetworkTopologyTypes m_NetworkTopologyType = NetworkTopologyTypes.ClientServer;
+
+        protected virtual bool UseCMBService()
+        {
+            return false;
+        }
+
+        protected virtual NetworkTopologyTypes OnGetNetworkTopologyType()
+        {
+            return m_NetworkTopologyType;
+        }
+
+        protected void SetDistributedAuthorityProperties(NetworkManager networkManager)
+        {
+            networkManager.NetworkConfig.NetworkTopology = m_NetworkTopologyType;
+            networkManager.NetworkConfig.AutoSpawnPlayerPrefabClientSide = m_DistributedAuthority;
+            networkManager.NetworkConfig.UseCMBService = UseCMBService() && m_DistributedAuthority;
+        }
+
         protected int m_TargetFrameRate = 60;
 
         private NetworkManagerInstatiationMode m_NetworkManagerInstatiationMode;
@@ -221,12 +252,13 @@ public enum HostOrServer
         /// stages and can be used to log verbose information
         /// for troubleshooting an integration test.
         /// </summary>
-        /// <param name="msg"></param>
+        /// <param name="msg">The debug message to be logged when verbose debugging is enabled</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         protected void VerboseDebug(string msg)
         {
             if (m_EnableVerboseDebug)
             {
+                VerboseDebugLog.AppendLine(msg);
                 Debug.Log(msg);
             }
         }
@@ -271,9 +303,20 @@ public void OneTimeSetup()
 
             // Enable NetcodeIntegrationTest auto-label feature
             NetcodeIntegrationTestHelpers.RegisterNetcodeIntegrationTest(true);
+
+#if UNITY_INCLUDE_TESTS
+            // Provide an external hook to be able to make adjustments to netcode classes prior to running any tests
+            NetworkManager.OnOneTimeSetup();
+#endif
+
             OnOneTimeSetup();
 
             VerboseDebug($"Exiting {nameof(OneTimeSetup)}");
+
+#if DEVELOPMENT_BUILD || UNITY_EDITOR
+            // Default to not log the serialized type not optimized warning message when testing.
+            NetworkManager.DisableNotOptimizedSerializedType = true;
+#endif
         }
 
         /// <summary>
@@ -304,6 +347,7 @@ protected virtual void OnInlineSetup()
         [UnitySetUp]
         public IEnumerator SetUp()
         {
+            VerboseDebugLog.Clear();
             VerboseDebug($"Entering {nameof(SetUp)}");
             NetcodeLogAssert = new NetcodeLogAssert();
             if (m_EnableTimeTravel)
@@ -316,6 +360,7 @@ public IEnumerator SetUp()
                 {
                     MockTransport.Reset();
                 }
+
                 // Setup the frames per tick for time travel advance to next tick
                 ConfigureFramesPerTick();
             }
@@ -346,6 +391,7 @@ public IEnumerator SetUp()
                 else
                 {
                     yield return StartServerAndClients();
+
                 }
             }
 
@@ -375,6 +421,7 @@ private void CreatePlayerPrefab()
             m_PlayerPrefab = new GameObject("Player");
             OnPlayerPrefabGameObjectCreated();
             NetworkObject networkObject = m_PlayerPrefab.AddComponent<NetworkObject>();
+            networkObject.IsSceneObject = false;
 
             // Make it a prefab
             NetcodeIntegrationTestHelpers.MakeNetworkObjectTestPrefab(networkObject);
@@ -422,14 +469,24 @@ private void AddRemoveNetworkManager(NetworkManager networkManager, bool addNetw
         /// CreateAndStartNewClient Only
         /// Invoked when the newly created client has been created
         /// </summary>
+        /// <param name="networkManager">The NetworkManager instance of the client.</param>
         protected virtual void OnNewClientCreated(NetworkManager networkManager)
         {
+            // Ensure any late joining client has all NetworkPrefabs required to connect.
+            foreach (var networkPrefab in m_ServerNetworkManager.NetworkConfig.Prefabs.Prefabs)
+            {
+                if (!networkManager.NetworkConfig.Prefabs.Contains(networkPrefab.Prefab))
+                {
+                    networkManager.NetworkConfig.Prefabs.Add(networkPrefab);
+                }
+            }
         }
 
         /// <summary>
         /// CreateAndStartNewClient Only
         /// Invoked when the newly created client has been created and started
         /// </summary>
+        /// <param name="networkManager">The NetworkManager instance of the client.</param>
         protected virtual void OnNewClientStarted(NetworkManager networkManager)
         {
         }
@@ -439,6 +496,7 @@ protected virtual void OnNewClientStarted(NetworkManager networkManager)
         /// Invoked when the newly created client has been created, started, and connected
         /// to the server-host.
         /// </summary>
+        /// <param name="networkManager">The NetworkManager instance of the client.</param>
         protected virtual void OnNewClientStartedAndConnected(NetworkManager networkManager)
         {
         }
@@ -450,6 +508,8 @@ protected virtual void OnNewClientStartedAndConnected(NetworkManager networkMana
         /// <remarks>
         /// Use this for testing connection and disconnection scenarios
         /// </remarks>
+        /// <param name="networkManager">The NetworkManager instance of the client.</param>
+        /// <returns>True if the test should wait for the client to connect; otherwise, false.</returns>
         protected virtual bool ShouldWaitForNewClientToConnect(NetworkManager networkManager)
         {
             return true;
@@ -459,10 +519,12 @@ protected virtual bool ShouldWaitForNewClientToConnect(NetworkManager networkMan
         /// This will create, start, and connect a new client while in the middle of an
         /// integration test.
         /// </summary>
+        /// <returns>An IEnumerator to be used in a coroutine for asynchronous execution.</returns>
         protected IEnumerator CreateAndStartNewClient()
         {
             var networkManager = NetcodeIntegrationTestHelpers.CreateNewClient(m_ClientNetworkManagers.Length, m_EnableTimeTravel);
             networkManager.NetworkConfig.PlayerPrefab = m_PlayerPrefab;
+            SetDistributedAuthorityProperties(networkManager);
 
             // Notification that the new client (NetworkManager) has been created
             // in the event any modifications need to be made before starting the client
@@ -491,12 +553,69 @@ protected IEnumerator CreateAndStartNewClient()
                     Object.DestroyImmediate(networkManager.gameObject);
                 }
 
-                AssertOnTimeout($"{nameof(CreateAndStartNewClient)} timed out waiting for the new client to be connected!");
+                AssertOnTimeout($"{nameof(CreateAndStartNewClient)} timed out waiting for the new client to be connected!\n {m_InternalErrorLog}");
                 ClientNetworkManagerPostStart(networkManager);
+                if (networkManager.DistributedAuthorityMode)
+                {
+                    yield return WaitForConditionOrTimeOut(() => AllPlayerObjectClonesSpawned(networkManager));
+                    AssertOnTimeout($"{nameof(CreateAndStartNewClient)} timed out waiting for all sessions to spawn Client-{networkManager.LocalClientId}'s player object!");
+                }
+
                 VerboseDebug($"[{networkManager.name}] Created and connected!");
             }
         }
 
+        private bool AllPlayerObjectClonesSpawned(NetworkManager joinedClient)
+        {
+            m_InternalErrorLog.Clear();
+            // If we are not checking for spawned players then exit early with a success
+            if (!ShouldCheckForSpawnedPlayers())
+            {
+                return true;
+            }
+
+            // Continue to populate the PlayerObjects list until all player object (local and clone) are found
+            ClientNetworkManagerPostStart(joinedClient);
+            var playerObjectRelative = m_ServerNetworkManager.SpawnManager.PlayerObjects.Where((c) => c.OwnerClientId == joinedClient.LocalClientId).FirstOrDefault();
+            if (playerObjectRelative == null)
+            {
+                m_InternalErrorLog.Append($"[AllPlayerObjectClonesSpawned][Server-Side] Joining Client-{joinedClient.LocalClientId} was not populated in the {nameof(NetworkSpawnManager.PlayerObjects)} list!");
+                return false;
+            }
+            else
+            {
+                // Go ahead and create an entry for this new client
+                if (!m_PlayerNetworkObjects[m_ServerNetworkManager.LocalClientId].ContainsKey(joinedClient.LocalClientId))
+                {
+                    m_PlayerNetworkObjects[m_ServerNetworkManager.LocalClientId].Add(joinedClient.LocalClientId, playerObjectRelative);
+                }
+            }
+
+            foreach (var clientNetworkManager in m_ClientNetworkManagers)
+            {
+                if (clientNetworkManager.LocalClientId == joinedClient.LocalClientId)
+                {
+                    continue;
+                }
+
+                playerObjectRelative = clientNetworkManager.SpawnManager.PlayerObjects.Where((c) => c.OwnerClientId == joinedClient.LocalClientId).FirstOrDefault();
+                if (playerObjectRelative == null)
+                {
+                    m_InternalErrorLog.Append($"[AllPlayerObjectClonesSpawned][Client-{clientNetworkManager.LocalClientId}] Client-{joinedClient.LocalClientId} was not populated in the {nameof(NetworkSpawnManager.PlayerObjects)} list!");
+                    return false;
+                }
+                else
+                {
+                    // Go ahead and create an entry for this new client
+                    if (!m_PlayerNetworkObjects[clientNetworkManager.LocalClientId].ContainsKey(joinedClient.LocalClientId))
+                    {
+                        m_PlayerNetworkObjects[clientNetworkManager.LocalClientId].Add(joinedClient.LocalClientId, playerObjectRelative);
+                    }
+                }
+            }
+            return true;
+        }
+
         /// <summary>
         /// This will create, start, and connect a new client while in the middle of an
         /// integration test.
@@ -505,6 +624,7 @@ protected void CreateAndStartNewClientWithTimeTravel()
         {
             var networkManager = NetcodeIntegrationTestHelpers.CreateNewClient(m_ClientNetworkManagers.Length, m_EnableTimeTravel);
             networkManager.NetworkConfig.PlayerPrefab = m_PlayerPrefab;
+            SetDistributedAuthorityProperties(networkManager);
 
             // Notification that the new client (NetworkManager) has been created
             // in the event any modifications need to be made before starting the client
@@ -542,7 +662,10 @@ protected void CreateAndStartNewClientWithTimeTravel()
         protected IEnumerator StopOneClient(NetworkManager networkManager, bool destroy = false)
         {
             NetcodeIntegrationTestHelpers.StopOneClient(networkManager, destroy);
-            AddRemoveNetworkManager(networkManager, false);
+            if (destroy)
+            {
+                AddRemoveNetworkManager(networkManager, false);
+            }
             yield return WaitForConditionOrTimeOut(() => !networkManager.IsConnectedClient);
         }
 
@@ -586,7 +709,7 @@ protected void SetTimeTravelSimulatedLatencyJitter(float jitterSeconds)
         /// <summary>
         /// Creates the server and clients
         /// </summary>
-        /// <param name="numberOfClients"></param>
+        /// <param name="numberOfClients">The number of client instances to create</param>
         protected void CreateServerAndClients(int numberOfClients)
         {
             VerboseDebug($"Entering {nameof(CreateServerAndClients)}");
@@ -616,9 +739,12 @@ protected void CreateServerAndClients(int numberOfClients)
             // Set the player prefab for the server and clients
             m_ServerNetworkManager.NetworkConfig.PlayerPrefab = m_PlayerPrefab;
 
+            SetDistributedAuthorityProperties(m_ServerNetworkManager);
+
             foreach (var client in m_ClientNetworkManagers)
             {
                 client.NetworkConfig.PlayerPrefab = m_PlayerPrefab;
+                SetDistributedAuthorityProperties(client);
             }
 
             // Provides opportunity to allow child derived classes to
@@ -758,6 +884,7 @@ protected virtual bool ShouldCheckForSpawnedPlayers()
             return true;
         }
 
+
         /// <summary>
         /// This starts the server and clients as long as <see cref="CanStartServerAndClients"/>
         /// returns true.
@@ -770,22 +897,27 @@ protected IEnumerator StartServerAndClients()
 
                 // Start the instances and pass in our SceneManagerInitialization action that is invoked immediately after host-server
                 // is started and after each client is started.
-                if (!NetcodeIntegrationTestHelpers.Start(m_UseHost, m_ServerNetworkManager, m_ClientNetworkManagers))
+
+                // When using the CMBService, don't start the server.
+                bool startServer = !(UseCMBService() && m_DistributedAuthority);
+                if (!NetcodeIntegrationTestHelpers.Start(m_UseHost, startServer, m_ServerNetworkManager, m_ClientNetworkManagers))
                 {
                     Debug.LogError("Failed to start instances");
                     Assert.Fail("Failed to start instances");
                 }
 
                 // When scene management is enabled, we need to re-apply the scenes populated list since we have overriden the ISceneManagerHandler
-                // imeplementation at this point. This assures any pre-loaded scenes will be automatically assigned to the server and force clients 
+                // imeplementation at this point. This assures any pre-loaded scenes will be automatically assigned to the server and force clients
                 // to load their own scenes.
                 if (m_ServerNetworkManager.NetworkConfig.EnableSceneManagement)
                 {
-                    var scenesLoaded = m_ServerNetworkManager.SceneManager.ScenesLoaded;
-                    m_ServerNetworkManager.SceneManager.SceneManagerHandler.PopulateLoadedScenes(ref scenesLoaded, m_ServerNetworkManager);
+                    if (startServer)
+                    {
+                        var scenesLoaded = m_ServerNetworkManager.SceneManager.ScenesLoaded;
+                        m_ServerNetworkManager.SceneManager.SceneManagerHandler.PopulateLoadedScenes(ref scenesLoaded, m_ServerNetworkManager);
+                    }
                 }
 
-
                 if (LogAllMessages)
                 {
                     EnableMessageLogging();
@@ -802,7 +934,7 @@ protected IEnumerator StartServerAndClients()
                     // Wait for all clients to connect
                     yield return WaitForClientsConnectedOrTimeOut();
 
-                    AssertOnTimeout($"{nameof(StartServerAndClients)} timed out waiting for all clients to be connected!");
+                    AssertOnTimeout($"{nameof(StartServerAndClients)} timed out waiting for all clients to be connected!\n {m_InternalErrorLog}");
 
                     if (m_UseHost || m_ServerNetworkManager.IsHost)
                     {
@@ -823,6 +955,24 @@ protected IEnumerator StartServerAndClients()
                             m_PlayerNetworkObjects[playerNetworkObject.NetworkManager.LocalClientId].Add(m_ServerNetworkManager.LocalClientId, playerNetworkObject);
                         }
                     }
+                    if (m_DistributedAuthority)
+                    {
+                        //yield return WaitForConditionOrTimeOut(AllClientPlayersSpawned);
+                        //AssertOnTimeout($"{nameof(CreateAndStartNewClient)} timed out waiting for all sessions to spawn all player objects!");
+                        foreach (var networkManager in m_ClientNetworkManagers)
+                        {
+                            if (networkManager.DistributedAuthorityMode)
+                            {
+                                yield return WaitForConditionOrTimeOut(() => AllPlayerObjectClonesSpawned(networkManager));
+                                AssertOnTimeout($"{nameof(CreateAndStartNewClient)} timed out waiting for all sessions to spawn Client-{networkManager.LocalClientId}'s player object!\n {m_InternalErrorLog}");
+                            }
+                        }
+                        if (m_ServerNetworkManager != null)
+                        {
+                            yield return WaitForConditionOrTimeOut(() => AllPlayerObjectClonesSpawned(m_ServerNetworkManager));
+                            AssertOnTimeout($"{nameof(CreateAndStartNewClient)} timed out waiting for all sessions to spawn Client-{m_ServerNetworkManager.LocalClientId}'s player object!\n {m_InternalErrorLog}");
+                        }
+                    }
 
                     if (ShouldCheckForSpawnedPlayers())
                     {
@@ -850,7 +1000,9 @@ protected void StartServerAndClientsWithTimeTravel()
 
                 // Start the instances and pass in our SceneManagerInitialization action that is invoked immediately after host-server
                 // is started and after each client is started.
-                if (!NetcodeIntegrationTestHelpers.Start(m_UseHost, m_ServerNetworkManager, m_ClientNetworkManagers))
+                // When using the CMBService, don't start the server.
+                var usingCMBService = UseCMBService() && m_DistributedAuthority;
+                if (!NetcodeIntegrationTestHelpers.Start(m_UseHost, !usingCMBService, m_ServerNetworkManager, m_ClientNetworkManagers))
                 {
                     Debug.LogError("Failed to start instances");
                     Assert.Fail("Failed to start instances");
@@ -900,6 +1052,24 @@ protected void StartServerAndClientsWithTimeTravel()
                         }
                     }
 
+                    if (m_DistributedAuthority)
+                    {
+
+                        foreach (var networkManager in m_ClientNetworkManagers)
+                        {
+                            if (networkManager.DistributedAuthorityMode)
+                            {
+                                WaitForConditionOrTimeOutWithTimeTravel(() => AllPlayerObjectClonesSpawned(m_ServerNetworkManager));
+                                AssertOnTimeout($"{nameof(CreateAndStartNewClient)} timed out waiting for all sessions to spawn Client-{networkManager.LocalClientId}'s player object!");
+                            }
+                        }
+                        if (m_ServerNetworkManager != null)
+                        {
+                            WaitForConditionOrTimeOutWithTimeTravel(() => AllPlayerObjectClonesSpawned(m_ServerNetworkManager));
+                            AssertOnTimeout($"{nameof(CreateAndStartNewClient)} timed out waiting for all sessions to spawn Client-{m_ServerNetworkManager.LocalClientId}'s player object!");
+                        }
+                    }
+
                     if (ShouldCheckForSpawnedPlayers())
                     {
                         ClientNetworkManagerPostStartInit();
@@ -1009,6 +1179,51 @@ protected void ShutdownAndCleanUp()
             // reset the m_ServerWaitForTick for the next test to initialize
             s_DefaultWaitForTick = new WaitForSecondsRealtime(1.0f / k_DefaultTickRate);
             VerboseDebug($"Exiting {nameof(ShutdownAndCleanUp)}");
+
+            // Assure any remaining NetworkManagers are destroyed
+            DestroyNetworkManagers();
+        }
+
+        protected IEnumerator CoroutineShutdownAndCleanUp()
+        {
+            VerboseDebug($"Entering {nameof(ShutdownAndCleanUp)}");
+            // Shutdown and clean up both of our NetworkManager instances
+            try
+            {
+                DeRegisterSceneManagerHandler();
+
+                NetcodeIntegrationTestHelpers.Destroy();
+
+                m_PlayerNetworkObjects.Clear();
+                s_GlobalNetworkObjects.Clear();
+            }
+            catch (Exception e)
+            {
+                throw e;
+            }
+            finally
+            {
+                if (m_PlayerPrefab != null)
+                {
+                    Object.DestroyImmediate(m_PlayerPrefab);
+                    m_PlayerPrefab = null;
+                }
+            }
+
+            // Allow time for NetworkManagers to fully shutdown
+            yield return s_DefaultWaitForTick;
+
+            // Cleanup any remaining NetworkObjects
+            DestroySceneNetworkObjects();
+
+            UnloadRemainingScenes();
+
+            // reset the m_ServerWaitForTick for the next test to initialize
+            s_DefaultWaitForTick = new WaitForSecondsRealtime(1.0f / k_DefaultTickRate);
+            VerboseDebug($"Exiting {nameof(ShutdownAndCleanUp)}");
+
+            // Assure any remaining NetworkManagers are destroyed
+            DestroyNetworkManagers();
         }
 
         /// <summary>
@@ -1040,7 +1255,14 @@ public IEnumerator TearDown()
 
             if (m_NetworkManagerInstatiationMode == NetworkManagerInstatiationMode.PerTest)
             {
-                ShutdownAndCleanUp();
+                if (m_TearDownIsACoroutine)
+                {
+                    yield return CoroutineShutdownAndCleanUp();
+                }
+                else
+                {
+                    ShutdownAndCleanUp();
+                }
             }
 
             if (m_EnableTimeTravel)
@@ -1051,16 +1273,18 @@ public IEnumerator TearDown()
             VerboseDebug($"Exiting {nameof(TearDown)}");
             LogWaitForMessages();
             NetcodeLogAssert.Dispose();
-            if (m_EnableTimeTravel)
+
+        }
+
+        /// <summary>
+        /// Destroys any remaining NetworkManager instances
+        /// </summary>
+        private void DestroyNetworkManagers()
+        {
+            var networkManagers = Object.FindObjectsByType<NetworkManager>(FindObjectsSortMode.None);
+            foreach (var networkManager in networkManagers)
             {
-                if (m_NetworkManagerInstatiationMode == NetworkManagerInstatiationMode.AllTests)
-                {
-                    MockTransport.ClearQueues();
-                }
-                else
-                {
-                    MockTransport.Reset();
-                }
+                Object.DestroyImmediate(networkManager.gameObject);
             }
         }
 
@@ -1092,6 +1316,10 @@ public void OneTimeTearDown()
             UnloadRemainingScenes();
 
             VerboseDebug($"Exiting {nameof(OneTimeTearDown)}");
+#if UNITY_INCLUDE_TESTS
+            // Provide an external hook to be able to make adjustments to netcode classes after running tests
+            NetworkManager.OnOneTimeTearDown();
+#endif
 
             IsRunning = false;
         }
@@ -1287,11 +1515,35 @@ public bool WaitForConditionOrTimeOutWithTimeTravel(IConditionalPredicate condit
         /// <param name="clientsToCheck">An array of clients to be checked</param>
         protected IEnumerator WaitForClientsConnectedOrTimeOut(NetworkManager[] clientsToCheck)
         {
-            var remoteClientCount = clientsToCheck.Length;
-            var serverClientCount = m_ServerNetworkManager.IsHost ? remoteClientCount + 1 : remoteClientCount;
+            yield return WaitForConditionOrTimeOut(() => CheckClientsConnected(clientsToCheck));
+        }
 
-            yield return WaitForConditionOrTimeOut(() => clientsToCheck.Where((c) => c.IsConnectedClient).Count() == remoteClientCount &&
-                                                         m_ServerNetworkManager.ConnectedClients.Count == serverClientCount);
+        /// <summary>
+        /// Validation for clients connected that includes additional information for easier troubleshooting purposes.
+        /// </summary>
+        private bool CheckClientsConnected(NetworkManager[] clientsToCheck)
+        {
+            m_InternalErrorLog.Clear();
+            var allClientsConnected = true;
+
+            for (int i = 0; i < clientsToCheck.Length; i++)
+            {
+                if (!clientsToCheck[i].IsConnectedClient)
+                {
+                    allClientsConnected = false;
+                    m_InternalErrorLog.AppendLine($"[Client-{i + 1}] Client is not connected!");
+                }
+            }
+            var expectedCount = m_ServerNetworkManager.IsHost ? clientsToCheck.Length + 1 : clientsToCheck.Length;
+            var currentCount = m_ServerNetworkManager.ConnectedClients.Count;
+
+            if (currentCount != expectedCount)
+            {
+                allClientsConnected = false;
+                m_InternalErrorLog.AppendLine($"[Server-Side] Expected {expectedCount} clients to connect but only {currentCount} connected!");
+            }
+
+            return allClientsConnected;
         }
 
         /// <summary>
@@ -1343,7 +1595,7 @@ internal IEnumerator WaitForMessageReceived<T>(List<NetworkManager> wiatForRecei
             // Used to determine if all clients received the CreateObjectMessage
             var hooks = new MessageHooksConditional(messageHookEntriesForSpawn);
             yield return WaitForConditionOrTimeOut(hooks);
-            Assert.False(s_GlobalTimeoutHelper.TimedOut);
+            AssertOnTimeout($"Timed out waiting for message type {typeof(T).Name}!");
         }
 
         internal IEnumerator WaitForMessagesReceived(List<Type> messagesInOrder, List<NetworkManager> waitForReceivedBy, ReceiptType type = ReceiptType.Handled)
@@ -1363,7 +1615,12 @@ internal IEnumerator WaitForMessagesReceived(List<Type> messagesInOrder, List<Ne
             // Used to determine if all clients received the CreateObjectMessage
             var hooks = new MessageHooksConditional(messageHookEntriesForSpawn);
             yield return WaitForConditionOrTimeOut(hooks);
-            Assert.False(s_GlobalTimeoutHelper.TimedOut);
+            var stringBuilder = new StringBuilder();
+            foreach (var messageType in messagesInOrder)
+            {
+                stringBuilder.Append($"{messageType.Name},");
+            }
+            AssertOnTimeout($"Timed out waiting for message types: {stringBuilder}!");
         }
 
 
@@ -1380,7 +1637,7 @@ internal void WaitForMessageReceivedWithTimeTravel<T>(List<NetworkManager> waitF
 
             // Used to determine if all clients received the CreateObjectMessage
             var hooks = new MessageHooksConditional(messageHookEntriesForSpawn);
-            Assert.True(WaitForConditionOrTimeOutWithTimeTravel(hooks));
+            Assert.True(WaitForConditionOrTimeOutWithTimeTravel(hooks), $"[Message Not Recieved] {hooks.GetHooksStillWaiting()}");
         }
 
         internal void WaitForMessagesReceivedWithTimeTravel(List<Type> messagesInOrder, List<NetworkManager> waitForReceivedBy, ReceiptType type = ReceiptType.Handled)
@@ -1399,7 +1656,7 @@ internal void WaitForMessagesReceivedWithTimeTravel(List<Type> messagesInOrder,
 
             // Used to determine if all clients received the CreateObjectMessage
             var hooks = new MessageHooksConditional(messageHookEntriesForSpawn);
-            Assert.True(WaitForConditionOrTimeOutWithTimeTravel(hooks));
+            Assert.True(WaitForConditionOrTimeOutWithTimeTravel(hooks), $"[Messages Not Recieved] {hooks.GetHooksStillWaiting()}");
         }
 
         /// <summary>
@@ -1415,8 +1672,11 @@ protected GameObject CreateNetworkObjectPrefab(string baseName)
                                           $"but before {nameof(OnStartedServerAndClients)}!";
             Assert.IsNotNull(m_ServerNetworkManager, prefabCreateAssertError);
             Assert.IsFalse(m_ServerNetworkManager.IsListening, prefabCreateAssertError);
-
-            return NetcodeIntegrationTestHelpers.CreateNetworkObjectPrefab(baseName, m_ServerNetworkManager, m_ClientNetworkManagers);
+            var prefabObject = NetcodeIntegrationTestHelpers.CreateNetworkObjectPrefab(baseName, m_ServerNetworkManager, m_ClientNetworkManagers);
+            // DANGO-TODO: Ownership flags could require us to change this
+            // For testing purposes, we default to true for the distribute ownership property when in a distirbuted authority network topology.
+            prefabObject.GetComponent<NetworkObject>().Ownership |= NetworkObject.OwnershipStatus.Distributable;
+            return prefabObject;
         }
 
         /// <summary>
@@ -1429,6 +1689,16 @@ protected GameObject SpawnObject(GameObject prefabGameObject, NetworkManager own
             return SpawnObject(prefabNetworkObject, owner, destroyWithScene);
         }
 
+        /// <summary>
+        /// Overloaded method <see cref="SpawnObject(NetworkObject, NetworkManager, bool)"/>
+        /// </summary>
+        protected GameObject SpawnPlayerObject(GameObject prefabGameObject, NetworkManager owner, bool destroyWithScene = false)
+        {
+            var prefabNetworkObject = prefabGameObject.GetComponent<NetworkObject>();
+            Assert.IsNotNull(prefabNetworkObject, $"{nameof(GameObject)} {prefabGameObject.name} does not have a {nameof(NetworkObject)} component!");
+            return SpawnObject(prefabNetworkObject, owner, destroyWithScene, true);
+        }
+
         /// <summary>
         /// Spawn a NetworkObject prefab instance
         /// </summary>
@@ -1436,28 +1706,57 @@ protected GameObject SpawnObject(GameObject prefabGameObject, NetworkManager own
         /// <param name="owner">the owner of the instance</param>
         /// <param name="destroyWithScene">default is false</param>
         /// <returns>GameObject instance spawned</returns>
-        private GameObject SpawnObject(NetworkObject prefabNetworkObject, NetworkManager owner, bool destroyWithScene = false)
+        private GameObject SpawnObject(NetworkObject prefabNetworkObject, NetworkManager owner, bool destroyWithScene = false, bool isPlayerObject = false)
         {
             Assert.IsTrue(prefabNetworkObject.GlobalObjectIdHash > 0, $"{nameof(GameObject)} {prefabNetworkObject.name} has a {nameof(NetworkObject.GlobalObjectIdHash)} value of 0! Make sure to make it a valid prefab before trying to spawn!");
             var newInstance = Object.Instantiate(prefabNetworkObject.gameObject);
             var networkObjectToSpawn = newInstance.GetComponent<NetworkObject>();
-            networkObjectToSpawn.NetworkManagerOwner = m_ServerNetworkManager; // Required to assure the server does the spawning
-            if (owner == m_ServerNetworkManager)
+
+            if (owner.NetworkConfig.NetworkTopology == NetworkTopologyTypes.DistributedAuthority)
             {
-                if (m_UseHost)
+                networkObjectToSpawn.NetworkManagerOwner = owner; // Required to assure the client does the spawning
+                if (isPlayerObject)
                 {
-                    networkObjectToSpawn.SpawnWithOwnership(owner.LocalClientId, destroyWithScene);
+                    networkObjectToSpawn.SpawnAsPlayerObject(owner.LocalClientId, destroyWithScene);
                 }
                 else
                 {
-                    networkObjectToSpawn.Spawn(destroyWithScene);
+                    networkObjectToSpawn.SpawnWithOwnership(owner.LocalClientId, destroyWithScene);
                 }
             }
             else
             {
-                networkObjectToSpawn.SpawnWithOwnership(owner.LocalClientId, destroyWithScene);
+                networkObjectToSpawn.NetworkManagerOwner = m_ServerNetworkManager; // Required to assure the server does the spawning
+                if (owner == m_ServerNetworkManager)
+                {
+                    if (m_UseHost)
+                    {
+                        if (isPlayerObject)
+                        {
+                            networkObjectToSpawn.SpawnAsPlayerObject(owner.LocalClientId, destroyWithScene);
+                        }
+                        else
+                        {
+                            networkObjectToSpawn.SpawnWithOwnership(owner.LocalClientId, destroyWithScene);
+                        }
+                    }
+                    else
+                    {
+                        networkObjectToSpawn.Spawn(destroyWithScene);
+                    }
+                }
+                else
+                {
+                    if (isPlayerObject)
+                    {
+                        networkObjectToSpawn.SpawnAsPlayerObject(owner.LocalClientId, destroyWithScene);
+                    }
+                    else
+                    {
+                        networkObjectToSpawn.SpawnWithOwnership(owner.LocalClientId, destroyWithScene);
+                    }
+                }
             }
-
             return newInstance;
         }
 
@@ -1495,6 +1794,22 @@ private List<GameObject> SpawnObjects(NetworkObject prefabNetworkObject, Network
         /// </summary>
         public NetcodeIntegrationTest()
         {
+            m_NetworkTopologyType = OnGetNetworkTopologyType();
+            m_DistributedAuthority = m_NetworkTopologyType == NetworkTopologyTypes.DistributedAuthority;
+            NetworkMessageManager.EnableMessageOrderConsoleLog = false;
+        }
+
+        public NetcodeIntegrationTest(NetworkTopologyTypes networkTopologyType)
+        {
+            m_NetworkTopologyType = networkTopologyType;
+            m_DistributedAuthority = m_NetworkTopologyType == NetworkTopologyTypes.DistributedAuthority;
+        }
+
+        public NetcodeIntegrationTest(NetworkTopologyTypes networkTopologyType, HostOrServer hostOrServer)
+        {
+            m_NetworkTopologyType = networkTopologyType;
+            m_DistributedAuthority = m_NetworkTopologyType == NetworkTopologyTypes.DistributedAuthority;
+            m_UseHost = hostOrServer == HostOrServer.Host || hostOrServer == HostOrServer.DAHost;
         }
 
         /// <summary>
@@ -1512,10 +1827,12 @@ public NetcodeIntegrationTest()
         ///     public MyChildClass(HostOrServer hostOrServer) : base(hostOrServer) { }
         /// }
         /// </summary>
-        /// <param name="hostOrServer"></param>
+        /// <param name="hostOrServer">Specifies whether to run the test as a Host or Server configuration</param>
         public NetcodeIntegrationTest(HostOrServer hostOrServer)
         {
-            m_UseHost = hostOrServer == HostOrServer.Host ? true : false;
+            m_UseHost = hostOrServer == HostOrServer.Host || hostOrServer == HostOrServer.DAHost;
+            m_NetworkTopologyType = hostOrServer == HostOrServer.DAHost ? NetworkTopologyTypes.DistributedAuthority : NetworkTopologyTypes.ClientServer;
+            m_DistributedAuthority = OnGetNetworkTopologyType() == NetworkTopologyTypes.DistributedAuthority;
         }
 
         /// <summary>
@@ -1546,12 +1863,16 @@ private void UnloadRemainingScenes()
             }
         }
 
-        private System.Text.StringBuilder m_WaitForLog = new System.Text.StringBuilder();
+        private StringBuilder m_WaitForLog = new StringBuilder();
 
         private void LogWaitForMessages()
         {
-            VerboseDebug(m_WaitForLog.ToString());
-            m_WaitForLog.Clear();
+            // If there is nothing to log, then don't log anything
+            if (m_WaitForLog.Length > 0)
+            {
+                VerboseDebug(m_WaitForLog.ToString());
+                m_WaitForLog.Clear();
+            }
         }
 
         private IEnumerator WaitForTickAndFrames(NetworkManager networkManager, int tickCount, float targetFrames)
@@ -1609,19 +1930,10 @@ protected IEnumerator WaitForTicks(NetworkManager networkManager, int count)
         /// This will only simulate the netcode update loop, as well as update events on
         /// NetworkBehaviour instances, and will not simulate any Unity update processes (physics, etc)
         /// </summary>
-        /// <param name="amountOfTimeInSeconds"></param>
-        /// <param name="numFramesToSimulate"></param>
-        protected static void TimeTravel(double amountOfTimeInSeconds, int numFramesToSimulate = -1)
+        /// <param name="amountOfTimeInSeconds">The total amount of time to simulate, in seconds</param>
+        /// <param name="numFramesToSimulate">The number of frames to distribute the time across</param>
+        protected static void TimeTravel(double amountOfTimeInSeconds, int numFramesToSimulate)
         {
-            if (numFramesToSimulate < 0)
-            {
-                var frameRate = Application.targetFrameRate;
-                if (frameRate <= 0)
-                {
-                    frameRate = 60;
-                }
-                numFramesToSimulate = Math.Max((int)(amountOfTimeInSeconds / frameRate), 1);
-            }
             var interval = amountOfTimeInSeconds / numFramesToSimulate;
             for (var i = 0; i < numFramesToSimulate; ++i)
             {
@@ -1679,16 +1991,6 @@ public static void TimeTravelToNextTick()
             TimeTravel(timePassed, frames);
         }
 
-        private struct UpdateData
-        {
-            public MethodInfo Update;
-            public MethodInfo FixedUpdate;
-            public MethodInfo LateUpdate;
-        }
-
-        private static object[] s_EmptyObjectArray = { };
-        private static Dictionary<Type, UpdateData> s_UpdateFunctionCache = new Dictionary<Type, UpdateData>();
-
         /// <summary>
         /// Simulates one SDK frame. This can be used even without TimeTravel, though it's of somewhat less use
         /// without TimeTravel, as, without the mock transport, it will likely not provide enough time for any
@@ -1710,35 +2012,36 @@ public static void SimulateOneFrame()
                 {
                     stage = NetworkUpdateStage.PostScriptLateUpdate;
                 }
+
                 NetworkUpdateLoop.RunNetworkUpdateStage(stage);
+                string methodName = string.Empty;
+                switch (stage)
+                {
+                    case NetworkUpdateStage.FixedUpdate:
+                        methodName = "FixedUpdate"; // mapping NetworkUpdateStage.FixedUpdate to MonoBehaviour.FixedUpdate
+                        break;
+                    case NetworkUpdateStage.Update:
+                        methodName = "Update"; // mapping NetworkUpdateStage.Update to MonoBehaviour.Update
+                        break;
+                    case NetworkUpdateStage.PreLateUpdate:
+                        methodName = "LateUpdate"; // mapping NetworkUpdateStage.PreLateUpdate to MonoBehaviour.LateUpdate
+                        break;
+                }
 
-                if (stage == NetworkUpdateStage.Update || stage == NetworkUpdateStage.FixedUpdate || stage == NetworkUpdateStage.PreLateUpdate)
+                if (!string.IsNullOrEmpty(methodName))
                 {
-                    foreach (var behaviour in Object.FindObjectsByType<NetworkBehaviour>(FindObjectsSortMode.None))
+#if UNITY_2023_1_OR_NEWER
+                    foreach (var obj in Object.FindObjectsByType<NetworkObject>(FindObjectsSortMode.InstanceID))
+#else
+                    foreach (var obj in Object.FindObjectsOfType<NetworkObject>())
+#endif
                     {
-                        var type = behaviour.GetType();
-                        if (!s_UpdateFunctionCache.TryGetValue(type, out var updateData))
-                        {
-                            updateData = new UpdateData
-                            {
-                                Update = type.GetMethod("Update", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance),
-                                FixedUpdate = type.GetMethod("FixedUpdate", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance),
-                                LateUpdate = type.GetMethod("LateUpdate", BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance),
-                            };
-                            s_UpdateFunctionCache[type] = updateData;
-                        }
-
-                        switch (stage)
+                        var method = obj.GetType().GetMethod(methodName, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+                        method?.Invoke(obj, new object[] { });
+                        foreach (var behaviour in obj.ChildNetworkBehaviours)
                         {
-                            case NetworkUpdateStage.FixedUpdate:
-                                updateData.FixedUpdate?.Invoke(behaviour, new object[] { });
-                                break;
-                            case NetworkUpdateStage.Update:
-                                updateData.Update?.Invoke(behaviour, new object[] { });
-                                break;
-                            case NetworkUpdateStage.PreLateUpdate:
-                                updateData.LateUpdate?.Invoke(behaviour, new object[] { });
-                                break;
+                            var behaviourMethod = behaviour.GetType().GetMethod(methodName, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+                            behaviourMethod?.Invoke(behaviour, new object[] { });
                         }
                     }
                 }
diff --git a/com.unity.netcode.gameobjects/TestHelpers/Runtime/NetcodeIntegrationTestHelpers.cs b/com.unity.netcode.gameobjects/TestHelpers/Runtime/NetcodeIntegrationTestHelpers.cs
index bf26f9f05a..789ef2d494 100644
--- a/com.unity.netcode.gameobjects/TestHelpers/Runtime/NetcodeIntegrationTestHelpers.cs
+++ b/com.unity.netcode.gameobjects/TestHelpers/Runtime/NetcodeIntegrationTestHelpers.cs
@@ -267,7 +267,8 @@ internal static NetworkManager CreateNewClient(int identifier, bool mockTranspor
         /// Used to add a client to the already existing list of clients
         /// </summary>
         /// <param name="clientCount">The amount of clients</param>
-        /// <param name="clients"></param>
+        /// <param name="clients">Output array containing the created NetworkManager instances</param>
+        /// <param name="useMockTransport">When true, uses mock transport for testing, otherwise uses real transport. Default value is false</param>
         public static bool CreateNewClients(int clientCount, out NetworkManager[] clients, bool useMockTransport = false)
         {
             clients = new NetworkManager[clientCount];
@@ -284,7 +285,8 @@ public static bool CreateNewClients(int clientCount, out NetworkManager[] client
         /// <summary>
         /// Stops one single client and makes sure to cleanup any static variables in this helper
         /// </summary>
-        /// <param name="clientToStop"></param>
+        /// <param name="clientToStop">The NetworkManager instance to stop</param>
+        /// <param name="destroy">When true, destroys the GameObject, when false, only shuts down the network connection. Default value is true</param>
         public static void StopOneClient(NetworkManager clientToStop, bool destroy = true)
         {
             clientToStop.Shutdown();
@@ -299,7 +301,7 @@ public static void StopOneClient(NetworkManager clientToStop, bool destroy = tru
         /// <summary>
         /// Starts one single client and makes sure to register the required hooks and handlers
         /// </summary>
-        /// <param name="clientToStart"></param>
+        /// <param name="clientToStart">The NetworkManager instance to start</param>
         public static void StartOneClient(NetworkManager clientToStart)
         {
             clientToStart.StartClient();
@@ -326,21 +328,31 @@ public static void Destroy()
 
             s_IsStarted = false;
 
-            // Shutdown the server which forces clients to disconnect
-            foreach (var networkManager in NetworkManagerInstances)
+            try
             {
-                networkManager.Shutdown();
-                s_Hooks.Remove(networkManager);
-            }
+                // Shutdown the server which forces clients to disconnect
+                foreach (var networkManager in NetworkManagerInstances)
+                {
+                    if (networkManager != null && networkManager.IsListening)
+                    {
+                        networkManager?.Shutdown();
+                        s_Hooks.Remove(networkManager);
+                    }
+                }
 
-            // Destroy the network manager instances
-            foreach (var networkManager in NetworkManagerInstances)
-            {
-                if (networkManager.gameObject != null)
+                // Destroy the network manager instances
+                foreach (var networkManager in NetworkManagerInstances)
                 {
-                    Object.DestroyImmediate(networkManager.gameObject);
+                    if (networkManager != null && networkManager.gameObject)
+                    {
+                        Object.DestroyImmediate(networkManager.gameObject);
+                    }
                 }
             }
+            catch (Exception ex)
+            {
+                Debug.LogException(ex);
+            }
 
             NetworkManagerInstances.Clear();
 
@@ -378,7 +390,8 @@ private static void SceneManagerValidationAndTestRunnerInitialization(NetworkMan
         {
             // If VerifySceneBeforeLoading is not already set, then go ahead and set it so the host/server
             // will not try to synchronize clients to the TestRunner scene.  We only need to do this for the server.
-            if (networkManager.IsServer && networkManager.SceneManager.VerifySceneBeforeLoading == null)
+            // All clients in distributed authority mode, should have this registered (since any one client can become the session owner).
+            if ((networkManager.IsServer && networkManager.SceneManager.VerifySceneBeforeLoading == null) || networkManager.DistributedAuthorityMode)
             {
                 networkManager.SceneManager.VerifySceneBeforeLoading = VerifySceneIsValidForClientsToLoad;
 
@@ -408,7 +421,21 @@ private static void SceneManagerValidationAndTestRunnerInitialization(NetworkMan
                 // with the clients.
                 if (!networkManager.SceneManager.ScenesLoaded.ContainsKey(scene.handle))
                 {
-                    networkManager.SceneManager.ScenesLoaded.Add(scene.handle, scene);
+                    networkManager.SceneManager.ScenesLoaded.Add(scene.handle, new NetworkSceneManager.SceneData(null, scene));
+                }
+                // In distributed authority we need to check if this scene is already added
+                if (networkManager.DistributedAuthorityMode)
+                {
+                    if (!networkManager.SceneManager.ServerSceneHandleToClientSceneHandle.ContainsKey(scene.handle))
+                    {
+                        networkManager.SceneManager.ServerSceneHandleToClientSceneHandle.Add(scene.handle, scene.handle);
+                    }
+
+                    if (!networkManager.SceneManager.ClientSceneHandleToServerSceneHandle.ContainsKey(scene.handle))
+                    {
+                        networkManager.SceneManager.ClientSceneHandleToServerSceneHandle.Add(scene.handle, scene.handle);
+                    }
+                    return;
                 }
                 networkManager.SceneManager.ServerSceneHandleToClientSceneHandle.Add(scene.handle, scene.handle);
             }
@@ -416,6 +443,11 @@ private static void SceneManagerValidationAndTestRunnerInitialization(NetworkMan
 
         public delegate void BeforeClientStartCallback();
 
+        internal static bool Start(bool host, bool startServer, NetworkManager server, NetworkManager[] clients)
+        {
+            return Start(host, server, clients, null, startServer);
+        }
+
         /// <summary>
         /// Starts NetworkManager instances created by the Create method.
         /// </summary>
@@ -423,8 +455,8 @@ private static void SceneManagerValidationAndTestRunnerInitialization(NetworkMan
         /// <param name="server">The Server NetworkManager</param>
         /// <param name="clients">The Clients NetworkManager</param>
         /// <param name="callback">called immediately after server is started and before client(s) are started</param>
-        /// <returns></returns>
-        public static bool Start(bool host, NetworkManager server, NetworkManager[] clients, BeforeClientStartCallback callback = null)
+        /// <returns>True if all instances started successfully, false otherwise</returns>
+        public static bool Start(bool host, NetworkManager server, NetworkManager[] clients, BeforeClientStartCallback callback = null, bool startServer = true)
         {
             if (s_IsStarted)
             {
@@ -433,24 +465,26 @@ public static bool Start(bool host, NetworkManager server, NetworkManager[] clie
 
             s_IsStarted = true;
             s_ClientCount = clients.Length;
-
-            if (host)
-            {
-                server.StartHost();
-            }
-            else
+            var hooks = (MultiInstanceHooks)null;
+            if (startServer)
             {
-                server.StartServer();
-            }
-
-            var hooks = new MultiInstanceHooks();
-            server.ConnectionManager.MessageManager.Hook(hooks);
-            s_Hooks[server] = hooks;
+                if (host)
+                {
+                    server.StartHost();
+                }
+                else
+                {
+                    server.StartServer();
+                }
 
-            // Register the server side handler (always pass true for server)
-            RegisterHandlers(server, true);
+                hooks = new MultiInstanceHooks();
+                server.ConnectionManager.MessageManager.Hook(hooks);
+                s_Hooks[server] = hooks;
 
-            callback?.Invoke();
+                // Register the server side handler (always pass true for server)
+                RegisterHandlers(server, true);
+                callback?.Invoke();
+            }
 
             for (int i = 0; i < clients.Length; i++)
             {
@@ -527,6 +561,29 @@ public static void MakeNetworkObjectTestPrefab(NetworkObject networkObject, uint
             }
         }
 
+        /// <summary>
+        /// Creates a <see cref="NetworkObject"/> to be used with integration testing
+        /// </summary>
+        /// <param name="baseName">namr of the object</param>
+        /// <param name="owner">owner of the object</param>
+        /// <param name="moveToDDOL">when true, the instance is automatically migrated into the DDOL</param>
+        /// <returns></returns>
+        internal static GameObject CreateNetworkObject(string baseName, NetworkManager owner, bool moveToDDOL = false)
+        {
+            var gameObject = new GameObject
+            {
+                name = baseName
+            };
+            var networkObject = gameObject.AddComponent<NetworkObject>();
+            networkObject.NetworkManagerOwner = owner;
+            MakeNetworkObjectTestPrefab(networkObject);
+            if (moveToDDOL)
+            {
+                Object.DontDestroyOnLoad(gameObject);
+            }
+            return gameObject;
+        }
+
         public static GameObject CreateNetworkObjectPrefab(string baseName, NetworkManager server, params NetworkManager[] clients)
         {
             void AddNetworkPrefab(NetworkConfig config, NetworkPrefab prefab)
@@ -538,13 +595,7 @@ void AddNetworkPrefab(NetworkConfig config, NetworkPrefab prefab)
             Assert.IsNotNull(server, prefabCreateAssertError);
             Assert.IsFalse(server.IsListening, prefabCreateAssertError);
 
-            var gameObject = new GameObject
-            {
-                name = baseName
-            };
-            var networkObject = gameObject.AddComponent<NetworkObject>();
-            networkObject.NetworkManagerOwner = server;
-            MakeNetworkObjectTestPrefab(networkObject);
+            var gameObject = CreateNetworkObject(baseName, server);
             var networkPrefab = new NetworkPrefab() { Prefab = gameObject };
 
             // We could refactor this test framework to share a NetworkPrefabList instance, but at this point it's
@@ -588,7 +639,7 @@ public static void MarkAsSceneObjectRoot(GameObject networkObjectRoot, NetworkMa
         /// </summary>
         /// <param name="client">The client</param>
         /// <param name="result">The result. If null, it will automatically assert</param>
-        /// <param name="maxFrames">The max frames to wait for</param>
+        /// <param name="timeout">Maximum time in seconds to wait for connection. Defaults to DefaultTimeout</param>
         public static IEnumerator WaitForClientConnected(NetworkManager client, ResultWrapper<bool> result = null, float timeout = DefaultTimeout)
         {
             yield return WaitForClientsConnected(new NetworkManager[] { client }, result, timeout);
@@ -598,9 +649,8 @@ public static IEnumerator WaitForClientConnected(NetworkManager client, ResultWr
         /// Similar to WaitForClientConnected, this waits for multiple clients to be connected.
         /// </summary>
         /// <param name="clients">The clients to be connected</param>
-        /// <param name="result">The result. If null, it will automatically assert<</param>
-        /// <param name="maxFrames">The max frames to wait for</param>
-        /// <returns></returns>
+        /// <param name="result">The result. If null, it will automatically assert</param>
+        /// <param name="timeout">Maximum time in seconds to wait for connection. Defaults to DefaultTimeout</param>
         public static IEnumerator WaitForClientsConnected(NetworkManager[] clients, ResultWrapper<bool> result = null, float timeout = DefaultTimeout)
         {
             // Make sure none are the host client
@@ -655,7 +705,7 @@ public static IEnumerator WaitForClientsConnected(NetworkManager[] clients, Resu
         /// </summary>
         /// <param name="server">The server</param>
         /// <param name="result">The result. If null, it will automatically assert</param>
-        /// <param name="maxFrames">The max frames to wait for</param>
+        /// <param name="timeout">Maximum time in seconds to wait for connection. Defaults to DefaultTimeout</param>
         public static IEnumerator WaitForClientConnectedToServer(NetworkManager server, ResultWrapper<bool> result = null, float timeout = DefaultTimeout)
         {
             yield return WaitForClientsConnectedToServer(server, server.IsHost ? s_ClientCount + 1 : s_ClientCount, result, timeout);
@@ -666,7 +716,7 @@ public static IEnumerator WaitForClientConnectedToServer(NetworkManager server,
         /// </summary>
         /// <param name="server">The server</param>
         /// <param name="result">The result. If null, it will automatically assert</param>
-        /// <param name="maxFrames">The max frames to wait for</param>
+        /// <param name="timeout">Maximum time in seconds to wait for connection. Defaults to DefaultTimeout</param>
         public static IEnumerator WaitForClientsConnectedToServer(NetworkManager server, int clientCount = 1, ResultWrapper<bool> result = null, float timeout = DefaultTimeout)
         {
             if (!server.IsServer)
@@ -701,7 +751,7 @@ public static IEnumerator WaitForClientsConnectedToServer(NetworkManager server,
         /// <param name="representation">The representation to get the object from</param>
         /// <param name="result">The result</param>
         /// <param name="failIfNull">Whether or not to fail if no object is found and result is null</param>
-        /// <param name="maxFrames">The max frames to wait for</param>
+        /// <param name="timeout">Maximum time in seconds to wait for connection. Defaults to DefaultTimeout</param>
         public static IEnumerator GetNetworkObjectByRepresentation(ulong networkObjectId, NetworkManager representation, ResultWrapper<NetworkObject> result, bool failIfNull = true, float timeout = DefaultTimeout)
         {
             if (result == null)
@@ -732,7 +782,7 @@ public static IEnumerator GetNetworkObjectByRepresentation(ulong networkObjectId
         /// <param name="representation">The representation to get the object from</param>
         /// <param name="result">The result</param>
         /// <param name="failIfNull">Whether or not to fail if no object is found and result is null</param>
-        /// <param name="maxFrames">The max frames to wait for</param>
+        /// <param name="timeout">Maximum time in seconds to wait for connection. Defaults to DefaultTimeout</param>
         public static IEnumerator GetNetworkObjectByRepresentation(Func<NetworkObject, bool> predicate, NetworkManager representation, ResultWrapper<NetworkObject> result, bool failIfNull = true, float timeout = DefaultTimeout)
         {
             if (result == null)
@@ -768,7 +818,7 @@ public static IEnumerator GetNetworkObjectByRepresentation(Func<NetworkObject, b
         /// <param name="representation">The representation to get the object from</param>
         /// <param name="result">The result</param>
         /// <param name="failIfNull">Whether or not to fail if no object is found and result is null</param>
-        /// <param name="maxFrames">The max frames to wait for</param>
+        /// <param name="maxTries">The max frames to wait for</param>
         public static void GetNetworkObjectByRepresentationWithTimeTravel(Func<NetworkObject, bool> predicate, NetworkManager representation, ResultWrapper<NetworkObject> result, bool failIfNull = true, int maxTries = 60)
         {
             if (result == null)
@@ -800,8 +850,8 @@ public static void GetNetworkObjectByRepresentationWithTimeTravel(Func<NetworkOb
         /// </summary>
         /// <param name="predicate">The predicate to wait for</param>
         /// <param name="result">The result. If null, it will fail if the predicate is not met</param>
+        /// <param name="timeout">Maximum time in seconds to wait for connection. Defaults to DefaultTimeout</param>
         /// <param name="minFrames">The min frames to wait for</param>
-        /// <param name="maxFrames">The max frames to wait for</param>
         public static IEnumerator WaitForCondition(Func<bool> predicate, ResultWrapper<bool> result = null, float timeout = DefaultTimeout, int minFrames = DefaultMinFrames)
         {
             if (predicate == null)
diff --git a/com.unity.netcode.gameobjects/TestHelpers/Runtime/NetworkManagerHelper.cs b/com.unity.netcode.gameobjects/TestHelpers/Runtime/NetworkManagerHelper.cs
index 23aad063dc..03d1d807b9 100644
--- a/com.unity.netcode.gameobjects/TestHelpers/Runtime/NetworkManagerHelper.cs
+++ b/com.unity.netcode.gameobjects/TestHelpers/Runtime/NetworkManagerHelper.cs
@@ -93,7 +93,7 @@ public static bool StartNetworkManager(out NetworkManager networkManager, Networ
         /// Add a GameObject with a NetworkObject component
         /// </summary>
         /// <param name="nameOfGameObject">the name of the object</param>
-        /// <returns></returns>
+        /// <returns>A unique identifier (GUID) for the newly created GameObject</returns>
         public static Guid AddGameNetworkObject(string nameOfGameObject)
         {
             var gameObjectId = Guid.NewGuid();
@@ -121,7 +121,7 @@ public static Guid AddGameNetworkObject(string nameOfGameObject)
         /// </summary>
         /// <typeparam name="T">NetworkBehaviour component being added to the GameObject</typeparam>
         /// <param name="gameObjectIdentifier">ID returned to reference the game object</param>
-        /// <returns></returns>
+        /// <returns>The newly added component instance of type T</returns>
         public static T AddComponentToObject<T>(Guid gameObjectIdentifier) where T : NetworkBehaviour
         {
             Assert.IsTrue(InstantiatedGameObjects.ContainsKey(gameObjectIdentifier));
diff --git a/com.unity.netcode.gameobjects/TestHelpers/Runtime/NetworkVariableHelper.cs b/com.unity.netcode.gameobjects/TestHelpers/Runtime/NetworkVariableHelper.cs
index 343e0bb788..cf357ea3b8 100644
--- a/com.unity.netcode.gameobjects/TestHelpers/Runtime/NetworkVariableHelper.cs
+++ b/com.unity.netcode.gameobjects/TestHelpers/Runtime/NetworkVariableHelper.cs
@@ -5,14 +5,16 @@ namespace Unity.Netcode.TestHelpers.Runtime
 {
     /// <summary>
     /// Will automatically register for the NetworkVariable OnValueChanged
-    /// delegate handler.  It then will expose that single delegate invocation
+    /// delegate handler. It then will expose that single delegate invocation
     /// to anything that registers for this NetworkVariableHelper's instance's OnValueChanged event.
     /// This allows us to register any NetworkVariable type as well as there are basically two "types of types":
-    /// IEquatable<T>
-    /// ValueType
+    /// <list type="bullet">
+    /// <item>IEquatable&lt;T&gt;</item>
+    /// <item>ValueType</item>
+    /// </list>
     /// From both we can then at least determine if the value indeed changed
     /// </summary>
-    /// <typeparam name="T"></typeparam>
+    /// <typeparam name="T">The type of value managed by the NetworkVariable</typeparam>
     public class NetworkVariableHelper<T> : NetworkVariableBaseHelper
     {
         private readonly NetworkVariable<T> m_NetworkVariable;
@@ -20,7 +22,7 @@ public class NetworkVariableHelper<T> : NetworkVariableBaseHelper
         public event OnMyValueChangedDelegateHandler OnValueChanged;
 
         /// <summary>
-        /// IEquatable<T> Equals Check
+        /// IEquatable&lt;T&gt; Equals Check
         /// </summary>
         private void CheckVariableChanged(IEquatable<T> previous, IEquatable<T> next)
         {
diff --git a/com.unity.netcode.gameobjects/TestHelpers/Runtime/TimeoutHelper.cs b/com.unity.netcode.gameobjects/TestHelpers/Runtime/TimeoutHelper.cs
index 1de7802444..a101873e6c 100644
--- a/com.unity.netcode.gameobjects/TestHelpers/Runtime/TimeoutHelper.cs
+++ b/com.unity.netcode.gameobjects/TestHelpers/Runtime/TimeoutHelper.cs
@@ -3,7 +3,7 @@
 namespace Unity.Netcode.TestHelpers.Runtime
 {
     /// <summary>
-    /// Can be used independently or assigned to <see cref="NetcodeIntegrationTest.WaitForConditionOrTimeOut"></see> in the
+    /// Can be used independently or assigned to <see cref="NetcodeIntegrationTest.WaitForConditionOrTimeOut"/> in the
     /// event the default timeout period needs to be adjusted
     /// </summary>
     public class TimeoutHelper
diff --git a/com.unity.netcode.gameobjects/TestHelpers/Runtime/com.unity.netcode.testhelpers.runtime.asmdef b/com.unity.netcode.gameobjects/TestHelpers/Runtime/com.unity.netcode.testhelpers.runtime.asmdef
index 2fb107c79f..14fad83862 100644
--- a/com.unity.netcode.gameobjects/TestHelpers/Runtime/com.unity.netcode.testhelpers.runtime.asmdef
+++ b/com.unity.netcode.gameobjects/TestHelpers/Runtime/com.unity.netcode.testhelpers.runtime.asmdef
@@ -6,7 +6,9 @@
         "Unity.Multiplayer.MetricTypes",
         "Unity.Multiplayer.NetStats",
         "Unity.Multiplayer.Tools.MetricTypes",
-        "Unity.Multiplayer.Tools.NetStats"
+        "Unity.Multiplayer.Tools.NetStats",
+        "Unity.ResourceManager",
+        "Unity.Addressables"
     ],
     "optionalUnityReferences": [
         "TestAssemblies"
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/ArithmeticTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/ArithmeticTests.cs
index 45baf5a1c4..2791e4ac84 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/ArithmeticTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/ArithmeticTests.cs
@@ -2,7 +2,7 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class ArithmeticTests
+    internal class ArithmeticTests
     {
         [Test]
         public void TestCeil()
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Build/BuildTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Build/BuildTests.cs
index c8cde89618..563c43b166 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/Build/BuildTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/Build/BuildTests.cs
@@ -1,3 +1,4 @@
+#if !MULTIPLAYER_TOOLS
 using System.IO;
 using System.Reflection;
 using NUnit.Framework;
@@ -7,7 +8,7 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class BuildTests
+    internal class BuildTests
     {
         public const string DefaultBuildScenePath = "Tests/Editor/Build/BuildTestScene.unity";
 
@@ -38,3 +39,4 @@ public void BasicBuildTest()
         }
     }
 }
+#endif
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/DisconnectMessageTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/DisconnectMessageTests.cs
index 644ed70bbd..e30ceccb1f 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/DisconnectMessageTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/DisconnectMessageTests.cs
@@ -3,7 +3,7 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class DisconnectMessageTests
+    internal class DisconnectMessageTests
     {
         [Test]
         public void EmptyDisconnectReason()
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/InterpolatorTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/InterpolatorTests.cs
index 224a25e0f8..666183abe6 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/InterpolatorTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/InterpolatorTests.cs
@@ -1,9 +1,8 @@
-using System;
 using NUnit.Framework;
 
 namespace Unity.Netcode.EditorTests
 {
-    public class InterpolatorTests
+    internal class InterpolatorTests
     {
         private const float k_Precision = 0.00000001f;
         private const int k_MockTickRate = 1;
@@ -43,29 +42,29 @@ public void NormalUsage()
 
             // too small update, nothing happens, doesn't consume from buffer yet
             var serverTime = new NetworkTime(k_MockTickRate, 0.01d); // t = 0.1d
-            interpolator.Update(.01f, serverTime);
+            interpolator.UpdateInternal(.01f, serverTime);
             Assert.That(interpolator.GetInterpolatedValue(), Is.EqualTo(0f));
 
             // consume first measurement, still can't interpolate with just one tick consumed
             serverTime += 1.0d; // t = 1.01
-            interpolator.Update(1.0f, serverTime);
+            interpolator.UpdateInternal(1.0f, serverTime);
             Assert.That(interpolator.GetInterpolatedValue(), Is.EqualTo(0f));
 
             // consume second measurement, start to interpolate
             serverTime += 1.0d; // t = 2.01
-            var valueFromUpdate = interpolator.Update(1.0f, serverTime);
+            var valueFromUpdate = interpolator.UpdateInternal(1.0f, serverTime);
             Assert.That(interpolator.GetInterpolatedValue(), Is.EqualTo(0.01f).Within(k_Precision));
             Assert.That(interpolator.GetInterpolatedValue(), Is.EqualTo(0.01f).Within(k_Precision)); // test a second time, to make sure the get doesn't update the value
             Assert.That(valueFromUpdate, Is.EqualTo(interpolator.GetInterpolatedValue()).Within(k_Precision));
 
             // continue interpolation
             serverTime = new NetworkTime(k_MockTickRate, 2.5d); // t = 2.5d
-            interpolator.Update(2.5f - 2.01f, serverTime);
+            interpolator.UpdateInternal(2.5f - 2.01f, serverTime);
             Assert.That(interpolator.GetInterpolatedValue(), Is.EqualTo(0.5f).Within(k_Precision));
 
             // check when reaching end
             serverTime += 0.5d; // t = 3
-            interpolator.Update(0.5f, serverTime);
+            interpolator.UpdateInternal(0.5f, serverTime);
             Assert.That(interpolator.GetInterpolatedValue(), Is.EqualTo(1f).Within(k_Precision));
         }
 
@@ -86,26 +85,25 @@ public void OutOfOrderShouldStillWork()
             interpolator.AddMeasurement(2f, 2d);
 
             serverTime = new NetworkTime(k_MockTickRate, 1.5d);
-            interpolator.Update(1.5f, serverTime);
+            interpolator.UpdateInternal(1.5f, serverTime);
             Assert.That(interpolator.GetInterpolatedValue(), Is.EqualTo(0f).Within(k_Precision));
 
             serverTime += timeStep; // t = 2.0
-            interpolator.Update((float)timeStep, serverTime);
+            interpolator.UpdateInternal((float)timeStep, serverTime);
             Assert.That(interpolator.GetInterpolatedValue(), Is.EqualTo(1f).Within(k_Precision));
 
             serverTime += timeStep; // t = 2.5
-            interpolator.Update((float)timeStep, serverTime);
+            interpolator.UpdateInternal((float)timeStep, serverTime);
             Assert.That(interpolator.GetInterpolatedValue(), Is.EqualTo(1.5f).Within(k_Precision));
 
             // makes sure that interpolation still continues in right direction
             interpolator.AddMeasurement(1, 1d);
 
             serverTime += timeStep; // t = 3
-            interpolator.Update((float)timeStep, serverTime);
+            interpolator.UpdateInternal((float)timeStep, serverTime);
             Assert.That(interpolator.GetInterpolatedValue(), Is.EqualTo(2f).Within(k_Precision));
         }
 
-        [Ignore("TODO: Fix this test to still handle testing message loss without extrapolation")]
         [Test]
         public void MessageLoss()
         {
@@ -123,66 +121,28 @@ public void MessageLoss()
 
             // first value teleports interpolator
             serverTime = new NetworkTime(k_MockTickRate, 1d);
-            interpolator.Update(1f, serverTime);
+            interpolator.UpdateInternal(1f, serverTime);
             Assert.That(interpolator.GetInterpolatedValue(), Is.EqualTo(1f));
 
             // nothing happens, not ready to consume second value yet
             serverTime += timeStep;  // t = 1.5
-            interpolator.Update((float)timeStep, serverTime);
+            interpolator.UpdateInternal((float)timeStep, serverTime);
             Assert.That(interpolator.GetInterpolatedValue(), Is.EqualTo(1f));
 
             // beginning of interpolation, second value consumed, currently at start
             serverTime += timeStep; // t = 2
-            interpolator.Update((float)timeStep, serverTime);
+            interpolator.UpdateInternal((float)timeStep, serverTime);
             Assert.That(interpolator.GetInterpolatedValue(), Is.EqualTo(1f));
 
             // interpolation starts
             serverTime += timeStep; // t = 2.5
-            interpolator.Update((float)timeStep, serverTime);
+            interpolator.UpdateInternal((float)timeStep, serverTime);
             Assert.That(interpolator.GetInterpolatedValue(), Is.EqualTo(1.5f));
 
             serverTime += timeStep; // t = 3
-            interpolator.Update((float)timeStep, serverTime);
+            interpolator.UpdateInternal((float)timeStep, serverTime);
             Assert.That(interpolator.GetInterpolatedValue(), Is.EqualTo(2f));
-
-            // extrapolating to 2.5
-            serverTime += timeStep; // t = 3.5d
-            interpolator.Update((float)timeStep, serverTime);
-            Assert.That(interpolator.GetInterpolatedValue(), Is.EqualTo(2.5f));
-
-            // next value skips to where it was supposed to be once buffer time is showing the next value
-            serverTime += timeStep; // t = 4
-            interpolator.Update((float)timeStep, serverTime);
-            Assert.That(interpolator.GetInterpolatedValue(), Is.EqualTo(3f));
-
-            // interpolation continues as expected
-            serverTime += timeStep; // t = 4.5
-            interpolator.Update((float)timeStep, serverTime);
-            Assert.That(interpolator.GetInterpolatedValue(), Is.EqualTo(3.5f));
-
-            serverTime += timeStep; // t = 5
-            interpolator.Update((float)timeStep, serverTime);
-            Assert.That(interpolator.GetInterpolatedValue(), Is.EqualTo(4f));
-
-            // lost time=6, extrapolating
-            serverTime += timeStep; // t = 5.5
-            interpolator.Update((float)timeStep, serverTime);
-            Assert.That(interpolator.GetInterpolatedValue(), Is.EqualTo(4.5f));
-
-            serverTime += timeStep; // t = 6.0
-            interpolator.Update((float)timeStep, serverTime);
-            Assert.That(interpolator.GetInterpolatedValue(), Is.EqualTo(5f));
-
-            // misprediction
-            serverTime += timeStep; // t = 6.5
-            interpolator.Update((float)timeStep, serverTime);
-            Assert.That(interpolator.GetInterpolatedValue(), Is.EqualTo(5.5f));
-
-            // lerp to right value
-            serverTime += timeStep; // t = 7.0
-            interpolator.Update((float)timeStep, serverTime);
-            Assert.That(interpolator.GetInterpolatedValue(), Is.GreaterThan(6.0f));
-            Assert.That(interpolator.GetInterpolatedValue(), Is.LessThanOrEqualTo(100f));
+            // Since there is no extrapolation, the rest of this test was removed.
         }
 
         [Test]
@@ -195,21 +155,21 @@ public void AddFirstMeasurement()
             interpolator.AddMeasurement(3f, 2d);
 
             serverTime += 1d; // t = 1
-            var interpolatedValue = interpolator.Update(1f, serverTime);
+            var interpolatedValue = interpolator.UpdateInternal(1f, serverTime);
             // when consuming only one measurement and it's the first one consumed, teleport to it
             Assert.That(interpolatedValue, Is.EqualTo(2f));
 
             // then interpolation should work as usual
             serverTime += 1d; // t = 2
-            interpolatedValue = interpolator.Update(1f, serverTime);
+            interpolatedValue = interpolator.UpdateInternal(1f, serverTime);
             Assert.That(interpolatedValue, Is.EqualTo(2f));
 
             serverTime += 0.5d; // t = 2.5
-            interpolatedValue = interpolator.Update(0.5f, serverTime);
+            interpolatedValue = interpolator.UpdateInternal(0.5f, serverTime);
             Assert.That(interpolatedValue, Is.EqualTo(2.5f));
 
             serverTime += 0.5d; // t = 3
-            interpolatedValue = interpolator.Update(.5f, serverTime);
+            interpolatedValue = interpolator.UpdateInternal(.5f, serverTime);
             Assert.That(interpolatedValue, Is.EqualTo(3f));
         }
 
@@ -223,12 +183,12 @@ public void JumpToEachValueIfDeltaTimeTooBig()
             interpolator.AddMeasurement(3f, 2d);
 
             serverTime += 1d; // t = 1
-            var interpolatedValue = interpolator.Update(1f, serverTime);
+            var interpolatedValue = interpolator.UpdateInternal(1f, serverTime);
             Assert.That(interpolatedValue, Is.EqualTo(2f));
 
             // big deltaTime, jumping to latest value
             serverTime += 9f; // t = 10
-            interpolatedValue = interpolator.Update(8f, serverTime);
+            interpolatedValue = interpolator.UpdateInternal(8f, serverTime);
             Assert.That(interpolatedValue, Is.EqualTo(3));
         }
 
@@ -248,7 +208,7 @@ public void JumpToLastValueFromStart()
 
             // big time jump
             serverTime += 7d; // t = 10
-            var interpolatedValue = interpolator.Update(10f, serverTime);
+            var interpolatedValue = interpolator.UpdateInternal(10f, serverTime);
             Assert.That(interpolatedValue, Is.EqualTo(3f));
 
             // interpolation continues as normal
@@ -256,19 +216,19 @@ public void JumpToLastValueFromStart()
             interpolator.AddMeasurement(11f, serverTime.Time); // out of order
 
             serverTime = new NetworkTime(k_MockTickRate, 10.5d); // t = 10.5
-            interpolatedValue = interpolator.Update(0.5f, serverTime);
+            interpolatedValue = interpolator.UpdateInternal(0.5f, serverTime);
             Assert.That(interpolatedValue, Is.EqualTo(3f));
 
             serverTime += 0.5d; // t = 11
-            interpolatedValue = interpolator.Update(0.5f, serverTime);
+            interpolatedValue = interpolator.UpdateInternal(0.5f, serverTime);
             Assert.That(interpolatedValue, Is.EqualTo(10f));
 
             serverTime += 0.5d; // t = 11.5
-            interpolatedValue = interpolator.Update(0.5f, serverTime);
+            interpolatedValue = interpolator.UpdateInternal(0.5f, serverTime);
             Assert.That(interpolatedValue, Is.EqualTo(10.5f));
 
             serverTime += 0.5d; // t = 12
-            interpolatedValue = interpolator.Update(0.5f, serverTime);
+            interpolatedValue = interpolator.UpdateInternal(0.5f, serverTime);
             Assert.That(interpolatedValue, Is.EqualTo(11f));
         }
 
@@ -281,7 +241,7 @@ public void TestBufferSizeLimit()
             var serverTime = new NetworkTime(k_MockTickRate, 0d);
             serverTime += 1.0d; // t = 1
             interpolator.AddMeasurement(-1f, serverTime.Time);
-            interpolator.Update(1f, serverTime);
+            interpolator.UpdateInternal(1f, serverTime);
 
             // max + 1
             serverTime += 1.0d; // t = 2
@@ -293,7 +253,7 @@ public void TestBufferSizeLimit()
 
             // client was paused for a while, some time has past, we just got a burst of values from the server that teleported us to the last value received
             serverTime = new NetworkTime(k_MockTickRate, 102d);
-            var interpolatedValue = interpolator.Update(101f, serverTime);
+            var interpolatedValue = interpolator.UpdateInternal(101f, serverTime);
             Assert.That(interpolatedValue, Is.EqualTo(102));
         }
 
@@ -302,11 +262,10 @@ public void TestUpdatingInterpolatorWithNoData()
         {
             var interpolator = new BufferedLinearInterpolatorFloat();
             var serverTime = new NetworkTime(k_MockTickRate, 0.0d);
-            // invalid case, this is undefined behaviour
-            Assert.Throws<InvalidOperationException>(() => interpolator.Update(1f, serverTime));
+            var interpolatedValue = interpolator.UpdateInternal(1f, serverTime);
+            Assert.IsTrue(interpolatedValue == 0.0f, $"Expected the result to be 0.0f but was {interpolatedValue}!");
         }
 
-        [Ignore("TODO: Fix this test to still test duplicated values without extrapolation")]
         [Test]
         public void TestDuplicatedValues()
         {
@@ -323,39 +282,24 @@ public void TestDuplicatedValues()
             // empty interpolator teleports to initial value
             serverTime = new NetworkTime(k_MockTickRate, 0.0d);
             serverTime += 1d; // t = 1
-            var interp = interpolator.Update(1f, serverTime);
+            var interp = interpolator.UpdateInternal(1f, serverTime);
             Assert.That(interp, Is.EqualTo(1f));
 
             // consume value, start interp, currently at start value
             serverTime += 1d; // t = 2
-            interp = interpolator.Update(1f, serverTime);
+            interp = interpolator.UpdateInternal(1f, serverTime);
             Assert.That(interp, Is.EqualTo(1f));
 
             // interp
             serverTime += 0.5d; // t = 2.5
-            interp = interpolator.Update(0.5f, serverTime);
+            interp = interpolator.UpdateInternal(0.5f, serverTime);
             Assert.That(interp, Is.EqualTo(1.5f));
 
             // reach end
             serverTime += 0.5d; // t = 3
-            interp = interpolator.Update(0.5f, serverTime);
-            Assert.That(interp, Is.EqualTo(2f));
-
-            // with unclamped interpolation, we continue mispredicting since the two last values are actually treated as the same. Therefore we're not stopping at "2"
-            serverTime += 0.5d; // t = 3.5
-            interp = interpolator.Update(0.5f, serverTime);
-            Assert.That(interp, Is.EqualTo(2.5f));
-
-            serverTime += 0.5d; // t = 4
-            interp = interpolator.Update(0.5f, serverTime);
-            Assert.That(interp, Is.EqualTo(3f));
-
-            // we add a measurement with an updated time
-            var pastServerTime = new NetworkTime(k_MockTickRate, 3.0d);
-            interpolator.AddMeasurement(2f, pastServerTime.Time);
-
-            interp = interpolator.Update(0.5f, serverTime);
+            interp = interpolator.UpdateInternal(0.5f, serverTime);
             Assert.That(interp, Is.EqualTo(2f));
+            // Since there is no extrapolation, the rest of this test was removed.
         }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Messaging/DisconnectOnSendTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Messaging/DisconnectOnSendTests.cs
index 9fbf55abd3..a33e7ac6f4 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/Messaging/DisconnectOnSendTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/Messaging/DisconnectOnSendTests.cs
@@ -3,7 +3,7 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class DisconnectOnSendTests
+    internal class DisconnectOnSendTests
     {
         private struct TestMessage : INetworkMessage, INetworkSerializeByMemcpy
         {
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageCorruptionTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageCorruptionTests.cs
index b37454f233..2403402701 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageCorruptionTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageCorruptionTests.cs
@@ -10,7 +10,7 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class MessageCorruptionTests
+    internal class MessageCorruptionTests
     {
 
         private struct TestMessage : INetworkMessage, INetworkSerializeByMemcpy
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageReceivingTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageReceivingTests.cs
index 1a9b3f644b..d77bf4ea72 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageReceivingTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageReceivingTests.cs
@@ -7,7 +7,7 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class MessageReceivingTests
+    internal class MessageReceivingTests
     {
         private struct TestMessage : INetworkMessage, INetworkSerializeByMemcpy
         {
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageRegistrationTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageRegistrationTests.cs
index bb7ab651d7..66898947e6 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageRegistrationTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageRegistrationTests.cs
@@ -3,7 +3,7 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class MessageRegistrationTests
+    internal class MessageRegistrationTests
     {
         private struct TestMessageOne : INetworkMessage, INetworkSerializeByMemcpy
         {
@@ -191,77 +191,5 @@ public void WhenCreatingMessageSystem_BoundTypeMessageHandlersAreRegistered()
                 Assert.AreEqual(handlerFour, systemThree.MessageHandlers[systemThree.GetMessageType(typeof(TestMessageFour))]);
             }
         }
-
-        internal class AAAEarlyLexicographicNetworkMessage : INetworkMessage
-        {
-            public void Serialize(FastBufferWriter writer, int targetVersion)
-            {
-            }
-
-            public bool Deserialize(FastBufferReader reader, ref NetworkContext context, int receivedMessageVersion)
-            {
-                return true;
-            }
-
-            public void Handle(ref NetworkContext context)
-            {
-            }
-
-            public int Version => 0;
-        }
-
-#pragma warning disable IDE1006
-        internal class zzzLateLexicographicNetworkMessage : AAAEarlyLexicographicNetworkMessage
-        {
-        }
-#pragma warning restore IDE1006
-
-        internal class OrderingMessageProvider : INetworkMessageProvider
-        {
-            public List<NetworkMessageManager.MessageWithHandler> GetMessages()
-            {
-                var listMessages = new List<NetworkMessageManager.MessageWithHandler>();
-
-                var messageWithHandler = new NetworkMessageManager.MessageWithHandler
-                {
-                    MessageType = typeof(zzzLateLexicographicNetworkMessage),
-                    GetVersion = NetworkMessageManager.CreateMessageAndGetVersion<zzzLateLexicographicNetworkMessage>
-                };
-                listMessages.Add(messageWithHandler);
-
-                messageWithHandler.MessageType = typeof(ConnectionRequestMessage);
-                messageWithHandler.GetVersion = NetworkMessageManager.CreateMessageAndGetVersion<ConnectionRequestMessage>;
-                listMessages.Add(messageWithHandler);
-
-                messageWithHandler.MessageType = typeof(ConnectionApprovedMessage);
-                messageWithHandler.GetVersion = NetworkMessageManager.CreateMessageAndGetVersion<ConnectionApprovedMessage>;
-                listMessages.Add(messageWithHandler);
-
-                messageWithHandler.MessageType = typeof(AAAEarlyLexicographicNetworkMessage);
-                messageWithHandler.GetVersion = NetworkMessageManager.CreateMessageAndGetVersion<AAAEarlyLexicographicNetworkMessage>;
-                listMessages.Add(messageWithHandler);
-
-                return listMessages;
-            }
-        }
-
-        [Test]
-        public void MessagesGetPrioritizedCorrectly()
-        {
-            var sender = new NopMessageSender();
-            var provider = new OrderingMessageProvider();
-            using var messageManager = new NetworkMessageManager(sender, null, provider);
-
-            // the 2 priority messages should appear first, in lexicographic order
-            Assert.AreEqual(messageManager.MessageTypes[0], typeof(ConnectionApprovedMessage));
-            Assert.AreEqual(messageManager.MessageTypes[1], typeof(ConnectionRequestMessage));
-
-            // the other should follow after
-            Assert.AreEqual(messageManager.MessageTypes[2], typeof(AAAEarlyLexicographicNetworkMessage));
-            Assert.AreEqual(messageManager.MessageTypes[3], typeof(zzzLateLexicographicNetworkMessage));
-
-            // there should not be any extras
-            Assert.AreEqual(messageManager.MessageHandlerCount, 4);
-        }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageSendingTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageSendingTests.cs
index 81cc7e7bb2..84967b7ee4 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageSendingTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageSendingTests.cs
@@ -10,7 +10,7 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class MessageSendingTests
+    internal class MessageSendingTests
     {
         private struct TestMessage : INetworkMessage, INetworkSerializeByMemcpy
         {
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageVersioningTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageVersioningTests.cs
index d19c882476..222c08b24b 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageVersioningTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/Messaging/MessageVersioningTests.cs
@@ -5,7 +5,7 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class MessageVersioningTests
+    internal class MessageVersioningTests
     {
         public static int SentVersion;
         public static int ReceivedVersion;
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Metrics/NetworkMetricsRegistrationTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Metrics/NetworkMetricsRegistrationTests.cs
index e962c86eb7..54114e2bd7 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/Metrics/NetworkMetricsRegistrationTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/Metrics/NetworkMetricsRegistrationTests.cs
@@ -8,7 +8,7 @@
 
 namespace Unity.Netcode.EditorTests.Metrics
 {
-    public class NetworkMetricsRegistrationTests
+    internal class NetworkMetricsRegistrationTests
     {
         private static Type[] s_MetricTypes = AppDomain.CurrentDomain.GetAssemblies()
             .SelectMany(x => x.GetTypes())
@@ -16,7 +16,7 @@ public class NetworkMetricsRegistrationTests
             .ToArray();
 
         [TestCaseSource(nameof(s_MetricTypes))]
-        [Ignore("Disable test while we reevaluate the assumption that INetworkMetricEvent interfaces must be reported from MLAPI.")]
+        [Ignore("Disable test while we reevaluate the assumption that INetworkMetricEvent interfaces must be reported from MLAPI. This ignored test is tracked in MTT-11339")]
         public void ValidateThatAllMetricTypesAreRegistered(Type metricType)
         {
             var dispatcher = new NetworkMetrics().Dispatcher as MetricDispatcher;
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/NetworkBehaviourTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/NetworkBehaviourTests.cs
index 395aa79d95..29c827923d 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/NetworkBehaviourTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/NetworkBehaviourTests.cs
@@ -4,7 +4,7 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class NetworkBehaviourTests
+    internal class NetworkBehaviourTests
     {
         [Test]
         public void HasNetworkObjectTest()
@@ -66,12 +66,12 @@ public void GivenClassDerivesFromNetworkBehaviourDerivedClass_GetTypeNameReturns
 
         // Note: in order to repro https://github.com/Unity-Technologies/com.unity.netcode.gameobjects/issues/1078
         // this child class must be defined before its parent to assure it is processed first by ILPP
-        public class DerivedNetworkBehaviour : EmptyNetworkBehaviour
+        internal class DerivedNetworkBehaviour : EmptyNetworkBehaviour
         {
 
         }
 
-        public class EmptyNetworkBehaviour : NetworkBehaviour
+        internal class EmptyNetworkBehaviour : NetworkBehaviour
         {
 
         }
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/NetworkManagerConfigurationTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/NetworkManagerConfigurationTests.cs
index 45ac91ce57..78b13e3abc 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/NetworkManagerConfigurationTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/NetworkManagerConfigurationTests.cs
@@ -9,8 +9,20 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class NetworkManagerConfigurationTests
+    internal class NetworkManagerConfigurationTests
     {
+        [SetUp]
+        public void OnSetup()
+        {
+            ILPPMessageProvider.IntegrationTestNoMessages = true;
+        }
+
+        [TearDown]
+        public void OnTearDown()
+        {
+            ILPPMessageProvider.IntegrationTestNoMessages = false;
+        }
+
         /// <summary>
         /// Does a simple check to make sure the nested network manager will
         /// notify the user when in the editor.  This is just a unit test to
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/NetworkObjectTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/NetworkObjectTests.cs
index dd0d930ea0..64dbc532be 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/NetworkObjectTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/NetworkObjectTests.cs
@@ -6,7 +6,7 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class NetworkObjectTests
+    internal class NetworkObjectTests
     {
         [Test]
         public void NetworkManagerOverrideTest()
@@ -146,12 +146,12 @@ private struct ComponentIndices
             public int NetworkBehaviourIndex;
         }
 
-        public class EmptyNetworkBehaviour : NetworkBehaviour
+        internal class EmptyNetworkBehaviour : NetworkBehaviour
         {
 
         }
 
-        public class EmptyMonoBehaviour : MonoBehaviour
+        internal class EmptyMonoBehaviour : MonoBehaviour
         {
 
         }
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/NetworkPrefabProcessorTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/NetworkPrefabProcessorTests.cs
index 275a83d70d..f50e502633 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/NetworkPrefabProcessorTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/NetworkPrefabProcessorTests.cs
@@ -5,7 +5,7 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class NetworkPrefabProcessorTests
+    internal class NetworkPrefabProcessorTests
     {
         private NetcodeForGameObjectsProjectSettings m_Settings;
         private bool m_EditorDefaultPrefabSetting;
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/NetworkVar/NetworkVarTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/NetworkVar/NetworkVarTests.cs
index e871b23315..77ad69dd62 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/NetworkVar/NetworkVarTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/NetworkVar/NetworkVarTests.cs
@@ -3,9 +3,9 @@
 
 namespace Unity.Netcode.EditorTests.NetworkVar
 {
-    public class NetworkVarTests
+    internal class NetworkVarTests
     {
-        public class NetworkVarComponent : NetworkBehaviour
+        internal class NetworkVarComponent : NetworkBehaviour
         {
             public NetworkVariable<int> NetworkVariable = new NetworkVariable<int>();
         }
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Serialization/BaseFastBufferReaderWriterTest.cs b/com.unity.netcode.gameobjects/Tests/Editor/Serialization/BaseFastBufferReaderWriterTest.cs
index a73f151e66..53e72cfba1 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/Serialization/BaseFastBufferReaderWriterTest.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/Serialization/BaseFastBufferReaderWriterTest.cs
@@ -6,7 +6,7 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public abstract class BaseFastBufferReaderWriterTest
+    internal abstract class BaseFastBufferReaderWriterTest
     {
         protected enum ByteEnum : byte
         {
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Serialization/BitCounterTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Serialization/BitCounterTests.cs
index 5e0f4c8a12..9200d6b987 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/Serialization/BitCounterTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/Serialization/BitCounterTests.cs
@@ -2,7 +2,7 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class BitCounterTests
+    internal class BitCounterTests
     {
         [Test]
         public void WhenCountingUsedBitsIn64BitValue_ResultMatchesHighBitSetPlusOne([Range(0, 63)] int highBit)
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Serialization/BitReaderTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Serialization/BitReaderTests.cs
index b6e4ef5ff9..de83183880 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/Serialization/BitReaderTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/Serialization/BitReaderTests.cs
@@ -4,7 +4,7 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class BitReaderTests
+    internal class BitReaderTests
     {
         [Test]
         public void TestReadingOneBit()
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Serialization/BitWriterTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Serialization/BitWriterTests.cs
index f35f725250..b4a84ff710 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/Serialization/BitWriterTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/Serialization/BitWriterTests.cs
@@ -4,7 +4,7 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class BitWriterTests
+    internal class BitWriterTests
     {
         [Test]
         public unsafe void TestWritingOneBit()
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Serialization/BufferSerializerTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Serialization/BufferSerializerTests.cs
index c36d738887..b6684ff0e0 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/Serialization/BufferSerializerTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/Serialization/BufferSerializerTests.cs
@@ -5,7 +5,7 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class BufferSerializerTests
+    internal class BufferSerializerTests
     {
         [Test]
         public void TestIsReaderIsWriter()
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Serialization/BytePackerTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Serialization/BytePackerTests.cs
index 99e8582fba..192f0db30d 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/Serialization/BytePackerTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/Serialization/BytePackerTests.cs
@@ -8,7 +8,7 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class BytePackerTests
+    internal class BytePackerTests
     {
         private enum ByteEnum : byte
         {
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Serialization/FastBufferReaderTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Serialization/FastBufferReaderTests.cs
index 2b4c70ebcb..020f7e6902 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/Serialization/FastBufferReaderTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/Serialization/FastBufferReaderTests.cs
@@ -7,7 +7,7 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class FastBufferReaderTests : BaseFastBufferReaderWriterTest
+    internal class FastBufferReaderTests : BaseFastBufferReaderWriterTest
     {
         private void WriteCheckBytes(FastBufferWriter writer, int writeSize, string failMessage = "")
         {
@@ -1579,5 +1579,21 @@ public unsafe void WhenCallingTryBeginReadInternal_AllowedReadPositionDoesNotMov
                 Assert.AreEqual(reader.Handle->AllowedReadMark, 25);
             }
         }
+
+        [Test]
+        public unsafe void WhenUsingArraySegment_ConstructorHonorsArraySegmentConfiguration()
+        {
+            var bytes = new byte[] { 0, 1, 2, 3 };
+            var segment = new ArraySegment<byte>(bytes, 1, 3);
+            var reader = new FastBufferReader(segment, Allocator.Temp);
+
+            var readerArray = reader.ToArray();
+            Assert.True(readerArray.Length == bytes.Length - 1, $"Array of reader should have a length of {bytes.Length - 1} but was {readerArray.Length}!");
+            for (int i = 0; i < readerArray.Length; i++)
+            {
+                Assert.True(bytes[i + 1] == readerArray[i], $"Value of {nameof(readerArray)} at index {i} is {readerArray[i]} but should be {bytes[i + 1]}!");
+            }
+            reader.Dispose();
+        }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Serialization/FastBufferWriterTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Serialization/FastBufferWriterTests.cs
index f658fcbcc4..53673d5742 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/Serialization/FastBufferWriterTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/Serialization/FastBufferWriterTests.cs
@@ -8,7 +8,7 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class FastBufferWriterTests : BaseFastBufferReaderWriterTest
+    internal class FastBufferWriterTests : BaseFastBufferReaderWriterTest
     {
         private void WriteCheckBytes(FastBufferWriter writer, int writeSize, string failMessage = "")
         {
@@ -311,8 +311,7 @@ private unsafe void VerifyArrayEquality<T>(NativeList<T> value, byte* unsafePtr,
         {
             int* sizeValue = (int*)(unsafePtr + offset);
             Assert.AreEqual(value.Length, *sizeValue);
-
-            var asTPointer = (T*)value.GetUnsafePtr();
+            var asTPointer = value.GetUnsafePtr();
             var underlyingTArray = (T*)(unsafePtr + sizeof(int) + offset);
             for (var i = 0; i < value.Length; ++i)
             {
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Serialization/UserBitReaderAndBitWriterTests_NCCBUG175.cs b/com.unity.netcode.gameobjects/Tests/Editor/Serialization/UserBitReaderAndBitWriterTests_NCCBUG175.cs
index 5db3db1639..f279f4de05 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/Serialization/UserBitReaderAndBitWriterTests_NCCBUG175.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/Serialization/UserBitReaderAndBitWriterTests_NCCBUG175.cs
@@ -3,7 +3,7 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class UserBitReaderAndBitWriterTests_NCCBUG175
+    internal class UserBitReaderAndBitWriterTests_NCCBUG175
     {
 
         [Test]
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Timing/ClientNetworkTimeSystemTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Timing/ClientNetworkTimeSystemTests.cs
index 8913ebc74a..fc7cb01d69 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/Timing/ClientNetworkTimeSystemTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/Timing/ClientNetworkTimeSystemTests.cs
@@ -7,7 +7,7 @@ namespace Unity.Netcode.EditorTests
     /// <summary>
     /// Tests for running a <see cref="NetworkTimeSystem"/> as a client.
     /// </summary>
-    public class ClientNetworkTimeSystemTests
+    internal class ClientNetworkTimeSystemTests
     {
         private const double k_AcceptableRttOffset = 0.03d; // 30ms offset is fine
 
@@ -18,15 +18,16 @@ public class ClientNetworkTimeSystemTests
         public void StableRttTest()
         {
             double receivedServerTime = 2;
-
-            var timeSystem = new NetworkTimeSystem(0.05d, 0.05d, 0.1d);
+            var baseRtt = 0.1f;
+            var halfRtt = 0.05f;
+            var timeSystem = new NetworkTimeSystem(0.05d, 0.05d, baseRtt);
             timeSystem.Reset(receivedServerTime, 0.15);
             var tickSystem = new NetworkTickSystem(60, timeSystem.LocalTime, timeSystem.ServerTime);
 
             Assert.True(timeSystem.LocalTime > 2);
 
-            var steps = TimingTestHelper.GetRandomTimeSteps(100f, 0.01f, 0.1f, 42);
-            var rttSteps = TimingTestHelper.GetRandomTimeSteps(1000f, 0.095f, 0.105f, 42); // 10ms jitter
+            var steps = TimingTestHelper.GetRandomTimeSteps(100f, 0.01f, baseRtt, 42);
+            var rttSteps = TimingTestHelper.GetRandomTimeSteps(1000f, baseRtt - 0.05f, baseRtt + 0.05f, 42); // 10ms jitter
 
             // run for a while so that we reach regular RTT offset
             TimingTestHelper.ApplySteps(timeSystem, tickSystem, steps, delegate (int step)
@@ -37,10 +38,11 @@ public void StableRttTest()
             });
 
             // check how we close we are to target time.
-            var expectedRtt = 0.1d;
-            var offsetToTarget = (timeSystem.LocalTime - timeSystem.ServerTime) - expectedRtt - timeSystem.ServerBufferSec - timeSystem.LocalBufferSec;
+            var offsetToTarget = (timeSystem.LocalTime - timeSystem.ServerTime) - halfRtt - timeSystem.ServerBufferSec - timeSystem.LocalBufferSec;
             Debug.Log($"offset to target time after running for a while: {offsetToTarget}");
-            Assert.IsTrue(Math.Abs(offsetToTarget) < k_AcceptableRttOffset);
+
+            // server speedup/slowdowns should not be affected by RTT
+            Assert.True(Math.Abs(offsetToTarget) < k_AcceptableRttOffset, $"Expected offset time to be less than {k_AcceptableRttOffset}ms but it was {offsetToTarget}!");
 
             // run again, test that we never need to speed up or slow down under stable RTT
             TimingTestHelper.ApplySteps(timeSystem, tickSystem, steps, delegate (int step)
@@ -51,9 +53,10 @@ public void StableRttTest()
             });
 
             // check again to ensure we are still close to the target
-            var newOffsetToTarget = (timeSystem.LocalTime - timeSystem.ServerTime) - expectedRtt - timeSystem.ServerBufferSec - timeSystem.LocalBufferSec;
+            var newOffsetToTarget = (timeSystem.LocalTime - timeSystem.ServerTime) - halfRtt - timeSystem.ServerBufferSec - timeSystem.LocalBufferSec;
             Debug.Log($"offset to target time after running longer: {newOffsetToTarget}");
-            Assert.IsTrue(Math.Abs(newOffsetToTarget) < k_AcceptableRttOffset);
+            // server speedup/slowdowns should not be affected by RTT
+            Assert.True(Math.Abs(offsetToTarget) < k_AcceptableRttOffset, $"Expected offset time to be less than {k_AcceptableRttOffset}ms but it was {offsetToTarget}!");
 
             // difference between first and second offset should be minimal
             var dif = offsetToTarget - newOffsetToTarget;
@@ -67,13 +70,14 @@ public void StableRttTest()
         public void RttCatchupSlowdownTest()
         {
             double receivedServerTime = 2;
-
-            var timeSystem = new NetworkTimeSystem(0.05d, 0.05d, 0.1d);
+            var baseRtt = 0.1f;
+            var halfRtt = 0.05f;
+            var timeSystem = new NetworkTimeSystem(0.05d, 0.05d, baseRtt);
             timeSystem.Reset(receivedServerTime, 0.15);
             var tickSystem = new NetworkTickSystem(60, timeSystem.LocalTime, timeSystem.ServerTime);
 
-            var steps = TimingTestHelper.GetRandomTimeSteps(100f, 0.01f, 0.1f, 42);
-            var rttSteps = TimingTestHelper.GetRandomTimeSteps(1000f, 0.095f, 0.105f, 42); // 10ms jitter
+            var steps = TimingTestHelper.GetRandomTimeSteps(100f, 0.01f, baseRtt, 42);
+            var rttSteps = TimingTestHelper.GetRandomTimeSteps(1000f, baseRtt - 0.05f, baseRtt + 0.05f, 42); // 10ms jitter
 
             // run for a while so that we reach regular RTT offset
             TimingTestHelper.ApplySteps(timeSystem, tickSystem, steps, delegate (int step)
@@ -102,11 +106,14 @@ public void RttCatchupSlowdownTest()
 
             // speed up of 0.1f expected
             Debug.Log($"Total local speed up time catch up: {totalLocalSpeedUpTime}");
-            Assert.True(Math.Abs(totalLocalSpeedUpTime - 0.1) < k_AcceptableRttOffset);
-            Assert.True(Math.Abs(totalServerSpeedUpTime) < k_AcceptableRttOffset); // server speedup/slowdowns should not be affected by RTT
+            var expectedSpeedUpTime = Math.Abs(totalLocalSpeedUpTime - halfRtt);
+            var expectedServerSpeedUpTime = Math.Abs(totalServerSpeedUpTime);
+            Assert.True(expectedSpeedUpTime < k_AcceptableRttOffset, $"Expected local speed up time to be less than {k_AcceptableRttOffset}ms but it was {expectedSpeedUpTime}!");
+            // server speedup/slowdowns should not be affected by RTT
+            Assert.True(Math.Abs(totalServerSpeedUpTime) < k_AcceptableRttOffset, $"Expected server speed up time to be less than {k_AcceptableRttOffset}ms but it was {expectedServerSpeedUpTime}!");
 
 
-            // run again with RTT ~100ms and see whether we slow down by -0.1f
+            // run again with RTT ~100ms and see whether we slow down by -halfRtt
             unscaledLocalTime = timeSystem.LocalTime;
             unscaledServerTime = timeSystem.ServerTime;
 
@@ -121,13 +128,13 @@ public void RttCatchupSlowdownTest()
 
             totalLocalSpeedUpTime = timeSystem.LocalTime - unscaledLocalTime;
             totalServerSpeedUpTime = timeSystem.ServerTime - unscaledServerTime;
-
-            // slow down of 0.1f expected
+            // slow down of half halfRtt expected
             Debug.Log($"Total local speed up time slow down: {totalLocalSpeedUpTime}");
-            Assert.True(Math.Abs(totalLocalSpeedUpTime + 0.1) < k_AcceptableRttOffset);
-            Assert.True(Math.Abs(totalServerSpeedUpTime) < k_AcceptableRttOffset); // server speedup/slowdowns should not be affected by RTT
-
-
+            expectedSpeedUpTime = Math.Abs(totalLocalSpeedUpTime + halfRtt);
+            expectedServerSpeedUpTime = Math.Abs(totalServerSpeedUpTime);
+            Assert.True(expectedSpeedUpTime < k_AcceptableRttOffset, $"Expected local speed up time to be less than {k_AcceptableRttOffset}ms but it was {expectedSpeedUpTime}!");
+            // server speedup/slowdowns should not be affected by RTT
+            Assert.True(Math.Abs(totalServerSpeedUpTime) < k_AcceptableRttOffset, $"Expected server speed up time to be less than {k_AcceptableRttOffset}ms but it was {expectedServerSpeedUpTime}!");
         }
 
         /// <summary>
@@ -172,8 +179,8 @@ public void ResetTest()
                 receivedServerTime += steps[step];
                 timeSystem.Sync(receivedServerTime, rttSteps2[step]);
 
-                // after hard reset time should stay close to rtt
-                var expectedRtt = 0.5d;
+                // after hard reset time should stay close to half rtt
+                var expectedRtt = 0.25d;
                 Assert.IsTrue(Math.Abs((timeSystem.LocalTime - timeSystem.ServerTime) - expectedRtt - timeSystem.ServerBufferSec - timeSystem.LocalBufferSec) < k_AcceptableRttOffset);
 
             });
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Timing/NetworkTimeTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Timing/NetworkTimeTests.cs
index be53a0df7f..2a137bde2b 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/Timing/NetworkTimeTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/Timing/NetworkTimeTests.cs
@@ -7,7 +7,7 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class NetworkTimeTests
+    internal class NetworkTimeTests
     {
         [Test]
         [TestCase(0d, 0u)]
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Timing/ServerNetworkTimeSystemTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Timing/ServerNetworkTimeSystemTests.cs
index ea5fe00701..8d5edba0a4 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/Timing/ServerNetworkTimeSystemTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/Timing/ServerNetworkTimeSystemTests.cs
@@ -3,7 +3,7 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class ServerNetworkTimeSystemTests
+    internal class ServerNetworkTimeSystemTests
     {
 
         /// <summary>
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Timing/TimingTestHelper.cs b/com.unity.netcode.gameobjects/Tests/Editor/Timing/TimingTestHelper.cs
index 16c840ded1..e1dee9b3a7 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/Timing/TimingTestHelper.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/Timing/TimingTestHelper.cs
@@ -7,7 +7,7 @@ namespace Unity.Netcode.EditorTests
     /// <summary>
     /// Helper functions for timing related tests. Allows to get a set of time steps and simulate time advancing without the need of a full playmode test.
     /// </summary>
-    public static class TimingTestHelper
+    internal static class TimingTestHelper
     {
         public static List<float> GetRandomTimeSteps(float totalDuration, float min, float max, int seed)
         {
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Transports/BatchedReceiveQueueTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Transports/BatchedReceiveQueueTests.cs
index 5470f21656..97671f906f 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/Transports/BatchedReceiveQueueTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/Transports/BatchedReceiveQueueTests.cs
@@ -2,11 +2,10 @@
 using NUnit.Framework;
 using Unity.Collections;
 using Unity.Netcode.Transports.UTP;
-using Unity.Networking.Transport;
 
 namespace Unity.Netcode.EditorTests
 {
-    public class BatchedReceiveQueueTests
+    internal class BatchedReceiveQueueTests
     {
         [Test]
         public void BatchedReceiveQueue_EmptyReader()
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Transports/BatchedSendQueueTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Transports/BatchedSendQueueTests.cs
index c1550da95f..f27bef95d3 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/Transports/BatchedSendQueueTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/Transports/BatchedSendQueueTests.cs
@@ -2,11 +2,10 @@
 using NUnit.Framework;
 using Unity.Collections;
 using Unity.Netcode.Transports.UTP;
-using Unity.Networking.Transport;
 
 namespace Unity.Netcode.EditorTests
 {
-    public class BatchedSendQueueTests
+    internal class BatchedSendQueueTests
     {
         private const int k_TestQueueCapacity = 16 * 1024;
         private const int k_TestMessageSize = 1020;
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Transports/UNetTransportTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Transports/UNetTransportTests.cs
index f8d7a46cd4..9cb0bda976 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/Transports/UNetTransportTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/Transports/UNetTransportTests.cs
@@ -7,7 +7,7 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class UNetTransportTests
+    internal class UNetTransportTests
     {
         [Test]
         public void StartServerReturnsFalseOnFailure()
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/Transports/UnityTransportTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/Transports/UnityTransportTests.cs
index fb61c053a1..bd9d9e937e 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/Transports/UnityTransportTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/Transports/UnityTransportTests.cs
@@ -5,8 +5,20 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class UnityTransportTests
+    internal class UnityTransportTests
     {
+        [SetUp]
+        public void OnSetup()
+        {
+            ILPPMessageProvider.IntegrationTestNoMessages = true;
+        }
+
+        [TearDown]
+        public void OnTearDown()
+        {
+            ILPPMessageProvider.IntegrationTestNoMessages = false;
+        }
+
         // Check that starting an IPv4 server succeeds.
         [Test]
         public void UnityTransport_BasicInitServer_IPv4()
@@ -157,7 +169,6 @@ public void UnityTransport_StartClientFailsWithBadAddress()
             transport.Shutdown();
         }
 
-#if UTP_TRANSPORT_2_0_ABOVE
         [Test]
         public void UnityTransport_EmptySecurityStringsShouldThrow([Values("", null)] string cert, [Values("", null)] string secret)
         {
@@ -178,7 +189,7 @@ public void UnityTransport_EmptySecurityStringsShouldThrow([Values("", null)] st
                     networkManager.StartServer();
                 });
                 // Make sure StartServer failed
-                Assert.False(transport.NetworkDriver.IsCreated);
+                Assert.False(transport.GetNetworkDriver().IsCreated);
                 Assert.False(networkManager.IsServer);
                 Assert.False(networkManager.IsListening);
             }
@@ -190,6 +201,5 @@ public void UnityTransport_EmptySecurityStringsShouldThrow([Values("", null)] st
                 }
             }
         }
-#endif
     }
 }
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/XXHashTests.cs b/com.unity.netcode.gameobjects/Tests/Editor/XXHashTests.cs
index 342a3739d0..30fbb52aff 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/XXHashTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Editor/XXHashTests.cs
@@ -2,7 +2,7 @@
 
 namespace Unity.Netcode.EditorTests
 {
-    public class XXHashTests
+    internal class XXHashTests
     {
         [Test]
         public void TestXXHash32Short()
diff --git a/com.unity.netcode.gameobjects/Tests/Editor/com.unity.netcode.editortests.asmdef b/com.unity.netcode.gameobjects/Tests/Editor/com.unity.netcode.editortests.asmdef
index 56d2377536..b2c942a948 100644
--- a/com.unity.netcode.gameobjects/Tests/Editor/com.unity.netcode.editortests.asmdef
+++ b/com.unity.netcode.gameobjects/Tests/Editor/com.unity.netcode.editortests.asmdef
@@ -33,11 +33,6 @@
             "name": "Unity",
             "expression": "(0,2022.2.0a5)",
             "define": "UNITY_UNET_PRESENT"
-        },
-        {
-            "name": "com.unity.transport",
-            "expression": "2.0.0-exp",
-            "define": "UTP_TRANSPORT_2_0_ABOVE"
         }
     ]
 }
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/ClientApprovalDenied.cs b/com.unity.netcode.gameobjects/Tests/Runtime/ClientApprovalDenied.cs
index 5b4bc1e0ed..fd0517dd76 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/ClientApprovalDenied.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/ClientApprovalDenied.cs
@@ -7,7 +7,7 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class ClientApprovalDenied : NetcodeIntegrationTest
+    internal class ClientApprovalDenied : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 2;
         private bool m_ApproveConnection = true;
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/ClientOnlyConnectionTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/ClientOnlyConnectionTests.cs
index 1e1be9eec3..dbd97fae53 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/ClientOnlyConnectionTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/ClientOnlyConnectionTests.cs
@@ -7,7 +7,7 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class ClientOnlyConnectionTests
+    internal class ClientOnlyConnectionTests
     {
         private NetworkManager m_ClientNetworkManager;
         private GameObject m_NetworkManagerGameObject;
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Components/BufferDataValidationComponent.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Components/BufferDataValidationComponent.cs
index 3912448423..3e46ec4b9e 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Components/BufferDataValidationComponent.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Components/BufferDataValidationComponent.cs
@@ -9,7 +9,7 @@ namespace Unity.Netcode.RuntimeTests
     /// - Sending and Receiving a continually growing buffer up to (MaximumBufferSize)
     /// - Default maximum buffer size is 1MB
     /// </summary>
-    public class BufferDataValidationComponent : NetworkBehaviour
+    internal class BufferDataValidationComponent : NetworkBehaviour
     {
         /// <summary>
         /// Allows the external RPCQueueTest to begin testing or stop it
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Components/NetworkVariableTestComponent.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Components/NetworkVariableTestComponent.cs
index 468600f8b3..346b908a17 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Components/NetworkVariableTestComponent.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Components/NetworkVariableTestComponent.cs
@@ -6,7 +6,7 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class EmbeddedManagedNetworkSerializableType : INetworkSerializable
+    internal class EmbeddedManagedNetworkSerializableType : INetworkSerializable
     {
         public int Int;
         public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReaderWriter
@@ -14,7 +14,7 @@ public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReade
             serializer.SerializeValue(ref Int);
         }
     }
-    public class ManagedNetworkSerializableType : INetworkSerializable, IEquatable<ManagedNetworkSerializableType>
+    internal class ManagedNetworkSerializableType : INetworkSerializable, IEquatable<ManagedNetworkSerializableType>
     {
         public string Str = "";
         public int[] Ints = Array.Empty<int>();
@@ -104,7 +104,7 @@ public override int GetHashCode()
             return 0;
         }
     }
-    public struct UnmanagedNetworkSerializableType : INetworkSerializable, IEquatable<UnmanagedNetworkSerializableType>
+    internal struct UnmanagedNetworkSerializableType : INetworkSerializable, IEquatable<UnmanagedNetworkSerializableType>
     {
         public FixedString32Bytes Str;
         public int Int;
@@ -143,7 +143,7 @@ public override int GetHashCode()
     }
 
 
-    public struct UnmanagedTemplateNetworkSerializableType<T> : INetworkSerializable where T : unmanaged, INetworkSerializable
+    internal struct UnmanagedTemplateNetworkSerializableType<T> : INetworkSerializable where T : unmanaged, INetworkSerializable
     {
         public T Value;
 
@@ -153,7 +153,7 @@ public void NetworkSerialize<TReaderWriterType>(BufferSerializer<TReaderWriterTy
         }
     }
 
-    public struct ManagedTemplateNetworkSerializableType<T> : INetworkSerializable where T : class, INetworkSerializable, new()
+    internal struct ManagedTemplateNetworkSerializableType<T> : INetworkSerializable where T : class, INetworkSerializable, new()
     {
         public T Value;
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Components/NetworkVisibilityComponent.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Components/NetworkVisibilityComponent.cs
index 2abf2c8243..856e77a817 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Components/NetworkVisibilityComponent.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Components/NetworkVisibilityComponent.cs
@@ -1,6 +1,6 @@
 namespace Unity.Netcode.RuntimeTests
 {
-    public class NetworkVisibilityComponent : NetworkBehaviour
+    internal class NetworkVisibilityComponent : NetworkBehaviour
     {
         public void Hide()
         {
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Connection.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Connection.meta
new file mode 100644
index 0000000000..e8a0528d8a
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Connection.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6a87f9e5685b4895bd5a7936e6ac567f
+timeCreated: 1740072310
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Connection/ClientConnectionTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Connection/ClientConnectionTests.cs
new file mode 100644
index 0000000000..d4c1550b8d
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Connection/ClientConnectionTests.cs
@@ -0,0 +1,82 @@
+using System.Collections;
+using System.Collections.Generic;
+using NUnit.Framework;
+using Unity.Netcode.TestHelpers.Runtime;
+using UnityEngine.TestTools;
+
+namespace Unity.Netcode.RuntimeTests
+{
+    [TestFixture(SceneManagementState.SceneManagementEnabled, NetworkTopologyTypes.DistributedAuthority)]
+    [TestFixture(SceneManagementState.SceneManagementDisabled, NetworkTopologyTypes.DistributedAuthority)]
+    [TestFixture(SceneManagementState.SceneManagementEnabled, NetworkTopologyTypes.ClientServer)]
+    [TestFixture(SceneManagementState.SceneManagementDisabled, NetworkTopologyTypes.ClientServer)]
+    internal class ClientConnectionTests : IntegrationTestWithApproximation
+    {
+        protected override int NumberOfClients => 3;
+        private readonly bool m_SceneManagementEnabled;
+        private HashSet<ulong> m_ServerCallbackCalled = new HashSet<ulong>();
+        private HashSet<ulong> m_ClientCallbackCalled = new HashSet<ulong>();
+
+        public ClientConnectionTests(SceneManagementState sceneManagementState, NetworkTopologyTypes networkTopologyType) : base(networkTopologyType)
+        {
+            m_SceneManagementEnabled = sceneManagementState == SceneManagementState.SceneManagementEnabled;
+        }
+
+        protected override void OnServerAndClientsCreated()
+        {
+            m_ServerNetworkManager.NetworkConfig.EnableSceneManagement = m_SceneManagementEnabled;
+            m_ServerNetworkManager.OnClientConnectedCallback += Server_OnClientConnectedCallback;
+
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                client.NetworkConfig.EnableSceneManagement = m_SceneManagementEnabled;
+                client.OnClientConnectedCallback += Client_OnClientConnectedCallback;
+            }
+
+            base.OnServerAndClientsCreated();
+        }
+
+        [UnityTest]
+        public IEnumerator VerifyOnClientConnectedCallback()
+        {
+            yield return WaitForConditionOrTimeOut(AllCallbacksCalled);
+            AssertOnTimeout("Timed out waiting for all clients to be connected!");
+
+            // The client callbacks should have been called once per client (called once on self)
+            Assert.True(m_ClientCallbackCalled.Count == NumberOfClients);
+
+            // The server callback should be called for self, and then once per client
+            Assert.True(m_ServerCallbackCalled.Count == 1 + NumberOfClients);
+        }
+
+        private void Server_OnClientConnectedCallback(ulong clientId)
+        {
+            if (!m_ServerCallbackCalled.Add(clientId))
+            {
+                Assert.Fail($"Client already connected: {clientId}");
+            }
+        }
+
+        private void Client_OnClientConnectedCallback(ulong clientId)
+        {
+            if (!m_ClientCallbackCalled.Add(clientId))
+            {
+                Assert.Fail($"Client already connected: {clientId}");
+            }
+        }
+
+        private bool AllCallbacksCalled()
+        {
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                if (!m_ClientCallbackCalled.Contains(client.LocalClientId) || !m_ServerCallbackCalled.Contains(client.LocalClientId))
+                {
+                    return false;
+                }
+            }
+
+            return m_ServerCallbackCalled.Contains(m_ServerNetworkManager.LocalClientId);
+        }
+    }
+}
+
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Connection/ClientConnectionTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Connection/ClientConnectionTests.cs.meta
new file mode 100644
index 0000000000..a52e7c6ccd
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Connection/ClientConnectionTests.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: c5c3b4494e2946dc967cc70ffea4d850
+timeCreated: 1740072340
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/ConnectionApproval.cs b/com.unity.netcode.gameobjects/Tests/Runtime/ConnectionApproval.cs
index ad6075d4ec..efa19cffd5 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/ConnectionApproval.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/ConnectionApproval.cs
@@ -4,6 +4,7 @@
 using System.Text;
 using NUnit.Framework;
 using Unity.Netcode.TestHelpers.Runtime;
+using UnityEngine;
 using UnityEngine.TestTools;
 
 namespace Unity.Netcode.RuntimeTests
@@ -12,9 +13,10 @@ namespace Unity.Netcode.RuntimeTests
     [TestFixture(PlayerCreation.PrefabHash)]
     [TestFixture(PlayerCreation.NoPlayer)]
     [TestFixture(PlayerCreation.FailValidation)]
-    internal class ConnectionApprovalTests : NetcodeIntegrationTest
+    internal class ConnectionApprovalTests : IntegrationTestWithApproximation
     {
         private const string k_InvalidToken = "Invalid validation token!";
+
         public enum PlayerCreation
         {
             Prefab,
@@ -24,6 +26,8 @@ public enum PlayerCreation
         }
         private PlayerCreation m_PlayerCreation;
         private bool m_ClientDisconnectReasonValidated;
+        private Vector3 m_ExpectedPosition;
+        private Quaternion m_ExpectedRotation;
 
         private Dictionary<ulong, bool> m_Validated = new Dictionary<ulong, bool>();
 
@@ -43,6 +47,12 @@ protected override bool ShouldCheckForSpawnedPlayers()
 
         protected override void OnServerAndClientsCreated()
         {
+            if (m_PlayerCreation == PlayerCreation.Prefab || m_PlayerCreation == PlayerCreation.PrefabHash)
+            {
+                m_ExpectedPosition = GetRandomVector3(-10.0f, 10.0f);
+                m_ExpectedRotation = Quaternion.Euler(GetRandomVector3(-359.98f, 359.98f));
+            }
+
             m_ClientDisconnectReasonValidated = false;
             m_BypassConnectionTimeout = m_PlayerCreation == PlayerCreation.FailValidation;
             m_Validated.Clear();
@@ -104,11 +114,36 @@ private bool ClientAndHostValidated()
             return true;
         }
 
+        private bool ValidatePlayersPositionRotation()
+        {
+            foreach (var playerEntries in m_PlayerNetworkObjects)
+            {
+                foreach (var player in playerEntries.Value)
+                {
+                    if (!Approximately(player.Value.transform.position, m_ExpectedPosition))
+                    {
+                        return false;
+                    }
+                    if (!Approximately(player.Value.transform.rotation, m_ExpectedRotation))
+                    {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+
         [UnityTest]
         public IEnumerator ConnectionApproval()
         {
             yield return WaitForConditionOrTimeOut(ClientAndHostValidated);
             AssertOnTimeout("Timed out waiting for all clients to be approved!");
+
+            if (m_PlayerCreation == PlayerCreation.Prefab || m_PlayerCreation == PlayerCreation.PrefabHash)
+            {
+                yield return WaitForConditionOrTimeOut(ValidatePlayersPositionRotation);
+                AssertOnTimeout("Not all player prefabs spawned in the correct position and/or rotation!");
+            }
         }
 
         private void NetworkManagerObject_ConnectionApprovalCallback(NetworkManager.ConnectionApprovalRequest request, NetworkManager.ConnectionApprovalResponse response)
@@ -127,8 +162,8 @@ private void NetworkManagerObject_ConnectionApprovalCallback(NetworkManager.Conn
             }
 
             response.CreatePlayerObject = ShouldCheckForSpawnedPlayers();
-            response.Position = null;
-            response.Rotation = null;
+            response.Position = m_ExpectedPosition;
+            response.Rotation = m_ExpectedRotation;
             response.PlayerPrefabHash = m_PlayerCreation == PlayerCreation.PrefabHash ? m_PlayerPrefab.GetComponent<NetworkObject>().GlobalObjectIdHash : null;
         }
 
@@ -150,3 +185,4 @@ public void VerifyUniqueNetworkConfigPerRequest()
         }
     }
 }
+
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/ConnectionApprovalTimeoutTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/ConnectionApprovalTimeoutTests.cs
index 9ccccfc11a..db1210face 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/ConnectionApprovalTimeoutTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/ConnectionApprovalTimeoutTests.cs
@@ -9,7 +9,7 @@ namespace Unity.Netcode.RuntimeTests
 {
     [TestFixture(ApprovalTimedOutTypes.ServerDoesNotRespond)]
     [TestFixture(ApprovalTimedOutTypes.ClientDoesNotRequest)]
-    public class ConnectionApprovalTimeoutTests : NetcodeIntegrationTest
+    internal class ConnectionApprovalTimeoutTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 1;
 
@@ -26,9 +26,9 @@ public ConnectionApprovalTimeoutTests(ApprovalTimedOutTypes approvalFailureType)
             m_ApprovalFailureType = approvalFailureType;
         }
 
-        // Must be >= 2 since this is an int value and the test waits for timeout - 1 to try to verify it doesn't
+        // Must be >= 5 since this is an int value and the test waits for timeout - 1 to try to verify it doesn't
         // time out early
-        private const int k_TestTimeoutPeriod = 1;
+        private const int k_TestTimeoutPeriod = 5;
 
         private Regex m_ExpectedLogMessage;
         private LogType m_LogType;
@@ -59,6 +59,7 @@ protected override IEnumerator OnStartedServerAndClients()
         {
             if (m_ApprovalFailureType == ApprovalTimedOutTypes.ServerDoesNotRespond)
             {
+                m_ServerNetworkManager.ConnectionManager.MockSkippingApproval = true;
                 // We catch (don't process) the incoming approval message to simulate the server not sending the approved message in time
                 m_ClientNetworkManagers[0].ConnectionManager.MessageManager.Hook(new MessageCatcher<ConnectionApprovedMessage>(m_ClientNetworkManagers[0]));
                 m_ExpectedLogMessage = new Regex("Timed out waiting for the server to approve the connection request.");
@@ -80,18 +81,18 @@ protected override IEnumerator OnStartedServerAndClients()
         [UnityTest]
         public IEnumerator ValidateApprovalTimeout()
         {
-            // Delay for half of the wait period
+            // Just delay for a second
             yield return new WaitForSeconds(k_TestTimeoutPeriod * 0.25f);
 
             // Verify we haven't received the time out message yet
             NetcodeLogAssert.LogWasNotReceived(LogType.Log, m_ExpectedLogMessage);
 
-            yield return new WaitForSeconds(k_TestTimeoutPeriod * 1.5f);
+            yield return new WaitForSeconds(k_TestTimeoutPeriod * 1.25f);
 
             // We should have the test relative log message by this time.
             NetcodeLogAssert.LogWasReceived(m_LogType, m_ExpectedLogMessage);
 
-            Debug.Log("Checking connected client count");
+            VerboseDebug("Checking connected client count");
             // It should only have the host client connected
             Assert.AreEqual(1, m_ServerNetworkManager.ConnectedClients.Count, $"Expected only one client when there were {m_ServerNetworkManager.ConnectedClients.Count} clients connected!");
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DeferredMessagingTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/DeferredMessagingTests.cs
index f85a9cbd41..5c2b0ca1d4 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/DeferredMessagingTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/DeferredMessagingTests.cs
@@ -5,6 +5,7 @@
 using Unity.Netcode.TestHelpers.Runtime;
 using UnityEngine;
 using UnityEngine.TestTools;
+
 using Object = UnityEngine.Object;
 
 namespace Unity.Netcode.RuntimeTests
@@ -84,12 +85,11 @@ public int DeferredMessageCountForKey(IDeferredNetworkMessageManager.TriggerType
 
             return 0;
         }
-
-        public override void DeferMessage(IDeferredNetworkMessageManager.TriggerType trigger, ulong key, FastBufferReader reader, ref NetworkContext context)
+        public override void DeferMessage(IDeferredNetworkMessageManager.TriggerType trigger, ulong key, FastBufferReader reader, ref NetworkContext context, string messageType)
         {
             OnBeforeDefer?.Invoke(this, key);
             DeferMessageCalled = true;
-            base.DeferMessage(trigger, key, reader, ref context);
+            base.DeferMessage(trigger, key, reader, ref context, messageType);
         }
 
         public override void ProcessTriggers(IDeferredNetworkMessageManager.TriggerType trigger, ulong key)
@@ -116,7 +116,7 @@ public override void CleanupStaleTriggers()
         }
     }
 
-    public class DeferredMessageTestRpcComponent : NetworkBehaviour
+    internal class DeferredMessageTestRpcComponent : NetworkBehaviour
     {
         public bool ClientRpcCalled;
 
@@ -137,7 +137,7 @@ public override void OnNetworkSpawn()
         }
     }
 
-    public class DeferredMessageTestNetworkVariableComponent : NetworkBehaviour
+    internal class DeferredMessageTestNetworkVariableComponent : NetworkBehaviour
     {
         public static readonly List<ulong> ClientInstances = new List<ulong>();
 
@@ -158,7 +158,7 @@ public override void OnNetworkSpawn()
         }
     }
 
-    public class DeferredMessageTestRpcAndNetworkVariableComponent : NetworkBehaviour
+    internal class DeferredMessageTestRpcAndNetworkVariableComponent : NetworkBehaviour
     {
         public static readonly List<ulong> ClientInstances = new List<ulong>();
         public bool ClientRpcCalled;
@@ -185,7 +185,7 @@ public void SendTestClientRpc()
         }
     }
 
-    public class DeferredMessagingTest : NetcodeIntegrationTest
+    internal class DeferredMessagingTest : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 0;
 
@@ -203,6 +203,9 @@ public class DeferredMessagingTest : NetcodeIntegrationTest
 
         protected override void OnInlineSetup()
         {
+            // Revert back to standard deferred message format for tests (for now)
+            DeferredMessageManager.IncludeMessageType = false;
+
             DeferredMessageTestRpcAndNetworkVariableComponent.ClientInstances.Clear();
             DeferredMessageTestRpcComponent.ClientInstances.Clear();
             DeferredMessageTestNetworkVariableComponent.ClientInstances.Clear();
@@ -256,8 +259,7 @@ protected override void OnNewClientCreated(NetworkManager networkManager)
             {
                 AddPrefabsToClient(networkManager);
             }
-
-            base.OnNewClientCreated(networkManager);
+            // Don't call base to avoid synchronizing the prefabs
         }
 
         private void SpawnClients(bool clearTestDeferredMessageManagerCallFlags = true)
@@ -492,7 +494,6 @@ public void WhenANetworkVariableDeltaMessageArrivesBeforeASpawnArrives_ItIsDefer
         }
 
         [Test]
-        //[Ignore("Disabling this temporarily until it is migrated into new integration test.")]
         public void WhenASpawnMessageArrivesBeforeThePrefabIsAvailable_ItIsDeferred()
         {
             m_SkipAddingPrefabsToClient = true;
@@ -667,7 +668,7 @@ public void WhenMultipleSpawnTriggeredMessagesAreDeferred_TheyAreAllProcessedOnS
 
             serverObject.GetComponent<NetworkObject>().ChangeOwnership(m_ClientNetworkManagers[0].LocalClientId);
 
-            WaitForAllClientsToReceive<ChangeOwnershipMessage, NetworkVariableDeltaMessage>();
+            WaitForAllClientsToReceive<ChangeOwnershipMessage>();
 
             foreach (var client in m_ClientNetworkManagers)
             {
@@ -675,9 +676,9 @@ public void WhenMultipleSpawnTriggeredMessagesAreDeferred_TheyAreAllProcessedOnS
                 Assert.IsTrue(manager.DeferMessageCalled);
                 Assert.IsFalse(manager.ProcessTriggersCalled);
 
-                Assert.AreEqual(4, manager.DeferredMessageCountTotal());
-                Assert.AreEqual(4, manager.DeferredMessageCountForType(IDeferredNetworkMessageManager.TriggerType.OnSpawn));
-                Assert.AreEqual(4, manager.DeferredMessageCountForKey(IDeferredNetworkMessageManager.TriggerType.OnSpawn, serverObject.GetComponent<NetworkObject>().NetworkObjectId));
+                Assert.AreEqual(3, manager.DeferredMessageCountTotal());
+                Assert.AreEqual(3, manager.DeferredMessageCountForType(IDeferredNetworkMessageManager.TriggerType.OnSpawn));
+                Assert.AreEqual(3, manager.DeferredMessageCountForKey(IDeferredNetworkMessageManager.TriggerType.OnSpawn, serverObject.GetComponent<NetworkObject>().NetworkObjectId));
                 Assert.AreEqual(0, manager.DeferredMessageCountForType(IDeferredNetworkMessageManager.TriggerType.OnAddPrefab));
                 AddPrefabsToClient(client);
             }
@@ -809,7 +810,7 @@ public void WhenSpawnTriggeredMessagesAreDeferredBeforeThePrefabIsAdded_AddingTh
 
             serverObject.GetComponent<NetworkObject>().ChangeOwnership(m_ClientNetworkManagers[0].LocalClientId);
 
-            WaitForAllClientsToReceive<ChangeOwnershipMessage, NetworkVariableDeltaMessage>();
+            WaitForAllClientsToReceive<ChangeOwnershipMessage>();
 
             // Validate messages are deferred and pending
             foreach (var client in m_ClientNetworkManagers)
@@ -818,10 +819,10 @@ public void WhenSpawnTriggeredMessagesAreDeferredBeforeThePrefabIsAdded_AddingTh
                 Assert.IsTrue(manager.DeferMessageCalled);
                 Assert.IsFalse(manager.ProcessTriggersCalled);
 
-                Assert.AreEqual(5, manager.DeferredMessageCountTotal());
+                Assert.AreEqual(4, manager.DeferredMessageCountTotal());
 
-                Assert.AreEqual(4, manager.DeferredMessageCountForType(IDeferredNetworkMessageManager.TriggerType.OnSpawn));
-                Assert.AreEqual(4, manager.DeferredMessageCountForKey(IDeferredNetworkMessageManager.TriggerType.OnSpawn, serverObject.GetComponent<NetworkObject>().NetworkObjectId));
+                Assert.AreEqual(3, manager.DeferredMessageCountForType(IDeferredNetworkMessageManager.TriggerType.OnSpawn));
+                Assert.AreEqual(3, manager.DeferredMessageCountForKey(IDeferredNetworkMessageManager.TriggerType.OnSpawn, serverObject.GetComponent<NetworkObject>().NetworkObjectId));
                 Assert.AreEqual(1, manager.DeferredMessageCountForType(IDeferredNetworkMessageManager.TriggerType.OnAddPrefab));
                 Assert.AreEqual(1, manager.DeferredMessageCountForKey(IDeferredNetworkMessageManager.TriggerType.OnAddPrefab, serverObject.GetComponent<NetworkObject>().GlobalObjectIdHash));
                 AddPrefabsToClient(client);
@@ -894,7 +895,7 @@ public void WhenAMessageIsDeferredForMoreThanTheConfiguredTime_ItIsRemoved([Valu
 
             foreach (var unused in m_ClientNetworkManagers)
             {
-                LogAssert.Expect(LogType.Warning, $"[Netcode] Deferred messages were received for a trigger of type {IDeferredNetworkMessageManager.TriggerType.OnSpawn} with key {serverObject.GetComponent<NetworkObject>().NetworkObjectId}, but that trigger was not received within within {timeout} second(s).");
+                LogAssert.Expect(LogType.Warning, $"[Netcode] Deferred messages were received for a trigger of type {IDeferredNetworkMessageManager.TriggerType.OnSpawn} associated with id ({serverObject.GetComponent<NetworkObject>().NetworkObjectId}), but the {nameof(NetworkObject)} was not received within the timeout period {timeout} second(s).");
             }
 
             int purgeCount = 0;
@@ -904,7 +905,7 @@ public void WhenAMessageIsDeferredForMoreThanTheConfiguredTime_ItIsRemoved([Valu
                 {
                     ++purgeCount;
                     var elapsed = client.RealTimeProvider.RealTimeSinceStartup - start;
-                    Debug.Log(client.RealTimeProvider.GetType().FullName);
+                    VerboseDebug(client.RealTimeProvider.GetType().FullName);
                     Assert.GreaterOrEqual(elapsed, timeout);
                     Assert.AreEqual(1, manager.DeferredMessageCountTotal());
                     Assert.AreEqual(1, manager.DeferredMessageCountForType(IDeferredNetworkMessageManager.TriggerType.OnSpawn));
@@ -990,7 +991,7 @@ public void WhenMultipleMessagesForTheSameObjectAreDeferredForMoreThanTheConfigu
 
             foreach (var unused in m_ClientNetworkManagers)
             {
-                LogAssert.Expect(LogType.Warning, $"[Netcode] Deferred messages were received for a trigger of type {IDeferredNetworkMessageManager.TriggerType.OnSpawn} with key {serverObject.GetComponent<NetworkObject>().NetworkObjectId}, but that trigger was not received within within {timeout} second(s).");
+                LogAssert.Expect(LogType.Warning, $"[Netcode] Deferred messages were received for a trigger of type {IDeferredNetworkMessageManager.TriggerType.OnSpawn} associated with id ({serverObject.GetComponent<NetworkObject>().NetworkObjectId}), but the {nameof(NetworkObject)} was not received within the timeout period {timeout} second(s).");
             }
 
             int purgeCount = 0;
@@ -1095,9 +1096,8 @@ public void WhenMultipleMessagesForDifferentObjectsAreDeferredForMoreThanTheConf
 
             foreach (var unused in m_ClientNetworkManagers)
             {
-
-                LogAssert.Expect(LogType.Warning, $"[Netcode] Deferred messages were received for a trigger of type {IDeferredNetworkMessageManager.TriggerType.OnSpawn} with key {serverObject.GetComponent<NetworkObject>().NetworkObjectId}, but that trigger was not received within within {timeout} second(s).");
-                LogAssert.Expect(LogType.Warning, $"[Netcode] Deferred messages were received for a trigger of type {IDeferredNetworkMessageManager.TriggerType.OnSpawn} with key {serverObject2.GetComponent<NetworkObject>().NetworkObjectId}, but that trigger was not received within within {timeout} second(s).");
+                LogAssert.Expect(LogType.Warning, $"[Netcode] Deferred messages were received for a trigger of type {IDeferredNetworkMessageManager.TriggerType.OnSpawn} associated with id ({serverObject.GetComponent<NetworkObject>().NetworkObjectId}), but the {nameof(NetworkObject)} was not received within the timeout period {timeout} second(s).");
+                LogAssert.Expect(LogType.Warning, $"[Netcode] Deferred messages were received for a trigger of type {IDeferredNetworkMessageManager.TriggerType.OnSpawn} associated with id ({serverObject2.GetComponent<NetworkObject>().NetworkObjectId}), but the {nameof(NetworkObject)} was not received within the timeout period {timeout} second(s).");
             }
 
             int purgeCount = 0;
@@ -1188,7 +1188,7 @@ public void WhenADeferredMessageIsRemoved_OtherMessagesForSameObjectAreRemoved([
 
             foreach (var unused in m_ClientNetworkManagers)
             {
-                LogAssert.Expect(LogType.Warning, $"[Netcode] Deferred messages were received for a trigger of type {IDeferredNetworkMessageManager.TriggerType.OnSpawn} with key {serverObject.GetComponent<NetworkObject>().NetworkObjectId}, but that trigger was not received within within {timeout} second(s).");
+                LogAssert.Expect(LogType.Warning, $"[Netcode] Deferred messages were received for a trigger of type {IDeferredNetworkMessageManager.TriggerType.OnSpawn} associated with id ({serverObject.GetComponent<NetworkObject>().NetworkObjectId}), but the {nameof(NetworkObject)} was not received within the timeout period {timeout} second(s).");
             }
 
             int purgeCount = 0;
@@ -1271,7 +1271,11 @@ public void WhenADeferredMessageIsRemoved_OtherMessagesForDifferentObjectsAreNot
                 Assert.AreEqual(0, manager.DeferredMessageCountForKey(IDeferredNetworkMessageManager.TriggerType.OnSpawn, serverObject2.GetComponent<NetworkObject>().NetworkObjectId));
             }
 
-            serverObject2.GetComponent<NetworkObject>().ChangeOwnership(m_ServerNetworkManager.LocalClientId);
+            // KITTY-TODO: Review this change please:
+            // Changing ownership when the owner specified is already an owner should not send any messages
+            // The original test was changing ownership to the server when the object was spawned with the server being an owner.
+            //serverObject2.GetComponent<NetworkObject>().ChangeOwnership(m_ServerNetworkManager.LocalClientId);
+            serverObject2.GetComponent<NetworkObject>().ChangeOwnership(m_ClientNetworkManagers[1].LocalClientId);
             WaitForAllClientsToReceive<ChangeOwnershipMessage>();
 
             foreach (var client in m_ClientNetworkManagers)
@@ -1285,7 +1289,7 @@ public void WhenADeferredMessageIsRemoved_OtherMessagesForDifferentObjectsAreNot
 
             foreach (var unused in m_ClientNetworkManagers)
             {
-                LogAssert.Expect(LogType.Warning, $"[Netcode] Deferred messages were received for a trigger of type {IDeferredNetworkMessageManager.TriggerType.OnSpawn} with key {serverObject.GetComponent<NetworkObject>().NetworkObjectId}, but that trigger was not received within within {timeout} second(s).");
+                LogAssert.Expect(LogType.Warning, $"[Netcode] Deferred messages were received for a trigger of type {IDeferredNetworkMessageManager.TriggerType.OnSpawn} associated with id ({serverObject.GetComponent<NetworkObject>().NetworkObjectId}), but the {nameof(NetworkObject)} was not received within the timeout period {timeout} second(s).");
             }
 
             int purgeCount = 0;
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DisconnectTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/DisconnectTests.cs
index bef91313a8..af001655ae 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/DisconnectTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/DisconnectTests.cs
@@ -21,7 +21,7 @@ namespace Unity.Netcode.RuntimeTests
     /// </summary>
     [TestFixture(OwnerPersistence.DestroyWithOwner)]
     [TestFixture(OwnerPersistence.DontDestroyWithOwner)]
-    public class DisconnectTests : NetcodeIntegrationTest
+    internal class DisconnectTests : NetcodeIntegrationTest
     {
         public enum OwnerPersistence
         {
@@ -146,8 +146,6 @@ public IEnumerator ClientPlayerDisconnected([Values] ClientDisconnectType client
 
             m_TransportClientId = m_ServerNetworkManager.ConnectionManager.ClientIdToTransportId(m_ClientId);
 
-            var clientManager = m_ClientNetworkManagers[0];
-
             if (clientDisconnectType == ClientDisconnectType.ServerDisconnectsClient)
             {
                 m_ClientNetworkManagers[0].OnClientDisconnectCallback += OnClientDisconnectCallback;
@@ -171,8 +169,8 @@ public IEnumerator ClientPlayerDisconnected([Values] ClientDisconnectType client
             {
                 Assert.IsTrue(m_DisconnectedEvent.ContainsKey(m_ServerNetworkManager), $"Could not find the server {nameof(NetworkManager)} disconnect event entry!");
                 Assert.IsTrue(m_DisconnectedEvent[m_ServerNetworkManager].ClientId == m_ClientId, $"Expected ClientID {m_ClientId} but found ClientID {m_DisconnectedEvent[m_ServerNetworkManager].ClientId} for the server {nameof(NetworkManager)} disconnect event entry!");
-                Assert.IsTrue(m_DisconnectedEvent.ContainsKey(clientManager), $"Could not find the client {nameof(NetworkManager)} disconnect event entry!");
-                Assert.IsTrue(m_DisconnectedEvent[clientManager].ClientId == m_ClientId, $"Expected ClientID {m_ClientId} but found ClientID {m_DisconnectedEvent[m_ServerNetworkManager].ClientId} for the client {nameof(NetworkManager)} disconnect event entry!");
+                Assert.IsTrue(m_DisconnectedEvent.ContainsKey(m_ClientNetworkManagers[0]), $"Could not find the client {nameof(NetworkManager)} disconnect event entry!");
+                Assert.IsTrue(m_DisconnectedEvent[m_ClientNetworkManagers[0]].ClientId == m_ClientId, $"Expected ClientID {m_ClientId} but found ClientID {m_DisconnectedEvent[m_ServerNetworkManager].ClientId} for the client {nameof(NetworkManager)} disconnect event entry!");
                 // Unregister for this event otherwise it will be invoked during teardown
                 m_ServerNetworkManager.OnConnectionEvent -= OnConnectionEvent;
             }
@@ -180,8 +178,8 @@ public IEnumerator ClientPlayerDisconnected([Values] ClientDisconnectType client
             {
                 Assert.IsTrue(m_DisconnectedEvent.ContainsKey(m_ServerNetworkManager), $"Could not find the server {nameof(NetworkManager)} disconnect event entry!");
                 Assert.IsTrue(m_DisconnectedEvent[m_ServerNetworkManager].ClientId == m_ClientId, $"Expected ClientID {m_ClientId} but found ClientID {m_DisconnectedEvent[m_ServerNetworkManager].ClientId} for the server {nameof(NetworkManager)} disconnect event entry!");
-                Assert.IsTrue(m_DisconnectedEvent.ContainsKey(clientManager), $"Could not find the client {nameof(NetworkManager)} disconnect event entry!");
-                Assert.IsTrue(m_DisconnectedEvent[clientManager].ClientId == m_ClientId, $"Expected ClientID {m_ClientId} but found ClientID {m_DisconnectedEvent[m_ServerNetworkManager].ClientId} for the client {nameof(NetworkManager)} disconnect event entry!");
+                Assert.IsTrue(m_DisconnectedEvent.ContainsKey(m_ClientNetworkManagers[0]), $"Could not find the client {nameof(NetworkManager)} disconnect event entry!");
+                Assert.IsTrue(m_DisconnectedEvent[m_ClientNetworkManagers[0]].ClientId == m_ClientId, $"Expected ClientID {m_ClientId} but found ClientID {m_DisconnectedEvent[m_ServerNetworkManager].ClientId} for the client {nameof(NetworkManager)} disconnect event entry!");
                 Assert.IsTrue(m_ServerNetworkManager.ConnectedClientsIds.Count == 1, $"Expected connected client identifiers count to be 1 but it was {m_ServerNetworkManager.ConnectedClientsIds.Count}!");
                 Assert.IsTrue(m_ServerNetworkManager.ConnectedClients.Count == 1, $"Expected connected client identifiers count to be 1 but it was {m_ServerNetworkManager.ConnectedClients.Count}!");
                 Assert.IsTrue(m_ServerNetworkManager.ConnectedClientsList.Count == 1, $"Expected connected client identifiers count to be 1 but it was {m_ServerNetworkManager.ConnectedClientsList.Count}!");
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority.meta b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority.meta
new file mode 100644
index 0000000000..ee02283755
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 421e3306c97e10f47b9efb6101a998ee
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/DeferredDespawningTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/DeferredDespawningTests.cs
new file mode 100644
index 0000000000..5787f169f1
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/DeferredDespawningTests.cs
@@ -0,0 +1,293 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using NUnit.Framework;
+using Unity.Netcode.TestHelpers.Runtime;
+using UnityEngine;
+using UnityEngine.TestTools;
+
+
+namespace Unity.Netcode.RuntimeTests
+{
+    [TestFixture(SetDestroyGameObject.DestroyGameObject)]
+    [TestFixture(SetDestroyGameObject.DontDestroyGameObject)]
+    internal class DeferredDespawningTests : IntegrationTestWithApproximation
+    {
+        private const int k_DaisyChainedCount = 5;
+        protected override int NumberOfClients => 2;
+        private List<GameObject> m_DaisyChainedDespawnObjects = new List<GameObject>();
+        private List<ulong> m_HasReachedEnd = new List<ulong>();
+
+        public enum SetDestroyGameObject
+        {
+            DestroyGameObject,
+            DontDestroyGameObject,
+        }
+        private bool m_DestroyGameObject;
+
+        public DeferredDespawningTests(SetDestroyGameObject destroyGameObject) : base(HostOrServer.DAHost)
+        {
+            m_DestroyGameObject = destroyGameObject == SetDestroyGameObject.DestroyGameObject;
+        }
+
+        protected override void OnServerAndClientsCreated()
+        {
+            var daisyChainPrevious = (DeferredDespawnDaisyChained)null;
+            for (int i = 0; i < k_DaisyChainedCount; i++)
+            {
+                var daisyChainNode = CreateNetworkObjectPrefab($"Daisy-{i}");
+                var daisyChainBehaviour = daisyChainNode.AddComponent<DeferredDespawnDaisyChained>();
+                daisyChainBehaviour.IsRoot = i == 0;
+                if (daisyChainPrevious != null)
+                {
+                    daisyChainPrevious.PrefabToSpawnWhenDespawned = daisyChainBehaviour.gameObject;
+                }
+                m_DaisyChainedDespawnObjects.Add(daisyChainNode);
+
+                daisyChainPrevious = daisyChainBehaviour;
+            }
+
+            base.OnServerAndClientsCreated();
+        }
+
+
+
+        [UnityTest]
+        public IEnumerator DeferredDespawning()
+        {
+            // Setup for test
+            DeferredDespawnDaisyChained.DestroyGameObject = m_DestroyGameObject;
+            DeferredDespawnDaisyChained.EnableVerbose = m_EnableVerboseDebug;
+            DeferredDespawnDaisyChained.ClientRelativeInstances = new Dictionary<ulong, Dictionary<ulong, DeferredDespawnDaisyChained>>();
+
+            // Spawn the initial object
+            var rootInstance = SpawnObject(m_DaisyChainedDespawnObjects[0], m_ServerNetworkManager);
+            DeferredDespawnDaisyChained.ReachedLastChainInstance = ReachedLastChainObject;
+
+            // Wait for the chain of objects to spawn and despawn
+            var timeoutHelper = new TimeoutHelper(300);
+            yield return WaitForConditionOrTimeOut(HaveAllClientsReachedEndOfChain, timeoutHelper);
+            AssertOnTimeout($"Timed out waiting for all children to reach the end of their chained deferred despawns!", timeoutHelper);
+
+            if (m_DestroyGameObject)
+            {
+                Assert.IsTrue(rootInstance == null); // Assert.IsNull doesn't work here
+            }
+            else
+            {
+                Assert.IsTrue(rootInstance != null); // Assert.IsNotNull doesn't work here
+            }
+        }
+
+        private bool HaveAllClientsReachedEndOfChain()
+        {
+            if (!m_HasReachedEnd.Contains(m_ServerNetworkManager.LocalClientId))
+            {
+                return false;
+            }
+
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                if (!m_HasReachedEnd.Contains(client.LocalClientId))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        private void ReachedLastChainObject(ulong clientId)
+        {
+            m_HasReachedEnd.Add(clientId);
+        }
+    }
+
+    /// <summary>
+    /// This helper behaviour handles the majority of the validation for deferred despawning.
+    /// Each instance triggers a series of deferred despawns where the owner validates the
+    /// NetworkVariables are updated and spawns another prefab prior to despawning locally
+    /// and the non-owners validate receiving the NetworkVariable change notification which
+    /// contains a reference to a DeferredDespawnDaisyChained component on the newly spawned
+    /// prefab driven by the authority. This repeats for the number specified in the integration
+    /// test.
+    /// </summary>
+    internal class DeferredDespawnDaisyChained : NetworkBehaviour
+    {
+        public static bool EnableVerbose;
+        public static bool DestroyGameObject;
+        public static Action<ulong> ReachedLastChainInstance;
+        private const int k_StartingDeferTick = 4;
+        public static Dictionary<ulong, Dictionary<ulong, DeferredDespawnDaisyChained>> ClientRelativeInstances;
+        public bool IsRoot;
+        public GameObject PrefabToSpawnWhenDespawned;
+        public bool WasContactedByPeviousChainMember { get; private set; }
+        public int DeferDespawnTick { get; private set; }
+
+        private void PingInstance()
+        {
+            WasContactedByPeviousChainMember = true;
+        }
+
+        /// <summary>
+        /// This hits two birds with one NetworkVariable:
+        /// - Validates that NetworkVariables modified while the authority is in the middle of deferring a despawn are serialized and received by non-authority instances.
+        /// - Validates that the non-authority instances receive the updates within the deferred tick period of time and can use them to handle other visual synchronization
+        /// realted tasks (or the like).
+        /// </summary>
+        private NetworkVariable<NetworkBehaviourReference> m_ValidateDirtyNetworkVarUpdate = new NetworkVariable<NetworkBehaviourReference>();
+
+        private DeferredDespawnDaisyChained m_NextNodeSpawned = null;
+
+        private void FailTest(string msg)
+        {
+            Assert.Fail($"[{nameof(DeferredDespawnDaisyChained)}][Client-{NetworkManager.LocalClientId}] {msg}");
+        }
+
+        public override void OnNetworkSpawn()
+        {
+            var localId = NetworkManager.LocalClientId;
+            if (!ClientRelativeInstances.ContainsKey(localId))
+            {
+                ClientRelativeInstances.Add(localId, new Dictionary<ulong, DeferredDespawnDaisyChained>());
+            }
+
+            if (ClientRelativeInstances[localId].ContainsKey(NetworkObject.NetworkObjectId))
+            {
+                FailTest($"[{nameof(OnNetworkSpawn)}] Client already has a table entry for NetworkObject-{NetworkObject.NetworkObjectId} | {name}!");
+            }
+
+            ClientRelativeInstances[localId].Add(NetworkObject.NetworkObjectId, this);
+
+            if (!HasAuthority)
+            {
+                m_ValidateDirtyNetworkVarUpdate.OnValueChanged += OnValidateDirtyChanged;
+            }
+
+            if (HasAuthority && IsRoot)
+            {
+                DeferDespawnTick = k_StartingDeferTick;
+            }
+
+            base.OnNetworkSpawn();
+        }
+
+        private void OnValidateDirtyChanged(NetworkBehaviourReference previous, NetworkBehaviourReference current)
+        {
+            if (!HasAuthority)
+            {
+                if (!current.TryGet(out m_NextNodeSpawned, NetworkManager))
+                {
+                    FailTest($"[{nameof(OnValidateDirtyChanged)}][{nameof(NetworkBehaviourReference)}] Failed to get the {nameof(DeferredDespawnDaisyChained)} behaviour from the {nameof(NetworkBehaviourReference)}!");
+                }
+
+                if (m_NextNodeSpawned.NetworkManager != NetworkManager)
+                {
+                    FailTest($"[{nameof(NetworkManager)}][{nameof(NetworkBehaviourReference.TryGet)}] The {nameof(NetworkManager)} of {nameof(m_NextNodeSpawned)} does not match the local relative {nameof(NetworkManager)} instance!");
+                }
+            }
+        }
+
+        public override void OnNetworkDespawn()
+        {
+            if (!HasAuthority && !NetworkManager.ShutdownInProgress)
+            {
+                if (PrefabToSpawnWhenDespawned != null)
+                {
+                    m_NextNodeSpawned.PingInstance();
+                }
+                else
+                {
+                    ReachedLastChainInstance?.Invoke(NetworkManager.LocalClientId);
+                }
+            }
+            base.OnNetworkDespawn();
+        }
+
+        private void InvokeDespawn()
+        {
+            if (!HasAuthority)
+            {
+                FailTest($"[{nameof(InvokeDespawn)}] Client is not the authority but this was invoked (integration test logic issue)!");
+            }
+            NetworkObject.DeferDespawn(DeferDespawnTick, DestroyGameObject);
+        }
+
+        public override void OnDeferringDespawn(int despawnTick)
+        {
+            if (!HasAuthority)
+            {
+                FailTest($"[{nameof(OnDeferringDespawn)}] Client is not the authority but this was invoked (integration test logic issue)!");
+            }
+
+            if (despawnTick != (DeferDespawnTick + NetworkManager.ServerTime.Tick))
+            {
+                FailTest($"[{nameof(OnDeferringDespawn)}] The passed in {despawnTick} parameter ({despawnTick}) does not equal the expected value of ({DeferDespawnTick + NetworkManager.ServerTime.Tick})!");
+            }
+
+            if (PrefabToSpawnWhenDespawned != null)
+            {
+                var deferNetworkObject = PrefabToSpawnWhenDespawned.GetComponent<NetworkObject>().InstantiateAndSpawn(NetworkManager);
+                var deferComponent = deferNetworkObject.GetComponent<DeferredDespawnDaisyChained>();
+                // Slowly increment the despawn tick count as we process the chain of deferred despawns
+                deferComponent.DeferDespawnTick = DeferDespawnTick + 1;
+                // This should get updated on all non-authority instances before they despawn
+                m_ValidateDirtyNetworkVarUpdate.Value = new NetworkBehaviourReference(deferComponent);
+            }
+            else
+            {
+                ReachedLastChainInstance?.Invoke(NetworkManager.LocalClientId);
+            }
+            base.OnDeferringDespawn(despawnTick);
+        }
+
+        private bool m_DeferredDespawn;
+        private void Update()
+        {
+            if (!IsSpawned || !HasAuthority || m_DeferredDespawn)
+            {
+                return;
+            }
+
+            // Wait until all clients have this instance
+            foreach (var clientId in NetworkManager.ConnectedClientsIds)
+            {
+                if (!ClientRelativeInstances.ContainsKey(clientId))
+                {
+                    // exit early if the client doesn't exist yet
+                    return;
+                }
+
+                if (!ClientRelativeInstances[clientId].ContainsKey(NetworkObjectId))
+                {
+                    // exit early if the client hasn't spawned a clone of this instance yet
+                    return;
+                }
+
+                if (clientId == NetworkManager.LocalClientId)
+                {
+                    continue;
+                }
+
+                // This should happen shortly after the instances spawn (based on the deferred despawn count)
+                if (!IsRoot && !ClientRelativeInstances[clientId][NetworkObjectId].WasContactedByPeviousChainMember)
+                {
+                    // exit early if the non-authority instance has not been contacted yet
+                    return;
+                }
+            }
+
+            // If we made it here, then defer despawn this instance
+            InvokeDespawn();
+            m_DeferredDespawn = true;
+        }
+
+        private void Log(string message)
+        {
+            if (!EnableVerbose)
+            {
+                return;
+            }
+            Debug.Log($"[{name}][Client-{NetworkManager.LocalClientId}][{NetworkObjectId}] {message}");
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/DeferredDespawningTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/DeferredDespawningTests.cs.meta
new file mode 100644
index 0000000000..e7d54c6d9b
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/DeferredDespawningTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c7b700919b058f446a75a398d5be9af4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/DistributeObjectsTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/DistributeObjectsTests.cs
new file mode 100644
index 0000000000..69680d96f2
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/DistributeObjectsTests.cs
@@ -0,0 +1,512 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using Unity.Netcode.Components;
+using Unity.Netcode.TestHelpers.Runtime;
+using Unity.Netcode.Transports.UTP;
+using UnityEngine;
+using UnityEngine.TestTools;
+using Random = UnityEngine.Random;
+
+namespace Unity.Netcode.RuntimeTests
+{
+    /// <summary>
+    /// Validates that distributable NetworkObjects are distributed upon
+    /// a client connecting or disconnecting.
+    /// </summary>
+    internal class DistributeObjectsTests : IntegrationTestWithApproximation
+    {
+        private GameObject m_DistributeObject;
+
+        private StringBuilder m_ErrorLog = new StringBuilder();
+
+        private const int k_LateJoinClientCount = 4;
+        protected override int NumberOfClients => 0;
+
+        public DistributeObjectsTests() : base(HostOrServer.DAHost)
+        {
+        }
+
+        protected override IEnumerator OnSetup()
+        {
+            m_ObjectToValidate = null;
+            return base.OnSetup();
+        }
+
+        protected override void OnServerAndClientsCreated()
+        {
+            var serverTransport = m_ServerNetworkManager.NetworkConfig.NetworkTransport as UnityTransport;
+            // I hate having to add time to our tests, but in case a VM is running slow the disconnect timeout needs to be reasonably high
+            serverTransport.DisconnectTimeoutMS = 1000;
+            m_DistributeObject = CreateNetworkObjectPrefab("DisObject");
+            m_DistributeObject.AddComponent<DistributeObjectsTestHelper>();
+            m_DistributeObject.AddComponent<DistributeTestTransform>();
+
+            // Set baseline to be distributable
+            var networkObject = m_DistributeObject.GetComponent<NetworkObject>();
+            networkObject.SetOwnershipStatus(NetworkObject.OwnershipStatus.Distributable);
+            networkObject.DontDestroyWithOwner = true;
+            base.OnServerAndClientsCreated();
+        }
+
+        protected override IEnumerator OnServerAndClientsConnected()
+        {
+            m_ServerNetworkManager.SpawnManager.EnableDistributeLogging = m_EnableVerboseDebug;
+            m_ServerNetworkManager.ConnectionManager.EnableDistributeLogging = m_EnableVerboseDebug;
+            return base.OnServerAndClientsConnected();
+        }
+
+        private NetworkObject m_ObjectToValidate;
+
+        private bool ValidateObjectSpawnedOnAllClients()
+        {
+            m_ErrorLog.Clear();
+
+            var networkObjectId = m_ObjectToValidate.NetworkObjectId;
+            var name = m_ObjectToValidate.name;
+            if (!UseCMBService() && !m_ServerNetworkManager.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId))
+            {
+                m_ErrorLog.Append($"Client-{m_ServerNetworkManager.LocalClientId} has not spawned {name}!");
+                return false;
+            }
+
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                if (!client.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId))
+                {
+                    m_ErrorLog.Append($"Client-{client.LocalClientId} has not spawned {name}!");
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        private const int k_ObjectCount = 20;
+
+        private bool ValidateDistributedObjectsSpawned(bool lateJoining)
+        {
+            m_ErrorLog.Clear();
+            var hostId = m_ServerNetworkManager.LocalClientId;
+            if (!DistributeObjectsTestHelper.DistributedObjects.ContainsKey(hostId))
+            {
+                m_ErrorLog.AppendLine($"[Client-{hostId}] Does not have an entry in the root of the {nameof(DistributeObjectsTestHelper.DistributedObjects)} table!");
+                return false;
+            }
+            var daHostObjectTracking = DistributeObjectsTestHelper.DistributedObjects[hostId];
+            if (!daHostObjectTracking.ContainsKey(hostId))
+            {
+                m_ErrorLog.AppendLine($"[Client-{hostId}] Does not have a local an entry in the {nameof(DistributeObjectsTestHelper.DistributedObjects)} table!");
+                return false;
+            }
+
+            var daHostObjects = daHostObjectTracking[hostId];
+            var expected = 0;
+            if (lateJoining)
+            {
+                expected = k_ObjectCount / (m_ClientNetworkManagers.Count() + 1);
+            }
+            else
+            {
+                expected = k_ObjectCount / (m_ClientNetworkManagers.Where((c) => c.IsConnectedClient).Count() + 1);
+            }
+
+            // It should theoretically be the expected or...
+            if (daHostObjects.Count != expected)
+            {
+                // due to not rounding one more than the expected
+                expected++;
+                if (daHostObjects.Count != expected)
+                {
+                    m_ErrorLog.AppendLine($"[Client-{hostId}][General] Expected {expected} spawned objects, but only {daHostObjects.Count} exist!");
+                    return false;
+                }
+            }
+
+            foreach (var networkObject in daHostObjects)
+            {
+                m_ObjectToValidate = networkObject.Value;
+                if (!ValidateObjectSpawnedOnAllClients())
+                {
+                    m_ErrorLog.AppendLine($"[{m_ObjectToValidate.name}] Was not spawned on all clients!");
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        private bool ValidateOwnershipTablesMatch()
+        {
+            m_ErrorLog.Clear();
+            var hostId = m_ServerNetworkManager.LocalClientId;
+            var expectedEntries = m_ClientNetworkManagers.Where((c) => c.IsListening && c.IsConnectedClient).Count() + 1;
+            // Make sure all clients have an table created
+            if (DistributeObjectsTestHelper.DistributedObjects.Count < expectedEntries)
+            {
+                m_ErrorLog.AppendLine($"[General] Expected {expectedEntries} entries in the root of the {nameof(DistributeObjectsTestHelper.DistributedObjects)} table but only {DistributeObjectsTestHelper.DistributedObjects.Count} exist!");
+                return false;
+            }
+
+            if (!DistributeObjectsTestHelper.DistributedObjects.ContainsKey(hostId))
+            {
+                m_ErrorLog.AppendLine($"[Client-{hostId}] Does not have an entry in the root of the {nameof(DistributeObjectsTestHelper.DistributedObjects)} table!");
+                return false;
+            }
+            var daHostEntries = DistributeObjectsTestHelper.DistributedObjects[hostId];
+            if (!daHostEntries.ContainsKey(hostId))
+            {
+                m_ErrorLog.AppendLine($"[Client-{hostId}] Does not have a local an entry in the {nameof(DistributeObjectsTestHelper.DistributedObjects)} table!");
+                return false;
+            }
+            var clients = m_ServerNetworkManager.ConnectedClientsIds.ToList();
+            clients.Remove(0);
+
+            // Cycle through each client's entry on the DAHost to run a comparison
+            foreach (var hostClientEntry in daHostEntries)
+            {
+                foreach (var ownerEntry in hostClientEntry.Value)
+                {
+                    foreach (var client in clients)
+                    {
+                        var clientOwnerTable = DistributeObjectsTestHelper.DistributedObjects[client];
+                        if (!clientOwnerTable.ContainsKey(hostClientEntry.Key))
+                        {
+                            m_ErrorLog.AppendLine($"[Client-{client}] No ownership table exists the client relative section of the {nameof(DistributeObjectsTestHelper.DistributedObjects)} table!");
+                            return false;
+                        }
+                        var clientEntry = clientOwnerTable[hostClientEntry.Key];
+                        if (!clientEntry.ContainsKey(ownerEntry.Key))
+                        {
+                            m_ErrorLog.AppendLine($"[Client-{client}] {ownerEntry.Value.name} does not exists in Client-{client}'s sub-section for Owner-{hostClientEntry.Key} relative section of the {nameof(DistributeObjectsTestHelper.DistributedObjects)} table!");
+                            return false;
+                        }
+                        var clientObjectEntry = clientEntry[ownerEntry.Key];
+                        if (clientObjectEntry.OwnerClientId != ownerEntry.Value.OwnerClientId)
+                        {
+                            m_ErrorLog.AppendLine($"[Client-{client}][Owner Mismatch] {clientObjectEntry.OwnerClientId} does equal {ownerEntry.Value.OwnerClientId}!");
+                            return false;
+                        }
+                        // Assure the observers match
+                        foreach (var observer in ownerEntry.Value.Observers)
+                        {
+                            if (!clientObjectEntry.Observers.Contains(observer))
+                            {
+                                m_ErrorLog.AppendLine($"[Client-{client}][Observer Mismatch] {nameof(NetworkObject)} {clientObjectEntry.name}'s observers does not contain {observer}, but the authority instance does!");
+                                return false;
+                            }
+                        }
+                    }
+                }
+            }
+            return true;
+        }
+
+        private bool ValidateTransformsMatch()
+        {
+            m_ErrorLog.Clear();
+            var hostId = m_ServerNetworkManager.LocalClientId;
+            var daHostEntries = DistributeObjectsTestHelper.DistributedObjects[hostId];
+            var clients = m_ServerNetworkManager.ConnectedClientsIds.ToList();
+            foreach (var clientOwner in daHostEntries.Keys)
+            {
+                // Cycle through the owner's objects
+                foreach (var entry in DistributeObjectsTestHelper.DistributedObjects[clientOwner][clientOwner].Values)
+                {
+                    var ownerTestTransform = entry.GetComponent<DistributeTestTransform>();
+                    // Compare against the other client instances of that object
+                    foreach (var client in clients)
+                    {
+                        if (client == clientOwner)
+                        {
+                            continue;
+                        }
+
+                        var clientObjectInstance = DistributeObjectsTestHelper.DistributedObjects[client][clientOwner][entry.NetworkObjectId];
+                        if (!ownerTestTransform.IsPositionClose(clientObjectInstance.transform.position))
+                        {
+                            m_ErrorLog.AppendLine($"[Position Mismatch] Client-{client} Instance: {GetVector3Values(clientObjectInstance.transform.position)} !=  Owner Instance: {GetVector3Values(ownerTestTransform.transform.position)}!");
+                            return false;
+                        }
+                    }
+                }
+            }
+            return true;
+        }
+
+        private bool SpawnCountsMatch()
+        {
+            var passed = true;
+            var spawnCount = 0;
+            m_ErrorLog.Clear();
+            if (!UseCMBService())
+            {
+                spawnCount = m_ServerNetworkManager.SpawnManager.SpawnedObjects.Count;
+            }
+            else
+            {
+                spawnCount = m_ClientNetworkManagers[0].SpawnManager.SpawnedObjects.Count;
+            }
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                var clientCount = client.SpawnManager.SpawnedObjects.Count;
+                if (clientCount != spawnCount)
+                {
+                    m_ErrorLog.AppendLine($"[Client-{client.LocalClientId}] Has a spawn count of {clientCount} but {spawnCount} was expected!");
+                    passed = false;
+                }
+            }
+            return passed;
+        }
+
+        /// <summary>
+        /// This is a straight forward validation for the distribution of NetworkObjects
+        /// upon a client connecting or disconnecting. It also validates that the observers
+        /// on each non-authority instance matches the authority instance's. Finally, it
+        /// also includes validation that NetworkTransform updates continue to update and
+        /// synchronize properly after ownership for a set number of objects has changed.
+        /// </summary>
+        [UnityTest]
+        public IEnumerator DistributeNetworkObjects()
+        {
+            for (int i = 0; i < k_ObjectCount; i++)
+            {
+                SpawnObject(m_DistributeObject, m_ServerNetworkManager);
+            }
+
+            // Validate NetworkObjects get redistributed properly when a client joins
+            for (int j = 0; j < k_LateJoinClientCount; j++)
+            {
+                yield return CreateAndStartNewClient();
+
+                yield return WaitForConditionOrTimeOut(() => ValidateDistributedObjectsSpawned(true));
+                AssertOnTimeout($"[Client-{j + 1}][Initial Spawn] Not all clients spawned all objects!\n {m_ErrorLog}");
+
+                yield return WaitForConditionOrTimeOut(ValidateOwnershipTablesMatch);
+                AssertOnTimeout($"[Client-{j + 1}][OnwershipTable Mismatch] {m_ErrorLog}");
+
+                // When ownership changes, the new owner will randomly pick a new target to move towards and will move towards the target.
+                // Validate all other instances of the NetworkObjects that have had newly assigned owners have matching positions to the
+                // newly assigned owenr's instance.
+                yield return WaitForConditionOrTimeOut(ValidateTransformsMatch);
+                AssertOnTimeout($"[Client-{j + 1}][Transform Mismatch] {m_ErrorLog}");
+                DisplayOwnership();
+
+                yield return WaitForConditionOrTimeOut(SpawnCountsMatch);
+                AssertOnTimeout($"[Spawn Count Mismatch] {m_ErrorLog}");
+            }
+
+            // Validate NetworkObjects get redistributed properly when a client disconnects
+            for (int j = k_LateJoinClientCount - 1; j >= 0; j--)
+            {
+                var client = m_ClientNetworkManagers[j];
+
+                // Remove the client from the other clients' ownership tracking table
+                DistributeObjectsTestHelper.RemoveClient(client.LocalClientId);
+
+                // Disconnect the client
+                yield return StopOneClient(client, true);
+
+                //yield return new WaitForSeconds(0.1f);
+
+                // Validate all tables match
+                yield return WaitForConditionOrTimeOut(ValidateOwnershipTablesMatch);
+
+                AssertOnTimeout($"[Client-{j + 1}][OnwershipTable Mismatch] {m_ErrorLog}");
+
+                // When ownership changes, the new owner will randomly pick a new target to move towards and will move towards the target.
+                // Validate all other instances of the NetworkObjects that have had newly assigned owners have matching positions to the
+                // newly assigned owenr's instance.
+                yield return WaitForConditionOrTimeOut(ValidateTransformsMatch);
+                AssertOnTimeout($"[Client-{j + 1}][Transform Mismatch] {m_ErrorLog}");
+
+                // DANGO-TODO: Make this tied to verbose mode once we know the CMB Service integration works properly
+                DisplayOwnership();
+
+                yield return WaitForConditionOrTimeOut(SpawnCountsMatch);
+                AssertOnTimeout($"[Spawn Count Mismatch] {m_ErrorLog}");
+            }
+        }
+
+        private void DisplayOwnership()
+        {
+            m_ErrorLog.Clear();
+            var daHostEntries = DistributeObjectsTestHelper.DistributedObjects[0];
+
+            foreach (var entry in daHostEntries)
+            {
+                m_ErrorLog.AppendLine($"[Client-{entry.Key}][Owned Objects: {entry.Value.Count}]");
+            }
+
+            VerboseDebug($"{m_ErrorLog}");
+        }
+
+        /// <summary>
+        /// This keeps track of each clients perspective of which NetworkObjects are owned by which client.
+        /// It is used to validate that all clients are in synch with ownership updates.
+        /// </summary>
+        internal class DistributeObjectsTestHelper : NetworkBehaviour
+        {
+            /// <summary>
+            /// [Client Context][Client Owners][NetworkObjectId][NetworkObject]
+            /// </summary>
+            public static Dictionary<ulong, Dictionary<ulong, Dictionary<ulong, NetworkObject>>> DistributedObjects = new Dictionary<ulong, Dictionary<ulong, Dictionary<ulong, NetworkObject>>>();
+
+            public static void RemoveClient(ulong clientId)
+            {
+                foreach (var clients in DistributedObjects.Values)
+                {
+                    clients.Remove(clientId);
+                }
+                DistributedObjects.Remove(clientId);
+            }
+
+            internal ulong ClientId;
+
+            public override void OnNetworkSpawn()
+            {
+                ClientId = NetworkManager.LocalClientId;
+                UpdateOwnerTableAdd();
+                base.OnNetworkSpawn();
+            }
+
+            private void UpdateOwnerTableAdd()
+            {
+                if (!DistributedObjects.ContainsKey(ClientId))
+                {
+                    DistributedObjects.Add(ClientId, new Dictionary<ulong, Dictionary<ulong, NetworkObject>>());
+                }
+                if (!DistributedObjects[ClientId].ContainsKey(OwnerClientId))
+                {
+                    DistributedObjects[ClientId].Add(OwnerClientId, new Dictionary<ulong, NetworkObject>());
+                }
+
+                if (DistributedObjects[ClientId][OwnerClientId].ContainsKey(NetworkObject.NetworkObjectId))
+                {
+                    throw new Exception($"[Client-{ClientId}][{name}] {nameof(NetworkObject)} already exists in Client-{ClientId}'s " +
+                        $"DistributedObjects being tracking under Client-{OwnerClientId}'s list of owned {nameof(NetworkObject)}s!");
+                }
+                DistributedObjects[ClientId][OwnerClientId].Add(NetworkObject.NetworkObjectId, NetworkObject);
+            }
+
+            private void UpdateOwnerTableRemove(ulong previous)
+            {
+                // This does not need to exist when first starting, but will (at one point in testing)
+                // become valid.
+                if (DistributedObjects[ClientId].ContainsKey(previous))
+                {
+                    if (DistributedObjects[ClientId][previous].ContainsKey(NetworkObject.NetworkObjectId))
+                    {
+                        DistributedObjects[ClientId][previous].Remove(NetworkObject.NetworkObjectId);
+                    }
+                }
+            }
+
+            protected override void OnOwnershipChanged(ulong previous, ulong current)
+            {
+                // At start, if NetworkSpawn has not been completed the local client ignores this
+                if (!DistributedObjects.ContainsKey(ClientId))
+                {
+                    return;
+                }
+                UpdateOwnerTableRemove(previous);
+                UpdateOwnerTableAdd();
+                base.OnOwnershipChanged(previous, current);
+            }
+        }
+
+        /// <summary>
+        /// This is used to validate that upon distributed ownership changes NetworkTransform sycnhronization
+        /// still works properly.
+        /// </summary>
+        internal class DistributeTestTransform : NetworkTransform
+        {
+            private float m_DeltaVarPosition = 0.15f;
+            private float m_DeltaVarQauternion = 0.015f;
+            protected Vector3 GetRandomVector3(float min, float max, Vector3 baseLine, bool randomlyApplySign = false)
+            {
+                var retValue = new Vector3(baseLine.x * Random.Range(min, max), baseLine.y * Random.Range(min, max), baseLine.z * Random.Range(min, max));
+                if (!randomlyApplySign)
+                {
+                    return retValue;
+                }
+
+                retValue.x *= Random.Range(1, 100) >= 50 ? -1 : 1;
+                retValue.y *= Random.Range(1, 100) >= 50 ? -1 : 1;
+                retValue.z *= Random.Range(1, 100) >= 50 ? -1 : 1;
+                return retValue;
+            }
+
+            protected override bool OnIsServerAuthoritative()
+            {
+                var isOwnerAuth = base.OnIsServerAuthoritative();
+                Assert.IsFalse(isOwnerAuth, $"Base {nameof(NetworkTransform)} did not automatically return false in distributed authority mode!");
+                return isOwnerAuth;
+            }
+
+            public override void OnNetworkSpawn()
+            {
+                base.OnNetworkSpawn();
+
+                if (CanCommitToTransform)
+                {
+                    var randomPos = GetRandomVector3(1.0f, 10.0f, Vector3.one, true);
+                    SetState(randomPos, null, null, false);
+                    m_TargetPosition = randomPos;
+                }
+            }
+
+            private Vector3 m_TargetPosition;
+            private Vector3 m_DirToTarget;
+            private bool m_ReachedTarget;
+
+            protected override void OnOwnershipChanged(ulong previous, ulong current)
+            {
+                base.OnOwnershipChanged(previous, current);
+                m_TargetPosition = transform.position + GetRandomVector3(4.0f, 8.0f, Vector3.one, true);
+                m_DirToTarget = (m_TargetPosition - transform.position).normalized;
+                m_ReachedTarget = false;
+            }
+
+            public override void OnUpdate()
+            {
+                if (CanCommitToTransform)
+                {
+                    if (!m_ReachedTarget)
+                    {
+                        var distance = Vector3.Distance(transform.position, m_TargetPosition);
+
+                        var speed = Mathf.Clamp(distance, 0.10f, 2.0f);
+
+                        transform.position += m_DirToTarget * speed * Time.deltaTime;
+
+                        m_ReachedTarget = IsPositionClose(m_TargetPosition);
+                    }
+                }
+            }
+
+            public bool IsPositionClose(Vector3 position)
+            {
+                return Approximately(transform.position, position);
+            }
+
+            protected bool Approximately(Vector3 a, Vector3 b)
+            {
+                var deltaVariance = m_DeltaVarPosition;
+                return Math.Round(Mathf.Abs(a.x - b.x), 2) <= deltaVariance &&
+                    Math.Round(Mathf.Abs(a.y - b.y), 2) <= deltaVariance &&
+                    Math.Round(Mathf.Abs(a.z - b.z), 2) <= deltaVariance;
+            }
+
+            protected bool Approximately(Quaternion a, Quaternion b)
+            {
+                var deltaVariance = m_DeltaVarQauternion;
+                return Mathf.Abs(a.x - b.x) <= deltaVariance &&
+                    Mathf.Abs(a.y - b.y) <= deltaVariance &&
+                    Mathf.Abs(a.z - b.z) <= deltaVariance &&
+                    Mathf.Abs(a.w - b.w) <= deltaVariance;
+            }
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/DistributeObjectsTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/DistributeObjectsTests.cs.meta
new file mode 100644
index 0000000000..b48a2d049f
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/DistributeObjectsTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4a759aeb53d12d842899381b411f3d2e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/DistributedAuthorityCodecTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/DistributedAuthorityCodecTests.cs
new file mode 100644
index 0000000000..2a89327bc4
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/DistributedAuthorityCodecTests.cs
@@ -0,0 +1,775 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using NUnit.Framework;
+using Unity.Collections;
+using Unity.Netcode.TestHelpers.Runtime;
+using Unity.Netcode.Transports.UTP;
+using Unity.Networking.Transport;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+using UnityEngine.TestTools;
+
+namespace Unity.Netcode.RuntimeTests
+{
+    /// <summary>
+    /// This class tests the NGO message codec between the C# SDK and the Rust runtime.
+    /// </summary>
+    /// <remarks>
+    /// These tests are run against a rust echo-server.
+    /// This server decodes incoming messages, and then re-encodes them before sending them back to the client.
+    /// Any errors in decoding or encoding messages will not echo the messages back, causing the tests to fail
+    /// No message handling logic is tested in these tests. They are only testing the codec.
+    /// The tests check if they can bind to a rust echo-server at the given address and port, if all tests are ignored.
+    /// The rust echo-server is run using `cargo run --example ngo_echo_server -- --port {port}`
+    /// The C# port can be configured using the environment variable "ECHO_SERVER_PORT"
+    /// The default behaviour when unity fails to connect to the echo-server is to ignore all tests in this class.
+    /// This can be overridden by setting the environment variable "ENSURE_CODEC_TESTS" to any value - then the tests will fail.
+    /// </remarks>
+    internal class DistributedAuthorityCodecTests : NetcodeIntegrationTest
+    {
+        protected override int NumberOfClients => 1;
+
+        // Use the CMB Service for all tests
+        protected override bool UseCMBService() => true;
+
+        // Set the network topology to distributed authority for all tests
+        protected override NetworkTopologyTypes OnGetNetworkTopologyType() => NetworkTopologyTypes.DistributedAuthority;
+
+        private CodecTestHooks m_ClientCodecHook;
+        private NetworkManager Client => m_ClientNetworkManagers[0];
+
+        private string m_TransportHost = Environment.GetEnvironmentVariable("NGO_HOST") ?? "127.0.0.1";
+        private static readonly ushort k_TransportPort = GetPortToBind();
+        private const int k_ClientId = 0;
+
+        /// <summary>
+        /// Configures the port to look for the rust echo-server.
+        /// </summary>
+        /// <returns>The port from the environment variable "ECHO_SERVER_PORT" if it is set and valid; otherwise uses port 7777</returns>
+        private static ushort GetPortToBind()
+        {
+            var value = Environment.GetEnvironmentVariable("ECHO_SERVER_PORT");
+            return ushort.TryParse(value, out var configuredPort) ? configuredPort : (ushort)7777;
+        }
+
+        private GameObject m_SpawnObject;
+
+        internal class TestNetworkComponent : NetworkBehaviour
+        {
+            public NetworkList<int> MyNetworkList = new NetworkList<int>(new List<int> { 1, 2, 3 });
+            public NetworkVariable<int> MyNetworkVar = new NetworkVariable<int>(3);
+
+            [Rpc(SendTo.Authority)]
+            public void TestAuthorityRpc(byte[] _)
+            {
+            }
+        }
+
+        protected override void OnOneTimeSetup()
+        {
+            // Prevents the tests from running if no CMB Service is detected
+            if (!CanConnectToServer(m_TransportHost, k_TransportPort))
+            {
+                var shouldFail = Environment.GetEnvironmentVariable("ENSURE_CODEC_TESTS");
+                if (string.IsNullOrEmpty(shouldFail) || shouldFail.ToLower() == "false")
+                {
+                    Assert.Ignore($"ignoring DA codec tests because UTP transport cannot connect to the rust echo-server at {m_TransportHost}:{k_TransportPort}");
+                }
+                else
+                {
+                    Assert.Fail($"Failed to connect to the rust echo-server at {m_TransportHost}:{k_TransportPort}");
+                }
+            }
+            base.OnOneTimeSetup();
+        }
+
+        /// <summary>
+        /// Add any additional components to default player prefab
+        /// </summary>
+        protected override void OnCreatePlayerPrefab()
+        {
+            m_PlayerPrefab.AddComponent<TestNetworkComponent>();
+            base.OnCreatePlayerPrefab();
+        }
+
+        /// <summary>
+        /// Modify NetworkManager instances for settings specific to tests
+        /// </summary>
+        protected override void OnServerAndClientsCreated()
+        {
+            var utpTransport = Client.gameObject.AddComponent<UnityTransport>();
+            Client.NetworkConfig.NetworkTransport = utpTransport;
+            Client.NetworkConfig.EnableSceneManagement = false;
+            Client.NetworkConfig.AutoSpawnPlayerPrefabClientSide = true;
+            utpTransport.ConnectionData.Address = Dns.GetHostAddresses(m_TransportHost).First().ToString();
+            utpTransport.ConnectionData.Port = k_TransportPort;
+            Client.LogLevel = LogLevel.Developer;
+
+            // Validate we are in distributed authority mode with client side spawning and using CMB Service
+            Assert.True(Client.NetworkConfig.NetworkTopology == NetworkTopologyTypes.DistributedAuthority, "Distributed authority topology is not set!");
+            Assert.True(Client.AutoSpawnPlayerPrefabClientSide, "Client side spawning is not set!");
+            Assert.True(Client.CMBServiceConnection, "CMBServiceConnection is not set!");
+
+            // Create a prefab for creating and destroying tests (auto-registers with NetworkManagers)
+            m_SpawnObject = CreateNetworkObjectPrefab("TestObject");
+            m_SpawnObject.AddComponent<TestNetworkComponent>();
+
+            // Ignore the client connection timeout after starting the client
+            m_BypassConnectionTimeout = true;
+        }
+
+        protected override IEnumerator OnStartedServerAndClients()
+        {
+            // Validate the NetworkManager are in distributed authority mode
+            Assert.True(Client.DistributedAuthorityMode, "Distributed authority is not set!");
+
+            // Register hooks after starting clients and server (in this case just the one client)
+            // We do this at this point in time because the MessageManager exists (happens within the same call stack when starting NetworkManagers)
+            m_ClientCodecHook = new CodecTestHooks();
+            Client.MessageManager.Hook(m_ClientCodecHook);
+            yield return base.OnStartedServerAndClients();
+
+            // wait for client to connect since m_BypassConnectionTimeout
+            yield return WaitForConditionOrTimeOut(() => Client.LocalClient.PlayerObject != null);
+            AssertOnTimeout($"Timed out waiting for the client's player to be spanwed!");
+        }
+
+        [UnityTest]
+        public IEnumerator AuthorityRpc()
+        {
+            var player = Client.LocalClient.PlayerObject;
+            player.OwnerClientId = Client.LocalClientId + 1;
+
+            var networkComponent = player.GetComponent<TestNetworkComponent>();
+            networkComponent.UpdateNetworkProperties();
+            networkComponent.TestAuthorityRpc(new byte[] { 1, 2, 3, 4 });
+
+            // Universal Rpcs are sent as a ProxyMessage (which contains an RpcMessage)
+            yield return m_ClientCodecHook.WaitForMessageReceived<ProxyMessage>();
+        }
+
+        [UnityTest]
+        public IEnumerator ChangeOwnership()
+        {
+            var message = new ChangeOwnershipMessage
+            {
+                DistributedAuthorityMode = true,
+                NetworkObjectId = 100,
+                OwnerClientId = 2,
+            };
+
+            yield return SendMessage(ref message);
+        }
+
+        [UnityTest]
+        public IEnumerator ClientConnected()
+        {
+            var message = new ClientConnectedMessage()
+            {
+                ClientId = 2,
+            };
+
+            yield return SendMessage(ref message);
+        }
+
+        [UnityTest]
+        public IEnumerator ClientDisconnected()
+        {
+            var message = new ClientDisconnectedMessage()
+            {
+                ClientId = 2,
+            };
+
+            yield return SendMessage(ref message);
+        }
+
+        [UnityTest]
+        public IEnumerator CreateObject()
+        {
+            SpawnObject(m_SpawnObject, Client);
+            yield return m_ClientCodecHook.WaitForMessageReceived<CreateObjectMessage>();
+        }
+
+        [UnityTest]
+        public IEnumerator DestroyObject()
+        {
+            var spawnedObject = SpawnObject(m_SpawnObject, Client);
+            yield return m_ClientCodecHook.WaitForMessageReceived<CreateObjectMessage>();
+            spawnedObject.GetComponent<NetworkObject>().Despawn();
+            yield return m_ClientCodecHook.WaitForMessageReceived<DestroyObjectMessage>();
+        }
+
+        [UnityTest]
+        public IEnumerator Disconnect()
+        {
+            var message = new DisconnectReasonMessage
+            {
+                Reason = "test"
+            };
+
+            return SendMessage(ref message);
+        }
+
+        [UnityTest]
+        public IEnumerator NamedMessage()
+        {
+            var writeBuffer = new FastBufferWriter(sizeof(int), Allocator.Temp);
+            writeBuffer.WriteValueSafe(5);
+
+            var message = new NamedMessage
+            {
+                Hash = 3,
+                SendData = writeBuffer,
+            };
+
+            yield return SendMessage(ref message);
+        }
+
+        [UnityTest]
+        public IEnumerator NetworkVariableDelta()
+        {
+            var component = Client.LocalClient.PlayerObject.GetComponent<TestNetworkComponent>();
+            var message = new NetworkVariableDeltaMessage
+            {
+                NetworkObjectId = Client.LocalClient.PlayerObject.NetworkObjectId,
+                NetworkBehaviourIndex = component.NetworkBehaviourId,
+                DeliveryMappedNetworkVariableIndex = new HashSet<int> { 0, 1 },
+                TargetClientId = 5,
+                NetworkBehaviour = component,
+            };
+
+            yield return SendMessage(ref message);
+        }
+
+        [UnityTest]
+        public IEnumerator NetworkVariableDelta_WithValueUpdate()
+        {
+            var networkObj = CreateNetworkObjectPrefab("TestObject");
+            networkObj.AddComponent<TestNetworkComponent>();
+            var instance = SpawnObject(networkObj, Client);
+            yield return m_ClientCodecHook.WaitForMessageReceived<CreateObjectMessage>();
+            var component = instance.GetComponent<TestNetworkComponent>();
+
+            var newValue = 5;
+            component.MyNetworkVar.Value = newValue;
+            yield return m_ClientCodecHook.WaitForMessageReceived<NetworkVariableDeltaMessage>();
+            Assert.AreEqual(newValue, component.MyNetworkVar.Value);
+        }
+
+        [UnityTest]
+        public IEnumerator NetworkListDelta_WithValueUpdate()
+        {
+            var networkObj = CreateNetworkObjectPrefab("TestObject");
+            networkObj.AddComponent<TestNetworkComponent>();
+            var instance = SpawnObject(networkObj, Client);
+            yield return m_ClientCodecHook.WaitForMessageReceived<CreateObjectMessage>();
+            var component = instance.GetComponent<TestNetworkComponent>();
+
+            component.MyNetworkList.Add(5);
+            yield return m_ClientCodecHook.WaitForMessageReceived<NetworkVariableDeltaMessage>();
+            component.MyNetworkList.Add(6);
+            component.MyNetworkList.Add(7);
+            yield return m_ClientCodecHook.WaitForMessageReceived<NetworkVariableDeltaMessage>();
+            component.MyNetworkList.Insert(1, 8);
+            yield return m_ClientCodecHook.WaitForMessageReceived<NetworkVariableDeltaMessage>();
+            component.MyNetworkList.Insert(8, 11);
+            yield return m_ClientCodecHook.WaitForMessageReceived<NetworkVariableDeltaMessage>();
+            component.MyNetworkList.Remove(6);
+            yield return m_ClientCodecHook.WaitForMessageReceived<NetworkVariableDeltaMessage>();
+            component.MyNetworkList.RemoveAt(2);
+            yield return m_ClientCodecHook.WaitForMessageReceived<NetworkVariableDeltaMessage>();
+            component.MyNetworkList.Clear();
+            yield return m_ClientCodecHook.WaitForMessageReceived<NetworkVariableDeltaMessage>();
+        }
+
+        [UnityTest]
+        public IEnumerator ParentSync()
+        {
+            var message = new ParentSyncMessage
+            {
+                NetworkObjectId = 0,
+                WorldPositionStays = true,
+                IsLatestParentSet = false,
+                Position = new Vector3(1, 2, 3),
+                Rotation = new Quaternion(4, 5, 6, 7),
+                Scale = new Vector3(8, 9, 10),
+            };
+
+            yield return SendMessage(ref message);
+        }
+
+        [UnityTest]
+        public IEnumerator SessionOwner()
+        {
+            var message = new SessionOwnerMessage()
+            {
+                SessionOwner = 2,
+            };
+
+            yield return SendMessage(ref message);
+        }
+
+        [UnityTest]
+        public IEnumerator ServerLog()
+        {
+            var message = new ServerLogMessage()
+            {
+                LogType = NetworkLog.LogType.Info,
+                Message = "test",
+            };
+
+            yield return SendMessage(ref message);
+        }
+
+        [UnityTest]
+        public IEnumerator UnnamedMessage()
+        {
+            var writeBuffer = new FastBufferWriter(sizeof(int), Allocator.Temp);
+            writeBuffer.WriteValueSafe(5);
+
+            var message = new UnnamedMessage
+            {
+                SendData = writeBuffer,
+            };
+
+            yield return SendMessage(ref message);
+        }
+
+        [UnityTest]
+        public IEnumerator SceneEventMessageLoad()
+        {
+            Client.SceneManager.SkipSceneHandling = true;
+            var eventData = new SceneEventData(Client)
+            {
+                SceneEventType = SceneEventType.Load,
+                LoadSceneMode = LoadSceneMode.Single,
+                SceneEventProgressId = Guid.NewGuid(),
+                SceneAsset = "SomeRandomSceneName",
+                SceneHandle = 23456,
+            };
+
+            var message = new SceneEventMessage()
+            {
+                EventData = eventData
+            };
+            yield return SendMessage(ref message);
+        }
+
+        [UnityTest]
+        public IEnumerator SceneEventMessageLoadWithObjects()
+        {
+            Client.SceneManager.SkipSceneHandling = true;
+            var prefabNetworkObject = m_SpawnObject.GetComponent<NetworkObject>();
+
+            Client.SceneManager.ScenePlacedObjects.Add(0, new Dictionary<int, NetworkObject>()
+            {
+                { 1, prefabNetworkObject }
+            });
+            var eventData = new SceneEventData(Client)
+            {
+                SceneEventType = SceneEventType.Load,
+                LoadSceneMode = LoadSceneMode.Single,
+                SceneEventProgressId = Guid.NewGuid(),
+                SceneAsset = "SomeRandomSceneName",
+                SceneHandle = 23456,
+            };
+
+            var message = new SceneEventMessage()
+            {
+                EventData = eventData
+            };
+            yield return SendMessage(ref message);
+        }
+
+        [UnityTest]
+        public IEnumerator SceneEventMessageUnload()
+        {
+            Client.SceneManager.SkipSceneHandling = true;
+            var eventData = new SceneEventData(Client)
+            {
+                SceneEventType = SceneEventType.Unload,
+                LoadSceneMode = LoadSceneMode.Single,
+                SceneEventProgressId = Guid.NewGuid(),
+                SceneAsset = "SomeRandomSceneName",
+                SceneHandle = 23456,
+            };
+
+            var message = new SceneEventMessage()
+            {
+                EventData = eventData
+            };
+            yield return SendMessage(ref message);
+        }
+
+        [UnityTest]
+        public IEnumerator SceneEventMessageLoadComplete()
+        {
+            Client.SceneManager.SkipSceneHandling = true;
+            var eventData = new SceneEventData(Client)
+            {
+                SceneEventType = SceneEventType.LoadComplete,
+                LoadSceneMode = LoadSceneMode.Single,
+                SceneEventProgressId = Guid.NewGuid(),
+                SceneAsset = "SomeRandomSceneName",
+                SceneHandle = 23456,
+            };
+
+            var message = new SceneEventMessage()
+            {
+                EventData = eventData
+            };
+            yield return SendMessage(ref message);
+        }
+
+        [UnityTest]
+        public IEnumerator SceneEventMessageUnloadComplete()
+        {
+            Client.SceneManager.SkipSceneHandling = true;
+            var eventData = new SceneEventData(Client)
+            {
+                SceneEventType = SceneEventType.UnloadComplete,
+                LoadSceneMode = LoadSceneMode.Single,
+                SceneEventProgressId = Guid.NewGuid(),
+                SceneAsset = "SomeRandomSceneName",
+                SceneHandle = 23456,
+            };
+
+            var message = new SceneEventMessage()
+            {
+                EventData = eventData
+            };
+            yield return SendMessage(ref message);
+        }
+
+        [UnityTest]
+        public IEnumerator SceneEventMessageLoadCompleted()
+        {
+            Client.SceneManager.SkipSceneHandling = true;
+            var eventData = new SceneEventData(Client)
+            {
+                SceneEventType = SceneEventType.LoadEventCompleted,
+                LoadSceneMode = LoadSceneMode.Single,
+                SceneEventProgressId = Guid.NewGuid(),
+                SceneAsset = "SomeRandomSceneName",
+                SceneHandle = 23456,
+                ClientsCompleted = new List<ulong>() { k_ClientId },
+                ClientsTimedOut = new List<ulong>() { 123456789 },
+            };
+
+            var message = new SceneEventMessage()
+            {
+                EventData = eventData
+            };
+            yield return SendMessage(ref message);
+        }
+
+        [UnityTest]
+        public IEnumerator SceneEventMessageUnloadLoadCompleted()
+        {
+            Client.SceneManager.SkipSceneHandling = true;
+            var eventData = new SceneEventData(Client)
+            {
+                SceneEventType = SceneEventType.UnloadEventCompleted,
+                LoadSceneMode = LoadSceneMode.Single,
+                SceneEventProgressId = Guid.NewGuid(),
+                SceneAsset = "SomeRandomSceneName",
+                SceneHandle = 23456,
+                ClientsCompleted = new List<ulong>() { k_ClientId },
+                ClientsTimedOut = new List<ulong>() { 123456789 },
+            };
+
+            var message = new SceneEventMessage()
+            {
+                EventData = eventData
+            };
+            yield return SendMessage(ref message);
+        }
+
+        [UnityTest]
+        public IEnumerator SceneEventMessageSynchronize()
+        {
+            Client.SceneManager.SkipSceneHandling = true;
+            var eventData = new SceneEventData(Client)
+            {
+                SceneEventType = SceneEventType.Synchronize,
+                LoadSceneMode = LoadSceneMode.Single,
+                ClientSynchronizationMode = LoadSceneMode.Single,
+                SceneAsset = "SomeRandomSceneName",
+                SceneHandle = 23456,
+                ScenesToSynchronize = new Queue<string>()
+            };
+            eventData.ScenesToSynchronize.Enqueue("SomeRandomSceneName2");
+            eventData.SceneHandlesToSynchronize = new Queue<uint>();
+            eventData.SceneHandlesToSynchronize.Enqueue(202);
+
+
+            var message = new SceneEventMessage()
+            {
+                EventData = eventData
+            };
+            yield return SendMessage(ref message);
+        }
+
+        [UnityTest]
+        public IEnumerator SceneEventMessageReSynchronize()
+        {
+            Client.SceneManager.SkipSceneHandling = true;
+            var eventData = new SceneEventData(Client)
+            {
+                SceneEventType = SceneEventType.ReSynchronize,
+                LoadSceneMode = LoadSceneMode.Single,
+                ClientSynchronizationMode = LoadSceneMode.Single,
+                SceneAsset = "SomeRandomSceneName",
+                SceneHandle = 23456,
+            };
+
+            var message = new SceneEventMessage()
+            {
+                EventData = eventData
+            };
+            yield return SendMessage(ref message);
+        }
+
+        [UnityTest]
+        public IEnumerator SceneEventMessageSynchronizeComplete()
+        {
+            Client.SceneManager.SkipSceneHandling = true;
+            var eventData = new SceneEventData(Client)
+            {
+                SceneEventType = SceneEventType.ReSynchronize,
+                LoadSceneMode = LoadSceneMode.Single,
+                ClientSynchronizationMode = LoadSceneMode.Single,
+                SceneAsset = "SomeRandomSceneName",
+                SceneHandle = 23456,
+            };
+
+            var message = new SceneEventMessage()
+            {
+                EventData = eventData
+            };
+            yield return SendMessage(ref message);
+        }
+
+        [UnityTest]
+        public IEnumerator SceneEventMessageActiveSceneChanged()
+        {
+            Client.SceneManager.SkipSceneHandling = true;
+            var eventData = new SceneEventData(Client)
+            {
+                SceneEventType = SceneEventType.ActiveSceneChanged,
+                ActiveSceneAsset = "SomeRandomSceneName"
+            };
+
+            var message = new SceneEventMessage()
+            {
+                EventData = eventData
+            };
+            yield return SendMessage(ref message);
+        }
+
+        [UnityTest, Ignore("Serializing twice causes data to disappear in the SceneManager for this event")]
+        public IEnumerator SceneEventMessageObjectSceneChanged()
+        {
+            Client.SceneManager.SkipSceneHandling = true;
+            var prefabNetworkObject = m_SpawnObject.GetComponent<NetworkObject>();
+            Client.SceneManager.ObjectsMigratedIntoNewScene = new Dictionary<int, Dictionary<ulong, List<NetworkObject>>>
+            {
+                { 0, new Dictionary<ulong, List<NetworkObject>>()}
+            };
+
+            Client.SceneManager.ObjectsMigratedIntoNewScene[0].Add(Client.LocalClientId, new List<NetworkObject>() { prefabNetworkObject });
+            var eventData = new SceneEventData(Client)
+            {
+                SceneEventType = SceneEventType.ObjectSceneChanged,
+            };
+
+            var message = new SceneEventMessage()
+            {
+                EventData = eventData
+            };
+            yield return SendMessage(ref message);
+        }
+
+
+        private IEnumerator SendMessage<T>(ref T message) where T : INetworkMessage
+        {
+            Client.MessageManager.SetVersion(k_ClientId, XXHash.Hash32(typeof(T).FullName), message.Version);
+
+            var clientIds = new NativeArray<ulong>(1, Allocator.Temp);
+            clientIds[0] = k_ClientId;
+            Client.MessageManager.SendMessage(ref message, NetworkDelivery.ReliableSequenced, clientIds);
+            Client.MessageManager.ProcessSendQueues();
+            return m_ClientCodecHook.WaitForMessageReceived(message);
+        }
+
+        private static bool CanConnectToServer(string host, ushort port, double timeoutMs = 100)
+        {
+            var address = Dns.GetHostAddresses(host).First();
+            var endpoint = NetworkEndpoint.Parse(address.ToString(), port);
+
+            var driver = NetworkDriver.Create();
+            var connection = driver.Connect(endpoint);
+
+            var start = DateTime.Now;
+            var ev = Networking.Transport.NetworkEvent.Type.Empty;
+            while (ev != Networking.Transport.NetworkEvent.Type.Connect)
+            {
+                driver.ScheduleUpdate().Complete();
+                ev = driver.PopEventForConnection(connection, out _, out _);
+
+                if (DateTime.Now - start > TimeSpan.FromMilliseconds(timeoutMs))
+                {
+                    return false;
+                }
+            }
+
+            driver.Disconnect(connection);
+            return true;
+        }
+    }
+
+    internal class CodecTestHooks : INetworkHooks
+    {
+        private Dictionary<string, Queue<TestMessage>> m_ExpectedMessages = new Dictionary<string, Queue<TestMessage>>();
+        private Dictionary<string, HashSet<string>> m_ReceivedMessages = new Dictionary<string, HashSet<string>>();
+
+        private struct TestMessage
+        {
+            public string Name;
+            public byte[] Data;
+        }
+
+        public void OnBeforeSendMessage<T>(ulong clientId, ref T message, NetworkDelivery delivery) where T : INetworkMessage
+        {
+            if (message is ConnectionRequestMessage)
+            {
+                return;
+            }
+
+            var writer = new FastBufferWriter(1024, Allocator.Temp);
+            // Serialize the message using the known message version
+            message.Serialize(writer, message.Version);
+
+            var testName = TestContext.CurrentContext.Test.Name;
+            if (!m_ExpectedMessages.ContainsKey(testName))
+            {
+                m_ExpectedMessages[testName] = new Queue<TestMessage>();
+            }
+
+            m_ExpectedMessages[testName].Enqueue(new TestMessage
+            {
+                Name = typeof(T).ToString(),
+                Data = writer.ToArray(),
+            });
+
+            writer.Dispose();
+        }
+
+        public void OnAfterSendMessage<T>(ulong clientId, ref T message, NetworkDelivery delivery, int messageSizeBytes) where T : INetworkMessage
+        {
+        }
+
+        public void OnBeforeReceiveMessage(ulong senderId, Type messageType, int messageSizeBytes)
+        {
+        }
+
+
+        public void OnAfterReceiveMessage(ulong senderId, Type messageType, int messageSizeBytes)
+        {
+        }
+
+
+        public void OnBeforeSendBatch(ulong clientId, int messageCount, int batchSizeInBytes, NetworkDelivery delivery)
+        {
+        }
+
+
+        public void OnAfterSendBatch(ulong clientId, int messageCount, int batchSizeInBytes, NetworkDelivery delivery)
+        {
+        }
+
+
+        public void OnBeforeReceiveBatch(ulong senderId, int messageCount, int batchSizeInBytes)
+        {
+        }
+
+
+        public void OnAfterReceiveBatch(ulong senderId, int messageCount, int batchSizeInBytes)
+        {
+        }
+
+
+        public bool OnVerifyCanSend(ulong destinationId, Type messageType, NetworkDelivery delivery)
+        {
+            return true;
+        }
+
+        public bool OnVerifyCanReceive(ulong senderId, Type messageType, FastBufferReader messageContent, ref NetworkContext context)
+        {
+            if (messageType == typeof(ConnectionApprovedMessage))
+            {
+                return true;
+            }
+
+            var testName = TestContext.CurrentContext.Test.Name;
+            Assert.True(m_ExpectedMessages.ContainsKey(testName));
+            Assert.IsNotEmpty(m_ExpectedMessages[testName]);
+
+            var nextMessage = m_ExpectedMessages[testName].Dequeue();
+            Assert.AreEqual(messageType.ToString(), nextMessage.Name, $"received unexpected message type: {messageType}");
+
+            if (!m_ReceivedMessages.ContainsKey(testName))
+            {
+                m_ReceivedMessages[testName] = new HashSet<string>();
+            }
+
+            m_ReceivedMessages[testName].Add(messageType.ToString());
+
+            // ServerLogMessage is an exception - it gets decoded correctly, but the bytes from the runtime do not directly match those sent by the SDK.
+            if (messageType == typeof(ServerLogMessage))
+            {
+                return true;
+            }
+
+            var expectedBytes = nextMessage.Data;
+            var receivedBytes = messageContent.ToArray();
+            Assert.AreEqual(expectedBytes, receivedBytes);
+
+            return true;
+        }
+
+        public void OnBeforeHandleMessage<T>(ref T message, ref NetworkContext context) where T : INetworkMessage
+        {
+        }
+
+        public void OnAfterHandleMessage<T>(ref T message, ref NetworkContext context) where T : INetworkMessage
+        {
+        }
+
+        public IEnumerator WaitForMessageReceived<T>(float timeout = 5) where T : INetworkMessage
+        {
+            var testName = TestContext.CurrentContext.Test.Name;
+            var messageType = typeof(T).FullName;
+            var startTime = Time.realtimeSinceStartup;
+
+            while ((!m_ReceivedMessages.ContainsKey(testName) || !m_ReceivedMessages[testName].Contains(messageType)) && Time.realtimeSinceStartup - startTime < timeout)
+            {
+                yield return null;
+            }
+
+            Assert.True(m_ReceivedMessages.ContainsKey(testName), "failed to receive any messages");
+            Assert.True(m_ReceivedMessages[testName].Contains(messageType), $"failed to receive {messageType} message, received: {string.Join(", ", m_ReceivedMessages[testName])}");
+
+            // Reset received messages
+            m_ReceivedMessages[testName] = new HashSet<string>();
+        }
+
+        public IEnumerator WaitForMessageReceived<T>(T _, float timeout = 5) where T : INetworkMessage
+        {
+            return WaitForMessageReceived<T>(timeout: timeout);
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/DistributedAuthorityCodecTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/DistributedAuthorityCodecTests.cs.meta
new file mode 100644
index 0000000000..72b937fc8e
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/DistributedAuthorityCodecTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4cec6e6e1b9bdb746806290355d8cb50
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/ExtendedNetworkShowAndHideTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/ExtendedNetworkShowAndHideTests.cs
new file mode 100644
index 0000000000..94cdd8b02b
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/ExtendedNetworkShowAndHideTests.cs
@@ -0,0 +1,153 @@
+using System.Collections;
+using NUnit.Framework;
+using Unity.Netcode.TestHelpers.Runtime;
+using UnityEngine;
+using UnityEngine.TestTools;
+
+namespace Unity.Netcode.RuntimeTests
+{
+    [TestFixture(HostOrServer.DAHost, true)]
+    [TestFixture(HostOrServer.DAHost, false)]
+    public class ExtendedNetworkShowAndHideTests : NetcodeIntegrationTest
+    {
+        protected override int NumberOfClients => 3;
+        private bool m_EnableSceneManagement;
+        private GameObject m_ObjectToSpawn;
+        private NetworkObject m_SpawnedObject;
+        private NetworkManager m_ClientToHideFrom;
+        private NetworkManager m_LateJoinClient;
+        private NetworkManager m_SpawnOwner;
+
+        public ExtendedNetworkShowAndHideTests(HostOrServer hostOrServer, bool enableSceneManagement) : base(hostOrServer)
+        {
+            m_EnableSceneManagement = enableSceneManagement;
+        }
+
+        protected override void OnServerAndClientsCreated()
+        {
+            if (!UseCMBService())
+            {
+                m_ServerNetworkManager.NetworkConfig.EnableSceneManagement = m_EnableSceneManagement;
+            }
+
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                client.NetworkConfig.EnableSceneManagement = m_EnableSceneManagement;
+            }
+
+            m_ObjectToSpawn = CreateNetworkObjectPrefab("TestObject");
+            m_ObjectToSpawn.SetActive(false);
+
+            base.OnServerAndClientsCreated();
+        }
+
+        private bool AllClientsSpawnedObject()
+        {
+            if (!UseCMBService())
+            {
+                if (!s_GlobalNetworkObjects.ContainsKey(m_ServerNetworkManager.LocalClientId))
+                {
+                    return false;
+                }
+                if (!s_GlobalNetworkObjects[m_ServerNetworkManager.LocalClientId].ContainsKey(m_SpawnedObject.NetworkObjectId))
+                {
+                    return false;
+                }
+            }
+
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                if (!s_GlobalNetworkObjects.ContainsKey(client.LocalClientId))
+                {
+                    return false;
+                }
+                if (!s_GlobalNetworkObjects[client.LocalClientId].ContainsKey(m_SpawnedObject.NetworkObjectId))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        private bool IsClientPromotedToSessionOwner()
+        {
+            if (!UseCMBService())
+            {
+                if (m_ServerNetworkManager.CurrentSessionOwner != m_ClientToHideFrom.LocalClientId)
+                {
+                    return false;
+                }
+            }
+
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                if (!client.IsConnectedClient)
+                {
+                    continue;
+                }
+                if (client.CurrentSessionOwner != m_ClientToHideFrom.LocalClientId)
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        protected override void OnNewClientCreated(NetworkManager networkManager)
+        {
+            m_LateJoinClient = networkManager;
+            networkManager.NetworkConfig.EnableSceneManagement = m_EnableSceneManagement;
+            base.OnNewClientCreated(networkManager);
+        }
+
+        /// <summary>
+        /// This test validates the following NetworkShow - NetworkHide issue:
+        /// - During a session, a spawned object is hidden from a client.
+        /// - The current session owner disconnects and the client the object is hidden from is prommoted to the session owner.
+        /// - A new client joins and the newly promoted session owner synchronizes the newly joined client with only objects visible to it.
+        /// - Any already connected non-session owner client should "NetworkShow" the object to the newly connected client
+        /// (but only if the hidden object has SpawnWithObservers enabled)
+        /// </summary>
+        [UnityTest]
+        public IEnumerator HiddenObjectPromotedSessionOwnerNewClientSynchronizes()
+        {
+            // Get the test relative session owner
+            var sessionOwner = UseCMBService() ? m_ClientNetworkManagers[0] : m_ServerNetworkManager;
+            m_SpawnOwner = UseCMBService() ? m_ClientNetworkManagers[1] : m_ClientNetworkManagers[0];
+            m_ClientToHideFrom = UseCMBService() ? m_ClientNetworkManagers[NumberOfClients - 1] : m_ClientNetworkManagers[1];
+            m_ObjectToSpawn.SetActive(true);
+
+            // Spawn the object with a non-session owner client
+            m_SpawnedObject = SpawnObject(m_ObjectToSpawn, m_SpawnOwner).GetComponent<NetworkObject>();
+            yield return WaitForConditionOrTimeOut(AllClientsSpawnedObject);
+            AssertOnTimeout($"Not all clients spawned and instance of {m_SpawnedObject.name}");
+
+            // Hide the spawned object from the to be promoted session owner
+            m_SpawnedObject.NetworkHide(m_ClientToHideFrom.LocalClientId);
+
+            yield return WaitForConditionOrTimeOut(() => !m_ClientToHideFrom.SpawnManager.SpawnedObjects.ContainsKey(m_SpawnedObject.NetworkObjectId));
+            AssertOnTimeout($"{m_SpawnedObject.name} was not hidden from Client-{m_ClientToHideFrom.LocalClientId}!");
+
+            // Promoted a new session owner (DAHost promotes while CMB Session we disconnect the current session owner)
+            if (!UseCMBService())
+            {
+                m_ServerNetworkManager.PromoteSessionOwner(m_ClientToHideFrom.LocalClientId);
+            }
+            else
+            {
+                sessionOwner.Shutdown();
+            }
+
+            // Wait for the new session owner to be promoted and for all clients to acknowledge the promotion
+            yield return WaitForConditionOrTimeOut(IsClientPromotedToSessionOwner);
+            AssertOnTimeout($"Client-{m_ClientToHideFrom.LocalClientId} was not promoted as session owner on all client instances!");
+
+            // Connect a new client instance
+            yield return CreateAndStartNewClient();
+
+            // Assure the newly connected client is synchronized with the NetworkObject hidden from the newly promoted session owner
+            yield return WaitForConditionOrTimeOut(() => m_LateJoinClient.SpawnManager.SpawnedObjects.ContainsKey(m_SpawnedObject.NetworkObjectId));
+            AssertOnTimeout($"Client-{m_LateJoinClient.LocalClientId} never spawned {nameof(NetworkObject)} {m_SpawnedObject.name}!");
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/ExtendedNetworkShowAndHideTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/ExtendedNetworkShowAndHideTests.cs.meta
new file mode 100644
index 0000000000..5d227513b6
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/ExtendedNetworkShowAndHideTests.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: a6389d04d9080b24b99de7e6900a064c
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/NetworkClientAndPlayerObjectTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/NetworkClientAndPlayerObjectTests.cs
new file mode 100644
index 0000000000..d768f60939
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/NetworkClientAndPlayerObjectTests.cs
@@ -0,0 +1,373 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using Unity.Netcode.TestHelpers.Runtime;
+using UnityEngine;
+using UnityEngine.TestTools;
+using Random = UnityEngine.Random;
+
+
+namespace Unity.Netcode.RuntimeTests
+{
+    [TestFixture(HostOrServer.Host)]
+    [TestFixture(HostOrServer.Server)]
+    [TestFixture(HostOrServer.DAHost)]
+    internal class NetworkClientAndPlayerObjectTests : NetcodeIntegrationTest
+    {
+        private const int k_PlayerPrefabCount = 6;
+        protected override int NumberOfClients => 2;
+
+        private List<GameObject> m_PlayerPrefabs = new List<GameObject>();
+        private Dictionary<ulong, uint> m_ChangedPlayerPrefabs = new Dictionary<ulong, uint>();
+
+
+        public NetworkClientAndPlayerObjectTests(HostOrServer hostOrServer) : base(hostOrServer)
+        {
+        }
+
+        protected override IEnumerator OnTearDown()
+        {
+            m_PlayerPrefabs.Clear();
+            return base.OnTearDown();
+        }
+
+        protected override void OnServerAndClientsCreated()
+        {
+            m_PlayerPrefabs.Clear();
+            for (int i = 0; i < k_PlayerPrefabCount; i++)
+            {
+                m_PlayerPrefabs.Add(CreateNetworkObjectPrefab($"PlayerPrefab{i}"));
+            }
+            base.OnServerAndClientsCreated();
+        }
+
+        protected override void OnNewClientCreated(NetworkManager networkManager)
+        {
+            if (m_DistributedAuthority)
+            {
+                networkManager.OnFetchLocalPlayerPrefabToSpawn = FetchPlayerPrefabToSpawn;
+            }
+            base.OnNewClientCreated(networkManager);
+        }
+
+        /// <summary>
+        /// Only for distributed authority mode
+        /// </summary>
+        /// <returns>a unique player prefab for the player</returns>
+        private GameObject FetchPlayerPrefabToSpawn()
+        {
+            var prefabObject = GetRandomPlayerPrefab();
+            var clientId = m_ClientNetworkManagers[m_ClientNetworkManagers.Length - 1].LocalClientId;
+            m_ChangedPlayerPrefabs.Add(clientId, prefabObject.GlobalObjectIdHash);
+            return prefabObject.gameObject;
+        }
+
+
+        private StringBuilder m_ErrorLogLevel3 = new StringBuilder();
+        private StringBuilder m_ErrorLogLevel2 = new StringBuilder();
+        private StringBuilder m_ErrorLogLevel1 = new StringBuilder();
+
+        private bool ValidateNetworkClient(NetworkClient networkClient)
+        {
+            m_ErrorLogLevel3.Clear();
+            var success = true;
+            if (networkClient == null)
+            {
+                m_ErrorLogLevel3.Append($"[NetworkClient is NULL]");
+                // Log error
+                success = false;
+            }
+            if (!networkClient.IsConnected)
+            {
+                m_ErrorLogLevel3.Append($"[NetworkClient {nameof(NetworkClient.IsConnected)}] is false]");
+                // Log error
+                success = false;
+            }
+            if (networkClient.PlayerObject == null)
+            {
+                m_ErrorLogLevel3.Append($"[NetworkClient {nameof(NetworkClient.PlayerObject)}] is NULL]");
+                // Log error
+                success = false;
+            }
+            return success;
+        }
+
+        private bool ValidateNetworkManagerNetworkClients(NetworkManager networkManager)
+        {
+            var success = true;
+            m_ErrorLogLevel2.Clear();
+
+            // Number of connected clients plus the DAHost
+            var expectedCount = m_ClientNetworkManagers.Length + (m_UseHost ? 1 : 0);
+
+            if (networkManager.ConnectedClients.Count != expectedCount)
+            {
+                m_ErrorLogLevel2.Append($"[{nameof(NetworkManager.ConnectedClients)} count: {networkManager.ConnectedClients.Count} vs expected count: {expectedCount}]");
+                // Log error
+                success = false;
+            }
+
+            if (m_UseHost && !ValidateNetworkClient(networkManager.LocalClient))
+            {
+                m_ErrorLogLevel2.Append($"[Local NetworkClient: --({m_ErrorLogLevel3})--]");
+                // Log error
+                success = false;
+            }
+
+            foreach (var networkClient in networkManager.ConnectedClients)
+            {
+                // When just running a server, ignore the server's local NetworkClient
+                if (!m_UseHost && networkManager.IsServer)
+                {
+                    continue;
+                }
+                if (!ValidateNetworkClient(networkManager.LocalClient))
+                {
+                    // Log error
+                    success = false;
+                    m_ErrorLogLevel2.Append($"[NetworkClient-{networkManager.LocalClientId}: --({m_ErrorLogLevel3})--]");
+                }
+            }
+            return success;
+        }
+
+        private bool AllNetworkClientsValidated()
+        {
+            m_ErrorLogLevel1.Clear();
+            var success = true;
+
+            if (!UseCMBService())
+            {
+                if (!ValidateNetworkManagerNetworkClients(m_ServerNetworkManager))
+                {
+                    m_ErrorLogLevel1.AppendLine($"[Client-{m_ServerNetworkManager.LocalClientId}]{m_ErrorLogLevel2}");
+                    // Log error
+                    success = false;
+                }
+            }
+
+            foreach (var clientNetworkManager in m_ClientNetworkManagers)
+            {
+                if (!ValidateNetworkManagerNetworkClients(clientNetworkManager))
+                {
+                    m_ErrorLogLevel1.AppendLine($"[Client-{clientNetworkManager.LocalClientId}]{m_ErrorLogLevel2}");
+                    // Log error
+                    success = false;
+                }
+            }
+            return success;
+        }
+
+        /// <summary>
+        /// Validates that all NetworkManager instances have valid NetworkClients for all connected clients
+        /// Validates the same thing when a client late joins and when a client disconnects.
+        /// </summary>
+        [UnityTest]
+        public IEnumerator ValidateNetworkClients()
+        {
+            // Validate the initial clients created
+            yield return WaitForConditionOrTimeOut(AllNetworkClientsValidated);
+            AssertOnTimeout($"[Start] Not all NetworkClients were valid!\n{m_ErrorLogLevel1}");
+
+            // Late join a player and revalidate all instances
+            yield return CreateAndStartNewClient();
+            yield return WaitForConditionOrTimeOut(AllNetworkClientsValidated);
+            AssertOnTimeout($"[Late Join] Not all NetworkClients were valid!\n{m_ErrorLogLevel1}");
+
+            // Disconnect a player and revalidate all instances
+            var initialCount = m_ClientNetworkManagers.Length;
+            yield return StopOneClient(m_ClientNetworkManagers[m_ClientNetworkManagers.Length - 1], true);
+            // Sanity check to assure we removed the NetworkManager from m_ClientNetworkManagers
+            Assert.False(initialCount == m_ClientNetworkManagers.Length, $"Disconnected player and expected total number of client {nameof(NetworkManager)}s " +
+                $"to be {initialCount - 1} but it was still {initialCount}!");
+
+            yield return WaitForConditionOrTimeOut(AllNetworkClientsValidated);
+            AssertOnTimeout($"[Client Disconnect] Not all NetworkClients were valid!\n{m_ErrorLogLevel1}");
+
+        }
+
+        /// <summary>
+        /// Verify that all NetworkClients are pointing to the correct player object, even if
+        /// the player object is changed.
+        /// </summary>
+        private bool ValidatePlayerObjectOnClients(NetworkManager clientToValidate)
+        {
+            m_ErrorLogLevel2.Clear();
+            var success = true;
+            var expectedGlobalObjectIdHash = m_ChangedPlayerPrefabs[clientToValidate.LocalClientId];
+            if (expectedGlobalObjectIdHash != clientToValidate.LocalClient.PlayerObject.GlobalObjectIdHash)
+            {
+                m_ErrorLogLevel2.Append($"[Local Prefab Mismatch][Expected GlobalObjectIdHash: {expectedGlobalObjectIdHash} but was {clientToValidate.LocalClient.PlayerObject.GlobalObjectIdHash}]");
+                success = false;
+            }
+
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                if (client == clientToValidate)
+                {
+                    continue;
+                }
+                var remoteNetworkClient = client.ConnectedClients[clientToValidate.LocalClientId];
+                if (expectedGlobalObjectIdHash != remoteNetworkClient.PlayerObject.GlobalObjectIdHash)
+                {
+                    m_ErrorLogLevel2.Append($"[Client-{client.LocalClientId} Prefab Mismatch][Expected GlobalObjectIdHash: {expectedGlobalObjectIdHash} but was {remoteNetworkClient.PlayerObject.GlobalObjectIdHash}]");
+                    success = false;
+                }
+
+                var foundPlayer = false;
+                foreach (var playerObject in client.SpawnManager.PlayerObjects)
+                {
+                    if (playerObject.NetworkObjectId == clientToValidate.LocalClient.PlayerObject.NetworkObjectId)
+                    {
+                        foundPlayer = true;
+                        break;
+                    }
+                }
+                if (!foundPlayer)
+                {
+                    m_ErrorLogLevel1.AppendLine($"[Client-{client.LocalClientId}] Local {nameof(NetworkSpawnManager.PlayerObjects)} does not contain {clientToValidate.LocalClient.PlayerObject.name}!");
+                    success = false;
+                }
+            }
+            return success;
+        }
+
+        private bool ValidateAllPlayerObjects()
+        {
+            m_ErrorLogLevel1.Clear();
+            var success = true;
+            if (m_UseHost && !UseCMBService())
+            {
+                if (!ValidatePlayerObjectOnClients(m_ServerNetworkManager))
+                {
+                    m_ErrorLogLevel1.AppendLine($"[Client-{m_ServerNetworkManager.LocalClientId}]{m_ErrorLogLevel2}");
+                    success = false;
+                }
+
+                if (m_ServerNetworkManager.LocalClient.PlayerObject == null)
+                {
+                    m_ErrorLogLevel1.AppendLine($"[Client-{m_ServerNetworkManager.LocalClientId}] Local {nameof(NetworkClient.PlayerObject)} is null!");
+                    success = false;
+                }
+            }
+
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                if (!ValidatePlayerObjectOnClients(client))
+                {
+                    m_ErrorLogLevel1.AppendLine($"[Client-{client.LocalClientId}]{m_ErrorLogLevel2}");
+                    success = false;
+                }
+                if (client.LocalClient.PlayerObject == null)
+                {
+                    m_ErrorLogLevel1.AppendLine($"[Client-{client.LocalClientId}] Local {nameof(NetworkClient.PlayerObject)} is null!");
+                    success = false;
+                }
+                else
+                if (!client.SpawnManager.PlayerObjects.Contains(client.LocalClient.PlayerObject))
+                {
+                    m_ErrorLogLevel1.AppendLine($"[Client-{client.LocalClientId}] Local {nameof(NetworkSpawnManager.PlayerObjects)} does not contain {client.LocalClient.PlayerObject.name}!");
+                    success = false;
+                }
+            }
+
+            return success;
+        }
+
+        private NetworkObject GetRandomPlayerPrefab()
+        {
+            return m_PlayerPrefabs[Random.Range(0, m_PlayerPrefabs.Count() - 1)].GetComponent<NetworkObject>();
+        }
+
+        public enum PlayerSpawnTypes
+        {
+            Normal,
+            NetworkObject,
+            SpawnManager
+        }
+
+        /// <summary>
+        /// Validates that when a client changes their player object that all connected client instances mirror the
+        /// client's new player object.
+        /// </summary>
+        [UnityTest]
+        public IEnumerator ValidatePlayerObjects([Values] PlayerSpawnTypes playerSpawnType)
+        {
+            // Just do a quick validation for all connected client's NetworkClients
+            yield return WaitForConditionOrTimeOut(AllNetworkClientsValidated);
+            AssertOnTimeout($"Not all NetworkClients were valid!\n{m_ErrorLogLevel1}");
+
+            // Now, have each client spawn a new player object
+            m_ChangedPlayerPrefabs.Clear();
+            var playerInstance = (GameObject)null;
+            var playerPrefabToSpawn = (NetworkObject)null;
+            if (m_UseHost)
+            {
+                playerPrefabToSpawn = GetRandomPlayerPrefab();
+                switch (playerSpawnType)
+                {
+                    case PlayerSpawnTypes.Normal:
+                        {
+                            playerInstance = SpawnPlayerObject(playerPrefabToSpawn.gameObject, m_ServerNetworkManager);
+                            break;
+                        }
+                    case PlayerSpawnTypes.NetworkObject:
+                        {
+                            playerInstance = NetworkObject.InstantiateAndSpawn(playerPrefabToSpawn.gameObject, m_ServerNetworkManager, isPlayerObject: true).gameObject;
+                            break;
+                        }
+                    case PlayerSpawnTypes.SpawnManager:
+                        {
+                            playerInstance = m_ServerNetworkManager.SpawnManager.InstantiateAndSpawn(playerPrefabToSpawn, isPlayerObject: true).gameObject;
+                            break;
+                        }
+                }
+
+                m_ChangedPlayerPrefabs.Add(m_ServerNetworkManager.LocalClientId, playerPrefabToSpawn.GlobalObjectIdHash);
+            }
+
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                playerPrefabToSpawn = GetRandomPlayerPrefab();
+                var networkManager = m_DistributedAuthority ? client : m_ServerNetworkManager;
+
+                switch (playerSpawnType)
+                {
+                    case PlayerSpawnTypes.Normal:
+                        {
+                            playerInstance = SpawnPlayerObject(playerPrefabToSpawn.gameObject, client);
+                            break;
+                        }
+                    case PlayerSpawnTypes.NetworkObject:
+                        {
+                            playerInstance = NetworkObject.InstantiateAndSpawn(playerPrefabToSpawn.gameObject, networkManager, client.LocalClientId, isPlayerObject: true).gameObject;
+                            break;
+                        }
+                    case PlayerSpawnTypes.SpawnManager:
+                        {
+                            playerInstance = networkManager.SpawnManager.InstantiateAndSpawn(playerPrefabToSpawn, client.LocalClientId, isPlayerObject: true).gameObject;
+                            break;
+                        }
+                }
+                m_ChangedPlayerPrefabs.Add(client.LocalClientId, playerPrefabToSpawn.GlobalObjectIdHash);
+            }
+
+            // Validate that all connected clients' NetworkClient instances have the correct player object for each connected client
+            yield return WaitForConditionOrTimeOut(ValidateAllPlayerObjects);
+            AssertOnTimeout($"[Existing Clients] Not all NetworkClient player objects were valid!\n{m_ErrorLogLevel1}");
+
+            // Distributed authority only feature validation (NetworkManager.OnFetchLocalPlayerPrefabToSpawn)
+            if (m_DistributedAuthority)
+            {
+                // Now test the fetch prefab callback to assure that this is working correctly.
+                // Start a new client and wait for it to connect
+                yield return CreateAndStartNewClient();
+                // Do another validation pass.
+                yield return WaitForConditionOrTimeOut(ValidateAllPlayerObjects);
+                AssertOnTimeout($"[Late Joined Client] Not all NetworkClient player objects were valid!\n{m_ErrorLogLevel1}");
+            }
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/NetworkClientAndPlayerObjectTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/NetworkClientAndPlayerObjectTests.cs.meta
new file mode 100644
index 0000000000..bacb51760b
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/NetworkClientAndPlayerObjectTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: db4c955c05fdc194eb47e7774b9c5101
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/OwnershipPermissionsTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/OwnershipPermissionsTests.cs
new file mode 100644
index 0000000000..4f70a864ad
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/OwnershipPermissionsTests.cs
@@ -0,0 +1,514 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using NUnit.Framework;
+using Unity.Netcode.TestHelpers.Runtime;
+using UnityEngine;
+using UnityEngine.TestTools;
+
+namespace Unity.Netcode.RuntimeTests
+{
+    internal class OwnershipPermissionsTests : IntegrationTestWithApproximation
+    {
+        private GameObject m_PermissionsObject;
+
+        private StringBuilder m_ErrorLog = new StringBuilder();
+
+        protected override int NumberOfClients => 4;
+
+        public OwnershipPermissionsTests() : base(HostOrServer.DAHost)
+        {
+        }
+
+        protected override IEnumerator OnSetup()
+        {
+            m_ObjectToValidate = null;
+            OwnershipPermissionsTestHelper.CurrentOwnedInstance = null;
+            return base.OnSetup();
+        }
+
+        protected override void OnServerAndClientsCreated()
+        {
+            m_PermissionsObject = CreateNetworkObjectPrefab("PermObject");
+            m_PermissionsObject.AddComponent<OwnershipPermissionsTestHelper>();
+
+            base.OnServerAndClientsCreated();
+        }
+
+        private NetworkObject m_ObjectToValidate;
+
+        private bool ValidateObjectSpawnedOnAllClients()
+        {
+            m_ErrorLog.Clear();
+
+            var networkObjectId = m_ObjectToValidate.NetworkObjectId;
+            var name = m_ObjectToValidate.name;
+            if (!UseCMBService() && !m_ServerNetworkManager.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId))
+            {
+                m_ErrorLog.Append($"Client-{m_ServerNetworkManager.LocalClientId} has not spawned {name}!");
+                return false;
+            }
+
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                if (!client.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId))
+                {
+                    m_ErrorLog.Append($"Client-{client.LocalClientId} has not spawned {name}!");
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        private bool ValidatePermissionsOnAllClients()
+        {
+            var currentPermissions = (ushort)m_ObjectToValidate.Ownership;
+            var otherPermissions = (ushort)0;
+            var networkObjectId = m_ObjectToValidate.NetworkObjectId;
+            var objectName = m_ObjectToValidate.name;
+            m_ErrorLog.Clear();
+            if (!UseCMBService())
+            {
+                otherPermissions = (ushort)m_ServerNetworkManager.SpawnManager.SpawnedObjects[networkObjectId].Ownership;
+                if (currentPermissions != otherPermissions)
+                {
+                    m_ErrorLog.Append($"Client-{m_ServerNetworkManager.LocalClientId} permissions for {objectName} is {otherPermissions} when it should be {currentPermissions}!");
+                    return false;
+                }
+            }
+
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                otherPermissions = (ushort)client.SpawnManager.SpawnedObjects[networkObjectId].Ownership;
+                if (currentPermissions != otherPermissions)
+                {
+                    m_ErrorLog.Append($"Client-{client.LocalClientId} permissions for {objectName} is {otherPermissions} when it should be {currentPermissions}!");
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        private bool ValidateAllInstancesAreOwnedByClient(ulong clientId)
+        {
+            var networkObjectId = m_ObjectToValidate.NetworkObjectId;
+            var otherNetworkObject = (NetworkObject)null;
+            m_ErrorLog.Clear();
+            if (!UseCMBService())
+            {
+                otherNetworkObject = m_ServerNetworkManager.SpawnManager.SpawnedObjects[networkObjectId];
+                if (otherNetworkObject.OwnerClientId != clientId)
+                {
+                    m_ErrorLog.Append($"[Client-{m_ServerNetworkManager.LocalClientId}][{otherNetworkObject.name}] Expected owner to be {clientId} but it was {otherNetworkObject.OwnerClientId}!");
+                    return false;
+                }
+            }
+
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                otherNetworkObject = client.SpawnManager.SpawnedObjects[networkObjectId];
+                if (otherNetworkObject.OwnerClientId != clientId)
+                {
+                    m_ErrorLog.Append($"[Client-{client.LocalClientId}][{otherNetworkObject.name}] Expected owner to be {clientId} but it was {otherNetworkObject.OwnerClientId}!");
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        [UnityTest]
+        public IEnumerator ValidateOwnershipPermissionsTest()
+        {
+            var firstInstance = SpawnObject(m_PermissionsObject, m_ClientNetworkManagers[0]).GetComponent<NetworkObject>();
+            OwnershipPermissionsTestHelper.CurrentOwnedInstance = firstInstance;
+            var firstInstanceHelper = firstInstance.GetComponent<OwnershipPermissionsTestHelper>();
+            var networkObjectId = firstInstance.NetworkObjectId;
+            m_ObjectToValidate = OwnershipPermissionsTestHelper.CurrentOwnedInstance;
+            yield return WaitForConditionOrTimeOut(ValidateObjectSpawnedOnAllClients);
+            AssertOnTimeout($"[Failed To Spawn] {firstInstance.name}: \n {m_ErrorLog}");
+
+            // Validate the base non-assigned permissions value for all instances are the same.
+            yield return WaitForConditionOrTimeOut(ValidatePermissionsOnAllClients);
+            AssertOnTimeout($"[Permissions Mismatch] {firstInstance.name}: \n {m_ErrorLog}");
+
+            //////////////////////////////////////
+            // Setting & Removing Ownership Flags:
+            //////////////////////////////////////
+
+            // Now, cycle through all permissions and validate that when the owner changes them the change
+            // is synchronized on all non-owner clients.
+            foreach (var permissionObject in Enum.GetValues(typeof(NetworkObject.OwnershipStatus)))
+            {
+                var permission = (NetworkObject.OwnershipStatus)permissionObject;
+                // Adding the SessionOwner flag here should fail as this NetworkObject is not owned by the Session Owner
+                if (permission == NetworkObject.OwnershipStatus.SessionOwner)
+                {
+                    Assert.IsFalse(firstInstance.SetOwnershipStatus(permission), $"[Add][IncorrectPermissions] Setting {NetworkObject.OwnershipStatus.SessionOwner} is not valid when the client is not the Session Owner: \n {m_ErrorLog}!");
+                    continue;
+                }
+                // Add the status
+                firstInstance.SetOwnershipStatus(permission);
+                // Validate the permissions value for all instances are the same.
+                yield return WaitForConditionOrTimeOut(ValidatePermissionsOnAllClients);
+                AssertOnTimeout($"[Add][Permissions Mismatch] {firstInstance.name}: \n {m_ErrorLog}");
+
+                // Remove the status unless it is None (ignore None).
+                if (permission == NetworkObject.OwnershipStatus.None)
+                {
+                    continue;
+                }
+                firstInstance.RemoveOwnershipStatus(permission);
+                // Validate the permissions value for all instances are the same.
+                yield return WaitForConditionOrTimeOut(ValidatePermissionsOnAllClients);
+                AssertOnTimeout($"[Remove][Permissions Mismatch] {firstInstance.name}: \n {m_ErrorLog}");
+            }
+
+            //Add multiple flags at the same time
+            var multipleFlags = NetworkObject.OwnershipStatus.Transferable | NetworkObject.OwnershipStatus.Distributable | NetworkObject.OwnershipStatus.RequestRequired;
+            firstInstance.SetOwnershipStatus(multipleFlags, true);
+            Assert.IsTrue(firstInstance.HasOwnershipStatus(multipleFlags), $"[Set][Multi-flag Failure] Expected: {(ushort)multipleFlags} but was {(ushort)firstInstance.Ownership}!");
+
+            // Validate the permissions value for all instances are the same.
+            yield return WaitForConditionOrTimeOut(ValidatePermissionsOnAllClients);
+            AssertOnTimeout($"[Set Multiple][Permissions Mismatch] {firstInstance.name}: \n {m_ErrorLog}");
+
+            // Remove multiple flags at the same time
+            multipleFlags = NetworkObject.OwnershipStatus.Transferable | NetworkObject.OwnershipStatus.RequestRequired;
+            firstInstance.RemoveOwnershipStatus(multipleFlags);
+            // Validate the two flags no longer are set
+            Assert.IsFalse(firstInstance.HasOwnershipStatus(multipleFlags), $"[Remove][Multi-flag Failure] Expected: {(ushort)NetworkObject.OwnershipStatus.Distributable} but was {(ushort)firstInstance.Ownership}!");
+            // Validate that the Distributable flag is still set
+            Assert.IsTrue(firstInstance.HasOwnershipStatus(NetworkObject.OwnershipStatus.Distributable), $"[Remove][Multi-flag Failure] Expected: {(ushort)NetworkObject.OwnershipStatus.Distributable} but was {(ushort)firstInstance.Ownership}!");
+
+            // Validate the permissions value for all instances are the same.
+            yield return WaitForConditionOrTimeOut(ValidatePermissionsOnAllClients);
+            AssertOnTimeout($"[Set Multiple][Permissions Mismatch] {firstInstance.name}: \n {m_ErrorLog}");
+
+            //////////////////////
+            // Changing Ownership:
+            //////////////////////
+
+            // Clear the flags, set the permissions to transferrable, and lock ownership in one pass.
+            firstInstance.SetOwnershipStatus(NetworkObject.OwnershipStatus.Transferable, true, NetworkObject.OwnershipLockActions.SetAndLock);
+
+            // Validate the permissions value for all instances are the same.
+            yield return WaitForConditionOrTimeOut(ValidatePermissionsOnAllClients);
+            AssertOnTimeout($"[Reset][Permissions Mismatch] {firstInstance.name}: \n {m_ErrorLog}");
+
+            var secondInstance = m_ClientNetworkManagers[1].SpawnManager.SpawnedObjects[networkObjectId];
+            var secondInstanceHelper = secondInstance.GetComponent<OwnershipPermissionsTestHelper>();
+
+            secondInstance.ChangeOwnership(m_ClientNetworkManagers[1].LocalClientId);
+            Assert.IsTrue(secondInstanceHelper.OwnershipPermissionsFailureStatus == NetworkObject.OwnershipPermissionsFailureStatus.Locked,
+                $"Expected {secondInstance.name} to return {NetworkObject.OwnershipPermissionsFailureStatus.Locked} but its permission failure" +
+                $" status is {secondInstanceHelper.OwnershipPermissionsFailureStatus}!");
+
+            firstInstance.SetOwnershipLock(false);
+            // Validate the permissions value for all instances are the same.
+            yield return WaitForConditionOrTimeOut(ValidatePermissionsOnAllClients);
+            AssertOnTimeout($"[Unlock][Permissions Mismatch] {firstInstance.name}: \n {m_ErrorLog}");
+
+            // Sanity check to assure this client's instance isn't already the owner.
+            Assert.True(!secondInstance.IsOwner, $"[Ownership Check] Client-{m_ClientNetworkManagers[1].LocalClientId} already is the owner!");
+            // Now try to acquire ownership
+            secondInstance.ChangeOwnership(m_ClientNetworkManagers[1].LocalClientId);
+
+            // Validate the permissions value for all instances are the same
+            yield return WaitForConditionOrTimeOut(() => secondInstance.IsOwner);
+            AssertOnTimeout($"[Acquire Ownership Failed] Client-{m_ClientNetworkManagers[1].LocalClientId} failed to get ownership!");
+
+            m_ObjectToValidate = OwnershipPermissionsTestHelper.CurrentOwnedInstance;
+            // Validate all other client instances are showing the same owner
+            yield return WaitForConditionOrTimeOut(() => ValidateAllInstancesAreOwnedByClient(m_ClientNetworkManagers[1].LocalClientId));
+            AssertOnTimeout($"[Ownership Mismatch] {secondInstance.name}: \n {m_ErrorLog}");
+
+            // Clear the flags, set the permissions to RequestRequired, and lock ownership in one pass.
+            secondInstance.SetOwnershipStatus(NetworkObject.OwnershipStatus.RequestRequired, true);
+
+            // Validate the permissions value for all instances are the same.
+            yield return WaitForConditionOrTimeOut(ValidatePermissionsOnAllClients);
+            AssertOnTimeout($"[Unlock][Permissions Mismatch] {secondInstance.name}: \n {m_ErrorLog}");
+
+            // Attempt to acquire ownership by just changing it
+            firstInstance.ChangeOwnership(firstInstance.NetworkManager.LocalClientId);
+
+            // Assure we are denied ownership due to it requiring ownership be requested
+            Assert.IsTrue(firstInstanceHelper.OwnershipPermissionsFailureStatus == NetworkObject.OwnershipPermissionsFailureStatus.RequestRequired,
+                $"Expected {secondInstance.name} to return {NetworkObject.OwnershipPermissionsFailureStatus.RequestRequired} but its permission failure" +
+                $" status is {secondInstanceHelper.OwnershipPermissionsFailureStatus}!");
+
+            //////////////////////////////////
+            // Test for single race condition:
+            //////////////////////////////////
+
+            // Start with a request for the client we expect to be given ownership
+            var requestStatus = firstInstance.RequestOwnership();
+            Assert.True(requestStatus == NetworkObject.OwnershipRequestStatus.RequestSent, $"Client-{firstInstance.NetworkManager.LocalClientId} was unable to send a request for ownership because: {requestStatus}!");
+
+            // Get the 3rd client to send a request at the "relatively" same time
+            var thirdInstance = m_ClientNetworkManagers[2].SpawnManager.SpawnedObjects[networkObjectId];
+            var thirdInstanceHelper = thirdInstance.GetComponent<OwnershipPermissionsTestHelper>();
+
+            // At the same time send a request by the third client.
+            requestStatus = thirdInstance.RequestOwnership();
+
+            // We expect the 3rd client's request should be able to be sent at this time as well (i.e. creates the race condition between two clients)
+            Assert.True(requestStatus == NetworkObject.OwnershipRequestStatus.RequestSent, $"Client-{m_ServerNetworkManager.LocalClientId} was unable to send a request for ownership because: {requestStatus}!");
+
+            // We expect the first requesting client to be given ownership
+            yield return WaitForConditionOrTimeOut(() => firstInstance.IsOwner);
+            AssertOnTimeout($"[Acquire Ownership Failed] Client-{firstInstance.NetworkManager.LocalClientId} failed to get ownership! ({firstInstanceHelper.OwnershipRequestResponseStatus})(Owner: {OwnershipPermissionsTestHelper.CurrentOwnedInstance.OwnerClientId}");
+            m_ObjectToValidate = OwnershipPermissionsTestHelper.CurrentOwnedInstance;
+
+            // Just do a sanity check to assure ownership has changed on all clients.
+            yield return WaitForConditionOrTimeOut(() => ValidateAllInstancesAreOwnedByClient(firstInstance.NetworkManager.LocalClientId));
+            AssertOnTimeout($"[Ownership Mismatch] {firstInstance.name}: \n {m_ErrorLog}");
+
+            // Now, the third client should get a RequestInProgress returned as their request response
+            yield return WaitForConditionOrTimeOut(() => thirdInstanceHelper.OwnershipRequestResponseStatus == NetworkObject.OwnershipRequestResponseStatus.RequestInProgress);
+            AssertOnTimeout($"[Request In Progress Failed] Client-{thirdInstanceHelper.NetworkManager.LocalClientId} did not get the right request denied reponse!");
+
+            // Validate the permissions value for all instances are the same.
+            yield return WaitForConditionOrTimeOut(ValidatePermissionsOnAllClients);
+            AssertOnTimeout($"[Unlock][Permissions Mismatch] {firstInstance.name}: \n {m_ErrorLog}");
+
+            ///////////////////////////////////////////////
+            // Test for multiple ownership race conditions:
+            ///////////////////////////////////////////////
+
+            // Get the 4th client's instance
+            var fourthInstance = m_ClientNetworkManagers[3].SpawnManager.SpawnedObjects[networkObjectId];
+            var fourthInstanceHelper = fourthInstance.GetComponent<OwnershipPermissionsTestHelper>();
+
+            // Send out a request from three clients at the same time
+            // The first one sent (and received for this test) gets ownership
+            requestStatus = secondInstance.RequestOwnership();
+            Assert.True(requestStatus == NetworkObject.OwnershipRequestStatus.RequestSent, $"Client-{secondInstance.NetworkManager.LocalClientId} was unable to send a request for ownership because: {requestStatus}!");
+            requestStatus = thirdInstance.RequestOwnership();
+            Assert.True(requestStatus == NetworkObject.OwnershipRequestStatus.RequestSent, $"Client-{thirdInstance.NetworkManager.LocalClientId} was unable to send a request for ownership because: {requestStatus}!");
+            requestStatus = fourthInstance.RequestOwnership();
+            Assert.True(requestStatus == NetworkObject.OwnershipRequestStatus.RequestSent, $"Client-{fourthInstance.NetworkManager.LocalClientId} was unable to send a request for ownership because: {requestStatus}!");
+
+            // The 2nd and 3rd client should be denied and the 4th client should be approved
+            yield return WaitForConditionOrTimeOut(() =>
+            (fourthInstanceHelper.OwnershipRequestResponseStatus == NetworkObject.OwnershipRequestResponseStatus.RequestInProgress) &&
+            (thirdInstanceHelper.OwnershipRequestResponseStatus == NetworkObject.OwnershipRequestResponseStatus.RequestInProgress) &&
+            (secondInstanceHelper.OwnershipRequestResponseStatus == NetworkObject.OwnershipRequestResponseStatus.Approved)
+            );
+            AssertOnTimeout($"[Targeted Owner] Client-{secondInstanceHelper.NetworkManager.LocalClientId} did not get the right request denied reponse: {secondInstanceHelper.OwnershipRequestResponseStatus}!");
+            m_ObjectToValidate = OwnershipPermissionsTestHelper.CurrentOwnedInstance;
+            // Just do a sanity check to assure ownership has changed on all clients.
+            yield return WaitForConditionOrTimeOut(() => ValidateAllInstancesAreOwnedByClient(secondInstance.NetworkManager.LocalClientId));
+            AssertOnTimeout($"[Ownership Mismatch] {secondInstance.name}: \n {m_ErrorLog}");
+
+            // Validate the permissions value for all instances are the same.
+            yield return WaitForConditionOrTimeOut(ValidatePermissionsOnAllClients);
+            AssertOnTimeout($"[Unlock][Permissions Mismatch] {secondInstance.name}: \n {m_ErrorLog}");
+
+            ///////////////////////////////////////////////
+            // Test for targeted ownership request:
+            ///////////////////////////////////////////////
+
+            // Now get the DAHost's client's instance
+            var daHostInstance = m_ServerNetworkManager.SpawnManager.SpawnedObjects[networkObjectId];
+            var daHostInstanceHelper = daHostInstance.GetComponent<OwnershipPermissionsTestHelper>();
+
+            secondInstanceHelper.AllowOwnershipRequest = true;
+            secondInstanceHelper.OnlyAllowTargetClientId = true;
+            secondInstanceHelper.ClientToAllowOwnership = daHostInstance.NetworkManager.LocalClientId;
+
+            // Send out a request from all three clients
+            requestStatus = firstInstance.RequestOwnership();
+            Assert.True(requestStatus == NetworkObject.OwnershipRequestStatus.RequestSent, $"Client-{firstInstance.NetworkManager.LocalClientId} was unable to send a request for ownership because: {requestStatus}!");
+            requestStatus = thirdInstance.RequestOwnership();
+            Assert.True(requestStatus == NetworkObject.OwnershipRequestStatus.RequestSent, $"Client-{thirdInstance.NetworkManager.LocalClientId} was unable to send a request for ownership because: {requestStatus}!");
+            requestStatus = fourthInstance.RequestOwnership();
+            Assert.True(requestStatus == NetworkObject.OwnershipRequestStatus.RequestSent, $"Client-{fourthInstance.NetworkManager.LocalClientId} was unable to send a request for ownership because: {requestStatus}!");
+            requestStatus = daHostInstance.RequestOwnership();
+            Assert.True(requestStatus == NetworkObject.OwnershipRequestStatus.RequestSent, $"Client-{daHostInstance.NetworkManager.LocalClientId} was unable to send a request for ownership because: {requestStatus}!");
+
+            // Only the client marked as ClientToAllowOwnership (daHost) should be approved. All others should be denied.
+            yield return WaitForConditionOrTimeOut(() =>
+            (firstInstanceHelper.OwnershipRequestResponseStatus == NetworkObject.OwnershipRequestResponseStatus.Denied) &&
+            (thirdInstanceHelper.OwnershipRequestResponseStatus == NetworkObject.OwnershipRequestResponseStatus.Denied) &&
+            (fourthInstanceHelper.OwnershipRequestResponseStatus == NetworkObject.OwnershipRequestResponseStatus.Denied) &&
+            (daHostInstanceHelper.OwnershipRequestResponseStatus == NetworkObject.OwnershipRequestResponseStatus.Approved)
+            );
+            AssertOnTimeout($"[Targeted Owner] Client-{daHostInstance.NetworkManager.LocalClientId} did not get the right request response: {daHostInstanceHelper.OwnershipRequestResponseStatus} Expecting: {NetworkObject.OwnershipRequestResponseStatus.Approved}!");
+
+            ///////////////////////////////////////////////
+            // Test OwnershipStatus.SessionOwner:
+            ///////////////////////////////////////////////
+
+            OwnershipPermissionsTestHelper.CurrentOwnedInstance = daHostInstance;
+            m_ObjectToValidate = OwnershipPermissionsTestHelper.CurrentOwnedInstance;
+
+            // Add multiple statuses
+            daHostInstance.SetOwnershipStatus(NetworkObject.OwnershipStatus.Transferable | NetworkObject.OwnershipStatus.SessionOwner);
+            // Validate the permissions value for all instances are the same.
+            yield return WaitForConditionOrTimeOut(ValidatePermissionsOnAllClients);
+            AssertOnTimeout($"[Add][Permissions Mismatch] {daHostInstance.name}: \n {m_ErrorLog}");
+
+            // Trying to set SessionOwner flag should override any other flags.
+            Assert.IsFalse(daHostInstance.HasOwnershipStatus(NetworkObject.OwnershipStatus.Transferable), $"[Set][SessionOwner flag Failure] Expected: {NetworkObject.OwnershipStatus.Transferable} not to be set!");
+
+            // Add another status. Should fail as SessionOwner should be exclusive
+            daHostInstance.SetOwnershipStatus(NetworkObject.OwnershipStatus.Distributable);
+            Assert.IsFalse(daHostInstance.HasOwnershipStatus(NetworkObject.OwnershipStatus.Distributable), $"[Add][SessionOwner flag Failure] Expected: {NetworkObject.OwnershipStatus.Transferable} not to be set!");
+
+            // Request ownership of the SessionOwner flag instance
+            requestStatus = firstInstance.RequestOwnership();
+            Assert.True(requestStatus == NetworkObject.OwnershipRequestStatus.RequestRequiredNotSet, $"Client-{firstInstance.NetworkManager.LocalClientId} should not be able to send a request for ownership because object is marked as owned by the session owner. {requestStatus}!");
+
+            // Set ownership directly on local object. This will allow the request to be sent
+            firstInstance.Ownership = NetworkObject.OwnershipStatus.RequestRequired;
+            requestStatus = firstInstance.RequestOwnership();
+            Assert.True(requestStatus == NetworkObject.OwnershipRequestStatus.RequestSent, $"Client-{firstInstance.NetworkManager.LocalClientId} was unable to send a request for ownership because: {requestStatus}!");
+
+            // Request should be denied with CannotRequest
+            yield return WaitForConditionOrTimeOut(() => firstInstanceHelper.OwnershipRequestResponseStatus == NetworkObject.OwnershipRequestResponseStatus.CannotRequest);
+            AssertOnTimeout($"[Targeted Owner] Client-{firstInstance.NetworkManager.LocalClientId} did not get the right request response: {daHostInstanceHelper.OwnershipRequestResponseStatus} Expecting: {NetworkObject.OwnershipRequestResponseStatus.CannotRequest}!");
+
+            // Try changing the ownership explicitly
+            // Get the cloned daHostInstance instance on a client side
+            var clientInstance = m_ClientNetworkManagers[2].SpawnManager.SpawnedObjects[daHostInstance.NetworkObjectId];
+
+            // Get the client instance of the OwnershipPermissionsTestHelper component
+            var clientInstanceHelper = clientInstance.GetComponent<OwnershipPermissionsTestHelper>();
+
+            // Have the client attempt to change ownership
+            clientInstance.ChangeOwnership(m_ClientNetworkManagers[2].LocalClientId);
+
+            // Verify the client side gets a permission failure status of NetworkObject.OwnershipPermissionsFailureStatus.SessionOwnerOnly
+            Assert.IsTrue(clientInstanceHelper.OwnershipPermissionsFailureStatus == NetworkObject.OwnershipPermissionsFailureStatus.SessionOwnerOnly,
+                $"Expected {clientInstance.name} to return {NetworkObject.OwnershipPermissionsFailureStatus.SessionOwnerOnly} but its permission failure" +
+                $" status is {clientInstanceHelper.OwnershipPermissionsFailureStatus}!");
+
+            // Have the session owner attempt to change ownership to a non-session owner
+            daHostInstance.ChangeOwnership(m_ClientNetworkManagers[2].LocalClientId);
+
+            // Verify the session owner cannot assign a SessionOwner permission NetworkObject to a non-sessionowner client
+            Assert.IsTrue(daHostInstanceHelper.OwnershipPermissionsFailureStatus == NetworkObject.OwnershipPermissionsFailureStatus.SessionOwnerOnly,
+                $"Expected {daHostInstance.name} to return {NetworkObject.OwnershipPermissionsFailureStatus.SessionOwnerOnly} but its permission failure" +
+                $" status is {daHostInstanceHelper.OwnershipPermissionsFailureStatus}!");
+
+            // Remove status
+            daHostInstance.RemoveOwnershipStatus(NetworkObject.OwnershipStatus.SessionOwner);
+            // Validate the permissions value for all instances are the same.
+            yield return WaitForConditionOrTimeOut(ValidatePermissionsOnAllClients);
+            AssertOnTimeout($"[Remove][Permissions Mismatch] {daHostInstance.name}: \n {m_ErrorLog}");
+        }
+
+
+        [UnityTest]
+        public IEnumerator ChangeOwnershipWithoutObservers()
+        {
+            var initialLogLevel = m_ServerNetworkManager.LogLevel;
+            m_ServerNetworkManager.LogLevel = LogLevel.Developer;
+            var firstInstance = SpawnObject(m_PermissionsObject, m_ServerNetworkManager).GetComponent<NetworkObject>();
+            OwnershipPermissionsTestHelper.CurrentOwnedInstance = firstInstance;
+            var firstInstanceHelper = firstInstance.GetComponent<OwnershipPermissionsTestHelper>();
+            var networkObjectId = firstInstance.NetworkObjectId;
+            m_ObjectToValidate = OwnershipPermissionsTestHelper.CurrentOwnedInstance;
+            yield return WaitForConditionOrTimeOut(ValidateObjectSpawnedOnAllClients);
+            AssertOnTimeout($"[Failed To Spawn] {firstInstance.name}: \n {m_ErrorLog}");
+
+            firstInstance.SetOwnershipStatus(NetworkObject.OwnershipStatus.Transferable, true);
+            // Validate the base non-assigned permissions value for all instances are the same.
+            yield return WaitForConditionOrTimeOut(ValidatePermissionsOnAllClients);
+            AssertOnTimeout($"[Permissions Mismatch] {firstInstance.name}: \n {m_ErrorLog}");
+
+            var secondInstance = m_ClientNetworkManagers[0].SpawnManager.SpawnedObjects[networkObjectId];
+
+            // Remove the client from the observers list
+            firstInstance.Observers.Remove(m_ClientNetworkManagers[0].LocalClientId);
+
+            // ChangeOwnership should fail
+            firstInstance.ChangeOwnership(m_ClientNetworkManagers[0].LocalClientId);
+            LogAssert.Expect(LogType.Warning, "[Session-Owner Sender=0] [Invalid Owner] Cannot send Ownership change as client-1 cannot see PermObject{2}-OnServer{0}! Use NetworkShow first.");
+            Assert.True(firstInstance.IsOwner, $"[Ownership Check] Client-{m_ServerNetworkManager.LocalClientId} should still own this object!");
+
+            // Now re-add the client to the Observers list and try to change ownership
+            firstInstance.Observers.Add(m_ClientNetworkManagers[0].LocalClientId);
+            firstInstance.ChangeOwnership(m_ClientNetworkManagers[0].LocalClientId);
+
+            // Validate the second client now owns the object
+            yield return WaitForConditionOrTimeOut(() => secondInstance.IsOwner);
+            AssertOnTimeout($"[Acquire Ownership Failed] Client-{m_ClientNetworkManagers[0].LocalClientId} failed to get ownership!");
+
+            m_ServerNetworkManager.LogLevel = initialLogLevel;
+        }
+
+        internal class OwnershipPermissionsTestHelper : NetworkBehaviour
+        {
+            public static NetworkObject CurrentOwnedInstance;
+
+            public static Dictionary<ulong, Dictionary<ulong, List<NetworkObject>>> DistributedObjects = new Dictionary<ulong, Dictionary<ulong, List<NetworkObject>>>();
+
+            public bool AllowOwnershipRequest = true;
+            public bool OnlyAllowTargetClientId = false;
+            public ulong ClientToAllowOwnership;
+
+            public NetworkObject.OwnershipRequestResponseStatus OwnershipRequestResponseStatus { get; private set; }
+
+            public NetworkObject.OwnershipPermissionsFailureStatus OwnershipPermissionsFailureStatus { get; private set; }
+
+            public NetworkObject.OwnershipRequestResponseStatus ExpectOwnershipRequestResponseStatus { get; set; }
+
+            public override void OnNetworkSpawn()
+            {
+                NetworkObject.OnOwnershipRequested = OnOwnershipRequested;
+                NetworkObject.OnOwnershipRequestResponse = OnOwnershipRequestResponse;
+                NetworkObject.OnOwnershipPermissionsFailure = OnOwnershipPermissionsFailure;
+
+                base.OnNetworkSpawn();
+            }
+
+            private bool OnOwnershipRequested(ulong clientId)
+            {
+                // If we are not allowing any client to request (without locking), then deny all requests
+                if (!AllowOwnershipRequest)
+                {
+                    return false;
+                }
+
+                // If we are only allowing a specific client and the requesting client is not the target,
+                // then deny the request
+                if (OnlyAllowTargetClientId && clientId != ClientToAllowOwnership)
+                {
+                    return false;
+                }
+
+                // Otherwise, approve the request
+                return true;
+            }
+
+            private void OnOwnershipRequestResponse(NetworkObject.OwnershipRequestResponseStatus ownershipRequestResponseStatus)
+            {
+                OwnershipRequestResponseStatus = ownershipRequestResponseStatus;
+            }
+
+            private void OnOwnershipPermissionsFailure(NetworkObject.OwnershipPermissionsFailureStatus ownershipPermissionsFailureStatus)
+            {
+                OwnershipPermissionsFailureStatus = ownershipPermissionsFailureStatus;
+            }
+
+            public override void OnNetworkDespawn()
+            {
+                NetworkObject.OnOwnershipRequested = null;
+                NetworkObject.OnOwnershipRequestResponse = null;
+                base.OnNetworkSpawn();
+            }
+
+            protected override void OnOwnershipChanged(ulong previous, ulong current)
+            {
+                if (current == NetworkManager.LocalClientId)
+                {
+                    CurrentOwnedInstance = NetworkObject;
+                }
+                base.OnOwnershipChanged(previous, current);
+            }
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/OwnershipPermissionsTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/OwnershipPermissionsTests.cs.meta
new file mode 100644
index 0000000000..392a011586
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/OwnershipPermissionsTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f35119aec96feb348a49b8e0fcd779de
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/ParentChildDistibutionTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/ParentChildDistibutionTests.cs
new file mode 100644
index 0000000000..bd74d710a2
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/ParentChildDistibutionTests.cs
@@ -0,0 +1,291 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using NUnit.Framework;
+using Unity.Netcode.TestHelpers.Runtime;
+using UnityEngine;
+using UnityEngine.TestTools;
+
+namespace Unity.Netcode.RuntimeTests
+{
+    internal class ParentChildDistibutionTests : IntegrationTestWithApproximation
+    {
+        protected override int NumberOfClients => 4;
+
+        private GameObject m_GenericPrefab;
+        private ulong m_OriginalOwnerId;
+        private List<NetworkObject> m_TargetSpawnedObjects = new List<NetworkObject>();
+        private List<NetworkObject> m_AltTargetSpawnedObjects = new List<NetworkObject>();
+        private Dictionary<ulong, List<NetworkObject>> m_AncillarySpawnedObjects = new Dictionary<ulong, List<NetworkObject>>();
+        private List<NetworkManager> m_NetworkManagers = new List<NetworkManager>();
+        private StringBuilder m_ErrorMsg = new StringBuilder();
+
+        public ParentChildDistibutionTests() : base(HostOrServer.DAHost)
+        {
+        }
+
+        protected override IEnumerator OnTearDown()
+        {
+            m_NetworkManagers.Clear();
+            m_TargetSpawnedObjects.Clear();
+            m_AncillarySpawnedObjects.Clear();
+            m_AltTargetSpawnedObjects.Clear();
+            return base.OnTearDown();
+        }
+
+        protected override void OnServerAndClientsCreated()
+        {
+            m_GenericPrefab = CreateNetworkObjectPrefab("GenPrefab");
+            var networkObject = m_GenericPrefab.GetComponent<NetworkObject>();
+            networkObject.DontDestroyWithOwner = true;
+            base.OnServerAndClientsCreated();
+        }
+
+        private bool AllTargetedInstancesSpawned()
+        {
+            m_ErrorMsg.Clear();
+            foreach (var client in m_NetworkManagers)
+            {
+                foreach (var spawnedObject in m_TargetSpawnedObjects)
+                {
+                    if (!client.SpawnManager.SpawnedObjects.ContainsKey(spawnedObject.NetworkObjectId))
+                    {
+                        m_ErrorMsg.AppendLine($"{client.name} has not spawned {spawnedObject.name}!");
+                    }
+                }
+            }
+
+            return m_ErrorMsg.Length == 0;
+        }
+
+        private bool AllAncillaryInstancesSpawned()
+        {
+            m_ErrorMsg.Clear();
+            foreach (var client in m_NetworkManagers)
+            {
+                foreach (var clientObjects in m_AncillarySpawnedObjects)
+                {
+                    foreach (var spawnedObject in clientObjects.Value)
+                    {
+                        if (!client.SpawnManager.SpawnedObjects.ContainsKey(spawnedObject.NetworkObjectId))
+                        {
+                            m_ErrorMsg.AppendLine($"{client.name} has not spawned {spawnedObject.name}!");
+                        }
+                    }
+                }
+            }
+
+            return m_ErrorMsg.Length == 0;
+        }
+
+        /// <summary>
+        /// Validates that a new owner is assigned to all of the targeted objects
+        /// </summary>
+        private bool TargetedObjectsChangedOwnership()
+        {
+            m_ErrorMsg.Clear();
+            var newOwnerId = m_OriginalOwnerId;
+            foreach (var spawnedObject in m_AltTargetSpawnedObjects)
+            {
+                var isParentLocked = spawnedObject.transform.parent != null ? spawnedObject.transform.parent.GetComponent<NetworkObject>().IsOwnershipLocked : false;
+                if (!isParentLocked && !spawnedObject.IsOwnershipLocked && spawnedObject.OwnerClientId == m_OriginalOwnerId)
+                {
+                    m_ErrorMsg.AppendLine($"{spawnedObject.name} still is owned by Client-{m_OriginalOwnerId}!");
+                }
+                else if (!isParentLocked && !spawnedObject.IsOwnershipLocked && m_OriginalOwnerId == newOwnerId)
+                {
+                    newOwnerId = spawnedObject.OwnerClientId;
+                }
+                else if ((isParentLocked || spawnedObject.IsOwnershipLocked) && spawnedObject.OwnerClientId != m_OriginalOwnerId)
+                {
+                    if (isParentLocked)
+                    {
+                        m_ErrorMsg.AppendLine($"{spawnedObject.name}'s parent was locked but its owner changed to Client-{m_OriginalOwnerId}!");
+                    }
+                    else
+                    {
+                        m_ErrorMsg.AppendLine($"{spawnedObject.name} was locked but its owner changed to Client-{m_OriginalOwnerId}!");
+                    }
+                }
+
+                if (spawnedObject.OwnerClientId != newOwnerId)
+                {
+                    m_ErrorMsg.AppendLine($"{spawnedObject.name} is not owned by Client-{newOwnerId}!");
+                }
+            }
+            return m_ErrorMsg.Length == 0;
+        }
+
+        private bool AncillaryObjectsKeptOwnership()
+        {
+            m_ErrorMsg.Clear();
+            foreach (var clientObjects in m_AncillarySpawnedObjects)
+            {
+                foreach (var spawnedObject in clientObjects.Value)
+                {
+                    if (spawnedObject.OwnerClientId != clientObjects.Key)
+                    {
+                        m_ErrorMsg.AppendLine($"{spawnedObject.name} changed ownership to Client-{spawnedObject.OwnerClientId}!");
+                    }
+                }
+            }
+            return m_ErrorMsg.Length == 0;
+        }
+
+        public enum DistributionTypes
+        {
+            UponConnect,
+            UponDisconnect
+        }
+
+        public enum OwnershipLocking
+        {
+            NoLocking,
+            LockRootParent,
+            LockTargetChild,
+        }
+
+
+        [UnityTest]
+        public IEnumerator DistributeOwnerHierarchy([Values] DistributionTypes distributionType, [Values] OwnershipLocking ownershipLock)
+        {
+            m_NetworkManagers.Clear();
+            m_TargetSpawnedObjects.Clear();
+            m_AncillarySpawnedObjects.Clear();
+            m_AltTargetSpawnedObjects.Clear();
+
+            if (distributionType == DistributionTypes.UponConnect)
+            {
+                m_ClientNetworkManagers[3].Shutdown();
+            }
+
+            if (!UseCMBService())
+            {
+                m_NetworkManagers.Add(m_ServerNetworkManager);
+            }
+            m_NetworkManagers.AddRange(m_ClientNetworkManagers);
+            if (distributionType == DistributionTypes.UponConnect)
+            {
+                m_NetworkManagers.Remove(m_ClientNetworkManagers[3]);
+            }
+
+            // When testing connect redistribution, 
+            var instances = distributionType == DistributionTypes.UponDisconnect ? 1 : 2;
+            var rootObject = (GameObject)null;
+            var childOne = (GameObject)null;
+            var childTwo = (GameObject)null;
+            var networkObject = (NetworkObject)null;
+
+            for (int i = 0; i < instances; i++)
+            {
+                rootObject = SpawnObject(m_GenericPrefab, m_ClientNetworkManagers[0]);
+                networkObject = rootObject.GetComponent<NetworkObject>();
+                networkObject.SetOwnershipStatus(NetworkObject.OwnershipStatus.Distributable);
+                if (ownershipLock == OwnershipLocking.LockRootParent && distributionType == DistributionTypes.UponConnect)
+                {
+                    networkObject.SetOwnershipLock(true);
+                }
+                m_TargetSpawnedObjects.Add(networkObject);
+
+                // Used to validate nested transferable transfers to the same owner
+                childOne = SpawnObject(m_GenericPrefab, m_ClientNetworkManagers[0]);
+                networkObject = childOne.GetComponent<NetworkObject>();
+                networkObject.SetOwnershipStatus(NetworkObject.OwnershipStatus.Transferable);
+                m_TargetSpawnedObjects.Add(networkObject);
+
+                // Used to validate nested distributable transfers to the same owner
+                childTwo = SpawnObject(m_GenericPrefab, m_ClientNetworkManagers[0]);
+                networkObject = childTwo.GetComponent<NetworkObject>();
+                networkObject.SetOwnershipStatus(NetworkObject.OwnershipStatus.Distributable);
+                if (ownershipLock == OwnershipLocking.LockTargetChild && distributionType == DistributionTypes.UponConnect)
+                {
+                    networkObject.SetOwnershipLock(true);
+                }
+                m_TargetSpawnedObjects.Add(childTwo.GetComponent<NetworkObject>());
+
+                childOne.transform.parent = rootObject.transform;
+                childTwo.transform.parent = rootObject.transform;
+            }
+            yield return WaitForConditionOrTimeOut(AllTargetedInstancesSpawned);
+            AssertOnTimeout($"Timed out waiting for all targeted cloned instances to spawn!\n {m_ErrorMsg}");
+
+            // Used to validate that other children do not transfer ownership when redistributing.
+
+            var altAchildOne = SpawnObject(m_GenericPrefab, m_ClientNetworkManagers[1]);
+            var altAchildTwo = SpawnObject(m_GenericPrefab, m_ClientNetworkManagers[1]);
+            m_AncillarySpawnedObjects.Add(m_ClientNetworkManagers[1].LocalClientId, new List<NetworkObject>());
+            networkObject = altAchildOne.GetComponent<NetworkObject>();
+            networkObject.SetOwnershipStatus(NetworkObject.OwnershipStatus.Distributable);
+            m_AncillarySpawnedObjects[m_ClientNetworkManagers[1].LocalClientId].Add(networkObject);
+            altAchildOne.transform.parent = rootObject.transform;
+
+            networkObject = altAchildTwo.GetComponent<NetworkObject>();
+            networkObject.SetOwnershipStatus(NetworkObject.OwnershipStatus.Transferable);
+            m_AncillarySpawnedObjects[m_ClientNetworkManagers[1].LocalClientId].Add(networkObject);
+            altAchildTwo.transform.parent = rootObject.transform;
+
+            var altBchildOne = SpawnObject(m_GenericPrefab, m_ClientNetworkManagers[2]);
+            var altBchildTwo = SpawnObject(m_GenericPrefab, m_ClientNetworkManagers[2]);
+            m_AncillarySpawnedObjects.Add(m_ClientNetworkManagers[2].LocalClientId, new List<NetworkObject>());
+            networkObject = altBchildOne.GetComponent<NetworkObject>();
+            networkObject.SetOwnershipStatus(NetworkObject.OwnershipStatus.Distributable);
+            m_AncillarySpawnedObjects[m_ClientNetworkManagers[2].LocalClientId].Add(networkObject);
+            altBchildOne.transform.parent = rootObject.transform;
+
+            networkObject = altBchildTwo.GetComponent<NetworkObject>();
+            networkObject.SetOwnershipStatus(NetworkObject.OwnershipStatus.Transferable);
+            m_AncillarySpawnedObjects[m_ClientNetworkManagers[2].LocalClientId].Add(networkObject);
+            altBchildTwo.transform.parent = rootObject.transform;
+
+            yield return WaitForConditionOrTimeOut(AllAncillaryInstancesSpawned);
+            AssertOnTimeout($"Timed out waiting for all ancillary cloned instances to spawn!\n {m_ErrorMsg}");
+
+            // Now disconnect the client that owns the rootObject
+            // Get the original clientId
+            m_OriginalOwnerId = m_ClientNetworkManagers[0].LocalClientId;
+
+            if (distributionType == DistributionTypes.UponDisconnect)
+            {
+                // Swap out the original owner's NetworkObject with one of the other client's since those instances will
+                // be destroyed when the client disconnects.
+                foreach (var entry in m_TargetSpawnedObjects)
+                {
+                    m_AltTargetSpawnedObjects.Add(m_ClientNetworkManagers[1].SpawnManager.SpawnedObjects[entry.NetworkObjectId]);
+                }
+                // Disconnect the client to trigger object redistribution
+                m_ClientNetworkManagers[0].Shutdown();
+            }
+            else
+            {
+                m_ClientNetworkManagers[3].StartClient();
+                yield return WaitForConditionOrTimeOut(() => m_ClientNetworkManagers[3].IsConnectedClient);
+                AssertOnTimeout($"{m_ClientNetworkManagers[3].name} failed to reconnect!");
+            }
+
+            // Verify all of the targeted objects changed ownership to the same client
+            yield return WaitForConditionOrTimeOut(TargetedObjectsChangedOwnership);
+            AssertOnTimeout($"All targeted objects did not get distributed to the same owner!\n {m_ErrorMsg}");
+
+            // When enabled, you should see one of the two root instances that have children get distributed to
+            // the reconnected client.
+            if (m_EnableVerboseDebug && distributionType == DistributionTypes.UponConnect)
+            {
+                m_ErrorMsg.Clear();
+                m_ErrorMsg.AppendLine($"Original targeted objects owner: {m_OriginalOwnerId}");
+                foreach (var spawnedObject in m_TargetSpawnedObjects)
+                {
+                    m_ErrorMsg.AppendLine($"{spawnedObject.name} new owner: {spawnedObject.OwnerClientId}");
+                }
+                Debug.Log($"{m_ErrorMsg}");
+            }
+
+            // We only want to make sure no other children owned by still connected clients change ownership
+            if (distributionType == DistributionTypes.UponDisconnect)
+            {
+                // Verify the ancillary objects kept the same ownership
+                yield return WaitForConditionOrTimeOut(AncillaryObjectsKeptOwnership);
+                AssertOnTimeout($"All ancillary objects did not get distributed to the same owner!\n {m_ErrorMsg}");
+            }
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/ParentChildDistibutionTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/ParentChildDistibutionTests.cs.meta
new file mode 100644
index 0000000000..1cf2f2310b
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/ParentChildDistibutionTests.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 45d9d6508546cda4dba613ef82b6e51e
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/RpcProxyMessageTesting.cs b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/RpcProxyMessageTesting.cs
new file mode 100644
index 0000000000..9a7a9f8557
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/RpcProxyMessageTesting.cs
@@ -0,0 +1,97 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using NUnit.Framework;
+using Unity.Netcode.TestHelpers.Runtime;
+
+namespace Unity.Netcode.RuntimeTests
+{
+    /// <summary>
+    /// This test validates PR-3000 where it would invoke
+    /// TODO:
+    /// We really need to get the service running during tests
+    /// so we can validate these issues. While this test does
+    /// partially validate it we still need to manually validate
+    /// with a service connection.
+    /// </summary>
+    [TestFixture(HostOrServer.Host)]
+    [TestFixture(HostOrServer.DAHost)]
+    public class RpcProxyMessageTesting : NetcodeIntegrationTest
+    {
+        protected override int NumberOfClients => 2;
+
+        private List<RpcProxyText> m_ProxyTestInstances = new List<RpcProxyText>();
+
+        private StringBuilder m_ValidationLogger = new StringBuilder();
+
+        public RpcProxyMessageTesting(HostOrServer hostOrServer) : base(hostOrServer) { }
+
+        protected override IEnumerator OnSetup()
+        {
+            m_ProxyTestInstances.Clear();
+            return base.OnSetup();
+        }
+
+        protected override void OnCreatePlayerPrefab()
+        {
+            m_PlayerPrefab.AddComponent<RpcProxyText>();
+            base.OnCreatePlayerPrefab();
+        }
+
+
+        private bool ValidateRpcProxyRpcs()
+        {
+            m_ValidationLogger.Clear();
+            foreach (var proxy in m_ProxyTestInstances)
+            {
+                if (proxy.ReceivedRpc.Count < NumberOfClients)
+                {
+                    m_ValidationLogger.AppendLine($"Not all clients received RPC from Client-{proxy.OwnerClientId}!");
+                }
+                foreach (var clientId in proxy.ReceivedRpc)
+                {
+                    if (clientId == proxy.OwnerClientId)
+                    {
+                        m_ValidationLogger.AppendLine($"Client-{proxy.OwnerClientId} sent itself an Rpc!");
+                    }
+                }
+            }
+            return m_ValidationLogger.Length == 0;
+        }
+
+
+        public IEnumerator ProxyDoesNotInvokeOnSender()
+        {
+            m_ProxyTestInstances.Add(m_ServerNetworkManager.LocalClient.PlayerObject.GetComponent<RpcProxyText>());
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                m_ProxyTestInstances.Add(client.LocalClient.PlayerObject.GetComponent<RpcProxyText>());
+            }
+
+            foreach (var clientProxyTest in m_ProxyTestInstances)
+            {
+                clientProxyTest.SendToEveryOneButMe();
+            }
+
+            yield return WaitForConditionOrTimeOut(ValidateRpcProxyRpcs);
+            AssertOnTimeout(m_ValidationLogger.ToString());
+        }
+
+        public class RpcProxyText : NetworkBehaviour
+        {
+            public List<ulong> ReceivedRpc = new List<ulong>();
+
+            public void SendToEveryOneButMe()
+            {
+                var baseTarget = NetworkManager.DistributedAuthorityMode ? RpcTarget.NotAuthority : RpcTarget.NotMe;
+                TestRpc(baseTarget);
+            }
+
+            [Rpc(SendTo.SpecifiedInParams)]
+            private void TestRpc(RpcParams rpcParams = default)
+            {
+                ReceivedRpc.Add(rpcParams.Receive.SenderClientId);
+            }
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/RpcProxyMessageTesting.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/RpcProxyMessageTesting.cs.meta
new file mode 100644
index 0000000000..a877e8228d
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/RpcProxyMessageTesting.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 22d1d751fe245f7419f8393090c27106
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/SessionVersionConnectionRequest.cs b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/SessionVersionConnectionRequest.cs
new file mode 100644
index 0000000000..cb37362f44
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/SessionVersionConnectionRequest.cs
@@ -0,0 +1,106 @@
+using System.Collections;
+using NUnit.Framework;
+using Unity.Netcode.TestHelpers.Runtime;
+using UnityEngine.TestTools;
+
+namespace Unity.Netcode.RuntimeTests
+{
+    internal class SessionVersionConnectionRequest : NetcodeIntegrationTest
+    {
+        protected override int NumberOfClients => 0;
+
+        public SessionVersionConnectionRequest() : base(NetworkTopologyTypes.DistributedAuthority, HostOrServer.DAHost) { }
+
+        private bool m_UseValidSessionVersion;
+        private bool m_ClientWasDisconnected;
+        private NetworkManager m_ClientNetworkManager;
+
+        /// <summary>
+        /// Callback used to mock the scenario where a client has an invalid session version
+        /// </summary>
+        /// <returns><see cref="SessionConfig"/></returns>
+        private SessionConfig GetInavlidSessionConfig()
+        {
+            return new SessionConfig(m_ServerNetworkManager.SessionConfig.SessionVersion - 1);
+        }
+
+        /// <summary>
+        /// Overriding this method allows us to configure the newly instantiated client's
+        /// NetworkManager prior to it being started.
+        /// </summary>
+        /// <param name="networkManager">the newly instantiated NetworkManager</param>
+        protected override void OnNewClientCreated(NetworkManager networkManager)
+        {
+            m_ClientWasDisconnected = false;
+            m_ClientNetworkManager = networkManager;
+            m_ClientNetworkManager.OnClientDisconnectCallback += OnClientDisconnectCallback;
+            if (!m_UseValidSessionVersion)
+            {
+                networkManager.OnGetSessionConfig = GetInavlidSessionConfig;
+            }
+            base.OnNewClientCreated(networkManager);
+        }
+
+        /// <summary>
+        /// Tracks if the client was disconnected or not
+        /// </summary>
+        private void OnClientDisconnectCallback(ulong clientId)
+        {
+            m_ClientWasDisconnected = true;
+            m_ClientNetworkManager.OnClientDisconnectCallback -= OnClientDisconnectCallback;
+        }
+
+        /// <summary>
+        /// This handles disabling the internal integration test logic that waits for
+        /// clients to be connected. When we know the client will be disconnected,
+        /// we want to have the NetcodeIntegrationTest not wait for the client to
+        /// connect (otherwise it will timeout there and fail the test).
+        /// </summary>
+        /// <param name="networkManager"></param>
+        /// <returns>true = wait | false = don't wait</returns>
+        protected override bool ShouldWaitForNewClientToConnect(NetworkManager networkManager)
+        {
+            return m_UseValidSessionVersion;
+        }
+
+        /// <summary>
+        /// Validates that when the client's session config version is valid a client will be
+        /// allowed to connect and when it is not valid the client will be disconnected.
+        /// </summary>
+        /// <remarks>
+        /// This is just a mock of the service logic to validate everything on the NGO side is
+        /// working correctly.
+        /// </remarks>
+        /// <param name="useValidSessionVersion">true = use valid session version | false = use invalid session version</param>
+        [UnityTest]
+        public IEnumerator ValidateSessionVersion([Values] bool useValidSessionVersion)
+        {
+            // Test client being disconnected due to invalid session version
+            m_UseValidSessionVersion = useValidSessionVersion;
+            yield return CreateAndStartNewClient();
+            yield return s_DefaultWaitForTick;
+            if (!m_UseValidSessionVersion)
+            {
+                yield return WaitForConditionOrTimeOut(() => m_ClientWasDisconnected);
+                AssertOnTimeout("Client was not disconnected when it should have been!");
+                Assert.True(m_ClientNetworkManager.DisconnectReason == ConnectionRequestMessage.InvalidSessionVersionMessage, "Client did not receive the correct invalid session version message!");
+            }
+            else
+            {
+                Assert.False(m_ClientWasDisconnected, "Client was disconnected when it was expected to connect!");
+                Assert.True(m_ClientNetworkManager.IsConnectedClient, "Client did not connect properly using the correct session version!");
+            }
+        }
+
+        /// <summary>
+        /// Invoked at the end of each integration test pass.
+        /// Primarily used to clean up for the next pass.
+        /// </summary>
+        protected override IEnumerator OnTearDown()
+        {
+            m_ClientNetworkManager.OnClientDisconnectCallback -= OnClientDisconnectCallback;
+            m_ClientNetworkManager = null;
+            yield return base.OnTearDown();
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/SessionVersionConnectionRequest.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/SessionVersionConnectionRequest.cs.meta
new file mode 100644
index 0000000000..207359dcc0
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/SessionVersionConnectionRequest.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 62913c78d28137141acc47ea8f63e657
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/SpawnDuringSynchronizationTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/SpawnDuringSynchronizationTests.cs
new file mode 100644
index 0000000000..6c91112259
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/SpawnDuringSynchronizationTests.cs
@@ -0,0 +1,147 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using NUnit.Framework;
+using Unity.Netcode.TestHelpers.Runtime;
+using UnityEngine;
+using UnityEngine.TestTools;
+
+namespace Unity.Netcode.RuntimeTests
+{
+    [TestFixture(NetworkBehaviourSpawnTimes.OnNetworkSpawn, SceneManagement.Enabled)]
+    [TestFixture(NetworkBehaviourSpawnTimes.OnNetworkPostSpawn, SceneManagement.Enabled)]
+    [TestFixture(NetworkBehaviourSpawnTimes.OnSynchronized, SceneManagement.Enabled)]
+    [TestFixture(NetworkBehaviourSpawnTimes.OnNetworkSpawn, SceneManagement.Disabled)]
+    [TestFixture(NetworkBehaviourSpawnTimes.OnNetworkPostSpawn, SceneManagement.Disabled)]
+    [TestFixture(NetworkBehaviourSpawnTimes.OnSynchronized, SceneManagement.Disabled)]
+    internal class SpawnDuringSynchronizationTests : NetcodeIntegrationTest
+    {
+        protected override int NumberOfClients => 2;
+
+        private List<NetworkManager> m_AllNetworkManagers = new List<NetworkManager>();
+        private StringBuilder m_ErrorLog = new StringBuilder();
+
+        private NetworkBehaviourSpawnTimes m_SpawnTime;
+        private bool m_EnableSceneManagement;
+        internal enum NetworkBehaviourSpawnTimes
+        {
+            OnNetworkSpawn,
+            OnNetworkPostSpawn,
+            OnSynchronized
+        }
+
+        internal enum SceneManagement
+        {
+            Enabled,
+            Disabled,
+        }
+
+        internal class SpawnTestComponent : NetworkBehaviour
+        {
+            public GameObject PrefabToSpawn;
+            public NetworkObject SpawnedObject { get; private set; }
+            public NetworkBehaviourSpawnTimes SpawnTime;
+
+            private void SpawnObject(NetworkBehaviourSpawnTimes spawnTime)
+            {
+                if (IsOwner && SpawnTime == spawnTime)
+                {
+                    SpawnedObject = NetworkObject.InstantiateAndSpawn(PrefabToSpawn, NetworkManager, OwnerClientId);
+                }
+            }
+
+            public override void OnNetworkSpawn()
+            {
+                SpawnObject(NetworkBehaviourSpawnTimes.OnNetworkSpawn);
+                base.OnNetworkSpawn();
+            }
+
+            protected override void OnNetworkPostSpawn()
+            {
+                SpawnObject(NetworkBehaviourSpawnTimes.OnNetworkPostSpawn);
+                base.OnNetworkPostSpawn();
+            }
+
+            protected override void OnNetworkSessionSynchronized()
+            {
+                SpawnObject(NetworkBehaviourSpawnTimes.OnSynchronized);
+                base.OnNetworkSessionSynchronized();
+            }
+        }
+
+
+        public SpawnDuringSynchronizationTests(NetworkBehaviourSpawnTimes spawnTime, SceneManagement sceneManagement) : base(NetworkTopologyTypes.DistributedAuthority, HostOrServer.DAHost)
+        {
+            m_SpawnTime = spawnTime;
+            m_EnableSceneManagement = sceneManagement == SceneManagement.Enabled;
+        }
+
+        protected override void OnCreatePlayerPrefab()
+        {
+            var spawnTestComponent = m_PlayerPrefab.AddComponent<SpawnTestComponent>();
+            spawnTestComponent.SpawnTime = m_SpawnTime;
+            spawnTestComponent.NetworkObject.SetOwnershipStatus(NetworkObject.OwnershipStatus.None);
+            base.OnCreatePlayerPrefab();
+        }
+
+        protected override void OnServerAndClientsCreated()
+        {
+            var spawnTestComponent = m_PlayerPrefab.GetComponent<SpawnTestComponent>();
+            spawnTestComponent.PrefabToSpawn = CreateNetworkObjectPrefab("ObjToSpawn");
+            spawnTestComponent.PrefabToSpawn.GetComponent<NetworkObject>().SetOwnershipStatus(NetworkObject.OwnershipStatus.Transferable);
+            if (!UseCMBService())
+            {
+                m_ServerNetworkManager.NetworkConfig.EnableSceneManagement = m_EnableSceneManagement;
+            }
+            foreach (var networkManager in m_ClientNetworkManagers)
+            {
+                networkManager.NetworkConfig.EnableSceneManagement = m_EnableSceneManagement;
+            }
+            base.OnServerAndClientsCreated();
+        }
+
+        private bool AllClientsSpawnedObject()
+        {
+            m_ErrorLog.Clear();
+            var spawnTestComponent = (SpawnTestComponent)null;
+            foreach (var networkManager in m_AllNetworkManagers)
+            {
+                spawnTestComponent = networkManager.LocalClient.PlayerObject.GetComponent<SpawnTestComponent>();
+                if (spawnTestComponent.SpawnedObject == null || !spawnTestComponent.SpawnedObject.IsSpawned)
+                {
+                    m_ErrorLog.AppendLine($"{networkManager.name}'s player failed to spawn the network prefab!");
+                    break;
+                }
+                foreach (var networkManagerToCheck in m_AllNetworkManagers)
+                {
+                    if (networkManagerToCheck == networkManager)
+                    {
+                        continue;
+                    }
+                    if (!networkManagerToCheck.SpawnManager.SpawnedObjects.ContainsKey(spawnTestComponent.NetworkObjectId))
+                    {
+                        m_ErrorLog.AppendLine($"{networkManager.name}'s player failed to spawn the network prefab!");
+                    }
+                }
+            }
+            return m_ErrorLog.Length == 0;
+        }
+
+        /// <summary>
+        /// Validates that a client can spawn network prefabs during OnNetworkSpawn, OnNetworkPostSpawn, and OnNetworkSessionSynchronized.
+        /// </summary>
+        [UnityTest]
+        public IEnumerator SpawnDuringSynchronization()
+        {
+            m_AllNetworkManagers.Clear();
+            m_AllNetworkManagers.AddRange(m_ClientNetworkManagers);
+            if (!UseCMBService())
+            {
+                m_AllNetworkManagers.Add(m_ServerNetworkManager);
+            }
+
+            yield return WaitForConditionOrTimeOut(AllClientsSpawnedObject);
+            AssertOnTimeout(m_ErrorLog.ToString());
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/SpawnDuringSynchronizationTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/SpawnDuringSynchronizationTests.cs.meta
new file mode 100644
index 0000000000..415940bde8
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/SpawnDuringSynchronizationTests.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 3535334da619ee944a73ca56e2e76d22
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/HiddenVariableTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/HiddenVariableTests.cs
index 83d159714a..94b44cf230 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/HiddenVariableTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/HiddenVariableTests.cs
@@ -7,11 +7,11 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class HiddenVariableTest : NetworkBehaviour
+    internal class HiddenVariableTest : NetworkBehaviour
     {
     }
 
-    public class HiddenVariableObject : NetworkBehaviour
+    internal class HiddenVariableObject : NetworkBehaviour
     {
         public static List<NetworkObject> ClientInstancesSpawned = new List<NetworkObject>();
 
@@ -22,13 +22,24 @@ public class HiddenVariableObject : NetworkBehaviour
         public static int ExpectedSize = 0;
         public static int SpawnCount = 0;
 
+        public static bool EnableVerbose;
+
+        public static void VerboseDebug(string message)
+        {
+            if (!EnableVerbose)
+            {
+                return;
+            }
+            Debug.Log(message);
+        }
+
         public override void OnNetworkSpawn()
         {
             if (!IsServer)
             {
                 ClientInstancesSpawned.Add(NetworkObject);
             }
-            Debug.Log($"{nameof(HiddenVariableObject)}.{nameof(OnNetworkSpawn)}() with value {MyNetworkVariable.Value}");
+            VerboseDebug($"{nameof(HiddenVariableObject)}.{nameof(OnNetworkSpawn)}() with value {MyNetworkVariable.Value}");
 
             MyNetworkVariable.OnValueChanged += Changed;
             MyNetworkList.OnListChanged += ListChanged;
@@ -48,17 +59,17 @@ public override void OnNetworkDespawn()
 
         public void Changed(int before, int after)
         {
-            Debug.Log($"Value changed from {before} to {after} on {NetworkManager.LocalClientId}");
+            VerboseDebug($"[Client-{NetworkManager.LocalClientId}][{name}][MyNetworkVariable] Value changed from {before} to {after}");
             ValueOnClient[NetworkManager.LocalClientId] = after;
         }
         public void ListChanged(NetworkListEvent<int> listEvent)
         {
-            Debug.Log($"ListEvent received: type {listEvent.Type}, index {listEvent.Index}, value {listEvent.Value}");
-            Debug.Assert(ExpectedSize == MyNetworkList.Count);
+            VerboseDebug($"[Client-{NetworkManager.LocalClientId}][{name}][MyNetworkList] ListEvent received: type {listEvent.Type}, index {listEvent.Index}, value {listEvent.Value}");
+            Debug.Assert(ExpectedSize == MyNetworkList.Count, $"[{name}] List change failure! Expected Count: {ExpectedSize} Actual Count:{MyNetworkList.Count}");
         }
     }
 
-    public class HiddenVariableTests : NetcodeIntegrationTest
+    internal class HiddenVariableTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 4;
 
@@ -155,30 +166,34 @@ private IEnumerator SetAndCheckValueSet(ulong otherClientId, int value)
             yield return WaitForConditionOrTimeOut(VerifyLists);
             Assert.IsFalse(s_GlobalTimeoutHelper.TimedOut, "Timed out waiting for all clients to have identical values!");
 
-            Debug.Log("Value changed");
+            VerboseDebug("Value changed");
         }
 
         [UnityTest]
         public IEnumerator HiddenVariableTest()
         {
+            HiddenVariableObject.EnableVerbose = m_EnableVerboseDebug;
             HiddenVariableObject.SpawnCount = 0;
             HiddenVariableObject.ValueOnClient.Clear();
             HiddenVariableObject.ExpectedSize = 0;
             HiddenVariableObject.SpawnCount = 0;
 
-            Debug.Log("Running test");
+            VerboseDebug("Running test");
 
             // ==== Spawn object with ownership on one client
             var client = m_ServerNetworkManager.ConnectedClientsList[1];
             var otherClient = m_ServerNetworkManager.ConnectedClientsList[2];
             m_NetSpawnedObject = SpawnObject(m_TestNetworkPrefab, m_ClientNetworkManagers[1]).GetComponent<NetworkObject>();
 
-            yield return RefreshGameObects(4);
+            yield return RefreshGameObects(NumberOfClients);
 
             // === Check spawn occurred
             yield return WaitForSpawnCount(NumberOfClients + 1);
+
+            AssertOnTimeout($"Timed out waiting for all clients to spawn {m_NetSpawnedObject.name}");
+
             Debug.Assert(HiddenVariableObject.SpawnCount == NumberOfClients + 1);
-            Debug.Log("Objects spawned");
+            VerboseDebug("Objects spawned");
 
             // ==== Set the NetworkVariable value to 2
             HiddenVariableObject.ExpectedSize = 1;
@@ -193,7 +208,6 @@ public IEnumerator HiddenVariableTest()
             // ==== Hide our object to a different client
             HiddenVariableObject.ExpectedSize = 2;
             m_NetSpawnedObject.NetworkHide(otherClient.ClientId);
-
             currentValueSet = 3;
             m_NetSpawnedObject.GetComponent<HiddenVariableObject>().MyNetworkVariable.Value = currentValueSet;
             m_NetSpawnedObject.GetComponent<HiddenVariableObject>().MyNetworkList.Add(currentValueSet);
@@ -207,10 +221,10 @@ public IEnumerator HiddenVariableTest()
             // ==== Wait for object to be spawned
             yield return WaitForSpawnCount(1);
             Debug.Assert(HiddenVariableObject.SpawnCount == 1);
-            Debug.Log("Object spawned");
+            VerboseDebug("Object spawned");
 
             // ==== We need a refresh for the newly re-spawned object
-            yield return RefreshGameObects(4);
+            yield return RefreshGameObects(NumberOfClients);
 
             currentValueSet = 4;
             m_NetSpawnedObject.GetComponent<HiddenVariableObject>().MyNetworkVariable.Value = currentValueSet;
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/IntegrationTestExamples.cs b/com.unity.netcode.gameobjects/Tests/Runtime/IntegrationTestExamples.cs
index 7cba4fb9ad..0318e79433 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/IntegrationTestExamples.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/IntegrationTestExamples.cs
@@ -7,7 +7,7 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class IntegrationTestUpdated : NetcodeIntegrationTest
+    internal class IntegrationTestUpdated : NetcodeIntegrationTest
     {
         private GameObject m_MyNetworkPrefab;
         protected override int NumberOfClients => 1;
@@ -45,7 +45,7 @@ public IEnumerator MyFirstIntegationTest()
 
     [TestFixture(HostOrServer.Host)]
     [TestFixture(HostOrServer.Server)]
-    public class IntegrationTestExtended : NetcodeIntegrationTest
+    internal class IntegrationTestExtended : NetcodeIntegrationTest
     {
         private GameObject m_MyNetworkPrefab;
         protected override int NumberOfClients => 1;
@@ -84,11 +84,11 @@ public IEnumerator MyFirstIntegationTest()
         }
     }
 
-    public class ExampleTestComponent : NetworkBehaviour
+    internal class ExampleTestComponent : NetworkBehaviour
     {
     }
 
-    public class IntegrationTestPlayers : NetcodeIntegrationTest
+    internal class IntegrationTestPlayers : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 5;
 
@@ -126,13 +126,13 @@ public void TestClientRelativePlayers()
         }
     }
 
-    public class SpawnTest : NetworkBehaviour
+    internal class SpawnTest : NetworkBehaviour
     {
         public static int TotalSpawned;
         public override void OnNetworkSpawn() { TotalSpawned++; }
         public override void OnNetworkDespawn() { TotalSpawned--; }
     }
-    public class IntegrationTestSpawning : NetcodeIntegrationTest
+    internal class IntegrationTestSpawning : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 2;
         private GameObject m_NetworkPrefabToSpawn;
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/InvalidConnectionEventsTest.cs b/com.unity.netcode.gameobjects/Tests/Runtime/InvalidConnectionEventsTest.cs
index 11d3121c31..d849bc216a 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/InvalidConnectionEventsTest.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/InvalidConnectionEventsTest.cs
@@ -12,7 +12,7 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class InvalidConnectionEventsTest : NetcodeIntegrationTest
+    internal class InvalidConnectionEventsTest : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 1;
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/ListChangedTest.cs b/com.unity.netcode.gameobjects/Tests/Runtime/ListChangedTest.cs
index f88f70a441..3f47ae9fcc 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/ListChangedTest.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/ListChangedTest.cs
@@ -1,16 +1,17 @@
 using System.Collections;
+using NUnit.Framework;
 using Unity.Netcode.TestHelpers.Runtime;
 using UnityEngine;
 using UnityEngine.TestTools;
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class NetworkListChangedTestComponent : NetworkBehaviour
+    internal class NetworkListChangedTestComponent : NetworkBehaviour
     {
 
     }
 
-    public class ListChangedObject : NetworkBehaviour
+    internal class ListChangedObject : NetworkBehaviour
     {
         public int ExpectedPreviousValue = 0;
         public int ExpectedValue = 0;
@@ -45,7 +46,9 @@ public void Changed(NetworkListEvent<int> listEvent)
         }
     }
 
-    public class NetworkListChangedTests : NetcodeIntegrationTest
+    [TestFixture(NetworkTopologyTypes.DistributedAuthority)]
+    [TestFixture(NetworkTopologyTypes.ClientServer)]
+    internal class NetworkListChangedTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 2;
 
@@ -54,6 +57,8 @@ public class NetworkListChangedTests : NetcodeIntegrationTest
 
         private NetworkObject m_NetSpawnedObject1;
 
+        public NetworkListChangedTests(NetworkTopologyTypes networkTopologyType) : base(networkTopologyType) { }
+
         protected override void OnServerAndClientsCreated()
         {
             m_PrefabToSpawn = CreateNetworkObjectPrefab("ListChangedObject");
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Messaging/DisconnectReasonTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Messaging/DisconnectReasonTests.cs
index ce28966270..e293be3e64 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Messaging/DisconnectReasonTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Messaging/DisconnectReasonTests.cs
@@ -8,12 +8,12 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class DisconnectReasonObject : NetworkBehaviour
+    internal class DisconnectReasonObject : NetworkBehaviour
     {
 
     }
 
-    public class DisconnectReasonTests : NetcodeIntegrationTest
+    internal class DisconnectReasonTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 2;
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Messaging/NamedMessageTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Messaging/NamedMessageTests.cs
index 64bab78658..4c2d0d8cfd 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Messaging/NamedMessageTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Messaging/NamedMessageTests.cs
@@ -8,7 +8,7 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class NamedMessageTests : NetcodeIntegrationTest
+    internal class NamedMessageTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 2;
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Messaging/UnnamedMessageTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Messaging/UnnamedMessageTests.cs
index 93551159c9..8b0c854b59 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Messaging/UnnamedMessageTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Messaging/UnnamedMessageTests.cs
@@ -8,7 +8,7 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class UnnamedMessageTests : NetcodeIntegrationTest
+    internal class UnnamedMessageTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 2;
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/ConnectionMetricsTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/ConnectionMetricsTests.cs
index 35356d4bcf..b94cc47725 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/ConnectionMetricsTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/ConnectionMetricsTests.cs
@@ -14,7 +14,7 @@ namespace Unity.Netcode.RuntimeTests.Metrics
     [TestFixture(ClientCount.TwoClients, HostOrServer.Host)]
     [TestFixture(ClientCount.OneClient, HostOrServer.Server)]
     [TestFixture(ClientCount.TwoClients, HostOrServer.Server)]
-    public class ConnectionMetricsTests : NetcodeIntegrationTest
+    internal class ConnectionMetricsTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => m_ClientCount;
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/MessagingMetricsTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/MessagingMetricsTests.cs
index 06b51c1d2f..6cd827f691 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/MessagingMetricsTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/MessagingMetricsTests.cs
@@ -12,7 +12,7 @@
 
 namespace Unity.Netcode.RuntimeTests.Metrics
 {
-    public class MessagingMetricsTests : DualClientMetricTestBase
+    internal class MessagingMetricsTests : DualClientMetricTestBase
     {
         private const uint k_MessageNameHashSize = 8;
         // Header is dynamically sized due to packing, will be 2 bytes for all test messages.
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/MetricsDispatchTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/MetricsDispatchTests.cs
index 519ddfa697..6d1eb91789 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/MetricsDispatchTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/MetricsDispatchTests.cs
@@ -3,12 +3,12 @@
 using System.Collections;
 using NUnit.Framework;
 using Unity.Multiplayer.Tools.NetStats;
-using UnityEngine.TestTools;
 using Unity.Netcode.TestHelpers.Runtime;
+using UnityEngine.TestTools;
 
 namespace Unity.Netcode.RuntimeTests.Metrics
 {
-    public class MetricsDispatchTests
+    internal class MetricsDispatchTests
     {
         private int m_NbDispatches;
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/NetworkObjectMetricsTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/NetworkObjectMetricsTests.cs
index 1679607d23..31abcadd50 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/NetworkObjectMetricsTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/NetworkObjectMetricsTests.cs
@@ -4,11 +4,10 @@
 using System.Linq;
 using NUnit.Framework;
 using Unity.Multiplayer.Tools.MetricTypes;
+using Unity.Netcode.TestHelpers.Runtime.Metrics;
 using UnityEngine;
 using UnityEngine.TestTools;
 
-using Unity.Netcode.TestHelpers.Runtime.Metrics;
-
 namespace Unity.Netcode.RuntimeTests.Metrics
 {
     internal class NetworkObjectMetricsTests : SingleClientMetricTestBase
@@ -73,20 +72,18 @@ public IEnumerator TrackNetworkObjectSpawnReceivedMetric()
         [UnityTest]
         public IEnumerator TrackNetworkObjectDestroySentMetric()
         {
-            var networkObject = SpawnNetworkObject();
-
-            yield return s_DefaultWaitForTick;
-
             var waitForMetricEvent = new WaitForEventMetricValues<ObjectDestroyedEvent>(ServerMetrics.Dispatcher, NetworkMetricTypes.ObjectDestroyedSent);
+            var networkObject = SpawnNetworkObject();
             var objectName = networkObject.name;
 
             Server.SpawnManager.OnDespawnObject(networkObject, true);
 
-            yield return s_DefaultWaitForTick;
+            // Wait for the metric to be received
             yield return waitForMetricEvent.WaitForMetricsReceived();
-
             var objectDestroyedSentMetricValues = waitForMetricEvent.AssertMetricValuesHaveBeenFound();
-            Assert.AreEqual(2, objectDestroyedSentMetricValues.Count);
+
+            // The server should have sent 1 destroy message to the 1 client connected
+            Assert.AreEqual(1, objectDestroyedSentMetricValues.Count);
 
             var objectDestroyed = objectDestroyedSentMetricValues.Last();
             Assert.AreEqual(Client.LocalClientId, objectDestroyed.Connection.Id);
@@ -242,20 +239,47 @@ public IEnumerator TrackNetworkObjectCountAfterDespawnOnServer()
         [UnityTest]
         public IEnumerator TrackNetworkObjectCountAfterDespawnOnClient()
         {
-            var objectList = Server.SpawnManager.SpawnedObjectsList;
-            for (int i = objectList.Count - 1; i >= 0; --i)
+            var initialSpawnCount = Server.SpawnManager.SpawnedObjectsList.Count;
+            var spawnedObjects = new List<GameObject>();
+            //By default, we have 2 network objects and will have spawned 4 so we want to wait for metrics to tell us we have 6 spawned objects
+            var waitForGaugeValues = new WaitForGaugeMetricValues(ClientMetrics.Dispatcher, NetworkMetricTypes.NetworkObjects, metric => (int)metric == 6);
+
+            for (int i = 0; i < 4; i++)
             {
-                objectList.ElementAt(i).Despawn();
+                spawnedObjects.Add(SpawnObject(m_NewNetworkPrefab, Server));
             }
 
-            //By default, we have 2 network objects
-            //There's a slight delay between the spawn on the server and the spawn on the client
-            //We want to have metrics when the value is different than the 2 default one to confirm the client has the new value
-            var waitForGaugeValues = new WaitForGaugeMetricValues(ClientMetrics.Dispatcher, NetworkMetricTypes.NetworkObjects, metric => (int)metric != 2);
+            yield return waitForGaugeValues.WaitForMetricsReceived();
+            var value = waitForGaugeValues.AssertMetricValueHaveBeenFound();
+            Assert.AreEqual(6, value);
 
+            // Create a new gauge that waits for the initial spawned client count
+            waitForGaugeValues = new WaitForGaugeMetricValues(ClientMetrics.Dispatcher, NetworkMetricTypes.NetworkObjects, metric => (int)metric != 6);
+
+            // Now despawn the 4 spawned objects
+            foreach (var spawnedObject in spawnedObjects)
+            {
+                spawnedObject.GetComponent<NetworkObject>().Despawn();
+            }
+            spawnedObjects.Clear();
             yield return waitForGaugeValues.WaitForMetricsReceived();
+            value = waitForGaugeValues.AssertMetricValueHaveBeenFound();
 
-            var value = waitForGaugeValues.AssertMetricValueHaveBeenFound();
+            // Validate the value is equals to the spawned objects prior to spawning the network prefab instances
+            Assert.AreEqual(initialSpawnCount, value);
+
+            // Create a new gauge that waits for the initial spawned client count
+            waitForGaugeValues = new WaitForGaugeMetricValues(ClientMetrics.Dispatcher, NetworkMetricTypes.NetworkObjects, metric => (int)metric == 0);
+
+            // Now assure despawning players are being tracked too
+            var spawnedPlayers = Server.SpawnManager.SpawnedObjectsList.ToList();
+            foreach (var spawnedObject in spawnedPlayers)
+            {
+                spawnedObject.Despawn();
+            }
+            yield return waitForGaugeValues.WaitForMetricsReceived();
+            value = waitForGaugeValues.AssertMetricValueHaveBeenFound();
+            // Nothing should be spawned on the client at this point
             Assert.AreEqual(0, value);
         }
 #endif
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/NetworkVariableMetricsTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/NetworkVariableMetricsTests.cs
index 640cee4615..11f38cea1b 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/NetworkVariableMetricsTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/NetworkVariableMetricsTests.cs
@@ -3,8 +3,8 @@
 using System.Linq;
 using NUnit.Framework;
 using Unity.Multiplayer.Tools.MetricTypes;
-using UnityEngine.TestTools;
 using Unity.Netcode.TestHelpers.Runtime.Metrics;
+using UnityEngine.TestTools;
 
 namespace Unity.Netcode.RuntimeTests.Metrics
 {
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/OwnershipChangeMetricsTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/OwnershipChangeMetricsTests.cs
index a3fcf30b3f..cc08dcd5b7 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/OwnershipChangeMetricsTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/OwnershipChangeMetricsTests.cs
@@ -4,10 +4,10 @@
 using NUnit.Framework;
 using Unity.Collections;
 using Unity.Multiplayer.Tools.MetricTypes;
-using UnityEngine;
-using UnityEngine.TestTools;
 using Unity.Netcode.TestHelpers.Runtime;
 using Unity.Netcode.TestHelpers.Runtime.Metrics;
+using UnityEngine;
+using UnityEngine.TestTools;
 
 namespace Unity.Netcode.RuntimeTests.Metrics
 {
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/PacketLossMetricsTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/PacketLossMetricsTests.cs
index 4a008cfe5e..1f9a35390f 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/PacketLossMetricsTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/PacketLossMetricsTests.cs
@@ -1,6 +1,5 @@
 #if MULTIPLAYER_TOOLS
 #if MULTIPLAYER_TOOLS_1_0_0_PRE_7
-
 using System.Collections;
 using NUnit.Framework;
 using Unity.Collections;
@@ -8,14 +7,12 @@
 using Unity.Netcode.TestHelpers.Runtime;
 using Unity.Netcode.TestHelpers.Runtime.Metrics;
 using Unity.Netcode.Transports.UTP;
-#if UTP_TRANSPORT_2_0_ABOVE
 using Unity.Networking.Transport.Utilities;
-#endif
 using UnityEngine.TestTools;
 
 namespace Unity.Netcode.RuntimeTests.Metrics
 {
-    public class PacketLossMetricsTests : NetcodeIntegrationTest
+    internal class PacketLossMetricsTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 1;
         private readonly int m_PacketLossRate = 25;
@@ -29,9 +26,6 @@ public PacketLossMetricsTests()
         protected override void OnServerAndClientsCreated()
         {
             var clientTransport = (UnityTransport)m_ClientNetworkManagers[0].NetworkConfig.NetworkTransport;
-#if !UTP_TRANSPORT_2_0_ABOVE
-            clientTransport.SetDebugSimulatorParameters(0, 0, m_PacketLossRate);
-#endif
 
             // Determined through trial and error. With both UTP 1.2 and 2.0, this random seed
             // results in an effective packet loss percentage between 22% and 28%. Future UTP
@@ -69,12 +63,10 @@ public IEnumerator TrackPacketLossAsClient()
             double packetLossRateMaxrange = (m_PacketLossRate + m_PacketLossRangeDelta) / 100d;
             var clientNetworkManager = m_ClientNetworkManagers[0];
 
-#if UTP_TRANSPORT_2_0_ABOVE
             var clientTransport = (UnityTransport)clientNetworkManager.NetworkConfig.NetworkTransport;
-            clientTransport.NetworkDriver.CurrentSettings.TryGet<SimulatorUtility.Parameters>(out var parameters);
+            clientTransport.GetNetworkDriver().CurrentSettings.TryGet<SimulatorUtility.Parameters>(out var parameters);
             parameters.PacketDropPercentage = m_PacketLossRate;
-            clientTransport.NetworkDriver.ModifySimulatorStageParameters(parameters);
-#endif
+            clientTransport.GetNetworkDriver().ModifySimulatorStageParameters(parameters);
 
             var waitForPacketLossMetric = new WaitForGaugeMetricValues((clientNetworkManager.NetworkMetrics as NetworkMetrics).Dispatcher,
                 NetworkMetricTypes.PacketLoss,
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/PacketMetricsTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/PacketMetricsTests.cs
index 90707de0b8..b6bfd71bf9 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/PacketMetricsTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/PacketMetricsTests.cs
@@ -4,8 +4,8 @@
 using NUnit.Framework;
 using Unity.Collections;
 using Unity.Multiplayer.Tools.MetricTypes;
-using UnityEngine.TestTools;
 using Unity.Netcode.TestHelpers.Runtime.Metrics;
+using UnityEngine.TestTools;
 
 namespace Unity.Netcode.RuntimeTests.Metrics
 {
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/RpcMetricsTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/RpcMetricsTests.cs
index b2b186a6f6..f68d502597 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/RpcMetricsTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/RpcMetricsTests.cs
@@ -4,8 +4,8 @@
 using NUnit.Framework;
 using Unity.Collections;
 using Unity.Multiplayer.Tools.MetricTypes;
-using UnityEngine.TestTools;
 using Unity.Netcode.TestHelpers.Runtime.Metrics;
+using UnityEngine.TestTools;
 
 namespace Unity.Netcode.RuntimeTests.Metrics
 {
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/RttMetricsTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/RttMetricsTests.cs
index 2c77c66f3a..3a1a2ca2d4 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/RttMetricsTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/RttMetricsTests.cs
@@ -7,9 +7,9 @@
 using NUnit.Framework;
 using Unity.Collections;
 using Unity.Multiplayer.Tools.MetricTypes;
-using UnityEngine.TestTools;
 using Unity.Netcode.TestHelpers.Runtime;
 using Unity.Netcode.TestHelpers.Runtime.Metrics;
+using UnityEngine.TestTools;
 
 namespace Unity.Netcode.RuntimeTests.Metrics
 {
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/ServerLogsMetricTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/ServerLogsMetricTests.cs
index 4fbd75fe36..758d7aa114 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/ServerLogsMetricTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Metrics/ServerLogsMetricTests.cs
@@ -5,8 +5,8 @@
 using NUnit.Framework;
 using Unity.Collections;
 using Unity.Multiplayer.Tools.MetricTypes;
-using UnityEngine.TestTools;
 using Unity.Netcode.TestHelpers.Runtime.Metrics;
+using UnityEngine.TestTools;
 
 namespace Unity.Netcode.RuntimeTests.Metrics
 {
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NestedNetworkManagerTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NestedNetworkManagerTests.cs
index 7ae6ad2d4e..c31f8a83f5 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NestedNetworkManagerTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NestedNetworkManagerTests.cs
@@ -6,7 +6,7 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class NestedNetworkManagerTests
+    internal class NestedNetworkManagerTests
     {
         [Test]
         public void CheckNestedNetworkManager()
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkBehaviourGenericTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkBehaviourGenericTests.cs
index ab48aaab09..91e3124932 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkBehaviourGenericTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkBehaviourGenericTests.cs
@@ -10,7 +10,7 @@ namespace Unity.Netcode.RuntimeTests
     /// <summary>
     /// This class is for testing general fixes or functionality of NetworkBehaviours
     /// </summary>
-    public class NetworkBehaviourGenericTests : NetcodeIntegrationTest
+    internal class NetworkBehaviourGenericTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 0;
 
@@ -21,7 +21,7 @@ protected override bool CanStartServerAndClients()
             return m_AllowServerToStart;
         }
 
-        public class SimpleNetworkBehaviour : NetworkBehaviour
+        internal class SimpleNetworkBehaviour : NetworkBehaviour
         {
             public bool OnNetworkDespawnCalled;
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkBehaviourPrePostSpawnTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkBehaviourPrePostSpawnTests.cs
index 471d9facd6..fc233a8653 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkBehaviourPrePostSpawnTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkBehaviourPrePostSpawnTests.cs
@@ -6,7 +6,9 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class NetworkBehaviourPrePostSpawnTests : NetcodeIntegrationTest
+    [TestFixture(HostOrServer.Host)]
+    [TestFixture(HostOrServer.DAHost)]
+    internal class NetworkBehaviourPrePostSpawnTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 0;
 
@@ -14,6 +16,8 @@ public class NetworkBehaviourPrePostSpawnTests : NetcodeIntegrationTest
 
         private GameObject m_PrePostSpawnObject;
 
+        public NetworkBehaviourPrePostSpawnTests(HostOrServer hostOrServer) : base(hostOrServer) { }
+
         protected override void OnServerAndClientsCreated()
         {
             m_PrePostSpawnObject = CreateNetworkObjectPrefab("PrePostSpawn");
@@ -23,7 +27,7 @@ protected override void OnServerAndClientsCreated()
             base.OnServerAndClientsCreated();
         }
 
-        public class NetworkBehaviourPreSpawn : NetworkBehaviour
+        internal class NetworkBehaviourPreSpawn : NetworkBehaviour
         {
             public static int ValueToSet;
             public bool OnNetworkPreSpawnCalled;
@@ -36,6 +40,7 @@ protected override void OnNetworkPreSpawn(ref NetworkManager networkManager)
                 OnNetworkPreSpawnCalled = true;
                 // If we are the server, then set the randomly generated value (1-200).
                 // Otherwise, just set the value to 0.
+                // TODO: Make adjustments when integrated CMB service testing is added
                 var val = networkManager.IsServer ? ValueToSet : 0;
                 // Instantiate the NetworkVariable as everyone read & owner write while also setting the value
                 TestNetworkVariable = new NetworkVariable<int>(val, NetworkVariableReadPermission.Everyone, NetworkVariableWritePermission.Owner);
@@ -50,7 +55,7 @@ public override void OnNetworkSpawn()
             }
         }
 
-        public class NetworkBehaviourPostSpawn : NetworkBehaviour
+        internal class NetworkBehaviourPostSpawn : NetworkBehaviour
         {
             public bool OnNetworkPostSpawnCalled;
 
@@ -88,12 +93,6 @@ protected override IEnumerator OnSetup()
             return base.OnSetup();
         }
 
-        protected override void OnNewClientCreated(NetworkManager networkManager)
-        {
-            networkManager.NetworkConfig.Prefabs = m_ServerNetworkManager.NetworkConfig.Prefabs;
-            base.OnNewClientCreated(networkManager);
-        }
-
         /// <summary>
         /// This validates that pre spawn can be used to instantiate and assign a NetworkVariable (or other prespawn tasks)
         /// which can be useful for assigning a NetworkVariable value on the server side when the NetworkVariable has owner write permissions.
@@ -109,28 +108,29 @@ public IEnumerator OnNetworkPreAndPostSpawn()
             yield return CreateAndStartNewClient();
 
             // Spawn the object with the newly joined client as the owner
-            var serverInstance = SpawnObject(m_PrePostSpawnObject, m_ClientNetworkManagers[0]);
-            var serverNetworkObject = serverInstance.GetComponent<NetworkObject>();
-            var serverPreSpawn = serverInstance.GetComponent<NetworkBehaviourPreSpawn>();
-            var serverPostSpawn = serverInstance.GetComponent<NetworkBehaviourPostSpawn>();
+            var networkManager = m_DistributedAuthority ? m_ServerNetworkManager : m_ClientNetworkManagers[0];
+            var authorityInstance = SpawnObject(m_PrePostSpawnObject, networkManager);
+            var authorityNetworkObject = authorityInstance.GetComponent<NetworkObject>();
+            var authorityPreSpawn = authorityInstance.GetComponent<NetworkBehaviourPreSpawn>();
+            var authorityPostSpawn = authorityInstance.GetComponent<NetworkBehaviourPostSpawn>();
 
             yield return WaitForConditionOrTimeOut(() => s_GlobalNetworkObjects.ContainsKey(m_ClientNetworkManagers[0].LocalClientId)
-            && s_GlobalNetworkObjects[m_ClientNetworkManagers[0].LocalClientId].ContainsKey(serverNetworkObject.NetworkObjectId));
-            AssertOnTimeout($"Client-{m_ClientNetworkManagers[0].LocalClientId} failed to spawn {nameof(NetworkObject)} id-{serverNetworkObject.NetworkObjectId}!");
+            && s_GlobalNetworkObjects[m_ClientNetworkManagers[0].LocalClientId].ContainsKey(authorityNetworkObject.NetworkObjectId));
+            AssertOnTimeout($"Client-{m_ClientNetworkManagers[0].LocalClientId} failed to spawn {nameof(NetworkObject)} id-{authorityNetworkObject.NetworkObjectId}!");
 
-            var clientNetworkObject = s_GlobalNetworkObjects[m_ClientNetworkManagers[0].LocalClientId][serverNetworkObject.NetworkObjectId];
+            var clientNetworkObject = s_GlobalNetworkObjects[m_ClientNetworkManagers[0].LocalClientId][authorityNetworkObject.NetworkObjectId];
             var clientPreSpawn = clientNetworkObject.GetComponent<NetworkBehaviourPreSpawn>();
             var clientPostSpawn = clientNetworkObject.GetComponent<NetworkBehaviourPostSpawn>();
 
-            Assert.IsTrue(serverPreSpawn.OnNetworkPreSpawnCalled, $"[Server-side] OnNetworkPreSpawn not invoked!");
+            Assert.IsTrue(authorityPreSpawn.OnNetworkPreSpawnCalled, $"[Authority-side] OnNetworkPreSpawn not invoked!");
             Assert.IsTrue(clientPreSpawn.OnNetworkPreSpawnCalled, $"[Client-side] OnNetworkPreSpawn not invoked!");
-            Assert.IsTrue(serverPostSpawn.OnNetworkPostSpawnCalled, $"[Server-side] OnNetworkPostSpawn not invoked!");
+            Assert.IsTrue(authorityPostSpawn.OnNetworkPostSpawnCalled, $"[Authority-side] OnNetworkPostSpawn not invoked!");
             Assert.IsTrue(clientPostSpawn.OnNetworkPostSpawnCalled, $"[Client-side] OnNetworkPostSpawn not invoked!");
 
-            Assert.IsTrue(serverPreSpawn.NetworkVarValueMatches, $"[Server-side][PreSpawn] Value {NetworkBehaviourPreSpawn.ValueToSet} does not match {serverPreSpawn.TestNetworkVariable.Value}!");
+            Assert.IsTrue(authorityPreSpawn.NetworkVarValueMatches, $"[Authority-side][PreSpawn] Value {NetworkBehaviourPreSpawn.ValueToSet} does not match {authorityPreSpawn.TestNetworkVariable.Value}!");
             Assert.IsTrue(clientPreSpawn.NetworkVarValueMatches, $"[Client-side][PreSpawn] Value {NetworkBehaviourPreSpawn.ValueToSet} does not match {clientPreSpawn.TestNetworkVariable.Value}!");
 
-            Assert.IsTrue(serverPostSpawn.ValueSet == NetworkBehaviourPreSpawn.ValueToSet, $"[Server-side][PostSpawn] Value {NetworkBehaviourPreSpawn.ValueToSet} does not match {serverPostSpawn.ValueSet}!");
+            Assert.IsTrue(authorityPostSpawn.ValueSet == NetworkBehaviourPreSpawn.ValueToSet, $"[Authority-side][PostSpawn] Value {NetworkBehaviourPreSpawn.ValueToSet} does not match {authorityPostSpawn.ValueSet}!");
             Assert.IsTrue(clientPostSpawn.ValueSet == NetworkBehaviourPreSpawn.ValueToSet, $"[Client-side][PostSpawn] Value {NetworkBehaviourPreSpawn.ValueToSet} does not match {clientPostSpawn.ValueSet}!");
         }
     }
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkBehaviourUpdaterTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkBehaviourUpdaterTests.cs
index 90e0be75c0..a7b0fc9244 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkBehaviourUpdaterTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkBehaviourUpdaterTests.cs
@@ -12,35 +12,8 @@ namespace Unity.Netcode.RuntimeTests
     /// <summary>
     /// This is a refactor of the original test's NetworkBehaviour INetVarInfo derived NetworkBehaviours
     /// </summary>
-    public class NetVarContainer : NetworkBehaviour
+    internal class NetVarContainer : NetworkBehaviour
     {
-        /// <summary>
-        /// Creates a prefab with two instances of this NetworkBehaviour
-        /// </summary>
-        /// <returns></returns>
-        public static GameObject CreatePrefabGameObject(NetVarCombinationTypes netVarsToCheck)
-        {
-            var gameObject = new GameObject
-            {
-                // Always a good idea to name the Prefab for easy identification purposes
-                name = "NetVarContainerObject"
-            };
-            var networkObject = gameObject.AddComponent<NetworkObject>();
-
-            // Create the two instances of the NetVarContainer components and add them to the
-            // GameObject of this prefab
-            var netVarContainer = gameObject.AddComponent<NetVarContainer>();
-            netVarContainer.NumberOfNetVarsToCheck = netVarsToCheck.FirstType;
-            netVarContainer.ValueToSetNetVarTo = NetworkBehaviourUpdaterTests.NetVarValueToSet;
-            netVarContainer = gameObject.AddComponent<NetVarContainer>();
-            netVarContainer.NumberOfNetVarsToCheck = netVarsToCheck.SecondType;
-            netVarContainer.ValueToSetNetVarTo = NetworkBehaviourUpdaterTests.NetVarValueToSet;
-
-            NetcodeIntegrationTestHelpers.MakeNetworkObjectTestPrefab(networkObject);
-
-            return gameObject;
-        }
-
         public enum NetVarsToCheck
         {
             One,
@@ -106,10 +79,16 @@ public bool AreNetVarsDirty()
         private NetworkVariable<int> m_FirstValue = new NetworkVariable<int>();
         private NetworkVariable<int> m_SeconValue = new NetworkVariable<int>();
 
+        public void SetOwnerWrite()
+        {
+            m_FirstValue = new NetworkVariable<int>(default, NetworkVariableReadPermission.Everyone, NetworkVariableWritePermission.Owner);
+            m_SeconValue = new NetworkVariable<int>(default, NetworkVariableReadPermission.Everyone, NetworkVariableWritePermission.Owner);
+        }
+
         public override void OnNetworkSpawn()
         {
-            // Clients will register each NetworkObject when it is spawned
-            if (!IsServer)
+            // Non-Authority will register each NetworkObject when it is spawned
+            if ((NetworkManager.DistributedAuthorityMode && !IsOwner) || (!NetworkManager.DistributedAuthorityMode && !IsServer))
             {
                 NetworkBehaviourUpdaterTests.ClientSideNotifyObjectSpawned(gameObject);
             }
@@ -121,7 +100,7 @@ public override void OnNetworkSpawn()
         /// </summary>
         public void SetNetworkVariableValues()
         {
-            if (IsServer)
+            if ((NetworkManager.DistributedAuthorityMode && IsOwner) || (!NetworkManager.DistributedAuthorityMode && IsServer))
             {
                 switch (NumberOfNetVarsToCheck)
                 {
@@ -147,19 +126,62 @@ public void SetNetworkVariableValues()
     /// Used to define how many NetworkVariables to use per NetVarContainer instance.
     /// There are always two
     /// </summary>
-    public struct NetVarCombinationTypes
+    internal struct NetVarCombinationTypes
     {
         public NetVarContainer.NetVarsToCheck FirstType;
         public NetVarContainer.NetVarsToCheck SecondType;
     }
 
-    public class NetworkBehaviourUpdaterTests : NetcodeIntegrationTest
+    /// <summary>
+    /// Server and Distributed Authority modes require at least 1 client while the host does not.
+    /// </summary>
+    /// [Host or Server mode][Number of Clients][First NetVar Type][Second NetVar Type]
+    [TestFixture(HostOrServer.DAHost, 1, NetVarContainer.NetVarsToCheck.One, NetVarContainer.NetVarsToCheck.One)]
+    [TestFixture(HostOrServer.DAHost, 1, NetVarContainer.NetVarsToCheck.One, NetVarContainer.NetVarsToCheck.Two)]
+    [TestFixture(HostOrServer.DAHost, 1, NetVarContainer.NetVarsToCheck.Two, NetVarContainer.NetVarsToCheck.Two)]
+    [TestFixture(HostOrServer.DAHost, 2, NetVarContainer.NetVarsToCheck.One, NetVarContainer.NetVarsToCheck.One)]
+    [TestFixture(HostOrServer.DAHost, 2, NetVarContainer.NetVarsToCheck.One, NetVarContainer.NetVarsToCheck.Two)]
+    [TestFixture(HostOrServer.DAHost, 2, NetVarContainer.NetVarsToCheck.Two, NetVarContainer.NetVarsToCheck.Two)]
+    [TestFixture(HostOrServer.Server, 1, NetVarContainer.NetVarsToCheck.One, NetVarContainer.NetVarsToCheck.One)]
+    [TestFixture(HostOrServer.Server, 1, NetVarContainer.NetVarsToCheck.One, NetVarContainer.NetVarsToCheck.Two)]
+    [TestFixture(HostOrServer.Server, 1, NetVarContainer.NetVarsToCheck.Two, NetVarContainer.NetVarsToCheck.Two)]
+    [TestFixture(HostOrServer.Server, 2, NetVarContainer.NetVarsToCheck.One, NetVarContainer.NetVarsToCheck.One)]
+    [TestFixture(HostOrServer.Server, 2, NetVarContainer.NetVarsToCheck.One, NetVarContainer.NetVarsToCheck.Two)]
+    [TestFixture(HostOrServer.Server, 2, NetVarContainer.NetVarsToCheck.Two, NetVarContainer.NetVarsToCheck.Two)]
+    [TestFixture(HostOrServer.Host, 0, NetVarContainer.NetVarsToCheck.One, NetVarContainer.NetVarsToCheck.One)]
+    [TestFixture(HostOrServer.Host, 0, NetVarContainer.NetVarsToCheck.One, NetVarContainer.NetVarsToCheck.Two)]
+    [TestFixture(HostOrServer.Host, 0, NetVarContainer.NetVarsToCheck.Two, NetVarContainer.NetVarsToCheck.Two)]
+    [TestFixture(HostOrServer.Host, 1, NetVarContainer.NetVarsToCheck.One, NetVarContainer.NetVarsToCheck.One)]
+    [TestFixture(HostOrServer.Host, 1, NetVarContainer.NetVarsToCheck.One, NetVarContainer.NetVarsToCheck.Two)]
+    [TestFixture(HostOrServer.Host, 1, NetVarContainer.NetVarsToCheck.Two, NetVarContainer.NetVarsToCheck.Two)]
+    [TestFixture(HostOrServer.Host, 2, NetVarContainer.NetVarsToCheck.One, NetVarContainer.NetVarsToCheck.One)]
+    [TestFixture(HostOrServer.Host, 2, NetVarContainer.NetVarsToCheck.One, NetVarContainer.NetVarsToCheck.Two)]
+    [TestFixture(HostOrServer.Host, 2, NetVarContainer.NetVarsToCheck.Two, NetVarContainer.NetVarsToCheck.Two)]
+    internal class NetworkBehaviourUpdaterTests : NetcodeIntegrationTest
     {
         // Go ahead and create maximum number of clients (not all tests will use them)
-        protected override int NumberOfClients => 2;
+        protected override int NumberOfClients => m_NumberOfClients;
         public const int NetVarValueToSet = 1;
         private static List<GameObject> s_ClientSpawnedNetworkObjects = new List<GameObject>();
-        private List<NetworkManager> m_ActiveClientsForCurrentTest;
+        private GameObject m_PrefabToSpawn;
+        private NetVarCombinationTypes m_NetVarCombinationTypes;
+        private int m_NumberOfClients = 0;
+
+        public NetworkBehaviourUpdaterTests(HostOrServer hostOrServer, int numberOfClients, NetVarContainer.NetVarsToCheck first, NetVarContainer.NetVarsToCheck second) : base(hostOrServer)
+        {
+            m_NetVarCombinationTypes = new NetVarCombinationTypes()
+            {
+                FirstType = first,
+                SecondType = second
+            };
+            m_NumberOfClients = numberOfClients;
+        }
+
+        protected override IEnumerator OnSetup()
+        {
+            s_ClientSpawnedNetworkObjects.Clear();
+            return base.OnSetup();
+        }
 
         /// <summary>
         /// Clients will call this when NetworkObjects are spawned on their end
@@ -173,70 +195,32 @@ public static void ClientSideNotifyObjectSpawned(GameObject objectSpaned)
             }
         }
 
-        protected override bool CanStartServerAndClients()
+        protected override void OnServerAndClientsCreated()
         {
-            return false;
-        }
-
-        /// <summary>
-        /// Creates the server and client(s) required for this particular test iteration
-        /// </summary>
-        private IEnumerator StartClientsAndServer(bool useHost, int numberOfClients, GameObject prefabObject)
-        {
-            void AddNetworkPrefab(NetworkConfig config, NetworkPrefab prefab)
+            m_PrefabToSpawn = CreateNetworkObjectPrefab("NetVarCont");
+            // Create the two instances of the NetVarContainer components and add them to the
+            // GameObject of this prefab
+            var netVarContainer = m_PrefabToSpawn.AddComponent<NetVarContainer>();
+            netVarContainer.NumberOfNetVarsToCheck = m_NetVarCombinationTypes.FirstType;
+            if (m_NetworkTopologyType == NetworkTopologyTypes.DistributedAuthority)
             {
-                config.Prefabs.Add(prefab);
+                netVarContainer.SetOwnerWrite();
             }
 
-            // Sanity check to make sure we are not trying to create more clients than we have available to use
-            Assert.True(numberOfClients <= m_ClientNetworkManagers.Length);
-            m_ActiveClientsForCurrentTest = new List<NetworkManager>();
-
-            // Create a list of the clients to be used in this test from the available clients
-            for (int i = 0; i < numberOfClients; i++)
-            {
-                m_ActiveClientsForCurrentTest.Add(m_ClientNetworkManagers[i]);
-            }
+            netVarContainer.ValueToSetNetVarTo = NetVarValueToSet;
+            netVarContainer = m_PrefabToSpawn.AddComponent<NetVarContainer>();
 
-            // Add the prefab to be used for this particular test iteration
-            var np = new NetworkPrefab { Prefab = prefabObject };
-            AddNetworkPrefab(m_ServerNetworkManager.NetworkConfig, np);
-            m_ServerNetworkManager.NetworkConfig.TickRate = 30;
-            foreach (var clientManager in m_ActiveClientsForCurrentTest)
+            if (m_NetworkTopologyType == NetworkTopologyTypes.DistributedAuthority)
             {
-                m_ServerNetworkManager.NetworkConfig.TickRate = 30;
-                AddNetworkPrefab(clientManager.NetworkConfig, np);
+                netVarContainer.SetOwnerWrite();
             }
 
-            // Now spin everything up normally
-            var clientsAsArry = m_ActiveClientsForCurrentTest.ToArray();
-            Assert.True(NetcodeIntegrationTestHelpers.Start(useHost, m_ServerNetworkManager, clientsAsArry), "Failed to start server and client instances");
+            netVarContainer.NumberOfNetVarsToCheck = m_NetVarCombinationTypes.SecondType;
+            netVarContainer.ValueToSetNetVarTo = NetVarValueToSet;
 
-            // Only if we have clients (not host)
-            if (numberOfClients > 0)
-            {
-                RegisterSceneManagerHandler();
-            }
-
-            // Wait for connection on client and server side
-            yield return WaitForClientsConnectedOrTimeOut(clientsAsArry);
+            base.OnServerAndClientsCreated();
         }
 
-        /// <summary>
-        /// This list replaces the original NetworkVariable types to be checked.
-        /// Both NetworkVariables are of type int and the original version of this test was testing
-        /// the NetworkBehaviour Update when there were 1 or more (i.e two) on the same NetworkBehaviour.
-        /// After reviewing, we really only needed to test a much smaller combination of types and so
-        /// this pre-generated array represents the reduced set of combinations to test.
-        /// Note:
-        /// The original test was also testing for no NetworkVariables of type int, which there ended up
-        /// being no reason to do that and only added to the length of the execution time for this test.
-        /// </summary>
-        public static NetVarCombinationTypes[] NetVarCombinationTypeValues = new[]{
-            new NetVarCombinationTypes() { FirstType = NetVarContainer.NetVarsToCheck.One, SecondType = NetVarContainer.NetVarsToCheck.One },
-            new NetVarCombinationTypes() { FirstType = NetVarContainer.NetVarsToCheck.One, SecondType = NetVarContainer.NetVarsToCheck.Two },
-            new NetVarCombinationTypes() { FirstType = NetVarContainer.NetVarsToCheck.Two, SecondType = NetVarContainer.NetVarsToCheck.Two }};
-
         /// <summary>
         /// The updated BehaviourUpdaterAllTests was re-designed to replicate the same functionality being tested in the
         /// original version of this test with additional time out handling and a re-organization in the order of operations.
@@ -246,59 +230,36 @@ void AddNetworkPrefab(NetworkConfig config, NetworkPrefab prefab)
         /// version like the desktop tests use).
         /// This update also updated how the server and clients were being constructed to help reduce the execution time.
         /// </summary>
-        /// <param name="useHost"> whether to run the server as a host or not</param>
-        /// <param name="varCombinationTypes">the NetworkVariable combination types</param>
-        /// <param name="nbClients"> number of clients to use for the test</param>
+        /// <param name="hostOrServer"> whether to run the server as a host or not</param>
         /// <param name="numToSpawn"> number of NetworkObjects to be spawned</param>
         [UnityTest]
-        public IEnumerator BehaviourUpdaterAllTests([Values] bool useHost,
-            [ValueSource(nameof(NetVarCombinationTypeValues))] NetVarCombinationTypes varCombinationTypes,
-            [Values(0, 1, 2)] int nbClients, [Values(1, 2)] int numToSpawn)
+        public IEnumerator BehaviourUpdaterAllTests([Values(1, 2)] int numToSpawn)
         {
-            s_ClientSpawnedNetworkObjects.Clear();
-
-            // The edge case scenario where we can exit early is when we are running
-            // just the server (i.e. non-host) and there are zero clients.  Under this
-            // edge case scenario of the various combinations we do not need to run
-            // this test as the IsDirty flag is never cleared when no clients exist at all.
-            if (nbClients == 0 && !useHost)
-            {
-                yield break;
-            }
-
-            // Create our prefab based on the NetVarCombinationTypes
-            var prefabToSpawn = NetVarContainer.CreatePrefabGameObject(varCombinationTypes);
-
-            yield return StartClientsAndServer(useHost, nbClients, prefabToSpawn);
-
             // Tracks the server-side spawned prefab instances
             var spawnedPrefabs = new List<GameObject>();
-            var tickInterval = 1.0f / m_ServerNetworkManager.NetworkConfig.TickRate;
 
             // Used to determine if the client-side checks of this test should be
             // executed or not as well is used to make sure all clients have spawned
             // the appropriate number of NetworkObjects with the NetVarContainer behaviour
-            var numberOfObjectsToSpawnOnClients = numToSpawn * nbClients;
+            var numberOfObjectsToSpawn = numToSpawn * NumberOfClients;
+
+            var authority = m_NetworkTopologyType == NetworkTopologyTypes.DistributedAuthority ? m_ClientNetworkManagers[0] : m_ServerNetworkManager;
 
             // spawn the objects
             for (int i = 0; i < numToSpawn; i++)
             {
-                var spawnedObject = Object.Instantiate(prefabToSpawn);
+                var spawnedObject = Object.Instantiate(m_PrefabToSpawn);
                 spawnedPrefabs.Add(spawnedObject);
                 var networkSpawnedObject = spawnedObject.GetComponent<NetworkObject>();
-                networkSpawnedObject.NetworkManagerOwner = m_ServerNetworkManager;
+                networkSpawnedObject.NetworkManagerOwner = authority;
                 networkSpawnedObject.Spawn();
             }
 
-            // When there are no clients (excluding when server is in host mode), we can skip all of this
-            // wait until all objects are spawned on the clients
-            if (numberOfObjectsToSpawnOnClients > 0)
-            {
-                // Waits for all clients to spawn the NetworkObjects
-                yield return WaitForConditionOrTimeOut(() => numberOfObjectsToSpawnOnClients == s_ClientSpawnedNetworkObjects.Count);
-                Assert.IsFalse(s_GlobalTimeoutHelper.TimedOut, $"Timed out waiting for clients to report spawning objects! " +
-                    $"Total reported client-side spawned objects {s_ClientSpawnedNetworkObjects.Count}");
-            }
+            // Waits for all clients to spawn the NetworkObjects
+            yield return WaitForConditionOrTimeOut(() => numberOfObjectsToSpawn == s_ClientSpawnedNetworkObjects.Count);
+            Assert.IsFalse(s_GlobalTimeoutHelper.TimedOut, $"Timed out waiting for clients to report spawning objects! " +
+                $"Total reported client-side spawned objects {s_ClientSpawnedNetworkObjects.Count}");
+
 
             // Once all clients have spawned the NetworkObjects, set the network variables for
             // those NetworkObjects on the server-side.
@@ -312,39 +273,33 @@ public IEnumerator BehaviourUpdaterAllTests([Values] bool useHost,
             }
 
             // Update the NetworkBehaviours to make sure all network variables are no longer marked as dirty
-            m_ServerNetworkManager.BehaviourUpdater.NetworkBehaviourUpdate();
+            authority.BehaviourUpdater.NetworkBehaviourUpdate();
 
             // Verify that all network variables are no longer dirty on server side only if we have clients (including host)
-            foreach (var serverSpawnedObject in spawnedPrefabs)
+            foreach (var spawnedPrefab in spawnedPrefabs)
             {
-                var netVarContainers = serverSpawnedObject.GetComponents<NetVarContainer>();
+                var netVarContainers = spawnedPrefab.GetComponents<NetVarContainer>();
                 foreach (var netVarContainer in netVarContainers)
                 {
                     Assert.False(netVarContainer.AreNetVarsDirty(), "Some NetworkVariables were still marked dirty after NetworkBehaviourUpdate!");
                 }
             }
 
-            // When there are no clients (excluding when server is in host mode), we can skip all of this
-            if (numberOfObjectsToSpawnOnClients > 0)
+            // Get a list of all NetVarContainer components on the client-side spawned NetworkObjects
+            var clientSideNetVarContainers = new List<NetVarContainer>();
+            foreach (var clientSpawnedObjects in s_ClientSpawnedNetworkObjects)
             {
-                // Get a list of all NetVarContainer components on the client-side spawned NetworkObjects
-                var clientSideNetVarContainers = new List<NetVarContainer>();
-                foreach (var clientSpawnedObjects in s_ClientSpawnedNetworkObjects)
+                var netVarContainers = clientSpawnedObjects.GetComponents<NetVarContainer>();
+                foreach (var netvarContiner in netVarContainers)
                 {
-                    var netVarContainers = clientSpawnedObjects.GetComponents<NetVarContainer>();
-                    foreach (var netvarContiner in netVarContainers)
-                    {
-                        clientSideNetVarContainers.Add(netvarContiner);
-                    }
+                    clientSideNetVarContainers.Add(netvarContiner);
                 }
-
-                yield return WaitForConditionOrTimeOut(() =>
-                clientSideNetVarContainers.Where(d =>
-                d.HaveAllValuesChanged(NetVarValueToSet)).Count() == clientSideNetVarContainers.Count);
-                Assert.IsFalse(s_GlobalTimeoutHelper.TimedOut, $"Timed out waiting for client side NetVarContainers to report all NetworkVariables have been updated!");
             }
 
-            Object.DestroyImmediate(prefabToSpawn);
+            yield return WaitForConditionOrTimeOut(() =>
+            clientSideNetVarContainers.Where(d =>
+            d.HaveAllValuesChanged(NetVarValueToSet)).Count() == clientSideNetVarContainers.Count);
+            Assert.IsFalse(s_GlobalTimeoutHelper.TimedOut, $"Timed out waiting for client side NetVarContainers to report all NetworkVariables have been updated!");
         }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkManagerCustomMessageManagerTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkManagerCustomMessageManagerTests.cs
index 3669efa77b..a43bd24746 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkManagerCustomMessageManagerTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkManagerCustomMessageManagerTests.cs
@@ -1,13 +1,9 @@
-using System.Collections;
 using NUnit.Framework;
-using Unity.Collections;
-using Unity.Netcode.TestHelpers.Runtime;
 using UnityEngine;
-using UnityEngine.TestTools;
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class NetworkManagerCustomMessageManagerTests
+    internal class NetworkManagerCustomMessageManagerTests
     {
         [Test]
         public void CustomMessageManagerAssigned()
@@ -34,87 +30,5 @@ public void CustomMessageManagerAssigned()
             networkManager.Shutdown();
             Object.DestroyImmediate(gameObject);
         }
-
-        [UnityTest]
-        public IEnumerator VerifyCustomMessageShutdownOrder()
-        {
-            Assert.True(NetcodeIntegrationTestHelpers.Create(1, out NetworkManager server, out NetworkManager[] clients));
-
-            bool isHost = false;
-
-            // Start server to cause initialization
-            NetcodeIntegrationTestHelpers.Start(isHost, server, clients);
-
-            // [Client-Side] Wait for a connection to the server
-            yield return NetcodeIntegrationTestHelpers.WaitForClientsConnected(clients, null, 512);
-
-            // [Host-Side] Check to make sure all clients are connected
-            yield return NetcodeIntegrationTestHelpers.WaitForClientsConnectedToServer(server, isHost ? (clients.Length + 1) : clients.Length, null, 512);
-
-            // Create a message to pass directly to the message handler. If we send the message its processed before we get a chance to shutdown
-
-            var dummySendData = new FastBufferWriter(128, Allocator.Temp);
-            dummySendData.WriteValueSafe("Dummy Data");
-
-            // make the message
-            var unnamedMessage = new UnnamedMessage
-            {
-                SendData = dummySendData
-            };
-
-            // make the message
-            using var serializedMessage = new FastBufferWriter(128, Allocator.Temp);
-            unnamedMessage.Serialize(serializedMessage, 0);
-
-            // Generate the full message
-            var messageHeader = new NetworkMessageHeader
-            {
-                MessageSize = (uint)serializedMessage.Length,
-                MessageType = server.MessageManager.GetMessageType(typeof(UnnamedMessage)),
-            };
-
-            var fullMessage = new FastBufferWriter(512, Allocator.Temp);
-            BytePacker.WriteValueBitPacked(fullMessage, messageHeader.MessageType);
-            BytePacker.WriteValueBitPacked(fullMessage, messageHeader.MessageSize);
-
-            fullMessage.WriteBytesSafe(serializedMessage.ToArray());
-
-            // Pack the message into a batch
-            var batchHeader = new NetworkBatchHeader
-            {
-                BatchCount = 1
-            };
-
-            var batchedMessage = new FastBufferWriter(1100, Allocator.Temp);
-            using (batchedMessage)
-            {
-                batchedMessage.TryBeginWrite(FastBufferWriter.GetWriteSize(batchHeader) +
-                                     FastBufferWriter.GetWriteSize(fullMessage));
-                batchedMessage.WriteValue(batchHeader);
-                batchedMessage.WriteBytesSafe(fullMessage.ToArray());
-
-                // Fill out the rest of the batch header
-                batchedMessage.Seek(0);
-                batchHeader = new NetworkBatchHeader
-                {
-                    Magic = NetworkBatchHeader.MagicValue,
-                    BatchSize = batchedMessage.Length,
-                    BatchHash = XXHash.Hash64(fullMessage.ToArray()),
-                    BatchCount = 1
-                };
-                batchedMessage.WriteValue(batchHeader);
-
-                // Handle the message as if it came from the server/client
-                server.MessageManager.HandleIncomingData(clients[0].LocalClientId, batchedMessage.ToArray(), 0);
-
-                foreach (var c in clients)
-                {
-                    c.MessageManager.HandleIncomingData(server.LocalClientId, batchedMessage.ToArray(), 0);
-                }
-            }
-
-            // shutdown the network managher
-            NetcodeIntegrationTestHelpers.Destroy();
-        }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkManagerEventsTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkManagerEventsTests.cs
index 34a406aed8..c2d482da67 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkManagerEventsTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkManagerEventsTests.cs
@@ -8,7 +8,7 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class NetworkManagerEventsTests
+    internal class NetworkManagerEventsTests
     {
         private NetworkManager m_ClientManager;
         private NetworkManager m_ServerManager;
@@ -67,7 +67,6 @@ private void NetworkManager_OnDestroying(NetworkManager networkManager)
             Assert.True(m_NetworkManagerInstantiated == networkManager, $"Destroying {nameof(NetworkManager)} and current instance is not a match for the one passed into the event!");
         }
 
-
         [UnityTest]
         public IEnumerator OnServerStoppedCalledWhenServerStops()
         {
@@ -237,6 +236,46 @@ public IEnumerator OnClientAndServerStartedCalledWhenHostStarts()
             Assert.AreEqual(2, callbacksInvoked, "either OnServerStarted or OnClientStarted wasn't invoked");
         }
 
+        [UnityTest]
+        public IEnumerator OnPreShutdownCalledWhenShuttingDown()
+        {
+            bool preShutdownInvoked = false;
+            bool shutdownInvoked = false;
+            var gameObject = new GameObject(nameof(OnPreShutdownCalledWhenShuttingDown));
+            m_ServerManager = gameObject.AddComponent<NetworkManager>();
+
+            // Set dummy transport that does nothing
+            var transport = gameObject.AddComponent<DummyTransport>();
+            m_ServerManager.NetworkConfig = new NetworkConfig() { NetworkTransport = transport };
+
+            Action onPreShutdown = () =>
+            {
+                preShutdownInvoked = true;
+                Assert.IsFalse(shutdownInvoked, "OnPreShutdown was invoked after OnServerStopped");
+            };
+
+            Action<bool> onServerStopped = (bool wasAlsoClient) =>
+            {
+                shutdownInvoked = true;
+                Assert.IsTrue(preShutdownInvoked, "OnPreShutdown wasn't invoked before OnServerStopped");
+            };
+
+            // Start server to cause initialization process
+            Assert.True(m_ServerManager.StartServer());
+            Assert.True(m_ServerManager.IsListening);
+
+            m_ServerManager.OnPreShutdown += onPreShutdown;
+            m_ServerManager.OnServerStopped += onServerStopped;
+            m_ServerManager.Shutdown();
+            Object.DestroyImmediate(gameObject);
+
+            yield return WaitUntilManagerShutsdown();
+
+            Assert.False(m_ServerManager.IsListening);
+            Assert.True(preShutdownInvoked, "OnPreShutdown wasn't invoked");
+            Assert.True(shutdownInvoked, "OnServerStopped wasn't invoked");
+        }
+
         private IEnumerator WaitUntilManagerShutsdown()
         {
             /* Need two updates to actually shut down. First one to see the transport failing, which
@@ -283,9 +322,6 @@ in NetworkTimeSystem.Sync */
         [UnityTearDown]
         public virtual IEnumerator Teardown()
         {
-            NetworkManager.OnInstantiated -= NetworkManager_OnInstantiated;
-            NetworkManager.OnDestroying -= NetworkManager_OnDestroying;
-
             NetcodeIntegrationTestHelpers.Destroy();
             if (m_ServerManager != null)
             {
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkManagerSceneManagerTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkManagerSceneManagerTests.cs
index dd9613268d..d7544b71f3 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkManagerSceneManagerTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkManagerSceneManagerTests.cs
@@ -3,7 +3,7 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class NetworkManagerSceneManagerTests
+    internal class NetworkManagerSceneManagerTests
     {
         [Test]
         public void SceneManagerAssigned()
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkManagerTransportTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkManagerTransportTests.cs
index fa1fbdaf3d..484f6301fd 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkManagerTransportTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkManagerTransportTests.cs
@@ -1,12 +1,15 @@
 using System;
 using System.Collections;
 using NUnit.Framework;
+using Unity.Netcode.TestHelpers.Runtime;
+using Unity.Netcode.Transports.UTP;
+using Unity.Networking.Transport;
 using UnityEngine;
 using UnityEngine.TestTools;
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class NetworkManagerTransportTests
+    internal class NetworkManagerTransportTests
     {
         [Test]
         public void ClientDoesNotStartWhenTransportFails()
@@ -106,7 +109,7 @@ public IEnumerator ShutsDownWhenTransportFails()
         /// <summary>
         /// Does nothing but simulate a transport that can fail at startup and/or when polling events.
         /// </summary>
-        public class FailedTransport : TestingNetworkTransport
+        internal class FailedTransport : TestingNetworkTransport
         {
             public bool FailOnStart = false;
             public bool FailOnNextPoll = false;
@@ -157,4 +160,49 @@ public override void DisconnectLocalClient()
             }
         }
     }
+
+    /// <summary>
+    /// Verifies the UnityTransport.GetEndpoint method returns
+    /// valid NetworkEndpoint information.
+    /// </summary>
+    internal class TransportEndpointTests : NetcodeIntegrationTest
+    {
+        protected override int NumberOfClients => 2;
+
+        [UnityTest]
+        public IEnumerator GetEndpointReportedCorrectly()
+        {
+            var serverUnityTransport = m_ServerNetworkManager.NetworkConfig.NetworkTransport as UnityTransport;
+            var serverEndpoint = new NetworkEndpoint();
+            var clientEndpoint = new NetworkEndpoint();
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                var unityTransport = client.NetworkConfig.NetworkTransport as UnityTransport;
+                serverEndpoint = unityTransport.GetEndpoint(m_ServerNetworkManager.LocalClientId);
+                clientEndpoint = serverUnityTransport.GetEndpoint(client.LocalClientId);
+                Assert.IsTrue(serverEndpoint.IsValid);
+                Assert.IsTrue(clientEndpoint.IsValid);
+                Assert.IsTrue(clientEndpoint.Address.Split(":")[0] == unityTransport.ConnectionData.Address);
+                Assert.IsTrue(serverEndpoint.Address.Split(":")[0] == serverUnityTransport.ConnectionData.Address);
+                Assert.IsTrue(serverEndpoint.Port == unityTransport.ConnectionData.Port);
+                Assert.IsTrue(clientEndpoint.Port >= serverUnityTransport.ConnectionData.Port);
+            }
+
+            // Now validate that when disconnected it returns a non-valid NetworkEndPoint
+            var clientId = m_ClientNetworkManagers[0].LocalClientId;
+            m_ClientNetworkManagers[0].Shutdown();
+            yield return s_DefaultWaitForTick;
+
+            serverEndpoint = (m_ClientNetworkManagers[0].NetworkConfig.NetworkTransport as UnityTransport).GetEndpoint(m_ServerNetworkManager.LocalClientId);
+            clientEndpoint = serverUnityTransport.GetEndpoint(clientId);
+            Assert.IsFalse(serverEndpoint.IsValid);
+            Assert.IsFalse(clientEndpoint.IsValid);
+
+            // Validate that invalid client identifiers return an invalid NetworkEndPoint
+            serverEndpoint = (m_ClientNetworkManagers[0].NetworkConfig.NetworkTransport as UnityTransport).GetEndpoint((ulong)UnityEngine.Random.Range(NumberOfClients + 1, 30));
+            clientEndpoint = serverUnityTransport.GetEndpoint((ulong)UnityEngine.Random.Range(NumberOfClients + 1, 30));
+            Assert.IsFalse(serverEndpoint.IsValid);
+            Assert.IsFalse(clientEndpoint.IsValid);
+        }
+    }
 }
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectDestroyTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectDestroyTests.cs
index 0e6d20e23f..1c65d3572d 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectDestroyTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectDestroyTests.cs
@@ -13,16 +13,29 @@ namespace Unity.Netcode.RuntimeTests
     /// - Server destroy spawned => Object gets destroyed and despawned/destroyed on all clients. Server does not run <see cref="NetworkPrefaInstanceHandler.HandleNetworkPrefabDestroy"/>. Client runs it.
     /// - Client destroy spawned => throw exception.
     /// </summary>
-    public class NetworkObjectDestroyTests : NetcodeIntegrationTest
+
+
+    [TestFixture(NetworkTopologyTypes.DistributedAuthority)]
+    [TestFixture(NetworkTopologyTypes.ClientServer)]
+    internal class NetworkObjectDestroyTests : NetcodeIntegrationTest
     {
-        protected override int NumberOfClients => 1;
+        protected override int NumberOfClients => 2;
+
+        public NetworkObjectDestroyTests(NetworkTopologyTypes networkTopologyType) : base(networkTopologyType) { }
+
+        protected override void OnCreatePlayerPrefab()
+        {
+            var playerNetworkObject = m_PlayerPrefab.GetComponent<NetworkObject>();
+            playerNetworkObject.SceneMigrationSynchronization = true;
+            base.OnCreatePlayerPrefab();
+        }
 
         /// <summary>
         /// Tests that a server can destroy a NetworkObject and that it gets despawned correctly.
         /// </summary>
         /// <returns></returns>
         [UnityTest]
-        public IEnumerator TestNetworkObjectServerDestroy()
+        public IEnumerator TestNetworkObjectAuthorityDestroy()
         {
             // This is the *SERVER VERSION* of the *CLIENT PLAYER*
             var serverClientPlayerResult = new NetcodeIntegrationTestHelpers.ResultWrapper<NetworkObject>();
@@ -35,15 +48,25 @@ public IEnumerator TestNetworkObjectServerDestroy()
             Assert.IsNotNull(serverClientPlayerResult.Result.gameObject);
             Assert.IsNotNull(clientClientPlayerResult.Result.gameObject);
 
-            // destroy the server player
-            Object.Destroy(serverClientPlayerResult.Result.gameObject);
+            var targetNetworkManager = m_ClientNetworkManagers[0];
+            if (m_DistributedAuthority)
+            {
+                targetNetworkManager = m_ClientNetworkManagers[1];
+                // destroy the authoritative player (distributed authority)
+                Object.Destroy(clientClientPlayerResult.Result.gameObject);
+            }
+            else
+            {
+                // destroy the authoritative player (client-server)
+                Object.Destroy(serverClientPlayerResult.Result.gameObject);
+            }
 
-            yield return NetcodeIntegrationTestHelpers.WaitForMessageOfTypeHandled<DestroyObjectMessage>(m_ClientNetworkManagers[0]);
+            yield return NetcodeIntegrationTestHelpers.WaitForMessageOfTypeHandled<DestroyObjectMessage>(targetNetworkManager);
 
             Assert.IsTrue(serverClientPlayerResult.Result == null); // Assert.IsNull doesn't work here
             Assert.IsTrue(clientClientPlayerResult.Result == null);
 
-            // create an unspawned networkobject and destroy it
+            // validate that any unspawned networkobject can be destroyed
             var go = new GameObject();
             go.AddComponent<NetworkObject>();
             Object.Destroy(go);
@@ -74,16 +97,42 @@ public IEnumerator TestNetworkObjectClientDestroy([Values] ClientDestroyObject c
             //destroying a NetworkObject while shutting down is allowed
             if (isShuttingDown)
             {
-                m_ClientNetworkManagers[0].Shutdown();
+                if (m_DistributedAuthority)
+                {
+                    // Shutdown the 2nd client
+                    m_ClientNetworkManagers[1].Shutdown();
+                }
+                else
+                {
+                    // Shutdown the
+                    m_ClientNetworkManagers[0].Shutdown();
+                }
             }
             else
             {
                 LogAssert.ignoreFailingMessages = true;
                 NetworkLog.NetworkManagerOverride = m_ClientNetworkManagers[0];
             }
+
             m_ClientPlayerName = clientPlayer.gameObject.name;
             m_ClientNetworkObjectId = clientPlayer.NetworkObjectId;
-            Object.DestroyImmediate(clientPlayer.gameObject);
+            if (m_DistributedAuthority)
+            {
+                m_ClientPlayerName = m_PlayerNetworkObjects[m_ClientNetworkManagers[1].LocalClientId][m_ClientNetworkManagers[0].LocalClientId].gameObject.name;
+                m_ClientNetworkObjectId = m_PlayerNetworkObjects[m_ClientNetworkManagers[1].LocalClientId][m_ClientNetworkManagers[0].LocalClientId].NetworkObjectId;
+
+                if (!isShuttingDown)
+                {
+                    NetworkLog.NetworkManagerOverride = m_ClientNetworkManagers[1];
+                }
+                // the 2nd client attempts to destroy the 1st client's player object (if shutting down then "ok" if not then not "ok")
+                Object.DestroyImmediate(m_PlayerNetworkObjects[m_ClientNetworkManagers[1].LocalClientId][m_ClientNetworkManagers[0].LocalClientId].gameObject);
+            }
+            else
+            {
+                // the 1st client attempts to destroy its own player object (if shutting down then "ok" if not then not "ok")
+                Object.DestroyImmediate(m_ClientNetworkManagers[0].LocalClient.PlayerObject.gameObject);
+            }
 
             // destroying a NetworkObject while a session is active is not allowed
             if (!isShuttingDown)
@@ -91,20 +140,37 @@ public IEnumerator TestNetworkObjectClientDestroy([Values] ClientDestroyObject c
                 yield return WaitForConditionOrTimeOut(HaveLogsBeenReceived);
                 AssertOnTimeout($"Not all expected logs were received when destroying a {nameof(NetworkObject)} on the client side during an active session!");
             }
+            if (m_DistributedAuthority)
+            {
+                Assert.IsFalse(m_ClientNetworkManagers[1].SpawnManager.NetworkObjectsToSynchronizeSceneChanges.ContainsKey(m_ClientNetworkObjectId), $"Player object {m_ClientNetworkObjectId} still exists within {nameof(NetworkSpawnManager.NetworkObjectsToSynchronizeSceneChanges)}!");
+            }
+            else
+            {
+                Assert.IsFalse(m_ClientNetworkManagers[0].SpawnManager.NetworkObjectsToSynchronizeSceneChanges.ContainsKey(m_ClientNetworkObjectId), $"Player object {m_ClientNetworkObjectId} still exists within {nameof(NetworkSpawnManager.NetworkObjectsToSynchronizeSceneChanges)}!");
+            }
         }
 
         private bool HaveLogsBeenReceived()
         {
-            if (!NetcodeLogAssert.HasLogBeenReceived(LogType.Error, $"[Netcode] [Invalid Destroy][{m_ClientPlayerName}][NetworkObjectId:{m_ClientNetworkObjectId}] Destroy a spawned {nameof(NetworkObject)} on a non-host client is not valid. Call Destroy or Despawn on the server/host instead."))
+            if (m_DistributedAuthority)
             {
-                return false;
+                if (!NetcodeLogAssert.HasLogBeenReceived(LogType.Error, $"[Netcode] [Invalid Destroy][{m_ClientPlayerName}][NetworkObjectId:{m_ClientNetworkObjectId}] Destroy a spawned {nameof(NetworkObject)} on a non-owner client is not valid during a distributed authority session. Call Destroy or Despawn on the client-owner instead."))
+                {
+                    return false;
+                }
             }
-
-            if (!NetcodeLogAssert.HasLogBeenReceived(LogType.Error, $"[Netcode-Server Sender={m_ClientNetworkManagers[0].LocalClientId}] [Invalid Destroy][{m_ClientPlayerName}][NetworkObjectId:{m_ClientNetworkObjectId}] Destroy a spawned {nameof(NetworkObject)} on a non-host client is not valid. Call Destroy or Despawn on the server/host instead."))
+            else
             {
-                return false;
+                if (!NetcodeLogAssert.HasLogBeenReceived(LogType.Error, $"[Netcode] [Invalid Destroy][{m_ClientPlayerName}][NetworkObjectId:{m_ClientNetworkObjectId}] Destroy a spawned {nameof(NetworkObject)} on a non-host client is not valid. Call Destroy or Despawn on the server/host instead."))
+                {
+                    return false;
+                }
+
+                if (!NetcodeLogAssert.HasLogBeenReceived(LogType.Error, $"[Netcode-Server Sender={m_ClientNetworkManagers[0].LocalClientId}] [Invalid Destroy][{m_ClientPlayerName}][NetworkObjectId:{m_ClientNetworkObjectId}] Destroy a spawned {nameof(NetworkObject)} on a non-host client is not valid. Call Destroy or Despawn on the server/host instead."))
+                {
+                    return false;
+                }
             }
-
             return true;
         }
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectDontDestroyWithOwnerTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectDontDestroyWithOwnerTests.cs
index 4300afddf6..51e86ea496 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectDontDestroyWithOwnerTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectDontDestroyWithOwnerTests.cs
@@ -8,9 +8,10 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
+    [TestFixture(HostOrServer.DAHost)]
     [TestFixture(HostOrServer.Host)]
     [TestFixture(HostOrServer.Server)]
-    public class NetworkObjectDontDestroyWithOwnerTests : NetcodeIntegrationTest
+    internal class NetworkObjectDontDestroyWithOwnerTests : NetcodeIntegrationTest
     {
         private const int k_NumberObjectsToSpawn = 32;
         protected override int NumberOfClients => 1;
@@ -36,6 +37,22 @@ public IEnumerator DontDestroyWithOwnerTest()
             yield return WaitForConditionOrTimeOut(() => client.SpawnManager.GetClientOwnedObjects(clientId).Count() == k_NumberObjectsToSpawn + 1);
             Assert.False(s_GlobalTimeoutHelper.TimedOut, $"Timed out waiting for client to have 33 NetworkObjects spawned! Only {client.SpawnManager.GetClientOwnedObjects(clientId).Count()} were assigned!");
 
+            // Since clients spawn their objects locally in distributed authority mode, we have to rebuild the list of the client
+            // owned objects on the (DAHost) server-side because when the client disconnects it will destroy its local instances.
+            if (m_DistributedAuthority)
+            {
+                networkObjects.Clear();
+                var serversideClientOwnedObjects = m_ServerNetworkManager.SpawnManager.GetClientOwnedObjects(clientId);
+
+                foreach (var networkObject in serversideClientOwnedObjects)
+                {
+                    if (!networkObject.IsPlayerObject)
+                    {
+                        networkObjects.Add(networkObject.gameObject);
+                    }
+                }
+            }
+
             // disconnect the client that owns all the clients
             NetcodeIntegrationTestHelpers.StopOneClient(client);
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectNetworkClientOwnedObjectsTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectNetworkClientOwnedObjectsTests.cs
index cd31ca218a..d9b0521e56 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectNetworkClientOwnedObjectsTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectNetworkClientOwnedObjectsTests.cs
@@ -7,7 +7,7 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class NetworkObjectNetworkClientOwnedObjectsTests : NetcodeIntegrationTest
+    internal class NetworkObjectNetworkClientOwnedObjectsTests : NetcodeIntegrationTest
     {
         private class DummyNetworkBehaviour : NetworkBehaviour
         {
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectOnNetworkDespawnTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectOnNetworkDespawnTests.cs
index ae1ea072d5..9a737a4d3e 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectOnNetworkDespawnTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectOnNetworkDespawnTests.cs
@@ -10,12 +10,13 @@ namespace Unity.Netcode.RuntimeTests
     /// <summary>
     /// Tests that check OnNetworkDespawn being invoked
     /// </summary>
+    [TestFixture(HostOrServer.DAHost)]
     [TestFixture(HostOrServer.Host)]
     [TestFixture(HostOrServer.Server)]
-    public class NetworkObjectOnNetworkDespawnTests : NetcodeIntegrationTest
+    internal class NetworkObjectOnNetworkDespawnTests : NetcodeIntegrationTest
     {
         private const string k_ObjectName = "TestDespawn";
-        public enum InstanceType
+        public enum InstanceTypes
         {
             Server,
             Client
@@ -23,7 +24,10 @@ public enum InstanceType
 
         protected override int NumberOfClients => 1;
         private GameObject m_ObjectToSpawn;
+        private NetworkObject m_NetworkObject;
+
         private HostOrServer m_HostOrServer;
+
         public NetworkObjectOnNetworkDespawnTests(HostOrServer hostOrServer) : base(hostOrServer)
         {
             m_HostOrServer = hostOrServer;
@@ -31,32 +35,17 @@ public NetworkObjectOnNetworkDespawnTests(HostOrServer hostOrServer) : base(host
 
         internal class OnNetworkDespawnTestComponent : NetworkBehaviour
         {
-            public static bool OnServerNetworkDespawnCalled { get; internal set; }
-            public static bool OnClientNetworkDespawnCalled { get; internal set; }
+            public bool OnNetworkDespawnCalled { get; internal set; }
 
             public override void OnNetworkSpawn()
             {
-                if (IsServer)
-                {
-                    OnServerNetworkDespawnCalled = false;
-                }
-                else
-                {
-                    OnClientNetworkDespawnCalled = false;
-                }
+                OnNetworkDespawnCalled = false;
                 base.OnNetworkSpawn();
             }
 
             public override void OnNetworkDespawn()
             {
-                if (IsServer)
-                {
-                    OnServerNetworkDespawnCalled = true;
-                }
-                else
-                {
-                    OnClientNetworkDespawnCalled = true;
-                }
+                OnNetworkDespawnCalled = true;
                 base.OnNetworkDespawn();
             }
         }
@@ -68,46 +57,67 @@ protected override void OnServerAndClientsCreated()
             base.OnServerAndClientsCreated();
         }
 
-        /// <summary>
-        /// This test validates that <see cref="NetworkBehaviour.OnNetworkDespawn"/> is invoked when the
-        /// <see cref="NetworkManager"/> is shutdown.
-        /// </summary>
-        [UnityTest]
-        public IEnumerator TestNetworkObjectDespawnOnShutdown()
+        private bool ObjectSpawnedOnAllNetworkManagerInstances()
         {
-            // Spawn the test object
-            var spawnedObject = SpawnObject(m_ObjectToSpawn, m_ServerNetworkManager);
-            var spawnedNetworkObject = spawnedObject.GetComponent<NetworkObject>();
+            if (!s_GlobalNetworkObjects.ContainsKey(m_ServerNetworkManager.LocalClientId))
+            {
+                return false;
+            }
+            if (!s_GlobalNetworkObjects[m_ServerNetworkManager.LocalClientId].ContainsKey(m_NetworkObject.NetworkObjectId))
+            {
+                return false;
+            }
 
-            // Wait for the client to spawn the object
-            yield return WaitForConditionOrTimeOut(() =>
+            foreach (var clientNetworkManager in m_ClientNetworkManagers)
             {
-                if (!s_GlobalNetworkObjects.ContainsKey(m_ClientNetworkManagers[0].LocalClientId))
+                if (!s_GlobalNetworkObjects.ContainsKey(clientNetworkManager.LocalClientId))
                 {
                     return false;
                 }
-                if (!s_GlobalNetworkObjects[m_ClientNetworkManagers[0].LocalClientId].ContainsKey(spawnedNetworkObject.NetworkObjectId))
+                if (!s_GlobalNetworkObjects[clientNetworkManager.LocalClientId].ContainsKey(m_NetworkObject.NetworkObjectId))
                 {
                     return false;
                 }
-                return true;
-            });
+            }
 
-            AssertOnTimeout($"Timed out waiting for client to spawn {k_ObjectName}!");
+            return true;
+        }
+
+        /// <summary>
+        /// This test validates that <see cref="NetworkBehaviour.OnNetworkDespawn"/> is invoked when the
+        /// <see cref="NetworkManager"/> is shutdown.
+        /// </summary>
+        [UnityTest]
+        public IEnumerator TestNetworkObjectDespawnOnShutdown([Values(InstanceTypes.Server, InstanceTypes.Client)] InstanceTypes despawnCheck)
+        {
+            var networkManager = despawnCheck == InstanceTypes.Server ? m_ServerNetworkManager : m_ClientNetworkManagers[0];
+            var networkManagerOwner = m_ServerNetworkManager;
+            if (m_DistributedAuthority)
+            {
+                networkManagerOwner = networkManager;
+            }
+
+            // Spawn the test object
+            var spawnedObject = SpawnObject(m_ObjectToSpawn, networkManagerOwner);
+            m_NetworkObject = spawnedObject.GetComponent<NetworkObject>();
+
+
+            yield return WaitForConditionOrTimeOut(ObjectSpawnedOnAllNetworkManagerInstances);
+            AssertOnTimeout($"Timed out waiting for all {nameof(NetworkManager)} instances to spawn {m_NetworkObject.name}!");
+
+            // Get the spawned object relative to which NetworkManager instance we are testing.
+            var relativeSpawnedObject = s_GlobalNetworkObjects[networkManager.LocalClientId][m_NetworkObject.NetworkObjectId];
+            var onNetworkDespawnTestComponent = relativeSpawnedObject.GetComponent<OnNetworkDespawnTestComponent>();
 
             // Confirm it is not set before shutting down the NetworkManager
-            Assert.IsFalse(OnNetworkDespawnTestComponent.OnClientNetworkDespawnCalled, "[Client-side] despawn state is already set (should not be set at this point)!");
-            Assert.IsFalse(OnNetworkDespawnTestComponent.OnServerNetworkDespawnCalled, $"[{m_HostOrServer}-side] despawn state is already set (should not be set at this point)!");
-
-            // Shutdown the client-side first to validate the client-side instance invokes OnNetworkDespawn
-            m_ClientNetworkManagers[0].Shutdown();
-            yield return WaitForConditionOrTimeOut(() => OnNetworkDespawnTestComponent.OnClientNetworkDespawnCalled);
-            AssertOnTimeout($"[Client-side] Timed out waiting for {k_ObjectName}'s {nameof(NetworkBehaviour.OnNetworkDespawn)} to be invoked!");
-
-            // Shutdown the servr-host-side second to validate servr-host-side instance invokes OnNetworkDespawn
-            m_ServerNetworkManager.Shutdown();
-            yield return WaitForConditionOrTimeOut(() => OnNetworkDespawnTestComponent.OnClientNetworkDespawnCalled);
-            AssertOnTimeout($"[{m_HostOrServer}-side]Timed out waiting for {k_ObjectName}'s {nameof(NetworkBehaviour.OnNetworkDespawn)} to be invoked!");
+            Assert.IsFalse(onNetworkDespawnTestComponent.OnNetworkDespawnCalled, $"{nameof(OnNetworkDespawnTestComponent.OnNetworkDespawnCalled)} was set prior to shutting down!");
+
+            // Shutdown the NetworkManager instance we are testing.
+            networkManager.Shutdown();
+
+            // Confirm that OnNetworkDespawn is invoked after shutdown
+            yield return WaitForConditionOrTimeOut(() => onNetworkDespawnTestComponent.OnNetworkDespawnCalled);
+            AssertOnTimeout($"Timed out waiting for {nameof(NetworkObject)} instance to despawn on the {despawnCheck} side!");
         }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectOnSpawnTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectOnSpawnTests.cs
index 17b618a0a1..8d8f02311f 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectOnSpawnTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectOnSpawnTests.cs
@@ -7,7 +7,10 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class NetworkObjectOnSpawnTests : NetcodeIntegrationTest
+
+    [TestFixture(NetworkTopologyTypes.DistributedAuthority)]
+    [TestFixture(NetworkTopologyTypes.ClientServer)]
+    internal class NetworkObjectOnSpawnTests : NetcodeIntegrationTest
     {
         private GameObject m_TestNetworkObjectPrefab;
         private GameObject m_TestNetworkObjectInstance;
@@ -27,23 +30,39 @@ public enum ObserverTestTypes
         private const string k_WithObserversError = "Not all clients spawned the";
         private const string k_WithoutObserversError = "A client spawned the";
 
+        public NetworkObjectOnSpawnTests(NetworkTopologyTypes networkTopologyType) : base(networkTopologyType) { }
+
         protected override void OnServerAndClientsCreated()
         {
             m_ObserverPrefab = CreateNetworkObjectPrefab(k_ObserverTestObjName);
             base.OnServerAndClientsCreated();
         }
 
-
         private bool CheckClientsSideObserverTestObj()
         {
             foreach (var client in m_ClientNetworkManagers)
             {
-                if (!s_GlobalNetworkObjects.ContainsKey(client.LocalClientId))
+                if (m_ObserverTestType == ObserverTestTypes.WithObservers)
                 {
-                    // When no observers there shouldn't be any client spawned NetworkObjects
-                    // (players are held in a different list)
-                    return !(m_ObserverTestType == ObserverTestTypes.WithObservers);
+                    // When validating this portion of the test and spawning with observers is true, there
+                    // should be spawned objects on the clients.
+                    if (!s_GlobalNetworkObjects.ContainsKey(client.LocalClientId))
+                    {
+                        return false;
+                    }
                 }
+                else
+                {
+                    // When validating this portion of the test and spawning with observers is false, there
+                    // should be no spawned objects on the clients.
+                    if (s_GlobalNetworkObjects.ContainsKey(client.LocalClientId))
+                    {
+                        return false;
+                    }
+                    // We don't need to check anything else for spawn without observers
+                    continue;
+                }
+
                 var clientObjects = s_GlobalNetworkObjects[client.LocalClientId];
                 // Make sure they did spawn the object
                 if (m_ObserverTestType == ObserverTestTypes.WithObservers)
@@ -67,13 +86,6 @@ private bool CheckClientsSideObserverTestObj()
         /// </summary>
         protected override void OnNewClientCreated(NetworkManager networkManager)
         {
-            foreach (var networkPrefab in m_ServerNetworkManager.NetworkConfig.Prefabs.Prefabs)
-            {
-                if (!networkManager.NetworkConfig.Prefabs.Contains(networkPrefab.Prefab))
-                {
-                    networkManager.NetworkConfig.Prefabs.Add(networkPrefab);
-                }
-            }
             networkManager.NetworkConfig.EnableSceneManagement = m_ServerNetworkManager.NetworkConfig.EnableSceneManagement;
             base.OnNewClientCreated(networkManager);
         }
@@ -83,10 +95,16 @@ protected override void OnNewClientCreated(NetworkManager networkManager)
         /// </summary>
         /// <param name="observerTestTypes">whether to spawn with or without observers</param>
         [UnityTest]
-        public IEnumerator ObserverSpawnTests([Values] ObserverTestTypes observerTestTypes, [Values] bool sceneManagement)
+        public IEnumerator ObserverSpawnTests([Values] ObserverTestTypes observerTestTypes, [Values] SceneManagementState sceneManagement)
         {
-            if (!sceneManagement)
+            if (sceneManagement == SceneManagementState.SceneManagementDisabled)
             {
+                // When scene management is disabled, we need this wait period for all clients to be up to date with
+                // all other clients before beginning the process of stopping all clients.
+                if (m_DistributedAuthority)
+                {
+                    yield return new WaitForSeconds(0.5f);
+                }
                 // Disable prefabs to prevent them from being destroyed
                 foreach (var networkPrefab in m_ServerNetworkManager.NetworkConfig.Prefabs.Prefabs)
                 {
@@ -156,8 +174,10 @@ public IEnumerator ObserverSpawnTests([Values] ObserverTestTypes observerTestTyp
                 m_ObserverTestType = ObserverTestTypes.WithoutObservers;
                 // Just give a little time to make sure nothing spawned
                 yield return s_DefaultWaitForTick;
-                yield return WaitForConditionOrTimeOut(CheckClientsSideObserverTestObj);
-                AssertOnTimeout($"{(withoutObservers ? k_WithoutObserversError : k_WithObserversError)} {k_ObserverTestObjName} object!");
+
+                // This just requires a targeted check to assure the newly joined client did not spawn the NetworkObject with SpawnWithObservers set to false
+                var lateJoinClientId = m_ClientNetworkManagers[m_ClientNetworkManagers.Length - 1].LocalClientId;
+                Assert.False(s_GlobalNetworkObjects.ContainsKey(lateJoinClientId), $"[Client-{lateJoinClientId}] Spawned {instance.name} when it shouldn't have!");
 
                 // Now validate that we can make the NetworkObject visible to the newly joined client
                 m_ObserverTestNetworkObject.NetworkShow(m_ClientNetworkManagers[NumberOfClients].LocalClientId);
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectOwnershipPropertiesTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectOwnershipPropertiesTests.cs
new file mode 100644
index 0000000000..6ae761b360
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectOwnershipPropertiesTests.cs
@@ -0,0 +1,206 @@
+using System.Collections;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using Unity.Netcode.TestHelpers.Runtime;
+using UnityEngine;
+using UnityEngine.TestTools;
+
+namespace Unity.Netcode.RuntimeTests
+{
+
+    [TestFixture(NetworkTopologyTypes.DistributedAuthority)]
+    [TestFixture(NetworkTopologyTypes.ClientServer)]
+    internal class NetworkObjectOwnershipPropertiesTests : NetcodeIntegrationTest
+    {
+        private class DummyNetworkBehaviour : NetworkBehaviour
+        {
+
+        }
+
+        protected override int NumberOfClients => 2;
+        private GameObject m_PrefabToSpawn;
+        private NetworkObject m_OwnerSpawnedInstance;
+        private NetworkObject m_TargetOwnerInstance;
+        private NetworkManager m_InitialOwner;
+        private NetworkManager m_NextTargetOwner;
+
+        private ulong m_InitialOwnerId;
+        private ulong m_TargetOwnerId;
+        private bool m_SpawnedInstanceIsOwner;
+        private bool m_InitialOwnerOwnedBySever;
+        private bool m_TargetOwnerOwnedBySever;
+
+        public NetworkObjectOwnershipPropertiesTests(NetworkTopologyTypes networkTopologyType) : base(networkTopologyType) { }
+
+        protected override IEnumerator OnTearDown()
+        {
+            m_OwnerSpawnedInstance = null;
+            m_InitialOwner = null;
+            m_NextTargetOwner = null;
+            m_PrefabToSpawn = null;
+            return base.OnTearDown();
+        }
+
+        protected override void OnServerAndClientsCreated()
+        {
+            m_PrefabToSpawn = CreateNetworkObjectPrefab("ClientOwnedObject");
+            m_PrefabToSpawn.gameObject.AddComponent<DummyNetworkBehaviour>();
+            m_PrefabToSpawn.GetComponent<NetworkObject>().SetOwnershipStatus(NetworkObject.OwnershipStatus.Distributable);
+        }
+
+        public enum InstanceTypes
+        {
+            Server,
+            Client
+        }
+
+        private StringBuilder m_OwnershipPropagatedFailures = new StringBuilder();
+        private bool OwnershipPropagated()
+        {
+            var conditionMet = true;
+            m_OwnershipPropagatedFailures.Clear();
+            // In distributed authority mode, we will check client owner to DAHost owner with InstanceTypes.Server and client owner to client
+            // when InstanceTypes.Client
+            if (m_DistributedAuthority)
+            {
+                if (!m_ClientNetworkManagers[1].SpawnManager.GetClientOwnedObjects(m_NextTargetOwner.LocalClientId).Any(x => x.NetworkObjectId == m_OwnerSpawnedInstance.NetworkObjectId))
+                {
+                    conditionMet = false;
+                    m_OwnershipPropagatedFailures.AppendLine($"Client-{m_ClientNetworkManagers[1].LocalClientId} has no ownership entry for {m_OwnerSpawnedInstance.name} ({m_OwnerSpawnedInstance.NetworkObjectId})");
+                }
+                if (!m_ClientNetworkManagers[0].SpawnManager.GetClientOwnedObjects(m_NextTargetOwner.LocalClientId).Any(x => x.NetworkObjectId == m_OwnerSpawnedInstance.NetworkObjectId))
+                {
+                    conditionMet = false;
+                    m_OwnershipPropagatedFailures.AppendLine($"Client-{m_ClientNetworkManagers[0].LocalClientId} has no ownership entry for {m_OwnerSpawnedInstance.name} ({m_OwnerSpawnedInstance.NetworkObjectId})");
+                }
+                if (!m_ServerNetworkManager.SpawnManager.GetClientOwnedObjects(m_NextTargetOwner.LocalClientId).Any(x => x.NetworkObjectId == m_OwnerSpawnedInstance.NetworkObjectId))
+                {
+                    conditionMet = false;
+                    m_OwnershipPropagatedFailures.AppendLine($"Client-{m_ServerNetworkManager.LocalClientId} has no ownership entry for {m_OwnerSpawnedInstance.name} ({m_OwnerSpawnedInstance.NetworkObjectId})");
+                }
+            }
+            else
+            {
+                if (m_NextTargetOwner != m_ServerNetworkManager)
+                {
+                    if (!m_NextTargetOwner.SpawnManager.GetClientOwnedObjects(m_NextTargetOwner.LocalClientId).Any(x => x.NetworkObjectId == m_OwnerSpawnedInstance.NetworkObjectId))
+                    {
+                        conditionMet = false;
+                        m_OwnershipPropagatedFailures.AppendLine($"Client-{m_NextTargetOwner.LocalClientId} has no ownership entry for {m_OwnerSpawnedInstance.name} ({m_OwnerSpawnedInstance.NetworkObjectId})");
+                    }
+                }
+                if (!m_ServerNetworkManager.SpawnManager.GetClientOwnedObjects(m_NextTargetOwner.LocalClientId).Any(x => x.NetworkObjectId == m_OwnerSpawnedInstance.NetworkObjectId))
+                {
+                    conditionMet = false;
+                    m_OwnershipPropagatedFailures.AppendLine($"Client-{m_ServerNetworkManager.LocalClientId} has no ownership entry for {m_OwnerSpawnedInstance.name} ({m_OwnerSpawnedInstance.NetworkObjectId})");
+                }
+            }
+            return conditionMet;
+        }
+
+        private void ValidateOwnerShipProperties(bool targetIsOwner = false)
+        {
+            Assert.AreEqual(m_OwnerSpawnedInstance.IsOwner, m_SpawnedInstanceIsOwner);
+            Assert.AreEqual(m_OwnerSpawnedInstance.IsOwnedByServer, m_InitialOwnerOwnedBySever);
+            Assert.AreEqual(targetIsOwner ? m_TargetOwnerId : m_InitialOwnerId, m_OwnerSpawnedInstance.OwnerClientId);
+
+            var initialOwnerBehaviour = m_OwnerSpawnedInstance.GetComponent<DummyNetworkBehaviour>();
+            Assert.AreEqual(initialOwnerBehaviour.IsOwner, m_SpawnedInstanceIsOwner);
+            Assert.AreEqual(initialOwnerBehaviour.IsOwnedByServer, m_InitialOwnerOwnedBySever);
+            Assert.AreEqual(targetIsOwner ? m_TargetOwnerId : m_InitialOwnerId, initialOwnerBehaviour.OwnerClientId);
+
+            Assert.AreEqual(m_TargetOwnerInstance.IsOwner, targetIsOwner);
+            Assert.AreEqual(m_TargetOwnerInstance.IsOwnedByServer, m_TargetOwnerOwnedBySever);
+
+            Assert.AreEqual(targetIsOwner ? m_TargetOwnerId : m_InitialOwnerId, m_TargetOwnerInstance.OwnerClientId);
+            var targetOwnerBehaviour = m_TargetOwnerInstance.GetComponent<DummyNetworkBehaviour>();
+            Assert.AreEqual(targetOwnerBehaviour.IsOwner, targetIsOwner);
+            Assert.AreEqual(targetOwnerBehaviour.IsOwnedByServer, m_TargetOwnerOwnedBySever);
+            Assert.AreEqual(targetIsOwner ? m_TargetOwnerId : m_InitialOwnerId, m_TargetOwnerInstance.OwnerClientId);
+        }
+
+
+        [UnityTest]
+        public IEnumerator ValidatePropertiesWithOwnershipChanges([Values(InstanceTypes.Server, InstanceTypes.Client)] InstanceTypes instanceType)
+        {
+            m_NextTargetOwner = instanceType == InstanceTypes.Server ? m_ServerNetworkManager : m_ClientNetworkManagers[0];
+            m_InitialOwner = instanceType == InstanceTypes.Client ? m_ServerNetworkManager : m_ClientNetworkManagers[0];
+
+            // In distributed authority mode, we will check client owner to DAHost owner with InstanceTypes.Server and client owner to client
+            // when InstanceTypes.Client
+            if (m_DistributedAuthority)
+            {
+                m_InitialOwner = m_ClientNetworkManagers[0];
+                if (instanceType == InstanceTypes.Client)
+                {
+                    m_NextTargetOwner = m_ClientNetworkManagers[1];
+                }
+                m_PrefabToSpawn.GetComponent<NetworkObject>().SetOwnershipStatus(NetworkObject.OwnershipStatus.Transferable);
+            }
+
+            m_InitialOwnerId = m_InitialOwner.LocalClientId;
+            m_TargetOwnerId = m_NextTargetOwner.LocalClientId;
+            m_InitialOwnerOwnedBySever = m_InitialOwner.IsServer;
+            m_TargetOwnerOwnedBySever = m_InitialOwner.IsServer;
+            var objectInstance = SpawnObject(m_PrefabToSpawn, m_InitialOwner);
+
+            m_OwnerSpawnedInstance = objectInstance.GetComponent<NetworkObject>();
+            m_SpawnedInstanceIsOwner = m_OwnerSpawnedInstance.NetworkManager == m_InitialOwner;
+            // Sanity check to verify that the next owner to target is not the owner of the spawned object
+            var hasEntry = m_InitialOwner.SpawnManager.GetClientOwnedObjects(m_NextTargetOwner.LocalClientId).Any(x => x.NetworkObjectId == m_OwnerSpawnedInstance.NetworkObjectId);
+            Assert.False(hasEntry);
+
+            // Since CreateObjectMessage gets proxied by DAHost, just wait until the next target owner has the spawned instance in the s_GlobalNetworkObjects table.
+            yield return WaitForConditionOrTimeOut(() => s_GlobalNetworkObjects.ContainsKey(m_NextTargetOwner.LocalClientId) && s_GlobalNetworkObjects[m_NextTargetOwner.LocalClientId].ContainsKey(m_OwnerSpawnedInstance.NetworkObjectId));
+            AssertOnTimeout($"Timed out waiting for Client-{m_NextTargetOwner.LocalClientId} to have an instance entry of {m_OwnerSpawnedInstance.name}-{m_OwnerSpawnedInstance.NetworkObjectId}!");
+
+            // Get the target client's instance of the spawned object
+            m_TargetOwnerInstance = s_GlobalNetworkObjects[m_NextTargetOwner.LocalClientId][m_OwnerSpawnedInstance.NetworkObjectId];
+
+            // Validate that NetworkObject and NetworkBehaviour ownership properties are correct
+            ValidateOwnerShipProperties();
+
+            // The authority always changes the ownership
+            // Client-Server: It will always be the host instance
+            // Distributed Authority: It can be either the DAHost or the client
+            if (m_DistributedAuthority)
+            {
+                // Use the target client's instance to change ownership
+                m_TargetOwnerInstance.ChangeOwnership(m_NextTargetOwner.LocalClientId);
+                if (instanceType == InstanceTypes.Client)
+                {
+                    var networkManagersList = new System.Collections.Generic.List<NetworkManager>() { m_ServerNetworkManager, m_ClientNetworkManagers[0] };
+                    // Provide enough time for the client to receive and process the spawned message.
+                    yield return WaitForMessageReceived<ChangeOwnershipMessage>(networkManagersList);
+                }
+                else
+                {
+                    // Provide enough time for the client to receive and process the change in ownership message.
+                    yield return WaitForMessageReceived<ChangeOwnershipMessage>(m_ClientNetworkManagers.ToList());
+                }
+            }
+            else
+            {
+                m_OwnerSpawnedInstance.ChangeOwnership(m_NextTargetOwner.LocalClientId);
+                // Provide enough time for the client to receive and process the change in ownership message.
+                yield return WaitForMessageReceived<ChangeOwnershipMessage>(m_ClientNetworkManagers.ToList());
+            }
+
+            // Ensure it's the ownership tables are updated
+            yield return WaitForConditionOrTimeOut(OwnershipPropagated);
+            AssertOnTimeout($"Timed out waiting for ownership to propagate!\n{m_OwnershipPropagatedFailures}");
+
+            m_SpawnedInstanceIsOwner = m_OwnerSpawnedInstance.NetworkManager == m_NextTargetOwner;
+            if (m_SpawnedInstanceIsOwner)
+            {
+                m_InitialOwnerOwnedBySever = m_OwnerSpawnedInstance.NetworkManager.IsServer;
+            }
+            m_InitialOwnerOwnedBySever = m_NextTargetOwner.IsServer;
+            m_TargetOwnerOwnedBySever = m_NextTargetOwner.IsServer;
+
+            // Validate that NetworkObject and NetworkBehaviour ownership properties are correct
+            ValidateOwnerShipProperties(true);
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectOwnershipPropertiesTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectOwnershipPropertiesTests.cs.meta
new file mode 100644
index 0000000000..5a555c06a6
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectOwnershipPropertiesTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7c88cc36139c1574fba571485477d642
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectOwnershipTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectOwnershipTests.cs
index 5fa49158e7..16670bf855 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectOwnershipTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectOwnershipTests.cs
@@ -2,14 +2,17 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using Unity.Netcode.Components;
 using Unity.Netcode.TestHelpers.Runtime;
 using UnityEngine;
 using UnityEngine.TestTools;
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class NetworkObjectOwnershipComponent : NetworkBehaviour
+    internal class NetworkObjectOwnershipComponent : NetworkBehaviour
     {
+        public static Dictionary<ulong, NetworkObjectOwnershipComponent> SpawnedInstances = new Dictionary<ulong, NetworkObjectOwnershipComponent>();
+
         public bool OnLostOwnershipFired = false;
         public bool OnGainedOwnershipFired = false;
 
@@ -23,16 +26,39 @@ public override void OnGainedOwnership()
             OnGainedOwnershipFired = true;
         }
 
+        protected override void OnOwnershipChanged(ulong previous, ulong current)
+        {
+            Assert.True(previous != current, $"[{nameof(OnOwnershipChanged)}][Invalid Parameters] Invoked and the previous ({previous}) equals the current ({current})!");
+            base.OnOwnershipChanged(previous, current);
+        }
+
+        public override void OnNetworkSpawn()
+        {
+            if (!SpawnedInstances.ContainsKey(NetworkManager.LocalClientId))
+            {
+                SpawnedInstances.Add(NetworkManager.LocalClientId, this);
+            }
+            base.OnNetworkSpawn();
+        }
+
         public void ResetFlags()
         {
             OnLostOwnershipFired = false;
             OnGainedOwnershipFired = false;
         }
+
+        [Rpc(SendTo.Authority)]
+        public void ChangeOwnershipRpc(RpcParams rpcParams = default)
+        {
+            NetworkObject.ChangeOwnership(rpcParams.Receive.SenderClientId);
+        }
     }
 
+
+    [TestFixture(HostOrServer.DAHost)]
     [TestFixture(HostOrServer.Host)]
     [TestFixture(HostOrServer.Server)]
-    public class NetworkObjectOwnershipTests : NetcodeIntegrationTest
+    internal class NetworkObjectOwnershipTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 9;
 
@@ -48,10 +74,21 @@ public enum OwnershipChecks
             Remove
         }
 
+        protected override IEnumerator OnSetup()
+        {
+            NetworkObjectOwnershipComponent.SpawnedInstances.Clear();
+            return base.OnSetup();
+        }
+
         protected override void OnServerAndClientsCreated()
         {
             m_OwnershipPrefab = CreateNetworkObjectPrefab("OnwershipPrefab");
             m_OwnershipPrefab.AddComponent<NetworkObjectOwnershipComponent>();
+            m_OwnershipPrefab.AddComponent<NetworkTransform>();
+            if (m_DistributedAuthority)
+            {
+                m_OwnershipPrefab.GetComponent<NetworkObject>().SetOwnershipStatus(NetworkObject.OwnershipStatus.Transferable);
+            }
             base.OnServerAndClientsCreated();
         }
 
@@ -67,6 +104,23 @@ public void TestPlayerIsOwned()
             Assert.NotNull(clientPlayerObject, $"Client Id {m_ClientNetworkManagers[0].LocalClientId} does not have its local player marked as an owned object using local client!");
         }
 
+        private bool AllObjectsSpawnedOnClients()
+        {
+            if (!NetworkObjectOwnershipComponent.SpawnedInstances.ContainsKey(m_ServerNetworkManager.LocalClientId))
+            {
+                return false;
+            }
+
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                if (!NetworkObjectOwnershipComponent.SpawnedInstances.ContainsKey(client.LocalClientId))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
         [UnityTest]
         public IEnumerator TestOwnershipCallbacks([Values] OwnershipChecks ownershipChecks)
         {
@@ -75,6 +129,9 @@ public IEnumerator TestOwnershipCallbacks([Values] OwnershipChecks ownershipChec
 
             yield return NetcodeIntegrationTestHelpers.WaitForMessageOfTypeHandled<CreateObjectMessage>(m_ClientNetworkManagers[0]);
 
+            yield return WaitForConditionOrTimeOut(AllObjectsSpawnedOnClients);
+            AssertOnTimeout($"Timed out waiting for all clients to spawn the ownership object!");
+
             var ownershipNetworkObjectId = m_OwnershipNetworkObject.NetworkObjectId;
             Assert.That(ownershipNetworkObjectId, Is.GreaterThan(0));
             Assert.That(m_ServerNetworkManager.SpawnManager.SpawnedObjects.ContainsKey(ownershipNetworkObjectId));
@@ -84,7 +141,11 @@ public IEnumerator TestOwnershipCallbacks([Values] OwnershipChecks ownershipChec
             }
 
             // Verifies that removing the ownership when the default (server) is already set does not cause a Key Not Found Exception
-            m_ServerNetworkManager.SpawnManager.RemoveOwnership(m_OwnershipNetworkObject);
+            // Distributed authority does not allow remove ownership (users are instructed to use change ownership)
+            if (!m_DistributedAuthority)
+            {
+                m_ServerNetworkManager.SpawnManager.RemoveOwnership(m_OwnershipNetworkObject);
+            }
 
             var serverObject = m_ServerNetworkManager.SpawnManager.SpawnedObjects[ownershipNetworkObjectId];
             var clientObject = m_ClientNetworkManagers[0].SpawnManager.SpawnedObjects[ownershipNetworkObjectId];
@@ -123,18 +184,22 @@ public IEnumerator TestOwnershipCallbacks([Values] OwnershipChecks ownershipChec
             else
             {
                 // Validates that when ownership is removed the server gets an OnGainedOwnership notification
-                serverObject.RemoveOwnership();
+                // In distributed authority mode, the current owner just rolls the ownership back over to the DAHost client (i.e. host mocking CMB Service)
+                if (m_DistributedAuthority)
+                {
+                    clientObject.ChangeOwnership(NetworkManager.ServerClientId);
+                }
+                else
+                {
+                    serverObject.RemoveOwnership();
+                }
             }
 
-            yield return s_DefaultWaitForTick;
-
-            Assert.That(serverComponent.OnGainedOwnershipFired);
-            Assert.That(serverComponent.OwnerClientId, Is.EqualTo(m_ServerNetworkManager.LocalClientId));
+            yield return WaitForConditionOrTimeOut(() => serverComponent.OnGainedOwnershipFired && serverComponent.OwnerClientId == m_ServerNetworkManager.LocalClientId);
+            AssertOnTimeout($"Timed out waiting for ownership to be transfered back to the host instance!");
 
-            yield return WaitForConditionOrTimeOut(() => clientComponent.OnLostOwnershipFired);
-            Assert.False(s_GlobalTimeoutHelper.TimedOut, $"Timed out waiting for client to lose ownership!");
-            Assert.That(clientComponent.OnLostOwnershipFired);
-            Assert.That(clientComponent.OwnerClientId, Is.EqualTo(m_ServerNetworkManager.LocalClientId));
+            yield return WaitForConditionOrTimeOut(() => clientComponent.OnLostOwnershipFired && clientComponent.OwnerClientId == m_ServerNetworkManager.LocalClientId);
+            AssertOnTimeout($"Timed out waiting for client-side lose ownership event to trigger or owner identifier to be equal to the host!");
         }
 
         /// <summary>
@@ -190,14 +255,19 @@ bool WaitForClientsToSpawnNetworkObject()
             Assert.False(s_GlobalTimeoutHelper.TimedOut, "Timed out waiting for all clients to change ownership!");
 
             // Verifies that removing the ownership when the default (server) is already set does not cause a Key Not Found Exception
-            m_ServerNetworkManager.SpawnManager.RemoveOwnership(m_OwnershipNetworkObject);
+            // Distributed authority does not allow remove ownership (users are instructed to use change ownership)
+            if (!m_DistributedAuthority)
+            {
+                m_ServerNetworkManager.SpawnManager.RemoveOwnership(m_OwnershipNetworkObject);
+            }
+
             var serverObject = m_ServerNetworkManager.SpawnManager.SpawnedObjects[ownershipNetworkObjectId];
             Assert.That(serverObject, Is.Not.Null);
-
+            var clientObject = (NetworkObject)null;
             var clientObjects = new List<NetworkObject>();
             for (int i = 0; i < NumberOfClients; i++)
             {
-                var clientObject = m_ClientNetworkManagers[i].SpawnManager.SpawnedObjects[ownershipNetworkObjectId];
+                clientObject = m_ClientNetworkManagers[i].SpawnManager.SpawnedObjects[ownershipNetworkObjectId];
                 Assert.That(clientObject, Is.Not.Null);
                 clientObjects.Add(clientObject);
             }
@@ -217,9 +287,12 @@ bool WaitForClientsToSpawnNetworkObject()
 
             // After the 1st client has been given ownership to the object, this will be used to make sure each previous owner properly received the remove ownership message
             var previousClientComponent = (NetworkObjectOwnershipComponent)null;
+
+            var networkManagersDAMode = new List<NetworkManager>();
+
             for (int clientIndex = 0; clientIndex < NumberOfClients; clientIndex++)
             {
-                var clientObject = clientObjects[clientIndex];
+                clientObject = clientObjects[clientIndex];
                 var clientId = m_ClientNetworkManagers[clientIndex].LocalClientId;
 
                 Assert.That(m_ServerNetworkManager.ConnectedClients.ContainsKey(clientId));
@@ -271,10 +344,44 @@ bool WaitForClientsToSpawnNetworkObject()
             else
             {
                 // Validates that when ownership is removed the server gets an OnGainedOwnership notification
-                serverObject.RemoveOwnership();
+                // In distributed authority mode, the current owner just rolls the ownership back over to the DAHost client (i.e. host mocking CMB Service)
+                if (m_DistributedAuthority)
+                {
+                    // In distributed authority, we have to clear out the NetworkManager instances as this changes relative to authority.
+                    networkManagersDAMode.Clear();
+                    foreach (var clientNetworkManager in m_ClientNetworkManagers)
+                    {
+                        if (clientNetworkManager.LocalClientId == clientObject.OwnerClientId)
+                        {
+                            continue;
+                        }
+                        networkManagersDAMode.Add(clientNetworkManager);
+                    }
+
+                    if (!UseCMBService() && clientObject.OwnerClientId != m_ServerNetworkManager.LocalClientId)
+                    {
+                        networkManagersDAMode.Add(m_ServerNetworkManager);
+                    }
+                    clientObject.ChangeOwnership(NetworkManager.ServerClientId);
+                }
+                else
+                {
+                    serverObject.RemoveOwnership();
+                }
+            }
+
+            if (m_DistributedAuthority)
+            {
+                // We use an alternate method (other than message hooks) to verify each client received the ownership message since message hooks becomes problematic when you need
+                // to make dynamic changes to your targets.
+                yield return WaitForConditionOrTimeOut(() => OwnershipChangedOnAllTargetedClients(networkManagersDAMode, clientObject.NetworkObjectId, NetworkManager.ServerClientId));
+            }
+            else
+            {
+                yield return WaitForConditionOrTimeOut(ownershipMessageHooks);
             }
 
-            yield return WaitForConditionOrTimeOut(ownershipMessageHooks);
+
             Assert.False(s_GlobalTimeoutHelper.TimedOut, $"Timed out waiting for all clients to receive the {nameof(ChangeOwnershipMessage)} message (back to server).");
 
             Assert.That(serverComponent.OnGainedOwnershipFired);
@@ -295,6 +402,22 @@ bool WaitForClientsToSpawnNetworkObject()
             serverComponent.ResetFlags();
         }
 
+        private bool OwnershipChangedOnAllTargetedClients(List<NetworkManager> networkManagers, ulong networkObjectId, ulong expectedOwner)
+        {
+            foreach (var networkManager in networkManagers)
+            {
+                if (!networkManager.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId))
+                {
+                    return false;
+                }
+                if (networkManager.SpawnManager.SpawnedObjects[networkObjectId].OwnerClientId != expectedOwner)
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
         private const int k_NumberOfSpawnedObjects = 5;
 
         private bool AllClientsHaveCorrectObjectCount()
@@ -302,7 +425,7 @@ private bool AllClientsHaveCorrectObjectCount()
 
             foreach (var clientNetworkManager in m_ClientNetworkManagers)
             {
-                if (clientNetworkManager.LocalClient.OwnedObjects.Count < k_NumberOfSpawnedObjects)
+                if (clientNetworkManager.LocalClient.OwnedObjects.Length < k_NumberOfSpawnedObjects)
                 {
                     return false;
                 }
@@ -316,7 +439,7 @@ private bool ServerHasCorrectClientOwnedObjectCount()
             // Only check when we are the host
             if (m_ServerNetworkManager.IsHost)
             {
-                if (m_ServerNetworkManager.LocalClient.OwnedObjects.Count < k_NumberOfSpawnedObjects)
+                if (m_ServerNetworkManager.LocalClient.OwnedObjects.Length < k_NumberOfSpawnedObjects)
                 {
                     return false;
                 }
@@ -324,7 +447,7 @@ private bool ServerHasCorrectClientOwnedObjectCount()
 
             foreach (var connectedClient in m_ServerNetworkManager.ConnectedClients)
             {
-                if (connectedClient.Value.OwnedObjects.Count < k_NumberOfSpawnedObjects)
+                if (connectedClient.Value.OwnedObjects.Length < k_NumberOfSpawnedObjects)
                 {
                     return false;
                 }
@@ -356,7 +479,87 @@ public IEnumerator TestOwnedObjectCounts()
 
             yield return WaitForConditionOrTimeOut(ServerHasCorrectClientOwnedObjectCount);
             AssertOnTimeout($"Server does not have the correct count for all clients spawned {k_NumberOfSpawnedObjects} {nameof(NetworkObject)}s!");
+        }
+
+        /// <summary>
+        /// Validates that when changing ownership NetworkTransform does not enter into a bad state
+        /// because the previous and current owner identifiers are the same. For client-server this
+        /// ends up always being the server, but for distributed authority the authority changes when
+        /// ownership changes.
+        /// </summary>
+        [UnityTest]
+        public IEnumerator TestAuthorityChangingOwnership()
+        {
+            var authorityManager = (NetworkManager)null;
+            var allNetworkManagers = m_ClientNetworkManagers.ToList();
+            allNetworkManagers.Add(m_ServerNetworkManager);
+
+            if (m_DistributedAuthority)
+            {
+                var authorityId = Random.Range(1, NumberOfClients) - 1;
+                authorityManager = m_ClientNetworkManagers[authorityId];
+                m_OwnershipObject = SpawnObject(m_OwnershipPrefab, authorityManager);
+                m_OwnershipNetworkObject = m_OwnershipObject.GetComponent<NetworkObject>();
+            }
+            else
+            {
+                authorityManager = m_ServerNetworkManager;
+                m_OwnershipObject = SpawnObject(m_OwnershipPrefab, m_ServerNetworkManager);
+                m_OwnershipNetworkObject = m_OwnershipObject.GetComponent<NetworkObject>();
+            }
+            var ownershipNetworkObjectId = m_OwnershipNetworkObject.NetworkObjectId;
+            bool WaitForClientsToSpawnNetworkObject()
+            {
+                foreach (var clientNetworkManager in m_ClientNetworkManagers)
+                {
+                    if (!clientNetworkManager.SpawnManager.SpawnedObjects.ContainsKey(ownershipNetworkObjectId))
+                    {
+                        return false;
+                    }
+                }
+                return true;
+            }
+
+            yield return WaitForConditionOrTimeOut(WaitForClientsToSpawnNetworkObject);
+            AssertOnTimeout($"Timed out waiting for all clients to spawn the {m_OwnershipNetworkObject.name} {nameof(NetworkObject)} instance!");
 
+            var currentTargetOwner = (ulong)0;
+            bool WaitForAllInstancesToChangeOwnership()
+            {
+                foreach (var clientNetworkManager in m_ClientNetworkManagers)
+                {
+                    if (!clientNetworkManager.SpawnManager.SpawnedObjects.ContainsKey(ownershipNetworkObjectId))
+                    {
+                        return false;
+                    }
+                    if (clientNetworkManager.SpawnManager.SpawnedObjects[ownershipNetworkObjectId].OwnerClientId != currentTargetOwner)
+                    {
+                        return false;
+                    }
+                }
+                return true;
+            }
+
+            // Change ownership a few times and as long as the previous and current owners are not the same when
+            // OnOwnershipChanged is invoked then the test passed.
+            foreach (var networkManager in allNetworkManagers)
+            {
+                if (networkManager == authorityManager)
+                {
+                    continue;
+                }
+                var clonedObject = networkManager.SpawnManager.SpawnedObjects[ownershipNetworkObjectId];
+
+                if (clonedObject.OwnerClientId == networkManager.LocalClientId)
+                {
+                    continue;
+                }
+
+                var testComponent = clonedObject.GetComponent<NetworkObjectOwnershipComponent>();
+                testComponent.ChangeOwnershipRpc();
+                yield return WaitForAllInstancesToChangeOwnership();
+                AssertOnTimeout($"Timed out waiting for all instances to change ownership to Client-{networkManager.LocalClientId}!");
+            }
         }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectPropertyTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectPropertyTests.cs
index 364a7cf05d..f1557f410e 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectPropertyTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectPropertyTests.cs
@@ -7,7 +7,7 @@ namespace Unity.Netcode.RuntimeTests
     /// <summary>
     /// Tests properties of NetworkObject for proper functionality.
     /// </summary>
-    public class NetworkObjectPropertyTests : NetcodeIntegrationTest
+    internal class NetworkObjectPropertyTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 1;
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectSpawnManyObjectsTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectSpawnManyObjectsTests.cs
index 8f35c970c0..b80e055f0f 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectSpawnManyObjectsTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectSpawnManyObjectsTests.cs
@@ -6,17 +6,19 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class NetworkObjectSpawnManyObjectsTests : NetcodeIntegrationTest
+
+    [TestFixture(NetworkTopologyTypes.ClientServer)]
+    [TestFixture(NetworkTopologyTypes.DistributedAuthority)]
+    internal class NetworkObjectSpawnManyObjectsTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 1;
-        // "many" in this case means enough to exceed a ushort_max message size written in the header
-        // 1500 is not a magic number except that it's big enough to trigger a failure
         private const int k_SpawnedObjects = 1500;
 
         private NetworkPrefab m_PrefabToSpawn;
 
+        public NetworkObjectSpawnManyObjectsTests(NetworkTopologyTypes networkTopologyType) : base(networkTopologyType) { }
         // Using this component assures we will know precisely how many prefabs were spawned on the client
-        public class SpawnObjecTrackingComponent : NetworkBehaviour
+        internal class SpawnObjecTrackingComponent : NetworkBehaviour
         {
             public static int SpawnedObjects;
             public override void OnNetworkSpawn()
@@ -35,6 +37,7 @@ protected override void OnServerAndClientsCreated()
             var gameObject = new GameObject("TestObject");
             var networkObject = gameObject.AddComponent<NetworkObject>();
             NetcodeIntegrationTestHelpers.MakeNetworkObjectTestPrefab(networkObject);
+            networkObject.IsSceneObject = false;
             gameObject.AddComponent<SpawnObjecTrackingComponent>();
 
             m_PrefabToSpawn = new NetworkPrefab() { Prefab = gameObject };
@@ -47,19 +50,23 @@ protected override void OnServerAndClientsCreated()
         }
 
         [UnityTest]
-        // When this test fails it does so without an exception and will wait the default ~6 minutes
-        [Timeout(10000)]
         public IEnumerator WhenManyObjectsAreSpawnedAtOnce_AllAreReceived()
         {
+            var timeStarted = Time.realtimeSinceStartup;
             for (int x = 0; x < k_SpawnedObjects; x++)
             {
                 NetworkObject serverObject = Object.Instantiate(m_PrefabToSpawn.Prefab).GetComponent<NetworkObject>();
                 serverObject.NetworkManagerOwner = m_ServerNetworkManager;
                 serverObject.Spawn();
             }
+
+            var timeSpawned = Time.realtimeSinceStartup - timeStarted;
+            // Provide plenty of time to spawn all 1500 objects in case the CI VM is running slow
+            var timeoutHelper = new TimeoutHelper(30);
             // ensure all objects are replicated
-            yield return WaitForConditionOrTimeOut(() => SpawnObjecTrackingComponent.SpawnedObjects == k_SpawnedObjects);
-            AssertOnTimeout($"Timed out waiting for the client to spawn {k_SpawnedObjects} objects!");
+            yield return WaitForConditionOrTimeOut(() => SpawnObjecTrackingComponent.SpawnedObjects == k_SpawnedObjects, timeoutHelper);
+
+            AssertOnTimeout($"Timed out waiting for the client to spawn {k_SpawnedObjects} objects! Time to spawn: {timeSpawned} | Time to timeout: {timeStarted - Time.realtimeSinceStartup}", timeoutHelper);
         }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectSynchronizationTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectSynchronizationTests.cs
index 3ac712e1e3..fc59ad09dc 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectSynchronizationTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectSynchronizationTests.cs
@@ -8,11 +8,13 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
+
+    [TestFixture(VariableLengthSafety.DisableNetVarSafety, HostOrServer.DAHost)]
     [TestFixture(VariableLengthSafety.DisableNetVarSafety, HostOrServer.Host)]
     [TestFixture(VariableLengthSafety.EnabledNetVarSafety, HostOrServer.Host)]
     [TestFixture(VariableLengthSafety.DisableNetVarSafety, HostOrServer.Server)]
     [TestFixture(VariableLengthSafety.EnabledNetVarSafety, HostOrServer.Server)]
-    public class NetworkObjectSynchronizationTests : NetcodeIntegrationTest
+    internal class NetworkObjectSynchronizationTests : NetcodeIntegrationTest
     {
         private const int k_NumberToSpawn = 30;
         protected override int NumberOfClients => 0;
@@ -29,17 +31,20 @@ public enum VariableLengthSafety
         {
             DisableNetVarSafety,
             EnabledNetVarSafety,
-        }
+        };
 
-        public NetworkObjectSynchronizationTests(VariableLengthSafety variableLengthSafety, HostOrServer hostOrServer)
+        public NetworkObjectSynchronizationTests(VariableLengthSafety variableLengthSafety, HostOrServer hostOrServer) : base(hostOrServer)
         {
             m_VariableLengthSafety = variableLengthSafety;
-            m_UseHost = hostOrServer == HostOrServer.Host;
         }
 
         protected override void OnCreatePlayerPrefab()
         {
-            m_PlayerPrefab.AddComponent<NetworkBehaviourWithOwnerNetworkVariables>();
+            var component = m_PlayerPrefab.AddComponent<NetworkBehaviourWithOwnerNetworkVariables>();
+            if (m_DistributedAuthority)
+            {
+                component.SetWritePermissions(NetworkVariableWritePermission.Owner);
+            }
             base.OnCreatePlayerPrefab();
         }
 
@@ -76,21 +81,16 @@ protected override void OnServerAndClientsCreated()
 
         protected override void OnNewClientCreated(NetworkManager networkManager)
         {
+            // Setup late joining client prefabs first
+            base.OnNewClientCreated(networkManager);
+
             networkManager.NetworkConfig.PlayerPrefab = m_PlayerPrefab;
             networkManager.NetworkConfig.EnsureNetworkVariableLengthSafety = m_VariableLengthSafety == VariableLengthSafety.EnabledNetVarSafety;
-            foreach (var networkPrefab in m_ServerNetworkManager.NetworkConfig.Prefabs.Prefabs)
-            {
-                // To simulate a failure, we exclude the m_InValidNetworkPrefab from the connecting
-                // client's side.
-                if (networkPrefab.Prefab.name != m_InValidNetworkPrefab.name)
-                {
-                    networkManager.NetworkConfig.Prefabs.Add(networkPrefab);
-                }
-            }
             // Disable forcing the same prefabs to avoid failed connections
             networkManager.NetworkConfig.ForceSamePrefabs = false;
             networkManager.LogLevel = m_CurrentLogLevel;
-            base.OnNewClientCreated(networkManager);
+            // To simulate a failure, exclude the m_InValidNetworkPrefab from the connecting client's side.
+            networkManager.NetworkConfig.Prefabs.Remove(m_InValidNetworkPrefab);
         }
 
         [UnityTest]
@@ -123,40 +123,64 @@ public IEnumerator NetworkObjectDeserializationFailure()
 
             if (m_UseHost)
             {
+                var delayCounter = 0;
+                while (m_ClientNetworkManagers.Length == 0)
+                {
+                    delayCounter++;
+                    Assert.True(delayCounter < 30, "TimeOut waiting for client to spawn!");
+                    yield return s_DefaultWaitForTick;
+                }
+                delayCounter = 0;
+                while (!m_PlayerNetworkObjects[m_ServerNetworkManager.LocalClientId].ContainsKey(m_ClientNetworkManagers[0].LocalClientId))
+                {
+                    delayCounter++;
+                    if (delayCounter >= 30)
+                    {
+                        VerboseDebug("Trap!");
+                    }
+                    Assert.True(delayCounter < 30, "TimeOut waiting for client to spawn!");
+                    yield return s_DefaultWaitForTick;
+                }
+
+
                 var serverSideClientPlayerComponent = m_PlayerNetworkObjects[m_ServerNetworkManager.LocalClientId][m_ClientNetworkManagers[0].LocalClientId].GetComponent<NetworkBehaviourWithOwnerNetworkVariables>();
                 var serverSideHostPlayerComponent = m_ServerNetworkManager.LocalClient.PlayerObject.GetComponent<NetworkBehaviourWithOwnerNetworkVariables>();
                 var clientSidePlayerComponent = m_ClientNetworkManagers[0].LocalClient.PlayerObject.GetComponent<NetworkBehaviourWithOwnerNetworkVariables>();
                 var clientSideHostPlayerComponent = m_PlayerNetworkObjects[m_ClientNetworkManagers[0].LocalClientId][m_ServerNetworkManager.LocalClientId].GetComponent<NetworkBehaviourWithOwnerNetworkVariables>();
-
+                var modeText = m_DistributedAuthority ? "owner" : "server";
                 // Validate that the client side player values match the server side value of the client's player
                 Assert.IsTrue(serverSideClientPlayerComponent.NetworkVariableData1.Value == clientSidePlayerComponent.NetworkVariableData1.Value,
-                    $"[{nameof(NetworkBehaviourWithOwnerNetworkVariables.NetworkVariableData1)}][Client Player] Client side value ({serverSideClientPlayerComponent.NetworkVariableData1.Value})" +
-                    $" does not equal the server side value ({serverSideClientPlayerComponent.NetworkVariableData1.Value})!");
+                    $"[{nameof(NetworkBehaviourWithOwnerNetworkVariables.NetworkVariableData1)}][Client Player-{clientSidePlayerComponent.OwnerClientId}] Client side value ({clientSidePlayerComponent.NetworkVariableData1.Value})" +
+                    $" does not equal the {modeText} side value ({serverSideClientPlayerComponent.NetworkVariableData1.Value})!");
                 Assert.IsTrue(serverSideClientPlayerComponent.NetworkVariableData2.Value == clientSidePlayerComponent.NetworkVariableData2.Value,
-                    $"[{nameof(NetworkBehaviourWithOwnerNetworkVariables.NetworkVariableData2)}][Client Player] Client side value ({serverSideClientPlayerComponent.NetworkVariableData2.Value})" +
-                    $" does not equal the server side value ({serverSideClientPlayerComponent.NetworkVariableData2.Value})!");
+                    $"[{nameof(NetworkBehaviourWithOwnerNetworkVariables.NetworkVariableData2)}][Client Player-{clientSidePlayerComponent.OwnerClientId}] Client side value ({clientSidePlayerComponent.NetworkVariableData2.Value})" +
+                    $" does not equal the {modeText} side value ({serverSideClientPlayerComponent.NetworkVariableData2.Value})!");
                 Assert.IsTrue(serverSideClientPlayerComponent.NetworkVariableData3.Value == clientSidePlayerComponent.NetworkVariableData3.Value,
-                    $"[{nameof(NetworkBehaviourWithOwnerNetworkVariables.NetworkVariableData3)}][Client Player] Client side value ({serverSideClientPlayerComponent.NetworkVariableData3.Value})" +
-                    $" does not equal the server side value ({serverSideClientPlayerComponent.NetworkVariableData3.Value})!");
+                    $"[{nameof(NetworkBehaviourWithOwnerNetworkVariables.NetworkVariableData3)}][Client Player-{clientSidePlayerComponent.OwnerClientId}] Client side value ({clientSidePlayerComponent.NetworkVariableData3.Value})" +
+                    $" does not equal the {modeText} side value ({serverSideClientPlayerComponent.NetworkVariableData3.Value})!");
                 Assert.IsTrue(serverSideClientPlayerComponent.NetworkVariableData4.Value == clientSidePlayerComponent.NetworkVariableData4.Value,
-                    $"[{nameof(NetworkBehaviourWithOwnerNetworkVariables.NetworkVariableData4)}][Client Player] Client side value ({serverSideClientPlayerComponent.NetworkVariableData4.Value})" +
-                    $" does not equal the server side value ({serverSideClientPlayerComponent.NetworkVariableData4.Value})!");
-
-
-                // Validate that only the 2nd and 4th NetworkVariable on the client side instance of the host's player is the same and the other two do not match
-                // (i.e. NetworkVariables owned by the server should not get synchronized on client)
-                Assert.IsTrue(serverSideHostPlayerComponent.NetworkVariableData1.Value != clientSideHostPlayerComponent.NetworkVariableData1.Value,
-                    $"[{nameof(NetworkBehaviourWithOwnerNetworkVariables.NetworkVariableData1)}][Host Player] Client side value ({serverSideHostPlayerComponent.NetworkVariableData1.Value})" +
-                    $" should not be equal to the server side value ({clientSideHostPlayerComponent.NetworkVariableData1.Value})!");
-                Assert.IsTrue(serverSideHostPlayerComponent.NetworkVariableData2.Value == clientSideHostPlayerComponent.NetworkVariableData2.Value,
-                    $"[{nameof(NetworkBehaviourWithOwnerNetworkVariables.NetworkVariableData2)}][Host Player] Client side value ({serverSideHostPlayerComponent.NetworkVariableData2.Value})" +
-                    $" does not equal the server side value ({clientSideHostPlayerComponent.NetworkVariableData2.Value})!");
-                Assert.IsTrue(serverSideHostPlayerComponent.NetworkVariableData3.Value != clientSideHostPlayerComponent.NetworkVariableData3.Value,
-                    $"[{nameof(NetworkBehaviourWithOwnerNetworkVariables.NetworkVariableData3)}][Host Player] Client side value ({serverSideHostPlayerComponent.NetworkVariableData3.Value})" +
-                    $" should not be equal to the server side value ({clientSideHostPlayerComponent.NetworkVariableData3.Value})!");
-                Assert.IsTrue(serverSideHostPlayerComponent.NetworkVariableData4.Value == clientSideHostPlayerComponent.NetworkVariableData4.Value,
-                    $"[{nameof(NetworkBehaviourWithOwnerNetworkVariables.NetworkVariableData4)}][Host Player] Client side value ({serverSideHostPlayerComponent.NetworkVariableData4.Value})" +
-                    $" does not equal the server side value ({clientSideHostPlayerComponent.NetworkVariableData4.Value})!");
+                    $"[{nameof(NetworkBehaviourWithOwnerNetworkVariables.NetworkVariableData4)}][Client Player-{clientSidePlayerComponent.OwnerClientId}] Client side value ({clientSidePlayerComponent.NetworkVariableData4.Value})" +
+                    $" does not equal the {modeText} side value ({serverSideClientPlayerComponent.NetworkVariableData4.Value})!");
+
+                // DANGO-TODO: This scenario is only possible to do if we add a DA-Server to mock the CMB Service or we integrate the CMB Service AND we have updated NetworkVariable permissions
+                // to only allow the service to write. For now, we will skip this validation for distributed authority
+                if (!m_DistributedAuthority)
+                {
+                    // Validate that only the 2nd and 4th NetworkVariable on the client side instance of the host's player is the same and the other two do not match
+                    // (i.e. NetworkVariables owned by the server should not get synchronized on client)
+                    Assert.IsTrue(serverSideHostPlayerComponent.NetworkVariableData1.Value != clientSideHostPlayerComponent.NetworkVariableData1.Value,
+                    $"[{nameof(NetworkBehaviourWithOwnerNetworkVariables.NetworkVariableData1)}][Host Player] Client side value ({clientSideHostPlayerComponent.NetworkVariableData1.Value})" +
+                    $" should not be equal to the server side value ({serverSideHostPlayerComponent.NetworkVariableData1.Value})!");
+                    Assert.IsTrue(serverSideHostPlayerComponent.NetworkVariableData2.Value == clientSideHostPlayerComponent.NetworkVariableData2.Value,
+                        $"[{nameof(NetworkBehaviourWithOwnerNetworkVariables.NetworkVariableData2)}][Host Player] Client side value ({clientSideHostPlayerComponent.NetworkVariableData2.Value})" +
+                        $" does not equal the server side value ({serverSideHostPlayerComponent.NetworkVariableData2.Value})!");
+                    Assert.IsTrue(serverSideHostPlayerComponent.NetworkVariableData3.Value != clientSideHostPlayerComponent.NetworkVariableData3.Value,
+                        $"[{nameof(NetworkBehaviourWithOwnerNetworkVariables.NetworkVariableData3)}][Host Player] Client side value ({clientSideHostPlayerComponent.NetworkVariableData3.Value})" +
+                        $" should not be equal to the server side value ({serverSideHostPlayerComponent.NetworkVariableData3.Value})!");
+                    Assert.IsTrue(serverSideHostPlayerComponent.NetworkVariableData4.Value == serverSideHostPlayerComponent.NetworkVariableData4.Value,
+                        $"[{nameof(NetworkBehaviourWithOwnerNetworkVariables.NetworkVariableData4)}][Host Player] Client side value ({clientSideHostPlayerComponent.NetworkVariableData4.Value})" +
+                        $" does not equal the server side value ({serverSideHostPlayerComponent.NetworkVariableData4.Value})!");
+                }
             }
             else
             {
@@ -190,44 +214,53 @@ public IEnumerator NetworkObjectDeserializationFailure()
                     $"[{nameof(NetworkBehaviourWithOwnerNetworkVariables.NetworkVariableData4)}][Player-{clientOneId}] Client-{clientOneId} value ({clientSide1PlayerComponent.NetworkVariableData4.Value})" +
                     $" does not equal Client-{clientTwoId}'s clone side value ({clientSide2Player1Clone.NetworkVariableData4.Value})!");
 
-
-                // Validate that client two's 2nd and 4th NetworkVariables for the local and clone instances match and the other two do not
-                Assert.IsTrue(clientSide2PlayerComponent.NetworkVariableData1.Value != clientSide1Player2Clone.NetworkVariableData1.Value,
-                   $"[{nameof(NetworkBehaviourWithOwnerNetworkVariables.NetworkVariableData1)}][Player-{clientTwoId}] Client-{clientTwoId} value ({clientSide2PlayerComponent.NetworkVariableData1.Value})" +
-                   $" should not be equal to Client-{clientOneId}'s clone side value ({clientSide1Player2Clone.NetworkVariableData1.Value})!");
-
-                Assert.IsTrue(clientSide2PlayerComponent.NetworkVariableData2.Value == clientSide1Player2Clone.NetworkVariableData2.Value,
-                    $"[{nameof(NetworkBehaviourWithOwnerNetworkVariables.NetworkVariableData2)}][Player-{clientTwoId}] Client-{clientTwoId} value ({clientSide2PlayerComponent.NetworkVariableData2.Value})" +
-                    $" does not equal Client-{clientOneId}'s clone side value ({clientSide1Player2Clone.NetworkVariableData2.Value})!");
-
-                Assert.IsTrue(clientSide2PlayerComponent.NetworkVariableData3.Value != clientSide1Player2Clone.NetworkVariableData3.Value,
-                    $"[{nameof(NetworkBehaviourWithOwnerNetworkVariables.NetworkVariableData3)}][Player-{clientTwoId}] Client-{clientTwoId} value ({clientSide2PlayerComponent.NetworkVariableData3.Value})" +
-                    $" should not be equal to Client-{clientOneId}'s clone side value ({clientSide1Player2Clone.NetworkVariableData3.Value})!");
-
-                Assert.IsTrue(clientSide2PlayerComponent.NetworkVariableData4.Value == clientSide1Player2Clone.NetworkVariableData4.Value,
-                    $"[{nameof(NetworkBehaviourWithOwnerNetworkVariables.NetworkVariableData4)}][Player-{clientTwoId}] Client-{clientTwoId} value ({clientSide2PlayerComponent.NetworkVariableData4.Value})" +
-                    $" does not equal Client-{clientOneId}'s clone side value ({clientSide1Player2Clone.NetworkVariableData4.Value})!");
+                // DANGO-TODO: This scenario is only possible to do if we add a DA-Server to mock the CMB Service or we integrate the CMB Service AND we have updated NetworkVariable permissions
+                // to only allow the service to write. For now, we will skip this validation for distributed authority
+                if (!m_DistributedAuthority)
+                {
+                    // Validate that client two's 2nd and 4th NetworkVariables for the local and clone instances match and the other two do not
+                    Assert.IsTrue(clientSide2PlayerComponent.NetworkVariableData1.Value != clientSide1Player2Clone.NetworkVariableData1.Value,
+                       $"[{nameof(NetworkBehaviourWithOwnerNetworkVariables.NetworkVariableData1)}][Player-{clientTwoId}] Client-{clientTwoId} value ({clientSide2PlayerComponent.NetworkVariableData1.Value})" +
+                       $" should not be equal to Client-{clientOneId}'s clone side value ({clientSide1Player2Clone.NetworkVariableData1.Value})!");
+
+                    Assert.IsTrue(clientSide2PlayerComponent.NetworkVariableData2.Value == clientSide1Player2Clone.NetworkVariableData2.Value,
+                        $"[{nameof(NetworkBehaviourWithOwnerNetworkVariables.NetworkVariableData2)}][Player-{clientTwoId}] Client-{clientTwoId} value ({clientSide2PlayerComponent.NetworkVariableData2.Value})" +
+                        $" does not equal Client-{clientOneId}'s clone side value ({clientSide1Player2Clone.NetworkVariableData2.Value})!");
+
+                    Assert.IsTrue(clientSide2PlayerComponent.NetworkVariableData3.Value != clientSide1Player2Clone.NetworkVariableData3.Value,
+                        $"[{nameof(NetworkBehaviourWithOwnerNetworkVariables.NetworkVariableData3)}][Player-{clientTwoId}] Client-{clientTwoId} value ({clientSide2PlayerComponent.NetworkVariableData3.Value})" +
+                        $" should not be equal to Client-{clientOneId}'s clone side value ({clientSide1Player2Clone.NetworkVariableData3.Value})!");
+
+                    Assert.IsTrue(clientSide2PlayerComponent.NetworkVariableData4.Value == clientSide1Player2Clone.NetworkVariableData4.Value,
+                        $"[{nameof(NetworkBehaviourWithOwnerNetworkVariables.NetworkVariableData4)}][Player-{clientTwoId}] Client-{clientTwoId} value ({clientSide2PlayerComponent.NetworkVariableData4.Value})" +
+                        $" does not equal Client-{clientOneId}'s clone side value ({clientSide1Player2Clone.NetworkVariableData4.Value})!");
+                }
             }
 
-            // Now validate all of the NetworkVariable values match to assure everything synchronized properly
-            foreach (var spawnedObject in validSpawnedNetworkObjects)
+            // DANGO-TODO: This scenario is only possible to do if we add a DA-Server to mock the CMB Service or we integrate the CMB Service AND we have updated NetworkVariable permissions
+            // to only allow the service to write. For now, we will skip this validation for distributed authority
+            if (!m_DistributedAuthority)
             {
-                foreach (var clientNetworkManager in m_ClientNetworkManagers)
+                // Now validate all of the NetworkVariable values match to assure everything synchronized properly
+                foreach (var spawnedObject in validSpawnedNetworkObjects)
                 {
-                    //Validate that the connected client has spawned all of the instances that shouldn't have failed.
-                    var clientSideNetworkObjects = s_GlobalNetworkObjects[clientNetworkManager.LocalClientId];
+                    foreach (var clientNetworkManager in m_ClientNetworkManagers)
+                    {
+                        //Validate that the connected client has spawned all of the instances that shouldn't have failed.
+                        var clientSideNetworkObjects = s_GlobalNetworkObjects[clientNetworkManager.LocalClientId];
 
-                    Assert.IsTrue(NetworkBehaviourWithNetworkVariables.ClientSpawnCount[clientNetworkManager.LocalClientId] == validSpawnedNetworkObjects.Count, $"Client-{clientNetworkManager.LocalClientId} spawned " +
-                        $"({NetworkBehaviourWithNetworkVariables.ClientSpawnCount}) {nameof(NetworkObject)}s but the expected number of {nameof(NetworkObject)}s should have been ({validSpawnedNetworkObjects.Count})!");
+                        Assert.IsTrue(NetworkBehaviourWithNetworkVariables.ClientSpawnCount[clientNetworkManager.LocalClientId] == validSpawnedNetworkObjects.Count, $"Client-{clientNetworkManager.LocalClientId} spawned " +
+                            $"({NetworkBehaviourWithNetworkVariables.ClientSpawnCount}) {nameof(NetworkObject)}s but the expected number of {nameof(NetworkObject)}s should have been ({validSpawnedNetworkObjects.Count})!");
 
-                    var spawnedNetworkObject = spawnedObject.GetComponent<NetworkObject>();
-                    Assert.IsTrue(clientSideNetworkObjects.ContainsKey(spawnedNetworkObject.NetworkObjectId), $"Failed to find valid spawned {nameof(NetworkObject)} on the client-side with a " +
-                        $"{nameof(NetworkObject.NetworkObjectId)} of {spawnedNetworkObject.NetworkObjectId}");
+                        var spawnedNetworkObject = spawnedObject.GetComponent<NetworkObject>();
+                        Assert.IsTrue(clientSideNetworkObjects.ContainsKey(spawnedNetworkObject.NetworkObjectId), $"Failed to find valid spawned {nameof(NetworkObject)} on the client-side with a " +
+                            $"{nameof(NetworkObject.NetworkObjectId)} of {spawnedNetworkObject.NetworkObjectId}");
 
-                    var clientSideObject = clientSideNetworkObjects[spawnedNetworkObject.NetworkObjectId];
-                    Assert.IsTrue(clientSideObject.NetworkManager == clientNetworkManager, $"Client-side object {clientSideObject}'s {nameof(NetworkManager)} is not valid!");
+                        var clientSideObject = clientSideNetworkObjects[spawnedNetworkObject.NetworkObjectId];
+                        Assert.IsTrue(clientSideObject.NetworkManager == clientNetworkManager, $"Client-side object {clientSideObject}'s {nameof(NetworkManager)} is not valid!");
 
-                    ValidateNetworkBehaviourWithNetworkVariables(spawnedNetworkObject, clientSideObject);
+                        ValidateNetworkBehaviourWithNetworkVariables(spawnedNetworkObject, clientSideObject);
+                    }
                 }
             }
         }
@@ -259,6 +292,22 @@ private void ValidateNetworkBehaviourWithNetworkVariables(NetworkObject serverSi
                 $"does not match the client side instance value ({clientSideComponent.NetworkVariableData4.Value})!");
         }
 
+
+        private bool ClientSpawnedNetworkObjects(List<GameObject> spawnedObjectList)
+        {
+            var clientSideNetworkObjects = s_GlobalNetworkObjects[m_ClientNetworkManagers[0].LocalClientId];
+
+            foreach (var spawnedObject in spawnedObjectList)
+            {
+                var serverSideSpawnedNetworkObject = spawnedObject.GetComponent<NetworkObject>();
+                if (!clientSideNetworkObjects.ContainsKey(serverSideSpawnedNetworkObject.NetworkObjectId))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
         /// <summary>
         /// This validates that when a NetworkBehaviour fails serialization or deserialization during synchronizations that other NetworkBehaviours
         /// will still be initialized properly
@@ -287,6 +336,9 @@ public IEnumerator NetworkBehaviourSynchronization()
             // Validate that when a NetworkBehaviour fails to synchronize and is skipped over it does not
             // impact the rest of the NetworkBehaviours.
             var clientSideNetworkObjects = s_GlobalNetworkObjects[m_ClientNetworkManagers[0].LocalClientId];
+            yield return WaitForConditionOrTimeOut(() => ClientSpawnedNetworkObjects(spawnedObjectList));
+            AssertOnTimeout($"Timed out waiting for newly joined client to spawn all NetworkObjects!");
+
             foreach (var spawnedObject in spawnedObjectList)
             {
                 var serverSideSpawnedNetworkObject = spawnedObject.GetComponent<NetworkObject>();
@@ -325,7 +377,7 @@ public IEnumerator NetworkBehaviourOnSynchronize()
     /// the synchronization process will continue (i.e. it will skip over that block
     /// of the reader buffer).
     /// </summary>
-    public class NetworkBehaviourWithNetworkVariables : NetworkBehaviour
+    internal class NetworkBehaviourWithNetworkVariables : NetworkBehaviour
     {
         public static int ServerSpawnCount { get; internal set; }
         public static readonly Dictionary<ulong, int> ClientSpawnCount = new Dictionary<ulong, int>();
@@ -385,8 +437,26 @@ public override void OnNetworkSpawn()
     /// when variable length safety checks are off NetworkVariables still are updated
     /// properly.
     /// </summary>
-    public class NetworkBehaviourWithOwnerNetworkVariables : NetworkBehaviour
+    internal class NetworkBehaviourWithOwnerNetworkVariables : NetworkBehaviour
     {
+        private NetworkVariableWritePermission m_NetworkVariableWritePermission = NetworkVariableWritePermission.Server;
+        /// <summary>
+        /// For distributed authority, there is no such thing as a server and only owners
+        /// DANGO-TODO: When NetworkVariable permissions are updated, this test might need to be updated
+        /// </summary>
+        /// <param name="networkVariableWritePermission"></param>
+        public void SetWritePermissions(NetworkVariableWritePermission networkVariableWritePermission)
+        {
+            m_NetworkVariableWritePermission = networkVariableWritePermission;
+            // Should synchronize with everyone
+            NetworkVariableData1 = new NetworkVariable<int>(default, NetworkVariableReadPermission.Everyone, networkVariableWritePermission);
+            // Should synchronize with everyone
+            NetworkVariableData2 = new NetworkVariable<long>(default, NetworkVariableReadPermission.Everyone, networkVariableWritePermission);
+            // Should synchronize with everyone
+            NetworkVariableData3 = new NetworkVariable<byte>(default, NetworkVariableReadPermission.Everyone, networkVariableWritePermission);
+            // Should synchronize with everyone
+            NetworkVariableData4 = new NetworkVariable<ushort>(default, NetworkVariableReadPermission.Everyone, networkVariableWritePermission);
+        }
 
         // Should not synchronize on non-owners
         public NetworkVariable<int> NetworkVariableData1 = new NetworkVariable<int>(default, NetworkVariableReadPermission.Owner, NetworkVariableWritePermission.Server);
@@ -399,7 +469,9 @@ public class NetworkBehaviourWithOwnerNetworkVariables : NetworkBehaviour
 
         public override void OnNetworkSpawn()
         {
-            if (IsServer)
+            // Adjustment for distributed authority mode
+            if ((m_NetworkVariableWritePermission == NetworkVariableWritePermission.Server && IsServer && !NetworkManager.DistributedAuthorityMode) ||
+                (m_NetworkVariableWritePermission == NetworkVariableWritePermission.Owner && IsOwner && NetworkManager.DistributedAuthorityMode))
             {
                 NetworkVariableData1.Value = Random.Range(1, 1000);
                 NetworkVariableData2.Value = Random.Range(1, 1000);
@@ -414,7 +486,7 @@ public override void OnNetworkSpawn()
     /// and provides a synchronization success version to validate that synchronization
     /// will continue if user synchronization code fails.
     /// </summary>
-    public class NetworkBehaviourSynchronizeFailureComponent : NetworkBehaviour
+    internal class NetworkBehaviourSynchronizeFailureComponent : NetworkBehaviour
     {
         public static int NumberOfFailureTypes { get; internal set; }
         public static int ServerSpawnCount { get; internal set; }
@@ -584,11 +656,11 @@ protected override void OnSynchronize<T>(ref BufferSerializer<T> serializer)
         }
     }
 
-    public class NetworkBehaviourOnSynchronizeComponent : NetworkBehaviour
+    internal class NetworkBehaviourOnSynchronizeComponent : NetworkBehaviour
     {
         public SomeCustomSerializationData CustomSerializationData = new SomeCustomSerializationData();
 
-        public struct SomeCustomSerializationData : INetworkSerializable
+        internal struct SomeCustomSerializationData : INetworkSerializable
         {
             public uint Value1;
             public bool Value2;
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkShowHideTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkShowHideTests.cs
index a68a0412dd..ea0107384d 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkShowHideTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkShowHideTests.cs
@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using NUnit.Framework;
 using Unity.Netcode.TestHelpers.Runtime;
 using UnityEngine;
@@ -8,7 +9,7 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class ShowHideObject : NetworkBehaviour
+    internal class ShowHideObject : NetworkBehaviour
     {
         public static List<ShowHideObject> ClientTargetedNetworkObjects = new List<ShowHideObject>();
         public static ulong ClientIdToTarget;
@@ -16,7 +17,6 @@ public class ShowHideObject : NetworkBehaviour
         public static int ValueAfterOwnershipChange = 0;
         public static Dictionary<ulong, ShowHideObject> ObjectsPerClientId = new Dictionary<ulong, ShowHideObject>();
         public static List<ulong> ClientIdsRpcCalledOn;
-
         public static NetworkObject GetNetworkObjectById(ulong networkObjectId)
         {
             foreach (var entry in ClientTargetedNetworkObjects)
@@ -113,7 +113,10 @@ public void Changed(int before, int after)
         [ClientRpc]
         public void SomeRandomClientRPC()
         {
-            Debug.Log($"RPC called {NetworkManager.LocalClientId}");
+            if (!Silent)
+            {
+                Debug.Log($"RPC called {NetworkManager.LocalClientId}");
+            }
             ClientIdsRpcCalledOn?.Add(NetworkManager.LocalClientId);
         }
 
@@ -123,12 +126,15 @@ public void TriggerRpc()
         }
     }
 
-    public class NetworkShowHideTests : NetcodeIntegrationTest
+    [TestFixture(NetworkTopologyTypes.ClientServer)]
+    [TestFixture(NetworkTopologyTypes.DistributedAuthority)]
+    internal class NetworkShowHideTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 4;
 
         private ulong m_ClientId0;
         private GameObject m_PrefabToSpawn;
+        private GameObject m_PrefabSpawnWithoutObservers;
 
         private NetworkObject m_NetSpawnedObject1;
         private NetworkObject m_NetSpawnedObject2;
@@ -137,10 +143,15 @@ public class NetworkShowHideTests : NetcodeIntegrationTest
         private NetworkObject m_Object2OnClient0;
         private NetworkObject m_Object3OnClient0;
 
+        public NetworkShowHideTests(NetworkTopologyTypes networkTopologyType) : base(networkTopologyType) { }
+
         protected override void OnServerAndClientsCreated()
         {
             m_PrefabToSpawn = CreateNetworkObjectPrefab("ShowHideObject");
             m_PrefabToSpawn.AddComponent<ShowHideObject>();
+
+            m_PrefabSpawnWithoutObservers = CreateNetworkObjectPrefab("ObserversObject");
+            m_PrefabSpawnWithoutObservers.GetComponent<NetworkObject>().SpawnWithObservers = false;
         }
 
         // Check that the first client see them, or not, as expected
@@ -377,6 +388,105 @@ public IEnumerator NetworkHideDespawnTest()
             LogAssert.NoUnexpectedReceived();
         }
 
+
+        private List<ulong> m_ClientsWithVisibility = new List<ulong>();
+        private NetworkObject m_ObserverTestObject;
+
+        private bool CheckListedClientsVisibility()
+        {
+            if (m_ClientsWithVisibility.Contains(m_ServerNetworkManager.LocalClientId))
+            {
+                if (!m_ServerNetworkManager.SpawnManager.SpawnedObjects.ContainsKey(m_ObserverTestObject.NetworkObjectId))
+                {
+                    return false;
+                }
+            }
+
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                if (m_ClientsWithVisibility.Contains(client.LocalClientId))
+                {
+                    if (!client.SpawnManager.SpawnedObjects.ContainsKey(m_ObserverTestObject.NetworkObjectId))
+                    {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+
+        [UnityTest]
+        public IEnumerator SpawnWithoutObserversTest()
+        {
+            var spawnedObject = SpawnObject(m_PrefabSpawnWithoutObservers, m_ServerNetworkManager);
+
+            m_ObserverTestObject = spawnedObject.GetComponent<NetworkObject>();
+
+            yield return WaitForTicks(m_ServerNetworkManager, 3);
+
+            // When in client-server, the server can spawn a NetworkObject without any observers (even when running as a host the host-client should not have visibility)
+            // When in distributed authority mode, the owner client has to be an observer of the object
+            if (!m_DistributedAuthority)
+            {
+                // No observers should be assigned at this point
+                Assert.True(m_ObserverTestObject.Observers.Count == m_ClientsWithVisibility.Count, $"Expected the observer count to be {m_ClientsWithVisibility.Count} but it was {m_ObserverTestObject.Observers.Count}!");
+                m_ObserverTestObject.NetworkShow(m_ServerNetworkManager.LocalClientId);
+            }
+            m_ClientsWithVisibility.Add(m_ServerNetworkManager.LocalClientId);
+
+            Assert.True(m_ObserverTestObject.Observers.Count == m_ClientsWithVisibility.Count, $"Expected the observer count to be {m_ClientsWithVisibility.Count} but it was {m_ObserverTestObject.Observers.Count}!");
+
+            yield return WaitForConditionOrTimeOut(CheckListedClientsVisibility);
+            AssertOnTimeout($"[Authority-Only] Timed out waiting for only the authority to be an observer!");
+
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                m_ObserverTestObject.NetworkShow(client.LocalClientId);
+                m_ClientsWithVisibility.Add(client.LocalClientId);
+                Assert.True(m_ObserverTestObject.Observers.Contains(client.LocalClientId), $"[NetworkShow] Client-{client.LocalClientId} is still not an observer!");
+                Assert.True(m_ObserverTestObject.Observers.Count == m_ClientsWithVisibility.Count, $"Expected the observer count to be {m_ClientsWithVisibility.Count} but it was {m_ObserverTestObject.Observers.Count}!");
+
+                yield return WaitForConditionOrTimeOut(CheckListedClientsVisibility);
+                AssertOnTimeout($"[Client-{client.LocalClientId}] Timed out waiting for the client to be an observer and spawn the {nameof(NetworkObject)}!");
+                Assert.False(client.SpawnManager.SpawnedObjects[m_ObserverTestObject.NetworkObjectId].SpawnWithObservers, $"Client-{client.LocalClientId} instance of {m_ObserverTestObject.name} has a {nameof(NetworkObject.SpawnWithObservers)} value of true!");
+            }
+        }
+
+        private bool ClientsSpawnedObject1()
+        {
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                if (!client.SpawnManager.SpawnedObjects.ContainsKey(m_NetSpawnedObject1.NetworkObjectId))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        private StringBuilder m_ErrorLog = new StringBuilder();
+        private ulong m_ClientWithoutVisibility;
+        private bool Object1IsNotVisibileToClient()
+        {
+            m_ErrorLog.Clear();
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                if (client.LocalClientId == m_ClientWithoutVisibility)
+                {
+                    if (client.SpawnManager.SpawnedObjects.ContainsKey(m_NetSpawnedObject1.NetworkObjectId))
+                    {
+                        m_ErrorLog.AppendLine($"{m_NetSpawnedObject1.name} is still visible to Client-{m_ClientWithoutVisibility}!");
+                    }
+                }
+                else
+                if (client.SpawnManager.SpawnedObjects[m_NetSpawnedObject1.NetworkObjectId].IsNetworkVisibleTo(m_ClientWithoutVisibility))
+                {
+                    m_ErrorLog.AppendLine($"Local instance of {m_NetSpawnedObject1.name} on Client-{client.LocalClientId} thinks Client-{m_ClientWithoutVisibility} still has visibility!");
+                }
+            }
+            return m_ErrorLog.Length == 0;
+        }
+
         [UnityTest]
         public IEnumerator NetworkHideChangeOwnership()
         {
@@ -387,12 +497,29 @@ public IEnumerator NetworkHideChangeOwnership()
             var spawnedObject1 = SpawnObject(m_PrefabToSpawn, m_ServerNetworkManager);
             m_NetSpawnedObject1 = spawnedObject1.GetComponent<NetworkObject>();
 
+            yield return WaitForConditionOrTimeOut(ClientsSpawnedObject1);
+            AssertOnTimeout($"Not all clients spawned object!");
+
             m_NetSpawnedObject1.GetComponent<ShowHideObject>().MyNetworkVariable.Value++;
             // Hide an object to a client
             m_NetSpawnedObject1.NetworkHide(m_ClientNetworkManagers[1].LocalClientId);
+            m_ClientWithoutVisibility = m_ClientNetworkManagers[1].LocalClientId;
+
+            yield return WaitForConditionOrTimeOut(Object1IsNotVisibileToClient);
+            AssertOnTimeout($"NetworkObject is still visible to Client-{m_ClientWithoutVisibility} or other clients think it is still visible to Client-{m_ClientWithoutVisibility}:\n {m_ErrorLog}");
 
             yield return WaitForConditionOrTimeOut(() => ShowHideObject.ClientTargetedNetworkObjects.Count == 0);
 
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                if (m_ClientNetworkManagers[1].LocalClientId == client.LocalClientId)
+                {
+                    continue;
+                }
+                var clientInstance = client.SpawnManager.SpawnedObjects[m_NetSpawnedObject1.NetworkObjectId];
+                Assert.IsFalse(clientInstance.IsNetworkVisibleTo(m_ClientNetworkManagers[1].LocalClientId), $"Object instance on Client-{client.LocalClientId} is still visible to Client-{m_ClientNetworkManagers[1].LocalClientId}!");
+            }
+
             // Change ownership while the object is hidden to some
             m_NetSpawnedObject1.ChangeOwnership(m_ClientNetworkManagers[0].LocalClientId);
 
@@ -400,30 +527,49 @@ public IEnumerator NetworkHideChangeOwnership()
             yield return new WaitForSeconds(1.25f);
 
             LogAssert.NoUnexpectedReceived();
-
             // Show the object again to check nothing unexpected happens
-            m_NetSpawnedObject1.NetworkShow(m_ClientNetworkManagers[1].LocalClientId);
+            if (m_DistributedAuthority)
+            {
+                Assert.True(m_ClientNetworkManagers[0].SpawnManager.SpawnedObjects.ContainsKey(m_NetSpawnedObject1.NetworkObjectId), $"Client-{m_ClientNetworkManagers[0].LocalClientId} has no spawned object with an ID of: {m_NetSpawnedObject1.NetworkObjectId}!");
+                var clientInstance = m_ClientNetworkManagers[0].SpawnManager.SpawnedObjects[m_NetSpawnedObject1.NetworkObjectId];
+                Assert.True(clientInstance.HasAuthority, $"Client-{m_ClientNetworkManagers[0].LocalClientId} does not have authority to hide NetworkObject ID: {m_NetSpawnedObject1.NetworkObjectId}!");
+                clientInstance.NetworkShow(m_ClientNetworkManagers[1].LocalClientId);
+            }
+            else
+            {
+                m_NetSpawnedObject1.NetworkShow(m_ClientNetworkManagers[1].LocalClientId);
+            }
 
             yield return WaitForConditionOrTimeOut(() => ShowHideObject.ClientTargetedNetworkObjects.Count == 1);
 
             Assert.True(ShowHideObject.ClientTargetedNetworkObjects[0].OwnerClientId == m_ClientNetworkManagers[0].LocalClientId);
         }
 
+        private bool AllClientsSpawnedObject1()
+        {
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                if (!ShowHideObject.ObjectsPerClientId.ContainsKey(client.LocalClientId))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
         [UnityTest]
         public IEnumerator NetworkHideChangeOwnershipNotHidden()
         {
             ShowHideObject.ClientTargetedNetworkObjects.Clear();
+            ShowHideObject.ObjectsPerClientId.Clear();
             ShowHideObject.ClientIdToTarget = m_ClientNetworkManagers[1].LocalClientId;
             ShowHideObject.Silent = true;
 
             var spawnedObject1 = SpawnObject(m_PrefabToSpawn, m_ServerNetworkManager);
             m_NetSpawnedObject1 = spawnedObject1.GetComponent<NetworkObject>();
 
-            // wait for host to have spawned and gained ownership
-            while (ShowHideObject.GainOwnershipCount == 0)
-            {
-                yield return new WaitForSeconds(0.0f);
-            }
+            yield return WaitForConditionOrTimeOut(AllClientsSpawnedObject1);
+            AssertOnTimeout($"Timed out waiting for all clients to spawn {spawnedObject1.name}!");
 
             // change the value
             m_NetSpawnedObject1.GetComponent<ShowHideObject>().MyOwnerReadNetworkVariable.Value++;
@@ -445,10 +591,10 @@ public IEnumerator NetworkHideChangeOwnershipNotHidden()
             yield return WaitForTicks(m_ClientNetworkManagers[0], 3);
 
             // verify ownership changed
-            Assert.True(ShowHideObject.ClientTargetedNetworkObjects[0].OwnerClientId == m_ClientNetworkManagers[0].LocalClientId);
+            Assert.AreEqual(ShowHideObject.ClientTargetedNetworkObjects[0].OwnerClientId, m_ClientNetworkManagers[0].LocalClientId);
 
             // verify the expected client got the OnValueChanged. (Only client 1 sets this value)
-            Assert.True(ShowHideObject.ValueAfterOwnershipChange == 1);
+            Assert.AreEqual(1, ShowHideObject.ValueAfterOwnershipChange);
         }
 
         private string Display(NetworkList<int> list)
@@ -487,20 +633,20 @@ private void Compare(NetworkList<int> list1, NetworkList<int> list2)
 
         private IEnumerator HideThenShowAndHideThenModifyAndShow()
         {
-            Debug.Log("Hiding");
+            VerboseDebug("Hiding");
             // hide
             m_NetSpawnedObject1.NetworkHide(1);
             yield return WaitForTicks(m_ServerNetworkManager, 3);
             yield return WaitForTicks(m_ClientNetworkManagers[0], 3);
 
-            Debug.Log("Showing and Hiding");
+            VerboseDebug("Showing and Hiding");
             // show and hide
             m_NetSpawnedObject1.NetworkShow(1);
             m_NetSpawnedObject1.NetworkHide(1);
             yield return WaitForTicks(m_ServerNetworkManager, 3);
             yield return WaitForTicks(m_ClientNetworkManagers[0], 3);
 
-            Debug.Log("Modifying and Showing");
+            VerboseDebug("Modifying and Showing");
             // modify and show
             m_NetSpawnedObject1.GetComponent<ShowHideObject>().MyList.Add(5);
             m_NetSpawnedObject1.NetworkShow(1);
@@ -575,19 +721,19 @@ public IEnumerator NetworkShowHideAroundListModify()
                 switch (i)
                 {
                     case 0:
-                        Debug.Log("Running HideThenModifyAndShow");
+                        VerboseDebug("Running HideThenModifyAndShow");
                         yield return HideThenModifyAndShow();
                         break;
                     case 1:
-                        Debug.Log("Running HideThenShowAndModify");
+                        VerboseDebug("Running HideThenShowAndModify");
                         yield return HideThenShowAndModify();
                         break;
                     case 2:
-                        Debug.Log("Running HideThenShowAndHideThenModifyAndShow");
+                        VerboseDebug("Running HideThenShowAndHideThenModifyAndShow");
                         yield return HideThenShowAndHideThenModifyAndShow();
                         break;
                     case 3:
-                        Debug.Log("Running HideThenShowAndRPC");
+                        VerboseDebug("Running HideThenShowAndRPC");
                         ShowHideObject.ClientIdsRpcCalledOn = new List<ulong>();
                         yield return HideThenShowAndRPC();
                         // Provide enough time for slower systems or VM systems possibly under a heavy load could fail on this test
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkSpawnManagerTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkSpawnManagerTests.cs
index 0806775a16..7835bfeb20 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkSpawnManagerTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkSpawnManagerTests.cs
@@ -1,12 +1,13 @@
 using System.Collections;
 using NUnit.Framework;
 using Unity.Netcode.TestHelpers.Runtime;
-using UnityEngine;
 using UnityEngine.TestTools;
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class NetworkSpawnManagerTests : NetcodeIntegrationTest
+    [TestFixture(HostOrServer.DAHost)]
+    [TestFixture(HostOrServer.Host)]
+    internal class NetworkSpawnManagerTests : NetcodeIntegrationTest
     {
         private ulong serverSideClientId => NetworkManager.ServerClientId;
         private ulong clientSideClientId => m_ClientNetworkManagers[0].LocalClientId;
@@ -14,6 +15,8 @@ public class NetworkSpawnManagerTests : NetcodeIntegrationTest
 
         protected override int NumberOfClients => 2;
 
+        public NetworkSpawnManagerTests(HostOrServer hostOrServer) : base(hostOrServer) { }
+
         [Test]
         public void TestServerCanAccessItsOwnPlayer()
         {
@@ -23,9 +26,16 @@ public void TestServerCanAccessItsOwnPlayer()
             Assert.AreEqual(serverSideClientId, serverSideServerPlayerObject.OwnerClientId);
         }
 
-        [Test]
-        public void TestServerCanAccessOtherPlayers()
+
+        /// <summary>
+        /// Test was converted from a Test to UnityTest so distributed authority mode will pass this test.
+        /// In distributed authority mode, client-side player spawning is enabled by default which requires
+        /// all client (including DAHost) instances to wait for all players to be spawned.
+        /// </summary>
+        [UnityTest]
+        public IEnumerator TestServerCanAccessOtherPlayers()
         {
+            yield return null;
             // server can access other players
             var serverSideClientPlayerObject = m_ServerNetworkManager.SpawnManager.GetPlayerNetworkObject(clientSideClientId);
             Assert.NotNull(serverSideClientPlayerObject);
@@ -34,11 +44,17 @@ public void TestServerCanAccessOtherPlayers()
             var serverSideOtherClientPlayerObject = m_ServerNetworkManager.SpawnManager.GetPlayerNetworkObject(otherClientSideClientId);
             Assert.NotNull(serverSideOtherClientPlayerObject);
             Assert.AreEqual(otherClientSideClientId, serverSideOtherClientPlayerObject.OwnerClientId);
+
         }
 
         [Test]
         public void TestClientCantAccessServerPlayer()
         {
+            if (m_DistributedAuthority)
+            {
+                VerboseDebug($"Ignoring test: Clients have access to other player objects in {m_NetworkTopologyType} mode.");
+                return;
+            }
             // client can't access server player
             Assert.Throws<NotServerException>(() =>
             {
@@ -55,9 +71,29 @@ public void TestClientCanAccessOwnPlayer()
             Assert.AreEqual(clientSideClientId, clientSideClientPlayerObject.OwnerClientId);
         }
 
+        [Test]
+        public void TestClientCanAccessOtherPlayer()
+        {
+
+            if (!m_DistributedAuthority)
+            {
+                VerboseDebug($"Ignoring test: Clients do not have access to other player objects in {m_NetworkTopologyType} mode.");
+                return;
+            }
+
+            var otherClientPlayer = m_ClientNetworkManagers[0].SpawnManager.GetPlayerNetworkObject(otherClientSideClientId);
+            Assert.NotNull(otherClientPlayer, $"Failed to obtain Client{otherClientSideClientId}'s player object!");
+        }
+
         [Test]
         public void TestClientCantAccessOtherPlayer()
         {
+            if (m_DistributedAuthority)
+            {
+                VerboseDebug($"Ignoring test: Clients have access to other player objects in {m_NetworkTopologyType} mode.");
+                return;
+            }
+
             // client can't access other player
             Assert.Throws<NotServerException>(() =>
             {
@@ -97,18 +133,8 @@ public void TestClientCanUseGetLocalPlayerObject()
         public IEnumerator TestConnectAndDisconnect()
         {
             // test when client connects, player object is now available
-
-            // connect new client
-            if (!NetcodeIntegrationTestHelpers.CreateNewClients(1, out NetworkManager[] clients))
-            {
-                Debug.LogError("Failed to create instances");
-                Assert.Fail("Failed to create instances");
-            }
-            var newClientNetworkManager = clients[0];
-            newClientNetworkManager.NetworkConfig.PlayerPrefab = m_PlayerPrefab;
-            newClientNetworkManager.StartClient();
-            yield return NetcodeIntegrationTestHelpers.WaitForClientConnected(newClientNetworkManager);
-            yield return WaitForConditionOrTimeOut(() => m_ServerNetworkManager.ConnectedClients.ContainsKey(newClientNetworkManager.LocalClientId));
+            yield return CreateAndStartNewClient();
+            var newClientNetworkManager = m_ClientNetworkManagers[NumberOfClients];
             var newClientLocalClientId = newClientNetworkManager.LocalClientId;
 
             // test new client can get that itself locally
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformBase.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformBase.cs
index 95ef88a784..7d9635dd76 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformBase.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformBase.cs
@@ -9,15 +9,15 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class NetworkTransformBase : IntegrationTestWithApproximation
+    internal class NetworkTransformBase : IntegrationTestWithApproximation
     {
 
-        // The number of iterations to change position, rotation, and scale for NetworkTransformMultipleChangesOverTime       
+        // The number of iterations to change position, rotation, and scale for NetworkTransformMultipleChangesOverTime
         protected const int k_PositionRotationScaleIterations = 3;
         protected const int k_PositionRotationScaleIterations3Axis = 8;
 
         protected float m_CurrentHalfPrecision = 0.0f;
-        protected const float k_HalfPrecisionPosScale = 0.115f;
+        protected const float k_HalfPrecisionPosScale = 0.1256f;
         protected const float k_HalfPrecisionRot = 0.725f;
 
 
@@ -126,7 +126,7 @@ protected override float GetDeltaVarianceThreshold()
             {
                 return m_CurrentHalfPrecision;
             }
-            return 0.045f;
+            return 0.055f;
         }
 
         /// <summary>
@@ -200,9 +200,8 @@ protected override IEnumerator OnTearDown()
         /// </summary>
         /// <param name="testWithHost">Determines if we are running as a server or host</param>
         /// <param name="authority">Determines if we are using server or owner authority</param>
-        public NetworkTransformBase(HostOrServer testWithHost, Authority authority, RotationCompression rotationCompression, Rotation rotation, Precision precision)
+        public NetworkTransformBase(HostOrServer testWithHost, Authority authority, RotationCompression rotationCompression, Rotation rotation, Precision precision) : base(testWithHost)
         {
-            m_UseHost = testWithHost == HostOrServer.Host;
             m_Authority = authority;
             m_Precision = precision;
             m_RotationCompression = rotationCompression;
@@ -339,7 +338,6 @@ protected override IEnumerator OnServerAndClientsConnected()
         /// </summary>
         protected override void OnNewClientCreated(NetworkManager networkManager)
         {
-            networkManager.NetworkConfig.Prefabs = m_ServerNetworkManager.NetworkConfig.Prefabs;
             networkManager.NetworkConfig.TickRate = GetTickRate();
             if (m_EnableVerboseDebug)
             {
@@ -376,6 +374,18 @@ protected bool AllChildObjectInstancesAreSpawned()
             return true;
         }
 
+        protected bool AllFirstLevelChildObjectInstancesHaveChild()
+        {
+            foreach (var instance in ChildObjectComponent.ClientInstances.Values)
+            {
+                if (instance.transform.parent == null)
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
         protected bool AllChildObjectInstancesHaveChild()
         {
             foreach (var instance in ChildObjectComponent.ClientInstances.Values)
@@ -398,6 +408,33 @@ protected bool AllChildObjectInstancesHaveChild()
             return true;
         }
 
+        protected bool AllFirstLevelChildObjectInstancesHaveNoParent()
+        {
+            foreach (var instance in ChildObjectComponent.ClientInstances.Values)
+            {
+                if (instance.transform.parent != null)
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        protected bool AllSubChildObjectInstancesHaveNoParent()
+        {
+            if (ChildObjectComponent.HasSubChild)
+            {
+                foreach (var instance in ChildObjectComponent.ClientSubChildInstances.Values)
+                {
+                    if (instance.transform.parent != null)
+                    {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+
         /// <summary>
         /// A wait condition specific method that assures the local space coordinates
         /// are not impacted by NetworkTransform when parented.
@@ -473,12 +510,12 @@ protected bool PostAllChildrenLocalTransformValuesMatch(bool useSubChild)
                         }
                         if (!Approximately(childLocalPosition, authorityObjectLocalPosition))
                         {
-                            m_InfoMessage.AppendLine($"[{childParentName}][{childInstance.name}] Child's Local Position ({childLocalPosition}) | Authority Local Position ({authorityObjectLocalPosition})");
+                            m_InfoMessage.AppendLine($"[{childParentName}][{childInstance.name}] Child's Local Position ({GetVector3Values(childLocalPosition)}) | Authority Local Position ({GetVector3Values(authorityObjectLocalPosition)})");
                             success = false;
                         }
                         if (!Approximately(childLocalScale, authorityObjectLocalScale))
                         {
-                            m_InfoMessage.AppendLine($"[{childParentName}][{childInstance.name}] Child's Local Scale ({childLocalScale}) | Authority Local Scale ({authorityObjectLocalScale})");
+                            m_InfoMessage.AppendLine($"[{childParentName}][{childInstance.name}] Child's Local Scale ({GetVector3Values(childLocalScale)}) | Authority Local Scale ({GetVector3Values(authorityObjectLocalScale)})");
                             success = false;
                         }
 
@@ -489,7 +526,7 @@ protected bool PostAllChildrenLocalTransformValuesMatch(bool useSubChild)
                         }
                         if (!ApproximatelyEuler(childLocalRotation, authorityObjectLocalRotation))
                         {
-                            m_InfoMessage.AppendLine($"[{childParentName}][{childInstance.name}] Child's Local Rotation ({childLocalRotation}) | Authority Local Rotation ({authorityObjectLocalRotation})");
+                            m_InfoMessage.AppendLine($"[{childParentName}][{childInstance.name}] Child's Local Rotation ({GetVector3Values(childLocalRotation)}) | Authority Local Rotation ({GetVector3Values(authorityObjectLocalRotation)})");
                             success = false;
                         }
                     }
@@ -594,14 +631,13 @@ protected bool PositionsMatchesValue(Vector3 positionToMatch)
             var nonAuthorityPosition = m_NonAuthoritativeTransform.transform.position;
             var auhtorityIsEqual = Approximately(authorityPosition, positionToMatch);
             var nonauthorityIsEqual = Approximately(nonAuthorityPosition, positionToMatch);
-
             if (!auhtorityIsEqual)
             {
-                VerboseDebug($"Authority position {authorityPosition} != position to match: {positionToMatch}!");
+                VerboseDebug($"Authority ({m_AuthoritativeTransform.name}) position {authorityPosition} != position to match: {positionToMatch}!");
             }
             if (!nonauthorityIsEqual)
             {
-                VerboseDebug($"NonAuthority position {nonAuthorityPosition} != position to match: {positionToMatch}!");
+                VerboseDebug($"NonAuthority ({m_NonAuthoritativeTransform.name}) position {nonAuthorityPosition} != position to match: {positionToMatch}!");
             }
             return auhtorityIsEqual && nonauthorityIsEqual;
         }
@@ -731,7 +767,7 @@ private void PrintPositionRotationScaleDeltas()
     /// <summary>
     /// Helper component for all NetworkTransformTests
     /// </summary>
-    public class NetworkTransformTestComponent : NetworkTransform
+    internal class NetworkTransformTestComponent : NetworkTransform
     {
         public bool ServerAuthority;
         public bool ReadyToReceivePositionUpdate = false;
@@ -745,38 +781,32 @@ public class NetworkTransformTestComponent : NetworkTransform
 
         protected override void OnAuthorityPushTransformState(ref NetworkTransformState networkTransformState)
         {
+            Debug.Log($"[Auth]{name} State Pushed.");
             StatePushed = true;
             AuthorityLastSentState = networkTransformState;
             AuthorityPushedTransformState?.Invoke(ref networkTransformState);
             base.OnAuthorityPushTransformState(ref networkTransformState);
         }
 
-        public bool AuthorityMove;
-        public Vector3 DirectionToMove;
-        public float MoveSpeed;
-
-        protected override void Update()
-        {
-            if (CanCommitToTransform && AuthorityMove)
-            {
-                transform.position += DirectionToMove * MoveSpeed * Time.deltaTime;
-            }
-            base.Update();
-        }
-
-
-        public delegate void NonAuthorityReceivedTransformStateDelegateHandler(ref NetworkTransformState networkTransformState);
-
-        public event NonAuthorityReceivedTransformStateDelegateHandler NonAuthorityReceivedTransformState;
 
         public bool StateUpdated { get; internal set; }
         protected override void OnNetworkTransformStateUpdated(ref NetworkTransformState oldState, ref NetworkTransformState newState)
         {
+            Debug.Log($"[Non-Auth]{name} State Updated.");
             StateUpdated = true;
-            NonAuthorityReceivedTransformState?.Invoke(ref newState);
             base.OnNetworkTransformStateUpdated(ref oldState, ref newState);
         }
 
+        protected string GetVector3Values(ref Vector3 vector3)
+        {
+            return $"({vector3.x:F6},{vector3.y:F6},{vector3.z:F6})";
+        }
+
+        protected string GetVector3Values(Vector3 vector3)
+        {
+            return GetVector3Values(ref vector3);
+        }
+
         protected override bool OnIsServerAuthoritative()
         {
             return ServerAuthority;
@@ -812,7 +842,7 @@ public void CommitToTransform()
     /// Helper component for NetworkTransform parenting tests when
     /// a child is a parent of another child (i.e. "sub child")
     /// </summary>
-    public class SubChildObjectComponent : ChildObjectComponent
+    internal class SubChildObjectComponent : ChildObjectComponent
     {
         protected override bool IsSubChild()
         {
@@ -823,7 +853,7 @@ protected override bool IsSubChild()
     /// <summary>
     /// Helper component for NetworkTransform parenting tests
     /// </summary>
-    public class ChildObjectComponent : NetworkTransform
+    internal class ChildObjectComponent : NetworkTransform
     {
         public static int TestCount;
         public static bool EnableChildLog;
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformErrorTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformErrorTests.cs
new file mode 100644
index 0000000000..d70984062e
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformErrorTests.cs
@@ -0,0 +1,140 @@
+using System.Collections;
+using Unity.Netcode.Components;
+using Unity.Netcode.TestHelpers.Runtime;
+using UnityEngine;
+using UnityEngine.TestTools;
+
+
+namespace Unity.Netcode.RuntimeTests
+{
+    internal class NetworkTransformErrorTests : NetcodeIntegrationTest
+    {
+        protected override int NumberOfClients => 1;
+
+        private GameObject m_AuthorityPrefab;
+        private GameObject m_NonAuthorityPrefab;
+
+        private HostAndClientPrefabHandler m_HostAndClientPrefabHandler;
+
+        public class EmptyNetworkBehaviour : NetworkBehaviour { }
+
+        /// <summary>
+        /// PrefabHandler that tracks and separates the client GameObject from the host GameObject.
+        /// Allows independent management of client and host game world while still instantiating NetworkObjects as expected.
+        /// </summary>
+        private class HostAndClientPrefabHandler : INetworkPrefabInstanceHandler
+        {
+            /// <summary>
+            /// The registered prefab is the prefab the networking stack is instantiated with.
+            /// Registering the prefab simulates the prefab that exists on the authority.
+            /// </summary>
+            private readonly GameObject m_RegisteredPrefab;
+
+            /// <summary>
+            /// Mocks the registered prefab changing on the non-authority after registration.
+            /// Allows testing situations mismatched GameObject state between the authority and non-authority.
+            /// </summary>
+            private readonly GameObject m_InstantiatedPrefab;
+
+            public HostAndClientPrefabHandler(GameObject authorityPrefab, GameObject nonAuthorityPrefab)
+            {
+                m_RegisteredPrefab = authorityPrefab;
+                m_InstantiatedPrefab = nonAuthorityPrefab;
+            }
+
+            /// <summary>
+            /// Returns the prefab that will mock the instantiated prefab not matching the registered prefab
+            /// </summary>
+            public NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaternion rotation)
+            {
+                return Object.Instantiate(m_InstantiatedPrefab).GetComponent<NetworkObject>();
+            }
+
+            public void Destroy(NetworkObject networkObject)
+            {
+                Object.Destroy(networkObject.gameObject);
+            }
+
+            public void Register(NetworkManager networkManager)
+            {
+                // Register the version that will be spawned by the authority (i.e. Host)
+                networkManager.PrefabHandler.AddHandler(m_RegisteredPrefab, this);
+            }
+        }
+
+        /// <summary>
+        /// Creates a GameObject and sets the transform parent to the given transform
+        /// Adds a component of the given type to the GameObject
+        /// </summary>
+        private static void AddChildToNetworkObject<T>(Transform transform) where T : Component
+        {
+            var gameObj = new GameObject();
+            gameObj.transform.parent = transform;
+            gameObj.AddComponent<T>();
+        }
+
+        protected override void OnServerAndClientsCreated()
+        {
+            // Create a prefab that has many child NetworkBehaviours
+            m_AuthorityPrefab = CreateNetworkObjectPrefab("AuthorityPrefab");
+            AddChildToNetworkObject<EmptyNetworkBehaviour>(m_AuthorityPrefab.transform);
+            AddChildToNetworkObject<EmptyNetworkBehaviour>(m_AuthorityPrefab.transform);
+            AddChildToNetworkObject<NetworkTransform>(m_AuthorityPrefab.transform);
+
+            // Create a second prefab with only one NetworkBehaviour
+            // This simulates the GameObjects on the other NetworkBehaviours being disabled
+            m_NonAuthorityPrefab = CreateNetworkObjectPrefab("NonAuthorityPrefab");
+            AddChildToNetworkObject<NetworkTransform>(m_NonAuthorityPrefab.transform);
+
+            // Create and register a prefab handler
+            // The prefab handler will behave as if the GameObjects have been disabled on the non-authority client
+            m_HostAndClientPrefabHandler = new HostAndClientPrefabHandler(m_AuthorityPrefab, m_NonAuthorityPrefab);
+            m_HostAndClientPrefabHandler.Register(m_ServerNetworkManager);
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                m_HostAndClientPrefabHandler.Register(client);
+            }
+
+            base.OnServerAndClientsCreated();
+        }
+
+        /// <summary>
+        /// Validates the fix where <see cref="NetworkTransformMessage"/> would throw an exception
+        /// if a user sets a <see cref="GameObject"/> with one or more <see cref="NetworkBehaviour"/> components
+        /// to inactive.
+        /// </summary>
+        [UnityTest]
+        public IEnumerator DisabledGameObjectErrorTest()
+        {
+            var instance = SpawnObject(m_AuthorityPrefab, m_ServerNetworkManager);
+            var networkObjectInstance = instance.GetComponent<NetworkObject>();
+            var networkTransformInstance = instance.GetComponentInChildren<NetworkTransform>();
+
+            yield return WaitForConditionOrTimeOut(() => ObjectSpawnedOnAllClients(networkObjectInstance.NetworkObjectId));
+            AssertOnTimeout("Timed out waiting for object to spawn!");
+
+            var errorMessage = $"[Netcode] {nameof(NetworkBehaviour)} index {networkTransformInstance.NetworkBehaviourId} was out of bounds for {m_NonAuthorityPrefab.name}(Clone). " +
+                $"{nameof(NetworkBehaviour)}s must be the same, and in the same order, between server and client.";
+            LogAssert.Expect(LogType.Error, errorMessage);
+            errorMessage = $"[{nameof(NetworkTransformMessage)}][Invalid] Targeted {nameof(NetworkTransform)}, {nameof(NetworkBehaviour.NetworkBehaviourId)} " +
+                $"({networkTransformInstance.NetworkBehaviourId}), does not exist! Make sure you are not spawning {nameof(NetworkObject)}s with disabled {nameof(GameObject)}s that have " +
+                $"{nameof(NetworkBehaviour)} components on them.";
+            LogAssert.Expect(LogType.Error, errorMessage);
+
+            yield return new WaitForSeconds(0.3f);
+        }
+
+        private bool ObjectSpawnedOnAllClients(ulong networkObjectId)
+        {
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                if (!client.SpawnManager.SpawnedObjects.ContainsKey(networkObjectId))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+    }
+
+}
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformErrorTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformErrorTests.cs.meta
new file mode 100644
index 0000000000..b99b07b5a5
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformErrorTests.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9f0f7bfcdffd47139aae1788ee8d2063
+timeCreated: 1738881698
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformGeneral.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformGeneral.cs
index b4d786946e..92c47522c1 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformGeneral.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformGeneral.cs
@@ -4,18 +4,39 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority)]
-    [TestFixture(HostOrServer.Host, Authority.ServerAuthority)]
-    public class NetworkTransformGeneral : NetworkTransformBase
+    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, NetworkTransform.InterpolationTypes.LegacyLerp)]
+    [TestFixture(HostOrServer.Host, Authority.ServerAuthority, NetworkTransform.InterpolationTypes.LegacyLerp)]
+    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, NetworkTransform.InterpolationTypes.SmoothDampening)]
+    [TestFixture(HostOrServer.Host, Authority.ServerAuthority, NetworkTransform.InterpolationTypes.SmoothDampening)]
+    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, NetworkTransform.InterpolationTypes.Lerp)]
+    [TestFixture(HostOrServer.Host, Authority.ServerAuthority, NetworkTransform.InterpolationTypes.Lerp)]
+    internal class NetworkTransformGeneral : NetworkTransformBase
     {
-        public NetworkTransformGeneral(HostOrServer testWithHost, Authority authority) :
+        public enum SmoothLerpSettings
+        {
+            SmoothLerp,
+            NormalLerp
+        }
+
+        public NetworkTransformGeneral(HostOrServer testWithHost, Authority authority, NetworkTransform.InterpolationTypes interpolationType) :
             base(testWithHost, authority, RotationCompression.None, Rotation.Euler, Precision.Full)
-        { }
+        {
+            NetworkTransform.AssignDefaultInterpolationType = true;
+            NetworkTransform.DefaultInterpolationType = interpolationType;
+        }
 
         protected override bool m_EnableTimeTravel => true;
         protected override bool m_SetupIsACoroutine => false;
         protected override bool m_TearDownIsACoroutine => false;
 
+        protected override void OnOneTimeTearDown()
+        {
+            m_EnableVerboseDebug = false;
+            NetworkTransform.AssignDefaultInterpolationType = false;
+            NetworkTransform.DefaultInterpolationType = NetworkTransform.InterpolationTypes.Lerp;
+            base.OnOneTimeTearDown();
+        }
+
         /// <summary>
         /// Test to verify nonAuthority cannot change the transform directly
         /// </summary>
@@ -66,7 +87,7 @@ public void TestRotationThresholdDeltaCheck([Values] Interpolation interpolation
             var halfThreshold = m_AuthoritativeTransform.RotAngleThreshold * 0.5001f;
 
             // Apply the current state prior to getting reference rotations which assures we have
-            // applied the most current rotation deltas and that all bitset flags are updated 
+            // applied the most current rotation deltas and that all bitset flags are updated
             var results = m_AuthoritativeTransform.ApplyState();
             TimeTravelAdvanceTick();
 
@@ -266,108 +287,57 @@ public void TestMultipleExplicitSetStates([Values] Interpolation interpolation)
         /// This also tests that the original server authoritative model with client-owner driven NetworkTransforms is preserved.
         /// </remarks>
         [Test]
-        public void NonAuthorityOwnerSettingStateTest([Values] Interpolation interpolation)
+        public void NonAuthorityOwnerSettingStateTest([Values] Interpolation interpolation, [Values] SmoothLerpSettings smoothLerp)
         {
-            var interpolate = interpolation != Interpolation.EnableInterpolate;
+            var interpolate = interpolation == Interpolation.EnableInterpolate;
+            var usingSmoothLerp = (smoothLerp == SmoothLerpSettings.SmoothLerp) && interpolate;
+            var waitForDelay = usingSmoothLerp ? 1000 : 500;
+            m_NonAuthoritativeTransform.PositionLerpSmoothing = usingSmoothLerp;
+            m_NonAuthoritativeTransform.RotationLerpSmoothing = usingSmoothLerp;
+            m_NonAuthoritativeTransform.ScaleLerpSmoothing = usingSmoothLerp;
+
             m_AuthoritativeTransform.Interpolate = interpolate;
             m_NonAuthoritativeTransform.Interpolate = interpolate;
             m_NonAuthoritativeTransform.RotAngleThreshold = m_AuthoritativeTransform.RotAngleThreshold = 0.1f;
 
+            m_EnableVerboseDebug = true;
+            VerboseDebug($"Target Frame Rate: {Application.targetFrameRate}");
             // Test one parameter at a time first
-            var newPosition = new Vector3(125f, 35f, 65f);
+            var newPosition = usingSmoothLerp ? new Vector3(15f, -12f, 10f) : new Vector3(55f, -24f, 20f);
             var newRotation = Quaternion.Euler(1, 2, 3);
             var newScale = new Vector3(2.0f, 2.0f, 2.0f);
             m_NonAuthoritativeTransform.SetState(newPosition, null, null, interpolate);
-            var success = WaitForConditionOrTimeOutWithTimeTravel(() => PositionsMatchesValue(newPosition));
-            Assert.True(success, $"Timed out waiting for non-authoritative position state request to be applied!");
+            var success = WaitForConditionOrTimeOutWithTimeTravel(() => PositionsMatchesValue(newPosition), waitForDelay);
+            Assert.True(success, $"Timed out waiting for non-authoritative position state request to be applied!\n {VerboseDebugLog}");
             Assert.True(Approximately(newPosition, m_AuthoritativeTransform.transform.position), "Authoritative position does not match!");
             Assert.True(Approximately(newPosition, m_NonAuthoritativeTransform.transform.position), "Non-Authoritative position does not match!");
-
             m_NonAuthoritativeTransform.SetState(null, newRotation, null, interpolate);
-            success = WaitForConditionOrTimeOutWithTimeTravel(() => RotationMatchesValue(newRotation.eulerAngles));
-            Assert.True(success, $"Timed out waiting for non-authoritative rotation state request to be applied!");
-            Assert.True(Approximately(newRotation.eulerAngles, m_AuthoritativeTransform.transform.rotation.eulerAngles), "Authoritative rotation does not match!");
-            Assert.True(Approximately(newRotation.eulerAngles, m_NonAuthoritativeTransform.transform.rotation.eulerAngles), "Non-Authoritative rotation does not match!");
+            success = WaitForConditionOrTimeOutWithTimeTravel(() => RotationMatchesValue(newRotation.eulerAngles), waitForDelay);
+            Assert.True(success, $"Timed out waiting for non-authoritative rotation state request to be applied!\n {VerboseDebugLog}");
+            Assert.True(Approximately(newRotation.eulerAngles, m_AuthoritativeTransform.transform.rotation.eulerAngles), $"Authoritative rotation does not match!\n {VerboseDebugLog}");
+            Assert.True(Approximately(newRotation.eulerAngles, m_NonAuthoritativeTransform.transform.rotation.eulerAngles), $"Non-Authoritative rotation does not match!\n {VerboseDebugLog}");
+            Assert.True(Approximately(newRotation.eulerAngles, m_NonAuthoritativeTransform.transform.rotation.eulerAngles), $"Non-Authoritative rotation does not match!\n {VerboseDebugLog}");
 
             m_NonAuthoritativeTransform.SetState(null, null, newScale, interpolate);
-            success = WaitForConditionOrTimeOutWithTimeTravel(() => ScaleMatchesValue(newScale));
-            Assert.True(success, $"Timed out waiting for non-authoritative scale state request to be applied!");
-            Assert.True(Approximately(newScale, m_AuthoritativeTransform.transform.localScale), "Authoritative scale does not match!");
-            Assert.True(Approximately(newScale, m_NonAuthoritativeTransform.transform.localScale), "Non-Authoritative scale does not match!");
+            success = WaitForConditionOrTimeOutWithTimeTravel(() => ScaleMatchesValue(newScale), waitForDelay);
+            Assert.True(success, $"Timed out waiting for non-authoritative scale state request to be applied!\n {VerboseDebugLog}");
+            Assert.True(Approximately(newScale, m_AuthoritativeTransform.transform.localScale), $"Authoritative scale does not match!\n {VerboseDebugLog}");
+            Assert.True(Approximately(newScale, m_NonAuthoritativeTransform.transform.localScale), $"Non-Authoritative scale does not match!\n {VerboseDebugLog}");
 
             // Test all parameters at once
-            newPosition = new Vector3(55f, 95f, -25f);
+            newPosition = new Vector3(-10f, 95f, -25f);
             newRotation = Quaternion.Euler(20, 5, 322);
             newScale = new Vector3(0.5f, 0.5f, 0.5f);
 
             m_NonAuthoritativeTransform.SetState(newPosition, newRotation, newScale, interpolate);
-            success = WaitForConditionOrTimeOutWithTimeTravel(() => PositionRotationScaleMatches(newPosition, newRotation.eulerAngles, newScale));
-            Assert.True(success, $"Timed out waiting for non-authoritative position, rotation, and scale state request to be applied!");
-            Assert.True(Approximately(newPosition, m_AuthoritativeTransform.transform.position), "Authoritative position does not match!");
-            Assert.True(Approximately(newPosition, m_NonAuthoritativeTransform.transform.position), "Non-Authoritative position does not match!");
-            Assert.True(Approximately(newRotation.eulerAngles, m_AuthoritativeTransform.transform.rotation.eulerAngles), "Authoritative rotation does not match!");
-            Assert.True(Approximately(newRotation.eulerAngles, m_NonAuthoritativeTransform.transform.rotation.eulerAngles), "Non-Authoritative rotation does not match!");
-            Assert.True(Approximately(newScale, m_AuthoritativeTransform.transform.localScale), "Authoritative scale does not match!");
-            Assert.True(Approximately(newScale, m_NonAuthoritativeTransform.transform.localScale), "Non-Authoritative scale does not match!");
-        }
-
-        /// <summary>
-        /// Validates that the unreliable frame synchronization is correct on the
-        /// non-authority side when using half float precision.
-        /// </summary>
-        [Test]
-        public void UnreliableHalfPrecisionTest([Values] Interpolation interpolation)
-        {
-            var interpolate = interpolation != Interpolation.EnableInterpolate;
-            m_AuthoritativeTransform.Interpolate = interpolate;
-            m_NonAuthoritativeTransform.Interpolate = interpolate;
-            m_AuthoritativeTransform.UseHalfFloatPrecision = true;
-            m_NonAuthoritativeTransform.UseHalfFloatPrecision = true;
-            m_AuthoritativeTransform.UseUnreliableDeltas = true;
-            m_NonAuthoritativeTransform.UseUnreliableDeltas = true;
-            m_AuthoritativeTransform.AuthorityPushedTransformState += AuthorityPushedTransformState;
-            m_NonAuthoritativeTransform.NonAuthorityReceivedTransformState += NonAuthorityReceivedTransformState;
-            m_AuthoritativeTransform.MoveSpeed = 6.325f;
-            m_AuthoritativeTransform.AuthorityMove = true;
-            m_AuthoritativeTransform.DirectionToMove = GetRandomVector3(-1.0f, 1.0f);
-
-            // Iterate several times so the authority moves around enough where we get 10 frame synchs to compare against.
-            for (int i = 0; i < 10; i++)
-            {
-                m_AuthorityFrameSync = false;
-                m_NonAuthorityFrameSync = false;
-                VerboseDebug($"Starting with authority ({m_AuthoritativeTransform.transform.position}) and nonauthority({m_NonAuthoritativeTransform.transform.position})");
-                var success = WaitForConditionOrTimeOutWithTimeTravel(() => m_AuthorityFrameSync && m_NonAuthorityFrameSync, 320);
-                Assert.True(success, $"Timed out waiting for authority or nonauthority frame state synchronization!");
-                VerboseDebug($"Comparing authority ({m_AuthorityPosition}) with nonauthority({m_NonAuthorityPosition})");
-                Assert.True(Approximately(m_AuthorityPosition, m_NonAuthorityPosition), $"Non-Authoritative position {m_AuthorityPosition} does not match authortative position {m_NonAuthorityPosition}!");
-            }
-
-            m_AuthoritativeTransform.AuthorityMove = false;
-            m_AuthoritativeTransform.AuthorityPushedTransformState -= AuthorityPushedTransformState;
-            m_NonAuthoritativeTransform.NonAuthorityReceivedTransformState -= NonAuthorityReceivedTransformState;
-        }
-
-        private bool m_AuthorityFrameSync;
-        private Vector3 m_AuthorityPosition;
-        private bool m_NonAuthorityFrameSync;
-        private Vector3 m_NonAuthorityPosition;
-        private void AuthorityPushedTransformState(ref NetworkTransform.NetworkTransformState networkTransformState)
-        {
-            if (networkTransformState.UnreliableFrameSync)
-            {
-                m_AuthorityPosition = m_AuthoritativeTransform.GetSpaceRelativePosition();
-                m_AuthorityFrameSync = true;
-            }
-        }
-
-        private void NonAuthorityReceivedTransformState(ref NetworkTransform.NetworkTransformState networkTransformState)
-        {
-            if (networkTransformState.UnreliableFrameSync)
-            {
-                m_NonAuthorityPosition = networkTransformState.NetworkDeltaPosition.GetFullPosition();
-                m_NonAuthorityFrameSync = true;
-            }
+            success = WaitForConditionOrTimeOutWithTimeTravel(() => PositionRotationScaleMatches(newPosition, newRotation.eulerAngles, newScale), waitForDelay);
+            Assert.True(success, $"Timed out waiting for non-authoritative position, rotation, and scale state request to be applied!\n {VerboseDebugLog}");
+            Assert.True(Approximately(newPosition, m_AuthoritativeTransform.transform.position), $"Authoritative position does not match!\n {VerboseDebugLog}");
+            Assert.True(Approximately(newPosition, m_NonAuthoritativeTransform.transform.position), $"Non-Authoritative position does not match!\n {VerboseDebugLog}");
+            Assert.True(Approximately(newRotation.eulerAngles, m_AuthoritativeTransform.transform.rotation.eulerAngles), $"Authoritative rotation does not match!\n {VerboseDebugLog}");
+            Assert.True(Approximately(newRotation.eulerAngles, m_NonAuthoritativeTransform.transform.rotation.eulerAngles), $"Non-Authoritative rotation does not match!\n {VerboseDebugLog}");
+            Assert.True(Approximately(newScale, m_AuthoritativeTransform.transform.localScale), $"Authoritative scale does not match!\n {VerboseDebugLog}");
+            Assert.True(Approximately(newScale, m_NonAuthoritativeTransform.transform.localScale), $"Non-Authoritative scale does not match!\n {VerboseDebugLog}");
         }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformMixedAuthorityTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformMixedAuthorityTests.cs
new file mode 100644
index 0000000000..663ba49810
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformMixedAuthorityTests.cs
@@ -0,0 +1,103 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using Unity.Netcode.Components;
+using Unity.Netcode.TestHelpers.Runtime;
+using UnityEngine;
+using UnityEngine.TestTools;
+
+namespace Unity.Netcode.RuntimeTests
+{
+    internal class NetworkTransformMixedAuthorityTests : IntegrationTestWithApproximation
+    {
+        private const float k_MotionMagnitude = 5.5f;
+        private const int k_Iterations = 4;
+
+        protected override int NumberOfClients => 2;
+
+        private StringBuilder m_ErrorMsg = new StringBuilder();
+        private List<NetworkManager> m_NetworkManagers = new List<NetworkManager>();
+
+        protected override void OnCreatePlayerPrefab()
+        {
+            m_PlayerPrefab.AddComponent<NetworkTransform>();
+
+            var childGameObject = new GameObject();
+            childGameObject.transform.parent = m_PlayerPrefab.transform;
+            var childNetworkTransform = childGameObject.AddComponent<NetworkTransform>();
+            childNetworkTransform.AuthorityMode = NetworkTransform.AuthorityModes.Owner;
+            childNetworkTransform.InLocalSpace = true;
+
+            base.OnCreatePlayerPrefab();
+        }
+
+        private void MovePlayers()
+        {
+            foreach (var networkManager in m_NetworkManagers)
+            {
+                var direction = GetRandomVector3(-1.0f, 1.0f);
+                var playerObject = networkManager.LocalClient.PlayerObject;
+                var playerObjectId = networkManager.LocalClient.PlayerObject.NetworkObjectId;
+                // Server authoritative
+                var serverPlayerClone = m_ServerNetworkManager.SpawnManager.SpawnedObjects[playerObjectId];
+                serverPlayerClone.transform.position += direction * k_MotionMagnitude;
+                // Owner authoritative
+                var childTransform = networkManager.LocalClient.PlayerObject.transform.GetChild(0);
+                childTransform.localPosition += direction * k_MotionMagnitude;
+            }
+        }
+
+        private bool AllInstancePositionsMatch()
+        {
+            m_ErrorMsg.Clear();
+            foreach (var networkManager in m_NetworkManagers)
+            {
+                var playerObject = networkManager.LocalClient.PlayerObject;
+                var playerObjectId = networkManager.LocalClient.PlayerObject.NetworkObjectId;
+                var serverRootPosition = m_ServerNetworkManager.SpawnManager.SpawnedObjects[playerObjectId].transform.position;
+                var ownerChildPosition = networkManager.LocalClient.PlayerObject.transform.GetChild(0).localPosition;
+                foreach (var client in m_NetworkManagers)
+                {
+                    if (client == networkManager)
+                    {
+                        continue;
+                    }
+                    var playerClone = client.SpawnManager.SpawnedObjects[playerObjectId];
+                    var cloneRootPosition = playerClone.transform.position;
+                    var cloneChildPosition = playerClone.transform.GetChild(0).localPosition;
+
+                    if (!Approximately(serverRootPosition, cloneRootPosition))
+                    {
+                        m_ErrorMsg.AppendLine($"[{playerObject.name}][{playerClone.name}] Root mismatch ({GetVector3Values(serverRootPosition)})({GetVector3Values(cloneRootPosition)})!");
+                    }
+
+                    if (!Approximately(ownerChildPosition, cloneChildPosition))
+                    {
+                        m_ErrorMsg.AppendLine($"[{playerObject.name}][{playerClone.name}] Child mismatch ({GetVector3Values(ownerChildPosition)})({GetVector3Values(cloneChildPosition)})!");
+                    }
+                }
+            }
+            return m_ErrorMsg.Length == 0;
+        }
+
+        /// <summary>
+        /// Client-Server Only
+        /// Validates that mixed authority is working properly
+        /// Root -- Server Authoritative
+        /// |--Child -- Owner Authoritative
+        /// </summary>
+        [UnityTest]
+        public IEnumerator MixedAuthorityTest()
+        {
+            m_NetworkManagers.Add(m_ServerNetworkManager);
+            m_NetworkManagers.AddRange(m_ClientNetworkManagers);
+
+            for (int i = 0; i < k_Iterations; i++)
+            {
+                MovePlayers();
+                yield return WaitForConditionOrTimeOut(AllInstancePositionsMatch);
+                AssertOnTimeout($"Transforms failed to synchronize!");
+            }
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformMixedAuthorityTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformMixedAuthorityTests.cs.meta
new file mode 100644
index 0000000000..33fe880cfa
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformMixedAuthorityTests.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 1bb4423be663c944ab55615995e28612
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformOwnershipTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformOwnershipTests.cs
index 1bcd7a9c0a..64f6646005 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformOwnershipTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformOwnershipTests.cs
@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using NUnit.Framework;
 using Unity.Netcode.Components;
 using Unity.Netcode.TestHelpers.Runtime;
@@ -9,36 +10,80 @@
 using UnityEngine.TestTools;
 namespace Unity.Netcode.RuntimeTests
 {
-    public class NetworkTransformOwnershipTests : IntegrationTestWithApproximation
+    [TestFixture(HostOrServer.DAHost, MotionModels.UseTransform)]
+    [TestFixture(HostOrServer.DAHost, MotionModels.UseRigidbody)]
+    [TestFixture(HostOrServer.Host, MotionModels.UseTransform)]
+    internal class NetworkTransformOwnershipTests : IntegrationTestWithApproximation
     {
+        public enum MotionModels
+        {
+            UseRigidbody,
+            UseTransform
+        }
         protected override int NumberOfClients => 1;
 
         private GameObject m_ClientNetworkTransformPrefab;
         private GameObject m_NetworkTransformPrefab;
 
+        private MotionModels m_MotionModel;
+
+        public NetworkTransformOwnershipTests(HostOrServer hostOrServer, MotionModels motionModel) : base(hostOrServer)
+        {
+            m_MotionModel = motionModel;
+        }
+
         protected override void OnServerAndClientsCreated()
         {
             VerifyObjectIsSpawnedOnClient.ResetObjectTable();
             m_ClientNetworkTransformPrefab = CreateNetworkObjectPrefab("OwnerAuthorityTest");
+            var clientNetworkObject = m_ClientNetworkTransformPrefab.GetComponent<NetworkObject>();
+            // When running in distributed authority mode, make the NetworkObject transferable
+            clientNetworkObject.SetOwnershipStatus(m_DistributedAuthority ? NetworkObject.OwnershipStatus.Transferable : NetworkObject.OwnershipStatus.None);
             var clientNetworkTransform = m_ClientNetworkTransformPrefab.AddComponent<TestClientNetworkTransform>();
+            clientNetworkTransform.AuthorityMode = NetworkTransform.AuthorityModes.Owner;
             clientNetworkTransform.Interpolate = false;
             clientNetworkTransform.UseHalfFloatPrecision = false;
             var rigidBody = m_ClientNetworkTransformPrefab.AddComponent<Rigidbody>();
             rigidBody.useGravity = false;
+            rigidBody.maxDepenetrationVelocity = 0;
+            rigidBody.mass = 100;
+            rigidBody.linearDamping = 100;
+            rigidBody.interpolation = RigidbodyInterpolation.None;
+            rigidBody.maxLinearVelocity = 0;
+            rigidBody.detectCollisions = false;
+            rigidBody.position = Vector3.zero;
+            rigidBody.rotation = Quaternion.identity;
+            rigidBody.transform.position = Vector3.zero;
+            rigidBody.transform.rotation = Quaternion.identity;
             // NOTE: We don't use a sphere collider for this integration test because by the time we can
             // assure they don't collide and skew the results the NetworkObjects are already synchronized
             // with skewed results
-            m_ClientNetworkTransformPrefab.AddComponent<NetworkRigidbody>();
+            var networkRigidbody = m_ClientNetworkTransformPrefab.AddComponent<NetworkRigidbody>();
+            networkRigidbody.UseRigidBodyForMotion = m_MotionModel == MotionModels.UseRigidbody;
             m_ClientNetworkTransformPrefab.AddComponent<VerifyObjectIsSpawnedOnClient>();
 
             m_NetworkTransformPrefab = CreateNetworkObjectPrefab("ServerAuthorityTest");
-            var networkTransform = m_NetworkTransformPrefab.AddComponent<NetworkTransform>();
+            var networkObject = m_ClientNetworkTransformPrefab.GetComponent<NetworkObject>();
+            // When running in distributed authority mode, make the NetworkObject transferable
+            networkObject.SetOwnershipStatus(m_DistributedAuthority ? NetworkObject.OwnershipStatus.Transferable : NetworkObject.OwnershipStatus.None);
+            var networkTransform = m_NetworkTransformPrefab.AddComponent<TestClientNetworkTransform>();
             rigidBody = m_NetworkTransformPrefab.AddComponent<Rigidbody>();
             rigidBody.useGravity = false;
+            rigidBody.maxDepenetrationVelocity = 0;
+            rigidBody.linearDamping = 100;
+            rigidBody.mass = 100;
+            rigidBody.interpolation = RigidbodyInterpolation.None;
+            rigidBody.maxLinearVelocity = 0;
+            rigidBody.detectCollisions = false;
+            rigidBody.position = Vector3.zero;
+            rigidBody.rotation = Quaternion.identity;
+            rigidBody.transform.position = Vector3.zero;
+            rigidBody.transform.rotation = Quaternion.identity;
             // NOTE: We don't use a sphere collider for this integration test because by the time we can
             // assure they don't collide and skew the results the NetworkObjects are already synchronized
             // with skewed results
-            m_NetworkTransformPrefab.AddComponent<NetworkRigidbody>();
+            networkRigidbody = m_NetworkTransformPrefab.AddComponent<NetworkRigidbody>();
+            networkRigidbody.UseRigidBodyForMotion = m_MotionModel == MotionModels.UseRigidbody;
             m_NetworkTransformPrefab.AddComponent<VerifyObjectIsSpawnedOnClient>();
             networkTransform.Interpolate = false;
             networkTransform.UseHalfFloatPrecision = false;
@@ -46,20 +91,6 @@ protected override void OnServerAndClientsCreated()
             base.OnServerAndClientsCreated();
         }
 
-        /// <summary>
-        /// Clients created during a test need to have their prefabs list updated to
-        /// match the server's prefab list.
-        /// </summary>
-        protected override void OnNewClientCreated(NetworkManager networkManager)
-        {
-            foreach (var networkPrefab in m_ServerNetworkManager.NetworkConfig.Prefabs.Prefabs)
-            {
-                networkManager.NetworkConfig.Prefabs.Add(networkPrefab);
-            }
-
-            base.OnNewClientCreated(networkManager);
-        }
-
         private bool ClientIsOwner()
         {
             var clientId = m_ClientNetworkManagers[0].LocalClientId;
@@ -99,10 +130,14 @@ public IEnumerator LateJoinedNonOwnerClientCannotChangeTransform()
 
             // Wait until the client gains ownership
             yield return WaitForConditionOrTimeOut(ClientIsOwner);
+            AssertOnTimeout($"Timed out waiting for the {nameof(ClientIsOwner)} condition to be met!");
 
             // Spawn a new client
             yield return CreateAndStartNewClient();
 
+            yield return WaitForConditionOrTimeOut(() => VerifyObjectIsSpawnedOnClient.NetworkManagerRelativeSpawnedObjects.ContainsKey(m_ClientNetworkManagers[1].LocalClientId));
+            AssertOnTimeout($"Timed out waiting for late joing client VerifyObjectIsSpawnedOnClient entry to be created!");
+
             // Get the instance of the object relative to the newly joined client
             var newClientObjectInstance = VerifyObjectIsSpawnedOnClient.GetClientInstance(m_ClientNetworkManagers[1].LocalClientId);
 
@@ -117,7 +152,16 @@ public IEnumerator LateJoinedNonOwnerClientCannotChangeTransform()
 
             // Wait one frame so the NetworkTransform can apply the owner's last state received on the late joining client side
             // (i.e. prevent the non-owner from changing the transform)
-            yield return null;
+            if (m_MotionModel == MotionModels.UseRigidbody)
+            {
+                // Allow fixed update to run twice for values to propogate to Unity transform
+                yield return new WaitForFixedUpdate();
+                yield return new WaitForFixedUpdate();
+            }
+            else
+            {
+                yield return null;
+            }
 
             // Get the owner instance
             var ownerInstance = VerifyObjectIsSpawnedOnClient.GetClientInstance(m_ClientNetworkManagers[0].LocalClientId);
@@ -139,6 +183,23 @@ public enum StartingOwnership
             ClientStartsAsOwner,
         }
 
+        private bool ClientAndServerSpawnedInstance()
+        {
+            return VerifyObjectIsSpawnedOnClient.NetworkManagerRelativeSpawnedObjects.ContainsKey(m_ServerNetworkManager.LocalClientId) && VerifyObjectIsSpawnedOnClient.NetworkManagerRelativeSpawnedObjects.ContainsKey(m_ClientNetworkManagers[0].LocalClientId);
+        }
+
+        private bool m_UseAdjustedVariance;
+        private const float k_AdjustedVariance = 0.025f;
+
+        protected override float GetDeltaVarianceThreshold()
+        {
+            if (m_UseAdjustedVariance)
+            {
+                return k_AdjustedVariance;
+            }
+            return base.GetDeltaVarianceThreshold();
+        }
+
         /// <summary>
         /// This verifies that when authority is owner authoritative the owner's
         /// Rigidbody is kinematic and the non-owner's is not.
@@ -155,28 +216,92 @@ public IEnumerator OwnerAuthoritativeTest([Values] StartingOwnership startingOwn
 
             // Spawn the m_ClientNetworkTransformPrefab and wait for the client-side to spawn the object
             var serverSideInstance = SpawnObject(m_ClientNetworkTransformPrefab, networkManagerOwner);
-            yield return WaitForConditionOrTimeOut(() => VerifyObjectIsSpawnedOnClient.GetClientsThatSpawnedThisPrefab().Contains(m_ClientNetworkManagers[0].LocalClientId));
+            yield return WaitForConditionOrTimeOut(ClientAndServerSpawnedInstance);
+            AssertOnTimeout($"Timed out waiting for all object instances to be spawned!");
 
             // Get owner relative instances
             var ownerInstance = VerifyObjectIsSpawnedOnClient.GetClientInstance(networkManagerOwner.LocalClientId);
             var nonOwnerInstance = VerifyObjectIsSpawnedOnClient.GetClientInstance(networkManagerNonOwner.LocalClientId);
             Assert.NotNull(ownerInstance);
             Assert.NotNull(nonOwnerInstance);
+            Assert.True(networkManagerOwner.LocalClientId != networkManagerNonOwner.LocalClientId);
+            Assert.True(nonOwnerInstance.OwnerClientId != networkManagerNonOwner.LocalClientId);
+            Assert.True(nonOwnerInstance.NetworkManager.LocalClientId == networkManagerNonOwner.LocalClientId);
+
+            Vector3 GetNonOwnerPosition()
+            {
+                if (m_MotionModel == MotionModels.UseRigidbody)
+                {
+                    return nonOwnerInstance.GetComponent<Rigidbody>().position;
+                }
+                else
+                {
+                    return nonOwnerInstance.transform.position;
+                }
+            }
+
+            Quaternion GetNonOwnerRotation()
+            {
+                if (m_MotionModel == MotionModels.UseRigidbody)
+                {
+                    return nonOwnerInstance.GetComponent<Rigidbody>().rotation;
+                }
+                else
+                {
+                    return nonOwnerInstance.transform.rotation;
+                }
+            }
+
+            void LogNonOwnerRigidBody(int stage)
+            {
+                if (m_MotionModel == MotionModels.UseRigidbody && m_EnableVerboseDebug)
+                {
+                    var rigidbody = nonOwnerInstance.GetComponent<Rigidbody>();
+                    Debug.Log($"[{stage}][Rigidbody-NonOwner][Owner:{nonOwnerInstance.OwnerClientId} [Client-{nonOwnerInstance.NetworkManager.LocalClientId}][Gravity: {rigidbody.useGravity}][Kinematic: {rigidbody.isKinematic}][RB-Pos: {rigidbody.position}][RB-Rotation: {rigidbody.rotation}]");
+                }
+            }
+
+            void LogOwnerRigidBody(int stage)
+            {
+                if (m_MotionModel == MotionModels.UseRigidbody && m_EnableVerboseDebug)
+                {
+                    var rigidbody = ownerInstance.GetComponent<Rigidbody>();
+                    Debug.Log($"[{stage}][Rigidbody-Owner][Owner:{ownerInstance.OwnerClientId} [Client-{ownerInstance.NetworkManager.LocalClientId}][Gravity: {rigidbody.useGravity}][Kinematic: {rigidbody.isKinematic}][RB-Pos: {rigidbody.position}][RB-Rotation: {rigidbody.rotation}]");
+                }
+            }
 
             // Make sure the owner is not kinematic and the non-owner(s) are kinematic
             Assert.True(nonOwnerInstance.GetComponent<Rigidbody>().isKinematic, $"{networkManagerNonOwner.name}'s object instance {nonOwnerInstance.name} is not kinematic when it should be!");
             Assert.False(ownerInstance.GetComponent<Rigidbody>().isKinematic, $"{networkManagerOwner.name}'s object instance {ownerInstance.name} is kinematic when it should not be!");
-
+            if (m_MotionModel == MotionModels.UseRigidbody)
+            {
+                nonOwnerInstance.GetComponent<NetworkTransform>().LogStateUpdate = m_EnableVerboseDebug;
+            }
             // Owner changes transform values
             var valueSetByOwner = Vector3.one * 2;
-            ownerInstance.transform.position = valueSetByOwner;
-            ownerInstance.transform.localScale = valueSetByOwner;
             var rotation = new Quaternion
             {
                 eulerAngles = valueSetByOwner
             };
-            ownerInstance.transform.rotation = rotation;
+            if (m_MotionModel == MotionModels.UseRigidbody)
+            {
+                TestClientNetworkTransform.EnableLogState(m_EnableVerboseDebug);
+                var ownerRigidbody = ownerInstance.GetComponent<Rigidbody>();
+                ownerRigidbody.Move(valueSetByOwner, rotation);
+                yield return new WaitForFixedUpdate();
+                ownerRigidbody.linearVelocity = Vector3.zero;
+                yield return new WaitForFixedUpdate();
+                ownerInstance.transform.localScale = valueSetByOwner;
+            }
+            else
+            {
+                ownerInstance.transform.position = valueSetByOwner;
+                ownerInstance.transform.rotation = rotation;
+                ownerInstance.transform.localScale = valueSetByOwner;
+            }
+
             var transformToTest = nonOwnerInstance.transform;
+            LogNonOwnerRigidBody(1);
             yield return WaitForConditionOrTimeOut(() => Approximately(transformToTest.position, valueSetByOwner) && Approximately(transformToTest.localScale, valueSetByOwner) && Approximately(transformToTest.rotation, rotation));
             Assert.False(s_GlobalTimeoutHelper.TimedOut, $"Timed out waiting for {networkManagerNonOwner.name}'s object instance {nonOwnerInstance.name} to change its transform!\n" +
                 $"Expected Position: {valueSetByOwner} | Current Position: {transformToTest.position}\n" +
@@ -186,14 +311,36 @@ public IEnumerator OwnerAuthoritativeTest([Values] StartingOwnership startingOwn
             // Verify non-owners cannot change transform values
             nonOwnerInstance.transform.position = Vector3.zero;
             yield return s_DefaultWaitForTick;
-            Assert.True(Approximately(nonOwnerInstance.transform.position, valueSetByOwner), $"{networkManagerNonOwner.name}'s object instance {nonOwnerInstance.name} was allowed to change its position! Expected: {valueSetByOwner} Is Currently:{nonOwnerInstance.transform.position}");
+            if (m_MotionModel == MotionModels.UseRigidbody)
+            {
+                yield return new WaitForFixedUpdate();
+            }
+
+            LogNonOwnerRigidBody(2);
+            Assert.True(Approximately(GetNonOwnerPosition(), valueSetByOwner), $"{networkManagerNonOwner.name}'s object instance {nonOwnerInstance.name} was allowed to change its position! Expected: {valueSetByOwner} Is Currently:{GetNonOwnerPosition()}");
 
             // Change ownership and wait for the non-owner to reflect the change
             VerifyObjectIsSpawnedOnClient.ResetObjectTable();
-            m_ServerNetworkManager.SpawnManager.ChangeOwnership(serverSideInstance.GetComponent<NetworkObject>(), networkManagerNonOwner.LocalClientId);
-            yield return WaitForConditionOrTimeOut(() => nonOwnerInstance.GetComponent<NetworkObject>().OwnerClientId == networkManagerNonOwner.LocalClientId);
-            Assert.False(s_GlobalTimeoutHelper.TimedOut, $"Timed out waiting for {networkManagerNonOwner.name}'s object instance {nonOwnerInstance.name} to change ownership!");
+            if (m_DistributedAuthority)
+            {
+                Assert.True(nonOwnerInstance.OwnerClientId != networkManagerNonOwner.LocalClientId, $"Non-Owner Client-{networkManagerNonOwner.LocalClientId} was already the owner prior to changing ownership!");
+                nonOwnerInstance.NetworkObject.ChangeOwnership(networkManagerNonOwner.LocalClientId);
+                nonOwnerInstance.GetComponent<Rigidbody>().linearVelocity = Vector3.zero;
+                Assert.True(nonOwnerInstance.OwnerClientId == networkManagerNonOwner.LocalClientId, $"Client-{networkManagerNonOwner.LocalClientId} failed to change ownership!");
+
+                LogNonOwnerRigidBody(3);
+                yield return WaitForConditionOrTimeOut(() => ownerInstance.GetComponent<NetworkObject>().OwnerClientId == networkManagerNonOwner.LocalClientId);
+                Assert.False(s_GlobalTimeoutHelper.TimedOut, $"Timed out waiting for original owner {networkManagerOwner.name}'s object instance {nonOwnerInstance.name} to change ownership!");
+            }
+            else
+            {
+                m_ServerNetworkManager.SpawnManager.ChangeOwnership(serverSideInstance.GetComponent<NetworkObject>(), networkManagerNonOwner.LocalClientId, true);
+                LogNonOwnerRigidBody(3);
+                yield return WaitForConditionOrTimeOut(() => nonOwnerInstance.GetComponent<NetworkObject>().OwnerClientId == networkManagerNonOwner.LocalClientId);
+                Assert.False(s_GlobalTimeoutHelper.TimedOut, $"Timed out waiting for {networkManagerNonOwner.name}'s object instance {nonOwnerInstance.name} to change ownership!");
+            }
 
+            LogNonOwnerRigidBody(4);
             // Re-assign the ownership references and wait for the non-owner instance to be notified of ownership change
             networkManagerOwner = startingOwnership == StartingOwnership.HostStartsAsOwner ? m_ClientNetworkManagers[0] : m_ServerNetworkManager;
             networkManagerNonOwner = startingOwnership == StartingOwnership.HostStartsAsOwner ? m_ServerNetworkManager : m_ClientNetworkManagers[0];
@@ -202,28 +349,68 @@ public IEnumerator OwnerAuthoritativeTest([Values] StartingOwnership startingOwn
             yield return WaitForConditionOrTimeOut(() => VerifyObjectIsSpawnedOnClient.GetClientInstance(networkManagerNonOwner.LocalClientId) != null);
             nonOwnerInstance = VerifyObjectIsSpawnedOnClient.GetClientInstance(networkManagerNonOwner.LocalClientId);
             Assert.NotNull(nonOwnerInstance);
+            Assert.True(!nonOwnerInstance.IsOwner, $"Ownership failed to change on Client-{networkManagerNonOwner.LocalClientId} side! Expected owner to be {networkManagerOwner.LocalClientId} but owner is still {networkManagerNonOwner.LocalClientId}!");
 
             // Make sure the owner is not kinematic and the non-owner(s) are kinematic
             Assert.False(ownerInstance.GetComponent<Rigidbody>().isKinematic, $"{networkManagerOwner.name}'s object instance {ownerInstance.name} is kinematic when it should not be!");
             Assert.True(nonOwnerInstance.GetComponent<Rigidbody>().isKinematic, $"{networkManagerNonOwner.name}'s object instance {nonOwnerInstance.name} is not kinematic when it should be!");
+            transformToTest = nonOwnerInstance.transform;
+            Assert.True(networkManagerOwner.LocalClientId != networkManagerNonOwner.LocalClientId);
+            Assert.True(nonOwnerInstance.OwnerClientId != networkManagerNonOwner.LocalClientId);
+            Assert.True(nonOwnerInstance.NetworkManager.LocalClientId == networkManagerNonOwner.LocalClientId);
+
+            yield return WaitForConditionOrTimeOut(() => Approximately(transformToTest.position, valueSetByOwner) && Approximately(transformToTest.localScale, valueSetByOwner) && Approximately(transformToTest.rotation, rotation));
+            Assert.False(s_GlobalTimeoutHelper.TimedOut, $"Timed out waiting for {networkManagerNonOwner.name}'s object instance {nonOwnerInstance.name} to change its transform!\n" +
+                $"Expected Position: {valueSetByOwner} | Current Position: {transformToTest.position}\n" +
+                $"Expected Rotation: {valueSetByOwner} | Current Rotation: {transformToTest.rotation.eulerAngles}\n" +
+                $"Expected Scale: {valueSetByOwner} | Current Scale: {transformToTest.localScale}\n {nonOwnerInstance.GetComponent<TestClientNetworkTransform>().LogInfoBuilder}");
 
+            LogNonOwnerRigidBody(5);
             // Have the new owner change transform values and wait for those values to be applied on the non-owner side.
             valueSetByOwner = Vector3.one * 10;
-            ownerInstance.transform.position = valueSetByOwner;
             ownerInstance.transform.localScale = valueSetByOwner;
             rotation.eulerAngles = valueSetByOwner;
-            ownerInstance.transform.rotation = rotation;
-            transformToTest = nonOwnerInstance.transform;
-            yield return WaitForConditionOrTimeOut(() => Approximately(transformToTest.position, valueSetByOwner) && Approximately(transformToTest.localScale, valueSetByOwner) && Approximately(transformToTest.rotation, rotation));
+            LogOwnerRigidBody(1);
+            if (m_MotionModel == MotionModels.UseRigidbody)
+            {
+                m_UseAdjustedVariance = true;
+                var ownerRigidbody = ownerInstance.GetComponent<Rigidbody>();
+                ownerRigidbody.Move(valueSetByOwner, rotation);
+                LogOwnerRigidBody(2);
+                yield return new WaitForFixedUpdate();
+                ownerInstance.GetComponent<NetworkTransform>().LogMotion = m_EnableVerboseDebug;
+                nonOwnerInstance.GetComponent<NetworkTransform>().LogMotion = m_EnableVerboseDebug;
+                ownerRigidbody.linearVelocity = Vector3.zero;
+            }
+            else
+            {
+                m_UseAdjustedVariance = false;
+                ownerInstance.transform.position = valueSetByOwner;
+                ownerInstance.transform.rotation = rotation;
+            }
+
+            LogOwnerRigidBody(3);
+            LogNonOwnerRigidBody(6);
+            yield return WaitForConditionOrTimeOut(() => Approximately(GetNonOwnerPosition(), valueSetByOwner) && Approximately(transformToTest.localScale, valueSetByOwner) && Approximately(GetNonOwnerRotation(), rotation));
+            if (s_GlobalTimeoutHelper.TimedOut)
+            {
+                LogOwnerRigidBody(4);
+                LogNonOwnerRigidBody(7);
+            }
+
             Assert.False(s_GlobalTimeoutHelper.TimedOut, $"Timed out waiting for {networkManagerNonOwner.name}'s object instance {nonOwnerInstance.name} to change its transform!\n" +
                 $"Expected Position: {valueSetByOwner} | Current Position: {transformToTest.position}\n" +
                 $"Expected Rotation: {valueSetByOwner} | Current Rotation: {transformToTest.rotation.eulerAngles}\n" +
-                $"Expected Scale: {valueSetByOwner} | Current Scale: {transformToTest.localScale}");
+                $"Expected Scale: {valueSetByOwner} | Current Scale: {transformToTest.localScale}\n {nonOwnerInstance.GetComponent<TestClientNetworkTransform>().LogInfoBuilder}");
 
             // The last check is to verify non-owners cannot change transform values after ownership has changed
             nonOwnerInstance.transform.position = Vector3.zero;
             yield return s_DefaultWaitForTick;
-            Assert.True(Approximately(nonOwnerInstance.transform.position, valueSetByOwner), $"{networkManagerNonOwner.name}'s object instance {nonOwnerInstance.name} was allowed to change its position! Expected: {Vector3.one} Is Currently:{nonOwnerInstance.transform.position}");
+            if (m_MotionModel == MotionModels.UseRigidbody)
+            {
+                yield return new WaitForFixedUpdate();
+            }
+            Assert.True(Approximately(GetNonOwnerPosition(), valueSetByOwner), $"{networkManagerNonOwner.name}'s object instance {nonOwnerInstance.name} was allowed to change its position! Expected: {valueSetByOwner} Is Currently:{GetNonOwnerPosition()}");
         }
 
         /// <summary>
@@ -255,6 +442,12 @@ public IEnumerator ServerAuthoritativeTest()
                 eulerAngles = valueSetByOwner
             };
             ownerInstance.transform.rotation = rotation;
+
+            // Allow scale to update first when using rigid body motion
+            if (m_MotionModel == MotionModels.UseRigidbody)
+            {
+                yield return new WaitForFixedUpdate();
+            }
             var transformToTest = nonOwnerInstance.transform;
             yield return WaitForConditionOrTimeOut(() => transformToTest.position == valueSetByOwner && transformToTest.localScale == valueSetByOwner && transformToTest.rotation == rotation);
             Assert.False(s_GlobalTimeoutHelper.TimedOut, $"Timed out waiting for {m_ClientNetworkManagers[0].name}'s object instance {nonOwnerInstance.name} to change its transform!\n" +
@@ -265,67 +458,86 @@ public IEnumerator ServerAuthoritativeTest()
             // The last check is to verify clients cannot change transform values
             nonOwnerInstance.transform.position = Vector3.zero;
             yield return s_DefaultWaitForTick;
+            // Allow scale to update first when using rigid body motion
+            if (m_MotionModel == MotionModels.UseRigidbody)
+            {
+                yield return new WaitForFixedUpdate();
+            }
             Assert.True(nonOwnerInstance.transform.position == valueSetByOwner, $"{m_ClientNetworkManagers[0].name}'s object instance {nonOwnerInstance.name} was allowed to change its position! Expected: {Vector3.one} Is Currently:{nonOwnerInstance.transform.position}");
         }
 
+        protected override IEnumerator OnTearDown()
+        {
+            TestClientNetworkTransform.EnableLogState(false);
+            return base.OnTearDown();
+        }
+
         /// <summary>
         /// NetworkTransformOwnershipTests helper behaviour
         /// </summary>
-        public class VerifyObjectIsSpawnedOnClient : NetworkBehaviour
+        internal class VerifyObjectIsSpawnedOnClient : NetworkBehaviour
         {
-            private static Dictionary<ulong, VerifyObjectIsSpawnedOnClient> s_NetworkManagerRelativeSpawnedObjects = new Dictionary<ulong, VerifyObjectIsSpawnedOnClient>();
+            public static Dictionary<ulong, VerifyObjectIsSpawnedOnClient> NetworkManagerRelativeSpawnedObjects = new Dictionary<ulong, VerifyObjectIsSpawnedOnClient>();
 
             public static void ResetObjectTable()
             {
-                s_NetworkManagerRelativeSpawnedObjects.Clear();
+                NetworkManagerRelativeSpawnedObjects.Clear();
             }
 
+            /// <summary>
+            /// For testing, just before changing ownership the table is cleared to assure that
+            /// ownership tansfer occurs. This will add the new owner to the table.
+            /// </summary>
             public override void OnGainedOwnership()
             {
-                if (!s_NetworkManagerRelativeSpawnedObjects.ContainsKey(NetworkManager.LocalClientId))
+                if (!NetworkManagerRelativeSpawnedObjects.ContainsKey(NetworkManager.LocalClientId))
                 {
-                    s_NetworkManagerRelativeSpawnedObjects.Add(NetworkManager.LocalClientId, this);
+                    NetworkManagerRelativeSpawnedObjects.Add(NetworkManager.LocalClientId, this);
                 }
                 base.OnGainedOwnership();
             }
 
+            /// <summary>
+            /// For testing, just before changing ownership the table is cleared to assure that
+            /// ownership tansfer occurs. This will add the previous owner to the table.
+            /// </summary>
             public override void OnLostOwnership()
             {
-                if (!s_NetworkManagerRelativeSpawnedObjects.ContainsKey(NetworkManager.LocalClientId))
+                if (!NetworkManagerRelativeSpawnedObjects.ContainsKey(NetworkManager.LocalClientId))
                 {
-                    s_NetworkManagerRelativeSpawnedObjects.Add(NetworkManager.LocalClientId, this);
+                    NetworkManagerRelativeSpawnedObjects.Add(NetworkManager.LocalClientId, this);
                 }
                 base.OnLostOwnership();
             }
 
             public static List<ulong> GetClientsThatSpawnedThisPrefab()
             {
-                return s_NetworkManagerRelativeSpawnedObjects.Keys.ToList();
+                return NetworkManagerRelativeSpawnedObjects.Keys.ToList();
             }
 
             public static VerifyObjectIsSpawnedOnClient GetClientInstance(ulong clientId)
             {
-                if (s_NetworkManagerRelativeSpawnedObjects.ContainsKey(clientId))
+                if (NetworkManagerRelativeSpawnedObjects.ContainsKey(clientId))
                 {
-                    return s_NetworkManagerRelativeSpawnedObjects[clientId];
+                    return NetworkManagerRelativeSpawnedObjects[clientId];
                 }
                 return null;
             }
 
             public override void OnNetworkSpawn()
             {
-                if (!s_NetworkManagerRelativeSpawnedObjects.ContainsKey(NetworkManager.LocalClientId))
+                if (!NetworkManagerRelativeSpawnedObjects.ContainsKey(NetworkManager.LocalClientId))
                 {
-                    s_NetworkManagerRelativeSpawnedObjects.Add(NetworkManager.LocalClientId, this);
+                    NetworkManagerRelativeSpawnedObjects.Add(NetworkManager.LocalClientId, this);
                 }
                 base.OnNetworkSpawn();
             }
 
             public override void OnNetworkDespawn()
             {
-                if (s_NetworkManagerRelativeSpawnedObjects.ContainsKey(NetworkManager.LocalClientId))
+                if (NetworkManagerRelativeSpawnedObjects.ContainsKey(NetworkManager.LocalClientId))
                 {
-                    s_NetworkManagerRelativeSpawnedObjects.Remove(NetworkManager.LocalClientId);
+                    NetworkManagerRelativeSpawnedObjects.Remove(NetworkManager.LocalClientId);
                 }
                 base.OnNetworkDespawn();
             }
@@ -336,31 +548,334 @@ public override void OnNetworkDespawn()
         /// This will have to be used to verify the ownership authority
         /// </summary>
         [DisallowMultipleComponent]
-        public class TestClientNetworkTransform : NetworkTransform
+        internal class TestClientNetworkTransform : NetworkTransform
         {
-            public override void OnNetworkSpawn()
+            public static void EnableLogState(bool enable)
             {
-                base.OnNetworkSpawn();
-                CanCommitToTransform = IsOwner;
+                s_LogStateEnabled = enable;
+                TrackByStateId = enable;
+            }
+
+            private static bool s_LogStateEnabled;
+
+            internal StringBuilder LogInfoBuilder = new StringBuilder();
+
+            private void LogInfo(NetworkTransformState state)
+            {
+                if (s_LogStateEnabled)
+                {
+                    LogInfoBuilder.AppendLine($"N:{name} | CID:{NetworkManager.LocalClientId} | SID: {state.StateId} |  NT:{NetworkManager.ServerTime.Tick} | Pos: {transform.position} | Sc: {transform.localScale}");
+                }
             }
 
-            protected override void Update()
+            protected override void OnOwnershipChanged(ulong previous, ulong current)
             {
-                CanCommitToTransform = IsOwner;
-                base.Update();
-                if (NetworkManager.Singleton != null && (NetworkManager.Singleton.IsConnectedClient || NetworkManager.Singleton.IsListening))
+
+                if (s_LogStateEnabled)
+                {
+                    LogInfoBuilder.AppendLine($"Ownership Changed: {previous} --> {current} | Position: {transform.position}");
+                }
+                LogInfo(LocalAuthoritativeNetworkState);
+                base.OnOwnershipChanged(previous, current);
+
+                // Assure no velocity is set on this object for this particular test
+                if (current == NetworkManager.LocalClientId)
                 {
-                    if (CanCommitToTransform)
+                    GetComponent<Rigidbody>().linearVelocity = Vector3.zero;
+                }
+            }
+
+            protected override void OnAuthorityPushTransformState(ref NetworkTransformState networkTransformState)
+            {
+                LogInfo(networkTransformState);
+                base.OnAuthorityPushTransformState(ref networkTransformState);
+            }
+
+            protected override void OnBeforeUpdateTransformState()
+            {
+                LogInfo(LocalAuthoritativeNetworkState);
+                base.OnBeforeUpdateTransformState();
+            }
+
+            protected override void OnNetworkTransformStateUpdated(ref NetworkTransformState oldState, ref NetworkTransformState newState)
+            {
+                LogInfo(newState);
+                base.OnNetworkTransformStateUpdated(ref oldState, ref newState);
+            }
+        }
+    }
+
+    [TestFixture(HostOrServer.DAHost, NetworkTransform.AuthorityModes.Owner)] // Validate the NetworkTransform owner authoritative mode fix using distributed authority
+    [TestFixture(HostOrServer.Host, NetworkTransform.AuthorityModes.Server)] // Validate we have not impacted NetworkTransform server authoritative mode
+    [TestFixture(HostOrServer.Host, NetworkTransform.AuthorityModes.Owner)] // Validate the NetworkTransform owner authoritative mode fix using client-server
+    internal class NestedNetworkTransformTests : IntegrationTestWithApproximation
+    {
+        private const int k_NestedChildren = 5;
+        protected override int NumberOfClients => 2;
+
+        private GameObject m_SpawnObject;
+
+        private NetworkTransform.AuthorityModes m_AuthorityMode;
+
+        private StringBuilder m_ErrorLog = new StringBuilder();
+
+        private List<NetworkManager> m_NetworkManagers = new List<NetworkManager>();
+        private List<GameObject> m_SpawnedObjects = new List<GameObject>();
+
+        public NestedNetworkTransformTests(HostOrServer hostOrServer, NetworkTransform.AuthorityModes authorityMode) : base(hostOrServer)
+        {
+            m_AuthorityMode = authorityMode;
+        }
+
+        /// <summary>
+        /// Creates a player prefab with several nested NetworkTransforms
+        /// </summary>
+        protected override void OnCreatePlayerPrefab()
+        {
+            var networkTransform = m_PlayerPrefab.AddComponent<NetworkTransform>();
+            networkTransform.AuthorityMode = m_AuthorityMode;
+            var parent = m_PlayerPrefab;
+            // Add several nested NetworkTransforms
+            for (int i = 0; i < k_NestedChildren; i++)
+            {
+                var nestedChild = new GameObject();
+                nestedChild.transform.parent = parent.transform;
+                var nestedNetworkTransform = nestedChild.AddComponent<NetworkTransform>();
+                nestedNetworkTransform.AuthorityMode = m_AuthorityMode;
+                nestedNetworkTransform.InLocalSpace = true;
+                parent = nestedChild;
+            }
+            base.OnCreatePlayerPrefab();
+        }
+
+        private void RandomizeObjectTransformPositions(GameObject gameObject)
+        {
+            var networkObject = gameObject.GetComponent<NetworkObject>();
+            Assert.True(networkObject.ChildNetworkBehaviours.Count > 0);
+
+            foreach (var networkTransform in networkObject.NetworkTransforms)
+            {
+                networkTransform.gameObject.transform.position = GetRandomVector3(-15.0f, 15.0f);
+            }
+        }
+
+        /// <summary>
+        /// Randomizes each player's position when validating distributed authority
+        /// </summary>
+        /// <returns></returns>
+        private GameObject FetchLocalPlayerPrefabToSpawn()
+        {
+            RandomizeObjectTransformPositions(m_PlayerPrefab);
+            return m_PlayerPrefab;
+        }
+
+        /// <summary>
+        /// Randomizes the player position when validating client-server
+        /// </summary>
+        /// <param name="connectionApprovalRequest"></param>
+        /// <param name="connectionApprovalResponse"></param>
+        private void ConnectionApprovalHandler(NetworkManager.ConnectionApprovalRequest connectionApprovalRequest, NetworkManager.ConnectionApprovalResponse connectionApprovalResponse)
+        {
+            connectionApprovalResponse.Approved = true;
+            connectionApprovalResponse.CreatePlayerObject = true;
+            RandomizeObjectTransformPositions(m_PlayerPrefab);
+            connectionApprovalResponse.Position = GetRandomVector3(-15.0f, 15.0f);
+        }
+
+        protected override void OnServerAndClientsCreated()
+        {
+            // Create a prefab to spawn with each NetworkManager as the owner
+            m_SpawnObject = CreateNetworkObjectPrefab("SpawnObj");
+            var networkTransform = m_SpawnObject.AddComponent<NetworkTransform>();
+            networkTransform.AuthorityMode = m_AuthorityMode;
+            var parent = m_SpawnObject;
+            // Add several nested NetworkTransforms
+            for (int i = 0; i < k_NestedChildren; i++)
+            {
+                var nestedChild = new GameObject();
+                nestedChild.transform.parent = parent.transform;
+                var nestedNetworkTransform = nestedChild.AddComponent<NetworkTransform>();
+                nestedNetworkTransform.AuthorityMode = m_AuthorityMode;
+                nestedNetworkTransform.InLocalSpace = true;
+                parent = nestedChild;
+            }
+
+            if (m_DistributedAuthority)
+            {
+                if (!UseCMBService())
+                {
+                    m_ServerNetworkManager.OnFetchLocalPlayerPrefabToSpawn = FetchLocalPlayerPrefabToSpawn;
+                }
+
+                foreach (var client in m_ClientNetworkManagers)
+                {
+                    client.OnFetchLocalPlayerPrefabToSpawn = FetchLocalPlayerPrefabToSpawn;
+                }
+            }
+            else
+            {
+                m_ServerNetworkManager.NetworkConfig.ConnectionApproval = true;
+                m_ServerNetworkManager.ConnectionApprovalCallback += ConnectionApprovalHandler;
+                foreach (var client in m_ClientNetworkManagers)
+                {
+                    client.NetworkConfig.ConnectionApproval = true;
+                }
+            }
+
+            base.OnServerAndClientsCreated();
+        }
+
+        /// <summary>
+        /// Validates the transform positions of two NetworkObject instances
+        /// </summary>
+        /// <param name="current">the local instance (source of truth)</param>
+        /// <param name="testing">the remote instance</param>
+        /// <returns></returns>
+        private bool ValidateTransforms(NetworkObject current, NetworkObject testing)
+        {
+            if (current.ChildNetworkBehaviours.Count == 0 || testing.ChildNetworkBehaviours.Count == 0)
+            {
+                return false;
+            }
+
+            for (int i = 0; i < current.NetworkTransforms.Count - 1; i++)
+            {
+                var transformA = current.NetworkTransforms[i].transform;
+                var transformB = testing.NetworkTransforms[i].transform;
+                if (!Approximately(transformA.position, transformB.position))
+                {
+                    m_ErrorLog.AppendLine($"TransformA Position {transformA.position} != TransformB Position {transformB.position}");
+                    return false;
+                }
+                if (!Approximately(transformA.localPosition, transformB.localPosition))
+                {
+                    m_ErrorLog.AppendLine($"TransformA Local Position {transformA.position} != TransformB Local Position {transformB.position}");
+                    return false;
+                }
+                if (transformA.parent != null)
+                {
+                    if (current.NetworkTransforms[i].InLocalSpace != testing.NetworkTransforms[i].InLocalSpace)
                     {
-                        TryCommitTransformToServer(transform, NetworkManager.LocalTime.Time);
+                        m_ErrorLog.AppendLine($"NetworkTransform-{current.OwnerClientId}-{current.NetworkTransforms[i].NetworkBehaviourId} InLocalSpace ({current.NetworkTransforms[i].InLocalSpace}) is different from the remote instance version on Client-{testing.NetworkManager.LocalClientId}!");
+                        return false;
                     }
                 }
             }
+            return true;
+        }
+
+        /// <summary>
+        /// Validates all player instances spawned with the correct positions including all nested NetworkTransforms
+        /// When running in server authority mode we are validating this fix did not impact that.
+        /// </summary>
+        private bool AllClientInstancesSynchronized()
+        {
+            m_ErrorLog.Clear();
 
-            protected override bool OnIsServerAuthoritative()
+            foreach (var current in m_NetworkManagers)
             {
-                return false;
+                var currentPlayer = current.LocalClient.PlayerObject;
+                var currentNetworkObjectId = currentPlayer.NetworkObjectId;
+                foreach (var testing in m_NetworkManagers)
+                {
+                    if (currentPlayer == testing.LocalClient.PlayerObject)
+                    {
+                        continue;
+                    }
+
+                    if (!testing.SpawnManager.SpawnedObjects.ContainsKey(currentNetworkObjectId))
+                    {
+                        m_ErrorLog.AppendLine($"Failed to find Client-{currentPlayer.OwnerClientId}'s player instance on Client-{testing.LocalClientId}!");
+                        return false;
+                    }
+
+                    var remoteInstance = testing.SpawnManager.SpawnedObjects[currentNetworkObjectId];
+                    if (!ValidateTransforms(currentPlayer, remoteInstance))
+                    {
+                        m_ErrorLog.AppendLine($"Failed to validate Client-{currentPlayer.OwnerClientId} against its remote instance on Client-{testing.LocalClientId}!");
+                        return false;
+                    }
+                }
             }
+            return true;
+        }
+
+        /// <summary>
+        /// Validates that dynamically spawning works the same.
+        /// When running in server authority mode we are validating this fix did not impact that.
+        /// </summary>
+        /// <returns></returns>
+        private bool AllSpawnedObjectsSynchronized()
+        {
+            m_ErrorLog.Clear();
+
+            foreach (var current in m_SpawnedObjects)
+            {
+                var currentNetworkObject = current.GetComponent<NetworkObject>();
+                var currentNetworkObjectId = currentNetworkObject.NetworkObjectId;
+                foreach (var testing in m_NetworkManagers)
+                {
+                    if (currentNetworkObject.OwnerClientId == testing.LocalClientId)
+                    {
+                        continue;
+                    }
+
+                    if (!testing.SpawnManager.SpawnedObjects.ContainsKey(currentNetworkObjectId))
+                    {
+                        m_ErrorLog.AppendLine($"Failed to find Client-{currentNetworkObject.OwnerClientId}'s player instance on Client-{testing.LocalClientId}!");
+                        return false;
+                    }
+
+                    var remoteInstance = testing.SpawnManager.SpawnedObjects[currentNetworkObjectId];
+                    if (!ValidateTransforms(currentNetworkObject, remoteInstance))
+                    {
+                        m_ErrorLog.AppendLine($"Failed to validate Client-{currentNetworkObject.OwnerClientId} against its remote instance on Client-{testing.LocalClientId}!");
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Validates that spawning player and dynamically spawned prefab instances with nested NetworkTransforms
+        /// synchronizes properly in both client-server and distributed authority when using owner authoritative mode.
+        /// </summary>
+        [UnityTest]
+        public IEnumerator NestedNetworkTransformSpawnPositionTest()
+        {
+            if (!m_DistributedAuthority || (m_DistributedAuthority && !UseCMBService()))
+            {
+                m_NetworkManagers.Add(m_ServerNetworkManager);
+            }
+            m_NetworkManagers.AddRange(m_ClientNetworkManagers);
+
+            yield return WaitForConditionOrTimeOut(AllClientInstancesSynchronized);
+            AssertOnTimeout($"Failed to synchronize all client instances!\n{m_ErrorLog}");
+
+            foreach (var networkManager in m_NetworkManagers)
+            {
+                // Randomize the position
+                RandomizeObjectTransformPositions(m_SpawnObject);
+
+                // Create an instance owned by the specified networkmanager
+                m_SpawnedObjects.Add(SpawnObject(m_SpawnObject, networkManager));
+            }
+            // Randomize the position once more just to assure we are instantiating remote instances
+            // with a completely different position
+            RandomizeObjectTransformPositions(m_SpawnObject);
+            yield return WaitForConditionOrTimeOut(AllSpawnedObjectsSynchronized);
+            AssertOnTimeout($"Failed to synchronize all spawned NetworkObject instances!\n{m_ErrorLog}");
+            m_SpawnedObjects.Clear();
+            m_NetworkManagers.Clear();
+        }
+
+        protected override IEnumerator OnTearDown()
+        {
+            // In case there was a failure, go ahead and clear these lists out for any pending TextFixture passes
+            m_SpawnedObjects.Clear();
+            m_NetworkManagers.Clear();
+            return base.OnTearDown();
         }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformPacketLossTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformPacketLossTests.cs
deleted file mode 100644
index d382cfb483..0000000000
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformPacketLossTests.cs
+++ /dev/null
@@ -1,489 +0,0 @@
-// TODO: Rewrite test to use the tools package. Debug simulator not available in UTP 2.X.
-#if !UTP_TRANSPORT_2_0_ABOVE
-using NUnit.Framework;
-using Unity.Netcode.Components;
-using UnityEngine;
-
-namespace Unity.Netcode.RuntimeTests
-{
-    /// <summary>
-    /// Integration tests for NetworkTransform that will test both
-    /// server and host operating modes and will test both authoritative
-    /// models for each operating mode when packet loss and latency is
-    /// present.
-    /// </summary>
-    [TestFixture(HostOrServer.Host, Authority.ServerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full)]
-    [TestFixture(HostOrServer.Host, Authority.ServerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half)]
-    [TestFixture(HostOrServer.Host, Authority.ServerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full)]
-    [TestFixture(HostOrServer.Host, Authority.ServerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half)]
-    [TestFixture(HostOrServer.Host, Authority.ServerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full)]
-    [TestFixture(HostOrServer.Host, Authority.ServerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half)]
-    public class NetworkTransformPacketLossTests : NetworkTransformBase
-    {
-        private const int k_Latency = 50;
-        private const int k_PacketLoss = 2;
-
-        private Vector3 m_RandomPosition;
-        private Vector3 m_TeleportOffset = new Vector3(-1024f, 0f, 0f);
-        private bool m_Teleported;
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="testWithHost">Determines if we are running as a server or host</param>
-        /// <param name="authority">Determines if we are using server or owner authority</param>
-        public NetworkTransformPacketLossTests(HostOrServer testWithHost, Authority authority, RotationCompression rotationCompression, Rotation rotation, Precision precision) :
-            base(testWithHost, authority, rotationCompression, rotation, precision)
-        { }
-
-        protected override bool m_EnableTimeTravel => true;
-        protected override bool m_SetupIsACoroutine => true;
-        protected override bool m_TearDownIsACoroutine => true;
-
-        protected override void OnTimeTravelServerAndClientsConnected()
-        {
-            base.OnTimeTravelServerAndClientsConnected();
-
-            SetTimeTravelSimulatedLatency(k_Latency * 0.001f);
-            SetTimeTravelSimulatedDropRate(k_PacketLoss * 0.01f);
-        }
-
-        /// <summary>
-        /// Handles validating all children of the test objects have matching local and global space vaues.
-        /// </summary>
-        private void AllChildrenLocalTransformValuesMatch(bool useSubChild, ChildrenTransformCheckType checkType)
-        {
-            // We don't assert on timeout here because we want to log this information during PostAllChildrenLocalTransformValuesMatch
-            WaitForConditionOrTimeOutWithTimeTravel(() => AllInstancesKeptLocalTransformValues(useSubChild));
-            var success = true;
-            if (s_GlobalTimeoutHelper.TimedOut)
-            {
-                //var waitForMs = new WaitForSeconds(0.001f);
-                // If we timed out, then wait for a full range of ticks to assure all data has been synchronized before declaring this a failed test.
-                for (int j = 0; j < m_ServerNetworkManager.NetworkConfig.TickRate; j++)
-                {
-                    m_InfoMessage.Clear();
-                    m_InfoMessage.AppendLine($"[{checkType}][{useSubChild}] Timed out waiting for all children to have the correct local space values:\n");
-                    var instances = useSubChild ? ChildObjectComponent.SubInstances : ChildObjectComponent.Instances;
-                    success = PostAllChildrenLocalTransformValuesMatch(useSubChild);
-                    TimeTravel(0.001f);
-                    //yield return waitForMs;
-                }
-            }
-
-            if (!success)
-            {
-                Assert.True(success, m_InfoMessage.ToString());
-            }
-        }
-
-        /// <summary>
-        /// Validates that transform values remain the same when a NetworkTransform is
-        /// parented under another NetworkTransform under all of the possible axial conditions
-        /// as well as when the parent has a varying scale.
-        /// </summary>
-        [Test]
-        public void ParentedNetworkTransformTest([Values] Interpolation interpolation, [Values] bool worldPositionStays, [Values(0.5f, 1.0f, 5.0f)] float scale)
-        {
-            ChildObjectComponent.EnableChildLog = m_EnableVerboseDebug;
-            if (m_EnableVerboseDebug)
-            {
-                ChildObjectComponent.TestCount++;
-            }
-            // Get the NetworkManager that will have authority in order to spawn with the correct authority
-            var isServerAuthority = m_Authority == Authority.ServerAuthority;
-            var authorityNetworkManager = m_ServerNetworkManager;
-            if (!isServerAuthority)
-            {
-                authorityNetworkManager = m_ClientNetworkManagers[0];
-            }
-
-            // Spawn a parent and children
-            ChildObjectComponent.HasSubChild = true;
-            var serverSideParent = SpawnObject(m_ParentObject.gameObject, authorityNetworkManager).GetComponent<NetworkObject>();
-            var serverSideChild = SpawnObject(m_ChildObject.gameObject, authorityNetworkManager).GetComponent<NetworkObject>();
-            var serverSideSubChild = SpawnObject(m_SubChildObject.gameObject, authorityNetworkManager).GetComponent<NetworkObject>();
-
-            // Assure all of the child object instances are spawned before proceeding to parenting
-            WaitForConditionOrTimeOutWithTimeTravel(AllChildObjectInstancesAreSpawned);
-            AssertOnTimeout("Timed out waiting for all child instances to be spawned!");
-
-            // Get the authority parent and child instances
-            m_AuthorityParentObject = NetworkTransformTestComponent.AuthorityInstance.NetworkObject;
-            m_AuthorityChildObject = ChildObjectComponent.AuthorityInstance.NetworkObject;
-            m_AuthoritySubChildObject = ChildObjectComponent.AuthoritySubInstance.NetworkObject;
-
-            // The child NetworkTransform will use world space when world position stays and
-            // local space when world position does not stay when parenting.
-            ChildObjectComponent.AuthorityInstance.InLocalSpace = !worldPositionStays;
-            ChildObjectComponent.AuthorityInstance.UseHalfFloatPrecision = m_Precision == Precision.Half;
-            ChildObjectComponent.AuthorityInstance.UseQuaternionSynchronization = m_Rotation == Rotation.Quaternion;
-            ChildObjectComponent.AuthorityInstance.UseQuaternionCompression = m_RotationCompression == RotationCompression.QuaternionCompress;
-
-            ChildObjectComponent.AuthoritySubInstance.InLocalSpace = !worldPositionStays;
-            ChildObjectComponent.AuthoritySubInstance.UseHalfFloatPrecision = m_Precision == Precision.Half;
-            ChildObjectComponent.AuthoritySubInstance.UseQuaternionSynchronization = m_Rotation == Rotation.Quaternion;
-            ChildObjectComponent.AuthoritySubInstance.UseQuaternionCompression = m_RotationCompression == RotationCompression.QuaternionCompress;
-
-            // Set whether we are interpolating or not
-            m_AuthorityParentNetworkTransform = m_AuthorityParentObject.GetComponent<NetworkTransformTestComponent>();
-            m_AuthorityParentNetworkTransform.Interpolate = interpolation == Interpolation.EnableInterpolate;
-            m_AuthorityChildNetworkTransform = m_AuthorityChildObject.GetComponent<ChildObjectComponent>();
-            m_AuthorityChildNetworkTransform.Interpolate = interpolation == Interpolation.EnableInterpolate;
-            m_AuthoritySubChildNetworkTransform = m_AuthoritySubChildObject.GetComponent<ChildObjectComponent>();
-            m_AuthoritySubChildNetworkTransform.Interpolate = interpolation == Interpolation.EnableInterpolate;
-
-
-            // Apply a scale to the parent object to make sure the scale on the child is properly updated on
-            // non-authority instances.
-            var halfScale = scale * 0.5f;
-            m_AuthorityParentObject.transform.localScale = GetRandomVector3(scale - halfScale, scale + halfScale);
-            m_AuthorityChildObject.transform.localScale = GetRandomVector3(scale - halfScale, scale + halfScale);
-            m_AuthoritySubChildObject.transform.localScale = GetRandomVector3(scale - halfScale, scale + halfScale);
-
-            // Allow one tick for authority to update these changes
-
-            WaitForConditionOrTimeOutWithTimeTravel(PositionRotationScaleMatches);
-
-            AssertOnTimeout("All transform values did not match prior to parenting!");
-
-            // Parent the child under the parent with the current world position stays setting
-            Assert.True(serverSideChild.TrySetParent(serverSideParent.transform, worldPositionStays), "[Server-Side Child] Failed to set child's parent!");
-
-            // Parent the sub-child under the child with the current world position stays setting
-            Assert.True(serverSideSubChild.TrySetParent(serverSideChild.transform, worldPositionStays), "[Server-Side SubChild] Failed to set sub-child's parent!");
-
-            // This waits for all child instances to be parented
-            WaitForConditionOrTimeOutWithTimeTravel(AllChildObjectInstancesHaveChild);
-            AssertOnTimeout("Timed out waiting for all instances to have parented a child!");
-            var latencyWait = k_Latency * 0.003f;
-            // Wait for at least 3x designated latency period
-            TimeTravel(latencyWait);
-
-            // This validates each child instance has preserved their local space values
-            AllChildrenLocalTransformValuesMatch(false, ChildrenTransformCheckType.Connected_Clients);
-
-            // This validates each sub-child instance has preserved their local space values
-            AllChildrenLocalTransformValuesMatch(true, ChildrenTransformCheckType.Connected_Clients);
-
-            // Verify that a late joining client will synchronize to the parented NetworkObjects properly
-            CreateAndStartNewClientWithTimeTravel();
-
-            // Assure all of the child object instances are spawned (basically for the newly connected client)
-            WaitForConditionOrTimeOutWithTimeTravel(AllChildObjectInstancesAreSpawned);
-            AssertOnTimeout("Timed out waiting for all child instances to be spawned!");
-
-            // This waits for all child instances to be parented
-            WaitForConditionOrTimeOutWithTimeTravel(AllChildObjectInstancesHaveChild);
-            AssertOnTimeout("Timed out waiting for all instances to have parented a child!");
-
-            // Wait for at least 3x designated latency period
-            TimeTravel(latencyWait);
-
-            // This validates each child instance has preserved their local space values
-            AllChildrenLocalTransformValuesMatch(false, ChildrenTransformCheckType.Late_Join_Client);
-
-            // This validates each sub-child instance has preserved their local space values
-            AllChildrenLocalTransformValuesMatch(true, ChildrenTransformCheckType.Late_Join_Client);
-        }
-
-        /// <summary>
-        /// This validates that multiple changes can occur within the same tick or over
-        /// several ticks while still keeping non-authoritative instances synchronized.
-        /// </summary>
-        /// <remarks>
-        /// When testing < 3 axis: Interpolation is disabled and only 3 delta updates are applied per unique test
-        /// When testing 3 axis: Interpolation is enabled, sometimes an axis is intentionally excluded during a
-        /// delta update, and it runs through 8 delta updates per unique test.
-        /// </remarks>
-        [Test]
-        public void NetworkTransformMultipleChangesOverTime([Values] TransformSpace testLocalTransform, [Values] Axis axis)
-        {
-            TimeTravelAdvanceTick();
-            // Just test for OverrideState.Update (they are already being tested for functionality in normal NetworkTransformTests)
-            var overideState = OverrideState.Update;
-            var tickRelativeTime = new WaitForSeconds(1.0f / m_ServerNetworkManager.NetworkConfig.TickRate);
-            m_AuthoritativeTransform.InLocalSpace = testLocalTransform == TransformSpace.Local;
-            bool axisX = axis == Axis.X || axis == Axis.XY || axis == Axis.XZ || axis == Axis.XYZ;
-            bool axisY = axis == Axis.Y || axis == Axis.XY || axis == Axis.YZ || axis == Axis.XYZ;
-            bool axisZ = axis == Axis.Z || axis == Axis.XZ || axis == Axis.YZ || axis == Axis.XYZ;
-
-            var axisCount = axisX ? 1 : 0;
-            axisCount += axisY ? 1 : 0;
-            axisCount += axisZ ? 1 : 0;
-
-            m_AuthoritativeTransform.StatePushed = false;
-            // Enable interpolation when all 3 axis are selected to make sure we are synchronizing properly
-            // when interpolation is enabled.
-            m_AuthoritativeTransform.Interpolate = axisCount == 3 ? true : false;
-
-            m_CurrentAxis = axis;
-
-            // Authority dictates what is synchronized and what the precision is going to be
-            // so we only need to set this on the authoritative side.
-            m_AuthoritativeTransform.UseHalfFloatPrecision = m_Precision == Precision.Half;
-            m_AuthoritativeTransform.UseQuaternionSynchronization = m_Rotation == Rotation.Quaternion;
-            m_AuthoritativeTransform.UseQuaternionCompression = m_RotationCompression == RotationCompression.QuaternionCompress;
-
-            m_AuthoritativeTransform.SyncPositionX = axisX;
-            m_AuthoritativeTransform.SyncPositionY = axisY;
-            m_AuthoritativeTransform.SyncPositionZ = axisZ;
-
-            if (!m_AuthoritativeTransform.UseQuaternionSynchronization)
-            {
-                m_AuthoritativeTransform.SyncRotAngleX = axisX;
-                m_AuthoritativeTransform.SyncRotAngleY = axisY;
-                m_AuthoritativeTransform.SyncRotAngleZ = axisZ;
-            }
-            else
-            {
-                // This is not required for usage (setting the value should not matter when quaternion synchronization is enabled)
-                // but is required for this test so we don't get a failure on an axis that is marked to not be synchronized when
-                // validating the authority's values on non-authority instances.
-                m_AuthoritativeTransform.SyncRotAngleX = true;
-                m_AuthoritativeTransform.SyncRotAngleY = true;
-                m_AuthoritativeTransform.SyncRotAngleZ = true;
-            }
-
-            m_AuthoritativeTransform.SyncScaleX = axisX;
-            m_AuthoritativeTransform.SyncScaleY = axisY;
-            m_AuthoritativeTransform.SyncScaleZ = axisZ;
-
-            var positionStart = GetRandomVector3(0.25f, 1.75f);
-            var rotationStart = GetRandomVector3(1f, 15f);
-            var scaleStart = GetRandomVector3(0.25f, 2.0f);
-            var position = positionStart;
-            var rotation = rotationStart;
-            var scale = scaleStart;
-            var success = false;
-
-
-            // Wait for the deltas to be pushed
-            WaitForConditionOrTimeOutWithTimeTravel(() => m_AuthoritativeTransform.StatePushed);
-
-            // Just in case we drop the first few state updates
-            if (s_GlobalTimeoutHelper.TimedOut)
-            {
-                // Set the local state to not reflect the authority state's local space settings
-                // to trigger the state update (it would eventually get there, but this is an integration test)
-                var state = m_AuthoritativeTransform.LocalAuthoritativeNetworkState;
-                state.InLocalSpace = !m_AuthoritativeTransform.InLocalSpace;
-                m_AuthoritativeTransform.LocalAuthoritativeNetworkState = state;
-                // Wait for the deltas to be pushed
-                WaitForConditionOrTimeOutWithTimeTravel(() => m_AuthoritativeTransform.StatePushed);
-            }
-            AssertOnTimeout("State was never pushed!");
-
-            // Allow the precision settings to propagate first as changing precision
-            // causes a teleport event to occur
-            TimeTravelAdvanceTick();
-            TimeTravelAdvanceTick();
-            TimeTravelAdvanceTick();
-            TimeTravelAdvanceTick();
-            TimeTravelAdvanceTick();
-            var iterations = axisCount == 3 ? k_PositionRotationScaleIterations3Axis : k_PositionRotationScaleIterations;
-
-            // Move and rotate within the same tick, validate the non-authoritative instance updates
-            // to each set of changes.  Repeat several times.
-            for (int i = 0; i < iterations; i++)
-            {
-                // Always reset this per delta update pass
-                m_AxisExcluded = false;
-                var deltaPositionDelta = GetRandomVector3(-1.5f, 1.5f);
-                var deltaRotationDelta = GetRandomVector3(-3.5f, 3.5f);
-                var deltaScaleDelta = GetRandomVector3(-0.5f, 0.5f);
-
-                m_NonAuthoritativeTransform.StateUpdated = false;
-                m_AuthoritativeTransform.StatePushed = false;
-
-                // With two or more axis, excluding one of them while chaging another will validate that
-                // full precision updates are maintaining their target state value(s) to interpolate towards
-                if (axisCount == 3)
-                {
-                    position += RandomlyExcludeAxis(deltaPositionDelta);
-                    rotation += RandomlyExcludeAxis(deltaRotationDelta);
-                    scale += RandomlyExcludeAxis(deltaScaleDelta);
-                }
-                else
-                {
-                    position += deltaPositionDelta;
-                    rotation += deltaRotationDelta;
-                    scale += deltaScaleDelta;
-                }
-
-                // Apply delta between ticks
-                MoveRotateAndScaleAuthority(position, rotation, scale, overideState);
-
-                // Wait for the deltas to be pushed (unlike the original test, we don't wait for state to be updated as that could be dropped here)
-                WaitForConditionOrTimeOutWithTimeTravel(() => m_AuthoritativeTransform.StatePushed);
-                AssertOnTimeout($"[Non-Interpolate {i}] Timed out waiting for state to be pushed ({m_AuthoritativeTransform.StatePushed})!");
-
-                // For 3 axis, we will skip validating that the non-authority interpolates to its target point at least once.
-                // This will validate that non-authoritative updates are maintaining their target state axis values if only 2
-                // of the axis are being updated to assure interpolation maintains the targeted axial value per axis.
-                // For 2 and 1 axis tests we always validate per delta update
-                if (m_AxisExcluded || axisCount < 3)
-                {
-                    // Wait for deltas to synchronize on non-authoritative side
-                    WaitForConditionOrTimeOutWithTimeTravel(PositionRotationScaleMatches);
-                    // Provide additional debug info about what failed (if it fails)
-                    if (s_GlobalTimeoutHelper.TimedOut)
-                    {
-                        Debug.Log("[Synch Issue Start - 1]");
-                        // If we timed out, then wait for a full range of ticks (plus 1) to assure it sent synchronization data.
-                        for (int j = 0; j < m_ServerNetworkManager.NetworkConfig.TickRate * 2; j++)
-                        {
-                            success = PositionRotationScaleMatches();
-                            if (success)
-                            {
-                                // If we matched, then something was dropped and recovered when synchronized
-                                break;
-                            }
-                            TimeTravelAdvanceTick();
-                        }
-
-                        // Only if we still didn't match
-                        if (!success)
-                        {
-                            m_EnableVerboseDebug = true;
-                            success = PositionRotationScaleMatches();
-                            m_EnableVerboseDebug = false;
-                            Debug.Log("[Synch Issue END - 1]");
-                            AssertOnTimeout($"[Non-Interpolate {i}] Timed out waiting for non-authority to match authority's position or rotation");
-                        }
-                    }
-                }
-            }
-
-            if (axisCount == 3)
-            {
-                // As a final test, wait for deltas to synchronize on non-authoritative side to assure it interpolates to the correct values
-                WaitForConditionOrTimeOutWithTimeTravel(PositionRotationScaleMatches);
-                // Provide additional debug info about what failed (if it fails)
-                if (s_GlobalTimeoutHelper.TimedOut)
-                {
-                    Debug.Log("[Synch Issue Start - 2]");
-                    // If we timed out, then wait for a full range of ticks (plus 1) to assure it sent synchronization data.
-                    for (int j = 0; j < m_ServerNetworkManager.NetworkConfig.TickRate * 2; j++)
-                    {
-                        success = PositionRotationScaleMatches();
-                        if (success)
-                        {
-                            // If we matched, then something was dropped and recovered when synchronized
-                            break;
-                        }
-                        TimeTravelAdvanceTick();
-                    }
-
-                    // Only if we still didn't match
-                    if (!success)
-                    {
-                        m_EnableVerboseDebug = true;
-                        PositionRotationScaleMatches();
-                        m_EnableVerboseDebug = false;
-                        Debug.Log("[Synch Issue END - 2]");
-                        AssertOnTimeout("Timed out waiting for non-authority to match authority's position or rotation");
-
-                    }
-                }
-
-            }
-        }
-
-        /// <summary>
-        /// Tests changing all axial values one at a time with packet loss
-        /// These tests are performed:
-        /// - While in local space and world space
-        /// - While interpolation is enabled and disabled
-        /// </summary>
-        [Test]
-        public void TestAuthoritativeTransformChangeOneAtATime([Values] TransformSpace testLocalTransform, [Values] Interpolation interpolation)
-        {
-            // Just test for OverrideState.Update (they are already being tested for functionality in normal NetworkTransformTests)
-            m_AuthoritativeTransform.Interpolate = interpolation == Interpolation.EnableInterpolate;
-            m_AuthoritativeTransform.InLocalSpace = testLocalTransform == TransformSpace.Local;
-            m_AuthoritativeTransform.UseQuaternionCompression = m_RotationCompression == RotationCompression.QuaternionCompress;
-            m_AuthoritativeTransform.UseHalfFloatPrecision = m_Precision == Precision.Half;
-            m_AuthoritativeTransform.UseQuaternionSynchronization = m_Rotation == Rotation.Quaternion;
-            m_NonAuthoritativeTransform.Interpolate = interpolation == Interpolation.EnableInterpolate;
-
-
-            // test position
-            var authPlayerTransform = m_AuthoritativeTransform.transform;
-
-            Assert.AreEqual(Vector3.zero, m_NonAuthoritativeTransform.transform.position, "server side pos should be zero at first"); // sanity check
-
-            m_AuthoritativeTransform.transform.position = GetRandomVector3(2f, 30f);
-
-            WaitForConditionOrTimeOutWithTimeTravel(() => PositionsMatch());
-            AssertOnTimeout($"Timed out waiting for positions to match {m_AuthoritativeTransform.transform.position} | {m_NonAuthoritativeTransform.transform.position}");
-
-            // test rotation
-            Assert.AreEqual(Quaternion.identity, m_NonAuthoritativeTransform.transform.rotation, "wrong initial value for rotation"); // sanity check
-
-            m_AuthoritativeTransform.transform.rotation = Quaternion.Euler(GetRandomVector3(5, 60)); // using euler angles instead of quaternions directly to really see issues users might encounter
-
-            // Make sure the values match
-            WaitForConditionOrTimeOutWithTimeTravel(() => RotationsMatch());
-            AssertOnTimeout($"Timed out waiting for rotations to match");
-
-            m_AuthoritativeTransform.StatePushed = false;
-            m_AuthoritativeTransform.transform.localScale = GetRandomVector3(1, 6);
-
-            // Make sure the scale values match
-            WaitForConditionOrTimeOutWithTimeTravel(() => ScaleValuesMatch());
-            AssertOnTimeout($"Timed out waiting for scale values to match");
-        }
-
-        [Test]
-        public void TestSameFrameDeltaStateAndTeleport([Values] TransformSpace testLocalTransform, [Values] Interpolation interpolation)
-        {
-            m_AuthoritativeTransform.Interpolate = interpolation == Interpolation.EnableInterpolate;
-
-            m_NonAuthoritativeTransform.Interpolate = interpolation == Interpolation.EnableInterpolate;
-
-            m_AuthoritativeTransform.InLocalSpace = testLocalTransform == TransformSpace.Local;
-
-            // test position
-            var authPlayerTransform = m_AuthoritativeTransform.transform;
-
-            Assert.AreEqual(Vector3.zero, m_NonAuthoritativeTransform.transform.position, "server side pos should be zero at first"); // sanity check
-
-            m_AuthoritativeTransform.AuthorityPushedTransformState += OnAuthorityPushedTransformState;
-            m_RandomPosition = GetRandomVector3(2f, 30f);
-            m_AuthoritativeTransform.transform.position = m_RandomPosition;
-            m_Teleported = false;
-            WaitForConditionOrTimeOutWithTimeTravel(() => m_Teleported);
-            AssertOnTimeout($"Timed out waiting for random position to be pushed!");
-
-            WaitForConditionOrTimeOutWithTimeTravel(() => PositionsMatch());
-            AssertOnTimeout($"Timed out waiting for positions to match {m_AuthoritativeTransform.transform.position} | {m_NonAuthoritativeTransform.transform.position}");
-
-            var authPosition = m_AuthoritativeTransform.GetSpaceRelativePosition();
-            var nonAuthPosition = m_NonAuthoritativeTransform.GetSpaceRelativePosition();
-
-            var finalPosition = m_TeleportOffset + m_RandomPosition;
-            Assert.True(Approximately(authPosition, finalPosition), $"Authority did not set its position ({authPosition}) to the teleport position ({finalPosition})!");
-            Assert.True(Approximately(nonAuthPosition, finalPosition), $"NonAuthority did not set its position ({nonAuthPosition}) to the teleport position ({finalPosition})!");
-        }
-
-        /// <summary>
-        /// For the TestSameFrameDeltaStateAndTeleport test, we want to teleport on the same frame that we had a delta state update when
-        /// using unreliable delta state updates (i.e. we want the unreliable packet to be sent first and then the teleport to be sent on
-        /// the next tick. Store off both states when invoked
-        /// </summary>
-        /// <param name="networkTransformState"></param>
-        private void OnAuthorityPushedTransformState(ref NetworkTransform.NetworkTransformState networkTransformState)
-        {
-            // Match the first position update
-            if (Approximately(m_RandomPosition, networkTransformState.GetPosition()))
-            {
-                // Teleport to the m_RandomPosition plus the 
-                m_AuthoritativeTransform.SetState(m_TeleportOffset + m_RandomPosition, null, null, false);
-                m_AuthoritativeTransform.AuthorityPushedTransformState -= OnAuthorityPushedTransformState;
-                m_Teleported = true;
-            }
-        }
-    }
-}
-#endif
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformPacketLossTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformPacketLossTests.cs.meta
deleted file mode 100644
index c363dc6cc9..0000000000
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformPacketLossTests.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: e0f584e8eb891d5459373e96e54fe821
-timeCreated: 1620872927
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformParentingTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformParentingTests.cs
new file mode 100644
index 0000000000..896e7ddda2
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformParentingTests.cs
@@ -0,0 +1,183 @@
+using System.Collections;
+using Unity.Netcode.Components;
+using Unity.Netcode.TestHelpers.Runtime;
+using UnityEngine;
+using UnityEngine.TestTools;
+
+namespace Unity.Netcode.RuntimeTests
+{
+    internal class NetworkTransformParentingTests : IntegrationTestWithApproximation
+    {
+        /// <summary>
+        /// A NetworkBehaviour that moves in space.
+        /// When spawned on the client, an RPC is sent to the server to spawn a player object for that client.
+        /// The server parents the player object to the spawner object. This gives a moving parent object and a non-moving child object.
+        /// The child object should always be at {0,0,0} local space, while the parent object moves around.
+        /// This NetworkBehaviour tests that parenting to a moving object works as expected.
+        /// </summary>
+        internal class PlayerSpawner : NetworkBehaviour
+        {
+            /// <summary>
+            /// Prefab for the player
+            /// </summary>
+            public NetworkObject PlayerPrefab;
+
+            /// <summary>
+            /// The server side NetworkObject that was spawned when the client connected.
+            /// </summary>
+            public NetworkObject SpawnedPlayer;
+
+            /// <summary>
+            /// Represents the different movement states of the PlayerSpawner during the test lifecycle.
+            /// </summary>
+            public enum MoveState
+            {
+                // Initial state, PlayerSpawner will move without counting frames
+                NotStarted,
+                // The player object has been spawned, start counting frames
+                PlayerSpawned,
+                // We have moved far enough to test location
+                ReachedPeak,
+            }
+            public MoveState State = MoveState.NotStarted;
+
+            // A count of the number of updates since the player object was spawned.
+            private int m_Count;
+
+            // Movement offsets and targets.
+            private const float k_PositionOffset = 5.0f;
+            private const float k_RotationOffset = 25.0f;
+            private readonly Vector3 m_PositionTarget = Vector3.one * k_PositionOffset * 10;
+            private readonly Vector3 m_RotationTarget = Vector3.one * k_RotationOffset * 10;
+
+            private void Update()
+            {
+                if (!IsServer)
+                {
+                    return;
+                }
+
+                transform.position = Vector3.Lerp(transform.position, m_PositionTarget, Time.deltaTime * 2);
+                var rotation = transform.rotation;
+                rotation.eulerAngles = Vector3.Slerp(rotation.eulerAngles, m_RotationTarget, Time.deltaTime * 2);
+                transform.rotation = rotation;
+
+                if (State != MoveState.PlayerSpawned)
+                {
+                    return;
+                }
+
+                // Move self for some time after player object is spawned
+                // This ensures the parent object is moving throughout the spawn process.
+                m_Count++;
+                if (m_Count > 10)
+                {
+                    // Mark PlayerSpawner as having moved far enough to test.
+                    State = MoveState.ReachedPeak;
+                }
+            }
+
+            public override void OnNetworkSpawn()
+            {
+                if (IsOwner)
+                {
+                    // Owner initialises PlayerSpawner movement on spawn
+                    transform.position = Vector3.one * k_PositionOffset;
+                    var rotation = transform.rotation;
+                    rotation.eulerAngles = Vector3.one * k_RotationOffset;
+                    transform.rotation = rotation;
+                }
+                else
+                {
+                    // When spawned on a client, send the RPC to spawn the player object
+                    // Using an RPC ensures the PlayerSpawner is moving for the entire spawning of the player object.
+                    RequestPlayerObjectSpawnServerRpc();
+                }
+            }
+
+            /// <summary>
+            /// A ServerRpc that requests the server to spawn a player object for the client that invoked this RPC.
+            /// </summary>
+            /// <param name="rpcParams">Parameters for the ServerRpc, including the sender's client ID.</param>
+            [ServerRpc(RequireOwnership = false)]
+            private void RequestPlayerObjectSpawnServerRpc(ServerRpcParams rpcParams = default)
+            {
+                SpawnedPlayer = Instantiate(PlayerPrefab);
+                SpawnedPlayer.SpawnAsPlayerObject(rpcParams.Receive.SenderClientId);
+                SpawnedPlayer.TrySetParent(NetworkObject, false);
+                State = MoveState.PlayerSpawned;
+            }
+        }
+
+        // Don't start with any clients, we will manually spawn a client inside the test
+        protected override int NumberOfClients => 0;
+
+        // Parent prefab with moving PlayerSpawner which will spawn the childPrefab
+        private GameObject m_PlayerSpawnerPrefab;
+
+        // Client and server instances
+        private PlayerSpawner m_ServerPlayerSpawner;
+        private NetworkObject m_NewClientPlayer;
+
+        protected override void OnServerAndClientsCreated()
+        {
+            m_PlayerSpawnerPrefab = CreateNetworkObjectPrefab("Parent");
+            var parentPlayerSpawner = m_PlayerSpawnerPrefab.AddComponent<PlayerSpawner>();
+            m_PlayerSpawnerPrefab.AddComponent<NetworkTransform>();
+
+            var playerPrefab = CreateNetworkObjectPrefab("Child");
+            var childNetworkTransform = playerPrefab.AddComponent<NetworkTransform>();
+            childNetworkTransform.AuthorityMode = NetworkTransform.AuthorityModes.Owner;
+            childNetworkTransform.InLocalSpace = true;
+
+            parentPlayerSpawner.PlayerPrefab = playerPrefab.GetComponent<NetworkObject>();
+
+            base.OnServerAndClientsCreated();
+        }
+
+        private bool NewPlayerObjectSpawned()
+        {
+            return m_ServerPlayerSpawner.SpawnedPlayer &&
+                   m_ClientNetworkManagers[0].SpawnManager.SpawnedObjects.ContainsKey(m_ServerPlayerSpawner.SpawnedPlayer.NetworkObjectId);
+        }
+
+        private bool HasServerInstanceReachedPeakPoint()
+        {
+            VerboseDebug($"Client Local: {m_NewClientPlayer.transform.localPosition} Server Local: {m_ServerPlayerSpawner.SpawnedPlayer.transform.localPosition}");
+            return m_ServerPlayerSpawner.State == PlayerSpawner.MoveState.ReachedPeak;
+        }
+
+        private bool ServerClientPositionMatches()
+        {
+            return Approximately(m_NewClientPlayer.transform.localPosition, m_ServerPlayerSpawner.SpawnedPlayer.transform.localPosition) &&
+                Approximately(m_NewClientPlayer.transform.position, m_ServerPlayerSpawner.SpawnedPlayer.transform.position);
+        }
+
+        [UnityTest]
+        public IEnumerator TestParentedPlayerUsingLocalSpace()
+        {
+            // Spawn the PlayerSpawner object and save the instantiated component
+            // The PlayerSpawner object will start moving.
+            m_ServerPlayerSpawner = SpawnObject(m_PlayerSpawnerPrefab, m_ServerNetworkManager).GetComponent<PlayerSpawner>();
+
+            // Create a new client and connect to the server
+            // The client will prompt the server to spawn a player object and parent it to the PlayerSpawner object.
+            yield return CreateAndStartNewClient();
+
+            yield return WaitForConditionOrTimeOut(NewPlayerObjectSpawned);
+            AssertOnTimeout($"Client did not spawn new player object!");
+
+            // Save the spawned player object
+            m_NewClientPlayer = m_ClientNetworkManagers[0].SpawnManager.SpawnedObjects[m_ServerPlayerSpawner.SpawnedPlayer.NetworkObjectId];
+
+            // Let the parent PlayerSpawner move for several ticks to get an offset
+            yield return WaitForConditionOrTimeOut(HasServerInstanceReachedPeakPoint);
+            AssertOnTimeout($"Server instance never reached peak point!");
+
+            // Check that the client and server local positions match (they should both be at {0,0,0} local space)
+            yield return WaitForConditionOrTimeOut(ServerClientPositionMatches);
+            AssertOnTimeout($"Client local position {m_NewClientPlayer.transform.localPosition} does not match" +
+                $" server local position {m_ServerPlayerSpawner.SpawnedPlayer.transform.localPosition}");
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformParentingTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformParentingTests.cs.meta
new file mode 100644
index 0000000000..d3c09da900
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformParentingTests.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 26e2041cdadd44419941135a150b75bd
+timeCreated: 1743196812
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformStateTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformStateTests.cs
index f2512ae3c2..0b47dff72a 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformStateTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformStateTests.cs
@@ -1,3 +1,4 @@
+#if !MULTIPLAYER_TOOLS
 using NUnit.Framework;
 using Unity.Netcode.Components;
 using UnityEngine;
@@ -14,7 +15,7 @@ namespace Unity.Netcode.RuntimeTests
     [TestFixture(TransformSpace.World, Precision.Half, Rotation.Quaternion)]
     [TestFixture(TransformSpace.Local, Precision.Full, Rotation.Quaternion)]
     [TestFixture(TransformSpace.Local, Precision.Half, Rotation.Quaternion)]
-    public class NetworkTransformStateTests
+    internal class NetworkTransformStateTests
     {
         public enum SyncAxis
         {
@@ -233,6 +234,8 @@ public void TestSyncAxes([Values] SynchronizationType synchronizationType, [Valu
 
             var manager = new GameObject($"Test-{nameof(NetworkManager)}.{nameof(TestSyncAxes)}");
             var networkManager = manager.AddComponent<NetworkManager>();
+            networkManager.NetworkConfig = new NetworkConfig();
+
             networkObject.NetworkManagerOwner = networkManager;
 
             networkTransform.enabled = false; // do not tick `FixedUpdate()` or `Update()`
@@ -905,3 +908,4 @@ public void TestThresholds(
         }
     }
 }
+#endif
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformTests.cs
index bf72bba38e..d4f22c11c5 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformTests.cs
@@ -1,5 +1,6 @@
 using System.Collections;
 using NUnit.Framework;
+using Unity.Netcode.Components;
 using UnityEngine;
 
 namespace Unity.Netcode.RuntimeTests
@@ -9,29 +10,94 @@ namespace Unity.Netcode.RuntimeTests
     /// server and host operating modes and will test both authoritative
     /// models for each operating mode.
     /// </summary>
-    [TestFixture(HostOrServer.Host, Authority.ServerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full)]
-    [TestFixture(HostOrServer.Host, Authority.ServerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half)]
-    [TestFixture(HostOrServer.Host, Authority.ServerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full)]
-    [TestFixture(HostOrServer.Host, Authority.ServerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half)]
-    [TestFixture(HostOrServer.Host, Authority.ServerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full)]
-    [TestFixture(HostOrServer.Host, Authority.ServerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half)]
-    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full)]
-    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half)]
-    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full)]
-    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half)]
-    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full)]
-    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half)]
-    public class NetworkTransformTests : NetworkTransformBase
+    [TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
+    [TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
+    [TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
+#if !MULTIPLAYER_TOOLS
+    [TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
+    [TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
+    [TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
+    [TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
+    [TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
+
+    [TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
+    [TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
+    [TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
+    [TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
+    [TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
+
+    [TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
+    [TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
+    [TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
+    [TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
+    [TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
+
+#endif
+    [TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
+    [TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
+    [TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
+#if !MULTIPLAYER_TOOLS
+    [TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
+    [TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
+    [TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
+    [TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
+    [TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
+
+    [TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
+    [TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
+    [TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
+    [TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
+    [TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
+
+    [TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
+    [TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
+    [TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
+    [TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
+    [TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
+#endif
+    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
+    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
+    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
+#if !MULTIPLAYER_TOOLS
+    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
+    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
+    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
+    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
+    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
+
+    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
+    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
+    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
+    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
+    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
+
+    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
+    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
+    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
+    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
+    [TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
+#endif
+    internal class NetworkTransformTests : NetworkTransformBase
     {
         protected const int k_TickRate = 60;
         /// <summary>
         /// Constructor
         /// </summary>
-        /// <param name="testWithHost">Determines if we are running as a server or host</param>
+        /// <param name="hostOrServer">Determines if we are running as a server or host</param>
         /// <param name="authority">Determines if we are using server or owner authority</param>
-        public NetworkTransformTests(HostOrServer testWithHost, Authority authority, RotationCompression rotationCompression, Rotation rotation, Precision precision) :
+        public NetworkTransformTests(HostOrServer testWithHost, Authority authority, RotationCompression rotationCompression, Rotation rotation, Precision precision, NetworkTransform.InterpolationTypes interpolation) :
             base(testWithHost, authority, rotationCompression, rotation, precision)
-        { }
+        {
+            NetworkTransform.AssignDefaultInterpolationType = true;
+            NetworkTransform.DefaultInterpolationType = interpolation;
+        }
+
+        protected override void OnOneTimeTearDown()
+        {
+            NetworkTransform.AssignDefaultInterpolationType = false;
+            NetworkTransform.DefaultInterpolationType = NetworkTransform.InterpolationTypes.Lerp;
+            base.OnOneTimeTearDown();
+        }
 
         protected override bool m_EnableTimeTravel => true;
         protected override bool m_SetupIsACoroutine => false;
@@ -88,6 +154,226 @@ private void AllChildrenLocalTransformValuesMatch(bool useSubChild, ChildrenTran
             }
         }
 
+#if !MULTIPLAYER_TOOLS
+
+        private void UpdateTransformLocal(NetworkTransform networkTransformTestComponent)
+        {
+            networkTransformTestComponent.transform.localPosition += GetRandomVector3(0.5f, 2.0f);
+            var rotation = networkTransformTestComponent.transform.localRotation;
+            var eulerRotation = rotation.eulerAngles;
+            eulerRotation += GetRandomVector3(0.5f, 5.0f);
+            rotation.eulerAngles = eulerRotation;
+            networkTransformTestComponent.transform.localRotation = rotation;
+        }
+
+        private void UpdateTransformWorld(NetworkTransform networkTransformTestComponent)
+        {
+            networkTransformTestComponent.transform.position += GetRandomVector3(0.5f, 2.0f);
+            var rotation = networkTransformTestComponent.transform.rotation;
+            var eulerRotation = rotation.eulerAngles;
+            eulerRotation += GetRandomVector3(0.5f, 5.0f);
+            rotation.eulerAngles = eulerRotation;
+            networkTransformTestComponent.transform.rotation = rotation;
+        }
+
+        /// <summary>
+        /// This test validates the SwitchTransformSpaceWhenParented setting under all network topologies
+        /// </summary>
+        [Test]
+        public void SwitchTransformSpaceWhenParentedTest([Values(0.5f, 1.0f, 5.0f)] float scale)
+        {
+            m_UseParentingThreshold = true;
+            // Get the NetworkManager that will have authority in order to spawn with the correct authority
+            var isServerAuthority = m_Authority == Authority.ServerAuthority;
+            var authorityNetworkManager = m_ServerNetworkManager;
+            if (!isServerAuthority)
+            {
+                authorityNetworkManager = m_ClientNetworkManagers[0];
+            }
+
+            var childAuthorityNetworkManager = m_ClientNetworkManagers[0];
+            if (!isServerAuthority)
+            {
+                childAuthorityNetworkManager = m_ServerNetworkManager;
+            }
+
+            // Spawn a parent and children
+            ChildObjectComponent.HasSubChild = true;
+            // Modify our prefabs for this specific test
+            m_ParentObject.GetComponent<NetworkTransformTestComponent>().TickSyncChildren = true;
+            m_ChildObject.GetComponent<ChildObjectComponent>().SwitchTransformSpaceWhenParented = true;
+            m_ChildObject.GetComponent<ChildObjectComponent>().TickSyncChildren = true;
+            m_SubChildObject.GetComponent<ChildObjectComponent>().SwitchTransformSpaceWhenParented = true;
+            m_SubChildObject.GetComponent<ChildObjectComponent>().TickSyncChildren = true;
+            m_ChildObject.AllowOwnerToParent = true;
+            m_SubChildObject.AllowOwnerToParent = true;
+
+
+            var authoritySideParent = SpawnObject(m_ParentObject.gameObject, authorityNetworkManager).GetComponent<NetworkObject>();
+            var authoritySideChild = SpawnObject(m_ChildObject.gameObject, childAuthorityNetworkManager).GetComponent<NetworkObject>();
+            var authoritySideSubChild = SpawnObject(m_SubChildObject.gameObject, childAuthorityNetworkManager).GetComponent<NetworkObject>();
+
+            // Assure all of the child object instances are spawned before proceeding to parenting
+            var success = WaitForConditionOrTimeOutWithTimeTravel(AllChildObjectInstancesAreSpawned);
+            Assert.True(success, "Timed out waiting for all child instances to be spawned!");
+
+            // Get the owner instance if in client-server mode with owner authority
+            if (m_Authority == Authority.OwnerAuthority && !m_DistributedAuthority)
+            {
+                authoritySideParent = s_GlobalNetworkObjects[authoritySideParent.OwnerClientId][authoritySideParent.NetworkObjectId];
+                authoritySideChild = s_GlobalNetworkObjects[authoritySideChild.OwnerClientId][authoritySideChild.NetworkObjectId];
+                authoritySideSubChild = s_GlobalNetworkObjects[authoritySideSubChild.OwnerClientId][authoritySideSubChild.NetworkObjectId];
+            }
+
+            // Get the authority parent and child instances
+            m_AuthorityParentObject = NetworkTransformTestComponent.AuthorityInstance.NetworkObject;
+            m_AuthorityChildObject = ChildObjectComponent.AuthorityInstance.NetworkObject;
+            m_AuthoritySubChildObject = ChildObjectComponent.AuthoritySubInstance.NetworkObject;
+
+            // The child NetworkTransform will use world space when world position stays and
+            // local space when world position does not stay when parenting.
+            ChildObjectComponent.AuthorityInstance.UseHalfFloatPrecision = m_Precision == Precision.Half;
+            ChildObjectComponent.AuthorityInstance.UseQuaternionSynchronization = m_Rotation == Rotation.Quaternion;
+            ChildObjectComponent.AuthorityInstance.UseQuaternionCompression = m_RotationCompression == RotationCompression.QuaternionCompress;
+
+            ChildObjectComponent.AuthoritySubInstance.UseHalfFloatPrecision = m_Precision == Precision.Half;
+            ChildObjectComponent.AuthoritySubInstance.UseQuaternionSynchronization = m_Rotation == Rotation.Quaternion;
+            ChildObjectComponent.AuthoritySubInstance.UseQuaternionCompression = m_RotationCompression == RotationCompression.QuaternionCompress;
+
+            // Set whether we are interpolating or not
+            m_AuthorityParentNetworkTransform = m_AuthorityParentObject.GetComponent<NetworkTransformTestComponent>();
+            m_AuthorityParentNetworkTransform.Interpolate = true;
+            m_AuthorityChildNetworkTransform = m_AuthorityChildObject.GetComponent<ChildObjectComponent>();
+            m_AuthorityChildNetworkTransform.Interpolate = true;
+            m_AuthoritySubChildNetworkTransform = m_AuthoritySubChildObject.GetComponent<ChildObjectComponent>();
+            m_AuthoritySubChildNetworkTransform.Interpolate = true;
+
+            // Apply a scale to the parent object to make sure the scale on the child is properly updated on
+            // non-authority instances.
+            var halfScale = scale * 0.5f;
+            m_AuthorityParentObject.transform.localScale = GetRandomVector3(scale - halfScale, scale + halfScale);
+            m_AuthorityChildObject.transform.localScale = GetRandomVector3(scale - halfScale, scale + halfScale);
+            m_AuthoritySubChildObject.transform.localScale = GetRandomVector3(scale - halfScale, scale + halfScale);
+
+            // Allow one tick for authority to update these changes
+            TimeTravelAdvanceTick();
+            success = WaitForConditionOrTimeOutWithTimeTravel(PositionRotationScaleMatches);
+
+            Assert.True(success, "All transform values did not match prior to parenting!");
+
+            success = WaitForConditionOrTimeOutWithTimeTravel(PositionRotationScaleMatches);
+
+            Assert.True(success, "All transform values did not match prior to parenting!");
+
+            // Move things around while parenting and removing the parent
+            // Not the absolute "perfect" test, but it validates the clients all synchronize
+            // parenting and transform values.
+            for (int i = 0; i < 30; i++)
+            {
+                // Provide two network ticks for interpolation to finalize
+                TimeTravelAdvanceTick();
+                TimeTravelAdvanceTick();
+
+                // This validates each child instance has preserved their local space values
+                AllChildrenLocalTransformValuesMatch(false, ChildrenTransformCheckType.Connected_Clients);
+
+                // This validates each sub-child instance has preserved their local space values
+                AllChildrenLocalTransformValuesMatch(true, ChildrenTransformCheckType.Connected_Clients);
+                // Parent while in motion
+                if (i == 5)
+                {
+                    // Parent the child under the parent with the current world position stays setting
+                    Assert.True(authoritySideChild.TrySetParent(authoritySideParent.transform), $"[Child][Client-{authoritySideChild.NetworkManagerOwner.LocalClientId}] Failed to set child's parent!");
+
+                    // This waits for all child instances to be parented
+                    success = WaitForConditionOrTimeOutWithTimeTravel(AllFirstLevelChildObjectInstancesHaveChild, 300);
+                    Assert.True(success, "Timed out waiting for all instances to have parented a child!");
+                }
+
+                if (i == 10)
+                {
+                    // Parent the sub-child under the child with the current world position stays setting
+                    Assert.True(authoritySideSubChild.TrySetParent(authoritySideChild.transform), $"[Sub-Child][Client-{authoritySideSubChild.NetworkManagerOwner.LocalClientId}] Failed to set sub-child's parent!");
+
+                    // This waits for all child instances to be parented
+                    success = WaitForConditionOrTimeOutWithTimeTravel(AllChildObjectInstancesHaveChild, 300);
+                    Assert.True(success, "Timed out waiting for all instances to have parented a child!");
+                }
+
+                if (i == 15)
+                {
+                    // Verify that a late joining client will synchronize to the parented NetworkObjects properly
+                    CreateAndStartNewClientWithTimeTravel();
+
+                    // Assure all of the child object instances are spawned (basically for the newly connected client)
+                    success = WaitForConditionOrTimeOutWithTimeTravel(AllChildObjectInstancesAreSpawned, 300);
+                    Assert.True(success, "Timed out waiting for all child instances to be spawned!");
+
+                    // This waits for all child instances to be parented
+                    success = WaitForConditionOrTimeOutWithTimeTravel(AllChildObjectInstancesHaveChild, 300);
+                    Assert.True(success, "Timed out waiting for all instances to have parented a child!");
+
+                    // This validates each child instance has preserved their local space values
+                    AllChildrenLocalTransformValuesMatch(false, ChildrenTransformCheckType.Late_Join_Client);
+
+                    // This validates each sub-child instance has preserved their local space values
+                    AllChildrenLocalTransformValuesMatch(true, ChildrenTransformCheckType.Late_Join_Client);
+                }
+
+                if (i == 20)
+                {
+                    // Remove the parent
+                    Assert.True(authoritySideSubChild.TryRemoveParent(), $"[Sub-Child][Client-{authoritySideSubChild.NetworkManagerOwner.LocalClientId}] Failed to set sub-child's parent!");
+
+                    // This waits for all child instances to have the parent removed
+                    success = WaitForConditionOrTimeOutWithTimeTravel(AllSubChildObjectInstancesHaveNoParent, 300);
+                    Assert.True(success, "Timed out waiting for all instances remove the parent!");
+                }
+
+                if (i == 25)
+                {
+                    // Parent the child under the parent with the current world position stays setting
+                    Assert.True(authoritySideChild.TryRemoveParent(), $"[Child][Client-{authoritySideChild.NetworkManagerOwner.LocalClientId}] Failed to remove parent!");
+
+                    // This waits for all child instances to be parented
+                    success = WaitForConditionOrTimeOutWithTimeTravel(AllFirstLevelChildObjectInstancesHaveNoParent, 300);
+                    Assert.True(success, "Timed out waiting for all instances remove the parent!");
+                }
+                UpdateTransformWorld(m_AuthorityParentNetworkTransform);
+                if (m_AuthorityChildNetworkTransform.InLocalSpace)
+                {
+                    UpdateTransformLocal(m_AuthorityChildNetworkTransform);
+                }
+                else
+                {
+                    UpdateTransformWorld(m_AuthorityChildNetworkTransform);
+                }
+
+                if (m_AuthoritySubChildNetworkTransform.InLocalSpace)
+                {
+                    UpdateTransformLocal(m_AuthoritySubChildNetworkTransform);
+                }
+                else
+                {
+                    UpdateTransformWorld(m_AuthoritySubChildNetworkTransform);
+                }
+            }
+
+            success = WaitForConditionOrTimeOutWithTimeTravel(PositionRotationScaleMatches, 300);
+
+            Assert.True(success, "All transform values did not match prior to parenting!");
+
+            // Revert the modifications made for this specific test
+            m_ParentObject.GetComponent<NetworkTransformTestComponent>().TickSyncChildren = false;
+            m_ChildObject.GetComponent<ChildObjectComponent>().SwitchTransformSpaceWhenParented = false;
+            m_ChildObject.GetComponent<ChildObjectComponent>().TickSyncChildren = false;
+            m_ChildObject.AllowOwnerToParent = false;
+            m_SubChildObject.AllowOwnerToParent = false;
+            m_SubChildObject.GetComponent<ChildObjectComponent>().SwitchTransformSpaceWhenParented = false;
+            m_SubChildObject.GetComponent<ChildObjectComponent>().TickSyncChildren = false;
+        }
+
+
         /// <summary>
         /// Validates that transform values remain the same when a NetworkTransform is
         /// parented under another NetworkTransform under all of the possible axial conditions
@@ -154,6 +440,10 @@ public void ParentedNetworkTransformTest([Values] Interpolation interpolation, [
 
             Assert.True(success, "All transform values did not match prior to parenting!");
 
+            success = WaitForConditionOrTimeOutWithTimeTravel(PositionRotationScaleMatches);
+
+            Assert.True(success, "All transform values did not match prior to parenting!");
+
             // Parent the child under the parent with the current world position stays setting
             Assert.True(serverSideChild.TrySetParent(serverSideParent.transform, worldPositionStays), "[Server-Side Child] Failed to set child's parent!");
 
@@ -202,7 +492,7 @@ public void ParentedNetworkTransformTest([Values] Interpolation interpolation, [
         /// delta update, and it runs through 8 delta updates per unique test.
         /// </remarks>
         [Test]
-        public void NetworkTransformMultipleChangesOverTime([Values] TransformSpace testLocalTransform, [Values] OverrideState overideState, [Values] Axis axis)
+        public void MultipleChangesOverTime([Values] TransformSpace testLocalTransform, [Values] OverrideState overideState, [Values] Axis axis)
         {
             m_AuthoritativeTransform.InLocalSpace = testLocalTransform == TransformSpace.Local;
             bool axisX = axis == Axis.X || axis == Axis.XY || axis == Axis.XZ || axis == Axis.XYZ;
@@ -217,6 +507,30 @@ public void NetworkTransformMultipleChangesOverTime([Values] TransformSpace test
             // when interpolation is enabled.
             m_AuthoritativeTransform.Interpolate = axisCount == 3 ? true : false;
 
+            // Lerp smoothing skews values based on our tests and how we had to originally adjust for the way we handled the original Lerp approach and how that
+            // consumed state updates from the buffer.
+            // With the two new interpolation types, they will process until close to the final value before moving on to the next.
+            // Lerp--> Will skip to next state before finishing the current state (i.e. loss of precision but arrives to the final value at the end of multiple updates faster)
+            // LerpAhead & SmoothDampening -->
+            // Will not skip to the next state update until approximately at the end of the current state (higher precision longer time to final value)
+            // How this impacts this test:
+            // It was re-written to use TimeTravel which has a limit of 60 update iterations per "WaitforCondition" which if you are interpolating between two large values
+            // it can take a few more iterations with lerp smoothing enabled. Lerp smoothing is purely a visual thing and will eventually end up at its final destination
+            // upon processing the last state update. However, this test should be only to verify the functionality of the actual lerping between values without the added
+            // delay of smoothing the final result. So, instead of having one timeout value for the two new interpolation types and the default for the original I am opting
+            // for the disabling of lerp smoothing while this particular test runs as it really is only validating that each interpolator type will interpolate to the right
+            // value within a given period of time which is simulated using the time travel approach.
+            // With smooth lerping enabled, the two new interpolation types will come very close to the correct value but will not reach the 2nd or 3rd pass values set because
+            // this test uses the adjusted approximation checks that prematurely determines the target values (position, rotation, and scale) have been reached and as such
+            // sends a new state update that will sit in the buffer for 3-4 frames before the two new interpolation types are done with the current state update. This will
+            // eventually lead to a time deficit that will offset the processing of the next state update such that the default time travel timeout (60 updates) will timeout
+            // and the test will fail. This only happens with 3 axis since that is the only time interpolation was enabled for this particular test.
+            // As such, just disabling smooth lerping for all 3 seemed like the better approach as the maximum interpolation time out period for smooth lerping is now
+            // adjustable by users (i.e. they can adjust how much lerp smoothing is applied based on their project's needs).
+            m_NonAuthoritativeTransform.PositionLerpSmoothing = false;
+            m_NonAuthoritativeTransform.RotationLerpSmoothing = false;
+            m_NonAuthoritativeTransform.ScaleLerpSmoothing = false;
+
             m_CurrentAxis = axis;
 
             m_AuthoritativeTransform.SyncPositionX = axisX;
@@ -251,12 +565,18 @@ public void NetworkTransformMultipleChangesOverTime([Values] TransformSpace test
             var scale = scaleStart;
             var success = false;
 
-            m_AuthoritativeTransform.StatePushed = false;
-            // Wait for the deltas to be pushed
-            WaitForConditionOrTimeOutWithTimeTravel(() => m_AuthoritativeTransform.StatePushed);
-            // Allow the precision settings to propagate first as changing precision
-            // causes a teleport event to occur
-            TimeTravelAdvanceTick();
+            // The default is interpolate, so we only need to check for the updated state when
+            // we turn off interpolation.
+            if (!m_AuthoritativeTransform.Interpolate)
+            {
+                // Reset our state updated and state pushed
+                m_NonAuthoritativeTransform.StateUpdated = false;
+                m_AuthoritativeTransform.StatePushed = false;
+                // Wait for both authority and non-authority to update their respective flags so we know the change to interpolation has been received.
+                success = WaitForConditionOrTimeOutWithTimeTravel(() => m_AuthoritativeTransform.StatePushed && m_NonAuthoritativeTransform.StateUpdated);
+                Assert.True(success, "Failed to wait for interpolation changed state update!");
+            }
+
             var iterations = axisCount == 3 ? k_PositionRotationScaleIterations3Axis : k_PositionRotationScaleIterations;
 
             // Move and rotate within the same tick, validate the non-authoritative instance updates
@@ -294,7 +614,7 @@ public void NetworkTransformMultipleChangesOverTime([Values] TransformSpace test
                 Assert.True(WaitForConditionOrTimeOutWithTimeTravel(() => m_AuthoritativeTransform.StatePushed && m_NonAuthoritativeTransform.StateUpdated), $"[Non-Interpolate {i}] Timed out waiting for state to be pushed ({m_AuthoritativeTransform.StatePushed}) or state to be updated ({m_NonAuthoritativeTransform.StateUpdated})!");
 
                 // For 3 axis, we will skip validating that the non-authority interpolates to its target point at least once.
-                // This will validate that non-authoritative updates are maintaining their target state axis values if only 2 
+                // This will validate that non-authoritative updates are maintaining their target state axis values if only 2
                 // of the axis are being updated to assure interpolation maintains the targeted axial value per axis.
                 // For 2 and 1 axis tests we always validate per delta update
                 if (m_AxisExcluded || axisCount < 3)
@@ -305,6 +625,7 @@ public void NetworkTransformMultipleChangesOverTime([Values] TransformSpace test
                     if (!success)
                     {
                         m_EnableVerboseDebug = true;
+                        VerboseDebug($"Failed on iteration: {i}");
                         success = PositionRotationScaleMatches();
                         m_EnableVerboseDebug = false;
                     }
@@ -369,6 +690,7 @@ public void LateJoiningPlayerInitialScaleValues([Values] TransformSpace testLoca
                 }
             }
         }
+#endif
 
         /// <summary>
         /// Tests changing all axial values one at a time.
@@ -392,6 +714,7 @@ public void TestAuthoritativeTransformChangeOneAtATime([Values] TransformSpace t
             Assert.AreEqual(Vector3.zero, m_NonAuthoritativeTransform.transform.position, "server side pos should be zero at first"); // sanity check
 
             TimeTravelAdvanceTick();
+            TimeTravelToNextTick();
 
             m_AuthoritativeTransform.StatePushed = false;
             var nextPosition = GetRandomVector3(2f, 30f);
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransformAnticipationTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransformAnticipationTests.cs
index d554cfc0f2..b9a361ef03 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransformAnticipationTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransformAnticipationTests.cs
@@ -5,11 +5,12 @@
 using Unity.Netcode.Components;
 using Unity.Netcode.TestHelpers.Runtime;
 using UnityEngine;
+using UnityEngine.TestTools.Utils;
 using Object = UnityEngine.Object;
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class NetworkTransformAnticipationComponent : NetworkBehaviour
+    internal class NetworkTransformAnticipationComponent : NetworkBehaviour
     {
         [Rpc(SendTo.Server)]
         public void MoveRpc(Vector3 newPosition)
@@ -51,7 +52,7 @@ public override void OnReanticipate(double lastRoundTripTime)
         }
     }
 
-    public class NetworkTransformAnticipationTests : NetcodeIntegrationTest
+    internal class NetworkTransformAnticipationTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 2;
 
@@ -117,6 +118,7 @@ public AnticipatedNetworkTransform GetOtherClientComponent()
         public void WhenAnticipating_ValueChangesImmediately()
         {
             var testComponent = GetTestComponent();
+            var quaternionComparer = new QuaternionEqualityComparer(0.000001f);
 
             testComponent.AnticipateMove(new Vector3(0, 1, 2));
             testComponent.AnticipateScale(new Vector3(1, 2, 3));
@@ -124,12 +126,11 @@ public void WhenAnticipating_ValueChangesImmediately()
 
             Assert.AreEqual(new Vector3(0, 1, 2), testComponent.transform.position);
             Assert.AreEqual(new Vector3(1, 2, 3), testComponent.transform.localScale);
-            Assert.AreEqual(Quaternion.LookRotation(new Vector3(2, 3, 4)), testComponent.transform.rotation);
+            Assert.That(testComponent.transform.rotation, Is.EqualTo(Quaternion.LookRotation(new Vector3(2, 3, 4))).Using(quaternionComparer)); // Quaternion comparer added due to FP precision problems on Android devices.
 
             Assert.AreEqual(new Vector3(0, 1, 2), testComponent.AnticipatedState.Position);
             Assert.AreEqual(new Vector3(1, 2, 3), testComponent.AnticipatedState.Scale);
-            Assert.AreEqual(Quaternion.LookRotation(new Vector3(2, 3, 4)), testComponent.AnticipatedState.Rotation);
-
+            Assert.That(testComponent.AnticipatedState.Rotation, Is.EqualTo(Quaternion.LookRotation(new Vector3(2, 3, 4))).Using(quaternionComparer)); // Quaternion comparer added due to FP precision problems on Android devices.
         }
 
         [Test]
@@ -299,16 +300,15 @@ public void WhenServerChangesSmoothValue_ValuesAreLerped()
             }, new List<NetworkManager> { m_ServerNetworkManager });
 
             WaitForMessageReceivedWithTimeTravel<NetworkTransformMessage>(m_ClientNetworkManagers.ToList());
-
             var percentChanged = 1f / 60f;
 
             AssertVectorsAreEquivalent(Vector3.Lerp(anticipePosition, serverSetPosition, percentChanged), testComponent.transform.position);
             AssertVectorsAreEquivalent(Vector3.Lerp(anticipeScale, serverSetScale, percentChanged), testComponent.transform.localScale);
-            AssertQuaternionsAreEquivalent(Quaternion.Slerp(anticipeRotation, serverSetRotation, percentChanged), testComponent.transform.rotation);
+            AssertQuaternionsAreEquivalent(Quaternion.Lerp(anticipeRotation, serverSetRotation, percentChanged), testComponent.transform.rotation);
 
             AssertVectorsAreEquivalent(Vector3.Lerp(anticipePosition, serverSetPosition, percentChanged), testComponent.AnticipatedState.Position);
             AssertVectorsAreEquivalent(Vector3.Lerp(anticipeScale, serverSetScale, percentChanged), testComponent.AnticipatedState.Scale);
-            AssertQuaternionsAreEquivalent(Quaternion.Slerp(anticipeRotation, serverSetRotation, percentChanged), testComponent.AnticipatedState.Rotation);
+            AssertQuaternionsAreEquivalent(Quaternion.Lerp(anticipeRotation, serverSetRotation, percentChanged), testComponent.AnticipatedState.Rotation);
 
             AssertVectorsAreEquivalent(serverSetPosition, testComponent.AuthoritativeState.Position);
             AssertVectorsAreEquivalent(serverSetScale, testComponent.AuthoritativeState.Scale);
@@ -316,11 +316,11 @@ public void WhenServerChangesSmoothValue_ValuesAreLerped()
 
             AssertVectorsAreEquivalent(Vector3.Lerp(startPosition, serverSetPosition, percentChanged), otherClientComponent.transform.position);
             AssertVectorsAreEquivalent(Vector3.Lerp(startScale, serverSetScale, percentChanged), otherClientComponent.transform.localScale);
-            AssertQuaternionsAreEquivalent(Quaternion.Slerp(startRotation, serverSetRotation, percentChanged), otherClientComponent.transform.rotation);
+            AssertQuaternionsAreEquivalent(Quaternion.Lerp(startRotation, serverSetRotation, percentChanged), otherClientComponent.transform.rotation);
 
             AssertVectorsAreEquivalent(Vector3.Lerp(startPosition, serverSetPosition, percentChanged), otherClientComponent.AnticipatedState.Position);
             AssertVectorsAreEquivalent(Vector3.Lerp(startScale, serverSetScale, percentChanged), otherClientComponent.AnticipatedState.Scale);
-            AssertQuaternionsAreEquivalent(Quaternion.Slerp(startRotation, serverSetRotation, percentChanged), otherClientComponent.AnticipatedState.Rotation);
+            AssertQuaternionsAreEquivalent(Quaternion.Lerp(startRotation, serverSetRotation, percentChanged), otherClientComponent.AnticipatedState.Rotation);
 
             AssertVectorsAreEquivalent(serverSetPosition, otherClientComponent.AuthoritativeState.Position);
             AssertVectorsAreEquivalent(serverSetScale, otherClientComponent.AuthoritativeState.Scale);
@@ -333,11 +333,11 @@ public void WhenServerChangesSmoothValue_ValuesAreLerped()
 
                 AssertVectorsAreEquivalent(Vector3.Lerp(anticipePosition, serverSetPosition, percentChanged), testComponent.transform.position);
                 AssertVectorsAreEquivalent(Vector3.Lerp(anticipeScale, serverSetScale, percentChanged), testComponent.transform.localScale);
-                AssertQuaternionsAreEquivalent(Quaternion.Slerp(anticipeRotation, serverSetRotation, percentChanged), testComponent.transform.rotation);
+                AssertQuaternionsAreEquivalent(Quaternion.Lerp(anticipeRotation, serverSetRotation, percentChanged), testComponent.transform.rotation);
 
                 AssertVectorsAreEquivalent(Vector3.Lerp(anticipePosition, serverSetPosition, percentChanged), testComponent.AnticipatedState.Position);
                 AssertVectorsAreEquivalent(Vector3.Lerp(anticipeScale, serverSetScale, percentChanged), testComponent.AnticipatedState.Scale);
-                AssertQuaternionsAreEquivalent(Quaternion.Slerp(anticipeRotation, serverSetRotation, percentChanged), testComponent.AnticipatedState.Rotation);
+                AssertQuaternionsAreEquivalent(Quaternion.Lerp(anticipeRotation, serverSetRotation, percentChanged), testComponent.AnticipatedState.Rotation);
 
                 AssertVectorsAreEquivalent(serverSetPosition, testComponent.AuthoritativeState.Position);
                 AssertVectorsAreEquivalent(serverSetScale, testComponent.AuthoritativeState.Scale);
@@ -345,11 +345,11 @@ public void WhenServerChangesSmoothValue_ValuesAreLerped()
 
                 AssertVectorsAreEquivalent(Vector3.Lerp(startPosition, serverSetPosition, percentChanged), otherClientComponent.transform.position);
                 AssertVectorsAreEquivalent(Vector3.Lerp(startScale, serverSetScale, percentChanged), otherClientComponent.transform.localScale);
-                AssertQuaternionsAreEquivalent(Quaternion.Slerp(startRotation, serverSetRotation, percentChanged), otherClientComponent.transform.rotation);
+                AssertQuaternionsAreEquivalent(Quaternion.Lerp(startRotation, serverSetRotation, percentChanged), otherClientComponent.transform.rotation);
 
                 AssertVectorsAreEquivalent(Vector3.Lerp(startPosition, serverSetPosition, percentChanged), otherClientComponent.AnticipatedState.Position);
                 AssertVectorsAreEquivalent(Vector3.Lerp(startScale, serverSetScale, percentChanged), otherClientComponent.AnticipatedState.Scale);
-                AssertQuaternionsAreEquivalent(Quaternion.Slerp(startRotation, serverSetRotation, percentChanged), otherClientComponent.AnticipatedState.Rotation);
+                AssertQuaternionsAreEquivalent(Quaternion.Lerp(startRotation, serverSetRotation, percentChanged), otherClientComponent.AnticipatedState.Rotation);
 
                 AssertVectorsAreEquivalent(serverSetPosition, otherClientComponent.AuthoritativeState.Position);
                 AssertVectorsAreEquivalent(serverSetScale, otherClientComponent.AuthoritativeState.Scale);
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransformAnticipationTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransformAnticipationTests.cs.meta
index 717612e818..ae75b6b866 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransformAnticipationTests.cs.meta
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransformAnticipationTests.cs.meta
@@ -1,3 +1,2 @@
-fileFormatVersion: 2
-guid: 4f149de86bec4f6eb1a4d62a1b52938a
-timeCreated: 1706630210
\ No newline at end of file
+fileFormatVersion: 2
+guid: ceb074b080c27184a9f669cd68355955
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkUpdateLoopTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkUpdateLoopTests.cs
index 97f83c15fc..06d10d414f 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkUpdateLoopTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkUpdateLoopTests.cs
@@ -9,7 +9,7 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class NetworkUpdateLoopTests
+    internal class NetworkUpdateLoopTests
     {
         [Test]
         public void RegisterCustomLoopInTheMiddle()
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable.meta
new file mode 100644
index 0000000000..8dbf0bc348
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7b4da27c6efa9684893f85f5d3ad80e6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVarBufferCopyTest.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVarBufferCopyTest.cs
similarity index 74%
rename from com.unity.netcode.gameobjects/Tests/Runtime/NetworkVarBufferCopyTest.cs
rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVarBufferCopyTest.cs
index 272e6444b7..892e70d6fd 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVarBufferCopyTest.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVarBufferCopyTest.cs
@@ -6,9 +6,11 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class NetworkVarBufferCopyTest : NetcodeIntegrationTest
+    [TestFixture(HostOrServer.DAHost)]
+    [TestFixture(HostOrServer.Host)]
+    internal class NetworkVarBufferCopyTest : NetcodeIntegrationTest
     {
-        public class DummyNetVar : NetworkVariableBase
+        internal class DummyNetVar : NetworkVariableBase
         {
             private const int k_DummyValue = 0x13579BDF;
             public bool DeltaWritten;
@@ -67,15 +69,32 @@ public override void ReadDelta(FastBufferReader reader, bool keepDirtyDelta)
 
                 DeltaRead = true;
             }
+
+            public DummyNetVar(
+            NetworkVariableReadPermission readPerm = DefaultReadPerm,
+            NetworkVariableWritePermission writePerm = DefaultWritePerm) : base(readPerm, writePerm) { }
         }
 
-        public class DummyNetBehaviour : NetworkBehaviour
+        internal class DummyNetBehaviour : NetworkBehaviour
         {
-            public DummyNetVar NetVar = new DummyNetVar();
+            public static bool DistributedAuthority;
+            public DummyNetVar NetVar;
+
+            private void Awake()
+            {
+                if (DistributedAuthority)
+                {
+                    NetVar = new DummyNetVar(writePerm: NetworkVariableWritePermission.Owner);
+                }
+                else
+                {
+                    NetVar = new DummyNetVar();
+                }
+            }
 
             public override void OnNetworkSpawn()
             {
-                if (!IsServer)
+                if ((NetworkManager.DistributedAuthorityMode && !IsOwner) || (!NetworkManager.DistributedAuthorityMode && !IsServer))
                 {
                     ClientDummyNetBehaviourSpawned(this);
                 }
@@ -84,6 +103,8 @@ public override void OnNetworkSpawn()
         }
         protected override int NumberOfClients => 1;
 
+        public NetworkVarBufferCopyTest(HostOrServer hostOrServer) : base(hostOrServer) { }
+
         private static List<DummyNetBehaviour> s_ClientDummyNetBehavioursSpawned = new List<DummyNetBehaviour>();
         public static void ClientDummyNetBehaviourSpawned(DummyNetBehaviour dummyNetBehaviour)
         {
@@ -98,6 +119,7 @@ protected override IEnumerator OnSetup()
 
         protected override void OnCreatePlayerPrefab()
         {
+            DummyNetBehaviour.DistributedAuthority = m_DistributedAuthority;
             m_PlayerPrefab.AddComponent<DummyNetBehaviour>();
         }
 
@@ -127,27 +149,29 @@ public IEnumerator TestEntireBufferIsCopiedOnNetworkVariableDelta()
             Assert.IsFalse(s_GlobalTimeoutHelper.TimedOut, "Timed out waiting for client side DummyNetBehaviour to register it was spawned!");
 
             // Check that FieldWritten is written when dirty
-            serverComponent.NetVar.SetDirty(true);
+            var authorityComponent = m_DistributedAuthority ? clientComponent : serverComponent;
+            var nonAuthorityComponent = m_DistributedAuthority ? serverComponent : clientComponent;
+            authorityComponent.NetVar.SetDirty(true);
             yield return s_DefaultWaitForTick;
-            Assert.True(serverComponent.NetVar.FieldWritten);
-
+            Assert.True(authorityComponent.NetVar.FieldWritten);
             // Check that DeltaWritten is written when dirty
-            serverComponent.NetVar.SetDirty(true);
+            authorityComponent.NetVar.SetDirty(true);
             yield return s_DefaultWaitForTick;
-            Assert.True(serverComponent.NetVar.DeltaWritten);
+            Assert.True(authorityComponent.NetVar.DeltaWritten);
+
 
             // Check that both FieldRead and DeltaRead were invoked on the client side
-            yield return WaitForConditionOrTimeOut(() => clientComponent.NetVar.FieldRead == true && clientComponent.NetVar.DeltaRead == true);
+            yield return WaitForConditionOrTimeOut(() => nonAuthorityComponent.NetVar.FieldRead == true && nonAuthorityComponent.NetVar.DeltaRead == true);
 
             var timedOutMessage = "Timed out waiting for client reads: ";
             if (s_GlobalTimeoutHelper.TimedOut)
             {
-                if (!clientComponent.NetVar.FieldRead)
+                if (!nonAuthorityComponent.NetVar.FieldRead)
                 {
                     timedOutMessage += "[FieldRead]";
                 }
 
-                if (!clientComponent.NetVar.DeltaRead)
+                if (!nonAuthorityComponent.NetVar.DeltaRead)
                 {
                     timedOutMessage += "[DeltaRead]";
                 }
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVarBufferCopyTest.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVarBufferCopyTest.cs.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Tests/Runtime/NetworkVarBufferCopyTest.cs.meta
rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVarBufferCopyTest.cs.meta
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableAnticipationTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableAnticipationTests.cs
similarity index 92%
rename from com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableAnticipationTests.cs
rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableAnticipationTests.cs
index e852fbaf21..66d2d8d90f 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableAnticipationTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableAnticipationTests.cs
@@ -7,7 +7,7 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class NetworkVariableAnticipationComponent : NetworkBehaviour
+    internal class NetworkVariableAnticipationComponent : NetworkBehaviour
     {
         public AnticipatedNetworkVariable<int> SnapOnAnticipationFailVariable = new AnticipatedNetworkVariable<int>(0, StaleDataHandling.Ignore);
         public AnticipatedNetworkVariable<float> SmoothOnAnticipationFailVariable = new AnticipatedNetworkVariable<float>(0, StaleDataHandling.Reanticipate);
@@ -59,7 +59,7 @@ public void SetReanticipateValueRpc(float f)
         }
     }
 
-    public class NetworkVariableAnticipationTests : NetcodeIntegrationTest
+    internal class NetworkVariableAnticipationTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 2;
 
@@ -416,5 +416,39 @@ public void WhenStaleDataArrivesToReanticipatedVariable_ItIsAppliedAndReanticipa
             Assert.AreEqual(25, otherClientComponent.ReanticipateOnAnticipationFailVariable.Value);
             Assert.AreEqual(20, otherClientComponent.ReanticipateOnAnticipationFailVariable.AuthoritativeValue);
         }
+
+
+        private int m_PreviousSnapValue;
+        /// <summary>
+        /// Validates the previous value is being properly updated on the non-authoritative side.
+        /// </summary>
+        [Test]
+        public void PreviousValueIsMaintainedProperly()
+        {
+            var testComponent = GetTestComponent();
+
+            testComponent.SnapOnAnticipationFailVariable.OnAuthoritativeValueChanged += OnAuthoritativeValueChanged;
+            testComponent.SnapOnAnticipationFailVariable.Anticipate(10);
+            testComponent.SetSnapValueRpc(10);
+            WaitForMessageReceivedWithTimeTravel<NetworkVariableDeltaMessage>(m_ClientNetworkManagers.ToList());
+            // Verify the previous value is 0
+            Assert.AreEqual(0, m_PreviousSnapValue);
+            testComponent.SetSnapValueRpc(20);
+
+            WaitForMessageReceivedWithTimeTravel<NetworkVariableDeltaMessage>(m_ClientNetworkManagers.ToList());
+            // Verify the previous value is 10
+            Assert.AreEqual(10, m_PreviousSnapValue);
+
+            testComponent.SetSnapValueRpc(30);
+            WaitForMessageReceivedWithTimeTravel<NetworkVariableDeltaMessage>(m_ClientNetworkManagers.ToList());
+            // Verify the previous value is 20
+            Assert.AreEqual(20, m_PreviousSnapValue);
+        }
+
+        private void OnAuthoritativeValueChanged(AnticipatedNetworkVariable<int> anticipatedValue, in int previous, in int current)
+        {
+            m_PreviousSnapValue = previous;
+        }
+
     }
 }
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableAnticipationTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableAnticipationTests.cs.meta
new file mode 100644
index 0000000000..357da56e2d
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableAnticipationTests.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 74e627a9d18dcd04e9c56ab2539a6593
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableBaseInitializesWhenPersisted.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableBaseInitializesWhenPersisted.cs
new file mode 100644
index 0000000000..7ae68bb53f
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableBaseInitializesWhenPersisted.cs
@@ -0,0 +1,413 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using Unity.Netcode.TestHelpers.Runtime;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+using UnityEngine.TestTools;
+
+namespace Unity.Netcode.RuntimeTests
+{
+    [TestFixture(NetworkTopologyTypes.ClientServer, HostOrServer.Server)]
+    [TestFixture(NetworkTopologyTypes.ClientServer, HostOrServer.Host)]
+    [TestFixture(NetworkTopologyTypes.DistributedAuthority, HostOrServer.DAHost)]
+    public class NetworkVariableBaseInitializesWhenPersisted : NetcodeIntegrationTest
+    {
+        protected override int NumberOfClients => 1;
+
+        private static GameObject s_NetworkPrefab;
+
+        public NetworkVariableBaseInitializesWhenPersisted(NetworkTopologyTypes networkTopologyTypes, HostOrServer hostOrServer) : base(networkTopologyTypes, hostOrServer) { }
+
+        protected override void OnOneTimeSetup()
+        {
+            // Create a prefab to persist for all tests
+            s_NetworkPrefab = new GameObject("PresistPrefab");
+            var networkObject = s_NetworkPrefab.AddComponent<NetworkObject>();
+            networkObject.GlobalObjectIdHash = 8888888;
+            networkObject.SetSceneObjectStatus(false);
+            s_NetworkPrefab.AddComponent<TestBehaviour>();
+            s_NetworkPrefab.AddComponent<ObjectNameIdentifier>();
+            // Create enough prefab instance handlers to be re-used for all tests.
+            PrefabInstanceHandler.OneTimeSetup(NumberOfClients + 1, s_NetworkPrefab);
+            Object.DontDestroyOnLoad(s_NetworkPrefab);
+            base.OnOneTimeSetup();
+        }
+
+        protected override void OnServerAndClientsCreated()
+        {
+            // Assign one of the precreated prefab instance handlers to the server
+            PrefabInstanceHandler.AssignHandler(m_ServerNetworkManager);
+            // Add the network prefab to the server networkmanager
+            m_ServerNetworkManager.AddNetworkPrefab(s_NetworkPrefab);
+            // Repeat these steps for clients
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                PrefabInstanceHandler.AssignHandler(client);
+                client.AddNetworkPrefab(s_NetworkPrefab);
+            }
+            // !!! IMPORTANT !!!
+            // Disable the persisted network prefab so it isn't spawned nor destroyed
+            s_NetworkPrefab.SetActive(false);
+            base.OnServerAndClientsCreated();
+        }
+
+        private List<NetworkManager> m_NetworkManagers = new List<NetworkManager>();
+        private List<NetworkObject> m_SpawnedObjects = new List<NetworkObject>();
+
+        [UnityTest]
+        public IEnumerator PrefabSessionIstantiationPass([Values(4, 3, 2, 1)] int iterationsLeft)
+        {
+            // Start out waiting for a long duration before updating the NetworkVariable so each
+            // next iteration we change it earlier than the previous. This validates that the
+            // NetworkVariable's last update time is being reset each time a persisted NetworkObject
+            // is being spawned.
+            var baseWaitTime = 0.35f;
+            var waitPeriod = baseWaitTime * iterationsLeft;
+            m_NetworkManagers.Add(m_ServerNetworkManager);
+            m_NetworkManagers.AddRange(m_ClientNetworkManagers);
+
+            foreach (var networkManager in m_NetworkManagers)
+            {
+                // Validate Pooled Objects Persisted Between Tests
+                // We start with having 4 iterations (including the first of the 4), which means that when we have 4
+                // iterations remaining we haven't spawned any instances so it will test that there are no instances.
+                // When we there are 3 iterations left, every persisted instance of the network prefab should have been
+                // spawned at least once...when 2 then all should have been spawned twice...when 1 then all should been
+                // spawned three times.
+                Assert.True(PrefabInstanceHandler.ValidatePersistedInstances(networkManager, 4 - iterationsLeft), "Failed validation of persisted pooled objects!");
+
+                // Spawn 1 NetworkObject per NetworkManager with the NetworkManager's client being the owner
+                var networkManagerToSpawn = m_DistributedAuthority ? networkManager : m_ServerNetworkManager;
+                var objectToSpawn = PrefabInstanceHandler.GetInstanceToSpawn(networkManagerToSpawn);
+                objectToSpawn.NetworkManagerOwner = networkManagerToSpawn;
+                objectToSpawn.SpawnWithOwnership(networkManager.LocalClientId);
+                m_SpawnedObjects.Add(objectToSpawn);
+            }
+
+            // Conditional wait for all clients to spawn all objects
+            bool AllInstancesSpawnedOnAllCLients()
+            {
+                foreach (var spawnedObject in m_SpawnedObjects)
+                {
+                    foreach (var networkManager in m_NetworkManagers)
+                    {
+                        if (!networkManager.SpawnManager.SpawnedObjects.ContainsKey(spawnedObject.NetworkObjectId))
+                        {
+                            return false;
+                        }
+                    }
+                }
+                return true;
+            }
+
+            // Wait for all clients to locally clone and spawn all spawned NetworkObjects
+            yield return WaitForConditionOrTimeOut(AllInstancesSpawnedOnAllCLients);
+            AssertOnTimeout($"Failed to spawn all instances on all clients!");
+
+            // Wait for the continually decreasing waitPeriod to validate that
+            // NetworkVariableBase has reset the last update time.
+            yield return new WaitForSeconds(waitPeriod);
+
+            // Have the owner of each spawned NetworkObject assign a new NetworkVariable
+            foreach (var spawnedObject in m_SpawnedObjects)
+            {
+                var testBehaviour = spawnedObject.GetComponent<TestBehaviour>();
+                if (!m_DistributedAuthority)
+                {
+                    var client = m_NetworkManagers.Where((c) => c.LocalClientId == testBehaviour.OwnerClientId).First();
+                    testBehaviour = client.SpawnManager.SpawnedObjects[testBehaviour.NetworkObjectId].GetComponent<TestBehaviour>();
+                }
+                testBehaviour.TestNetworkVariable.Value = Random.Range(0, 1000);
+            }
+
+            // Wait for half of the base time before checking to see if the time delta is within the acceptable range.
+            // The time delta is the time from spawn to when the value changes. Each iteration of this test decreases
+            // the total wait period, and so the delta should always be less than the wait period plus the base wait time.
+            yield return new WaitForSeconds(baseWaitTime * 0.5f);
+
+            // Conditional to verify the time delta between spawn and the NetworkVariable being updated is within the
+            // expected range
+            bool AllSpawnedObjectsUpdatedWithinTimeSpan()
+            {
+                foreach (var spawnedObject in m_SpawnedObjects)
+                {
+                    foreach (var networkManager in m_NetworkManagers)
+                    {
+                        if (spawnedObject.OwnerClientId == networkManager.LocalClientId)
+                        {
+                            continue;
+                        }
+                        if (!networkManager.SpawnManager.SpawnedObjects.ContainsKey(spawnedObject.NetworkObjectId))
+                        {
+                            return false;
+                        }
+                        var instance = networkManager.SpawnManager.SpawnedObjects[spawnedObject.NetworkObjectId].GetComponent<TestBehaviour>();
+                        // Check to make sure all clients' delta between updates is not greater than the wait period plus the baseWaitTime.
+                        // Ignore the first iteration as that becomes our baseline.
+                        if (iterationsLeft < 4 && instance.LastUpdateDelta >= (waitPeriod + baseWaitTime))
+                        {
+                            VerboseDebug($"Last Spawn Delta = {instance.LastUpdateDelta} is greater or equal to {waitPeriod + baseWaitTime}");
+                            return false;
+                        }
+                    }
+                }
+                return true;
+            }
+
+            yield return WaitForConditionOrTimeOut(AllSpawnedObjectsUpdatedWithinTimeSpan);
+            AssertOnTimeout($"Failed to reset NetworkVariableBase instances!");
+        }
+
+
+        protected override IEnumerator OnTearDown()
+        {
+            m_NetworkManagers.Clear();
+            m_SpawnedObjects.Clear();
+            PrefabInstanceHandler.ReleaseAll();
+            yield return base.OnTearDown();
+        }
+
+        protected override void OnOneTimeTearDown()
+        {
+            Object.DestroyImmediate(s_NetworkPrefab);
+            s_NetworkPrefab = null;
+            PrefabInstanceHandler.ReleaseAll(true);
+            base.OnOneTimeTearDown();
+        }
+
+        /// <summary>
+        /// Test NetworkBehaviour that updates a NetworkVariable and tracks the time between
+        /// spawn and when the NetworkVariable is updated.
+        /// </summary>
+        public class TestBehaviour : NetworkBehaviour
+        {
+            public NetworkVariable<int> TestNetworkVariable = new NetworkVariable<int>(default, NetworkVariableReadPermission.Everyone, NetworkVariableWritePermission.Owner);
+
+            public float LastUpdateDelta { get; private set; }
+            private float m_TimeSinceLastUpdate = 0.0f;
+
+            // How many times has this instance been spawned.
+            public int SpawnedCount { get; private set; }
+
+            public override void OnNetworkSpawn()
+            {
+                SpawnedCount++;
+                if (IsOwner)
+                {
+                    TestNetworkVariable.Value = 0;
+                }
+                base.OnNetworkSpawn();
+            }
+
+            protected override void OnNetworkPostSpawn()
+            {
+                if (!IsOwner)
+                {
+                    TestNetworkVariable.OnValueChanged += OnTestValueChanged;
+                }
+                m_TimeSinceLastUpdate = Time.realtimeSinceStartup;
+                base.OnNetworkPostSpawn();
+            }
+
+            public override void OnDestroy()
+            {
+                base.OnDestroy();
+            }
+
+            public override void OnNetworkDespawn()
+            {
+                TestNetworkVariable.OnValueChanged -= OnTestValueChanged;
+                LastUpdateDelta = 0.0f;
+                base.OnNetworkDespawn();
+            }
+
+            private void OnTestValueChanged(int previous, int current)
+            {
+                LastUpdateDelta = Time.realtimeSinceStartup - m_TimeSinceLastUpdate;
+            }
+        }
+
+        /// <summary>
+        /// Creates a specified number of instances that persist throughout the entire test session
+        /// and will only be destroyed/released during the OneTimeTeardown
+        /// </summary>
+        public class PrefabInstanceHandler : INetworkPrefabInstanceHandler
+        {
+            private static Dictionary<NetworkManager, PrefabInstanceHandler> s_AssignedInstances = new Dictionary<NetworkManager, PrefabInstanceHandler>();
+            private static Queue<PrefabInstanceHandler> s_PrefabInstanceHandlers = new Queue<PrefabInstanceHandler>();
+            public Queue<GameObject> PrefabInstances = new Queue<GameObject>();
+            private GameObject m_NetworkPrefab;
+            private NetworkManager m_NetworkManager;
+            private ulong m_AssignedClientId;
+
+            public static void OneTimeSetup(int numberOfInstances, GameObject prefabInstance)
+            {
+                for (int i = 0; i < numberOfInstances; i++)
+                {
+                    s_PrefabInstanceHandlers.Enqueue(new PrefabInstanceHandler(prefabInstance));
+                }
+            }
+
+            /// <summary>
+            /// Invoke when <see cref="NetworkManager"/>s are created but not started.
+            /// </summary>
+            /// <param name="networkManager">The <see cref="NetworkManager"/> instance to assign a handler to. Must not be null and must not already have a handler assigned.</param>
+            public static void AssignHandler(NetworkManager networkManager)
+            {
+                if (s_PrefabInstanceHandlers.Count > 0)
+                {
+                    var instance = s_PrefabInstanceHandlers.Dequeue();
+                    instance.Initialize(networkManager);
+                    s_AssignedInstances.Add(networkManager, instance);
+                }
+                else
+                {
+                    Debug.LogError($"[{nameof(PrefabInstanceHandler)}] Exhausted total number of instances available!");
+                }
+            }
+
+            public static NetworkObject GetInstanceToSpawn(NetworkManager networkManager)
+            {
+                if (s_AssignedInstances.ContainsKey(networkManager))
+                {
+                    return s_AssignedInstances[networkManager].GetInstance();
+                }
+                return null;
+            }
+
+
+            public static bool ValidatePersistedInstances(NetworkManager networkManager, int minCount)
+            {
+                if (s_AssignedInstances.ContainsKey(networkManager))
+                {
+                    var prefabInstanceHandler = s_AssignedInstances[networkManager];
+                    return prefabInstanceHandler.ValidateInstanceSpawnCount(minCount);
+                }
+                return false;
+            }
+
+            /// <summary>
+            /// Releases back to the queue and if destroy is true it will completely
+            /// remove all references so they are cleaned up when
+            /// </summary>
+            /// <param name="destroy">If true, completely removes all references and cleans up instances. If false, returns handlers to the queue for reuse.</param>
+            public static void ReleaseAll(bool destroy = false)
+            {
+                foreach (var entry in s_AssignedInstances)
+                {
+                    entry.Value.DeregisterHandler();
+                    if (!destroy)
+                    {
+                        s_PrefabInstanceHandlers.Enqueue(entry.Value);
+                    }
+                    else if (entry.Value.PrefabInstances.Count > 0)
+                    {
+                        entry.Value.CleanInstances();
+                    }
+                }
+                s_AssignedInstances.Clear();
+
+                if (destroy)
+                {
+                    while (s_PrefabInstanceHandlers.Count > 0)
+                    {
+                        s_PrefabInstanceHandlers.Dequeue();
+                    }
+                }
+            }
+
+            public PrefabInstanceHandler(GameObject gameObject)
+            {
+                m_NetworkPrefab = gameObject;
+            }
+
+
+            public void Initialize(NetworkManager networkManager)
+            {
+                m_NetworkManager = networkManager;
+                networkManager.PrefabHandler.AddHandler(m_NetworkPrefab, this);
+            }
+
+            /// <summary>
+            /// This validates that the instances persisted to the next test set and persisted
+            /// between network sessions
+            /// </summary>
+            public bool ValidateInstanceSpawnCount(int minCount)
+            {
+                // First pass we should have no instances
+                if (minCount == 0)
+                {
+                    return PrefabInstances.Count == 0;
+                }
+                else
+                {
+                    foreach (var instance in PrefabInstances)
+                    {
+                        var testBehaviour = instance.GetComponent<TestBehaviour>();
+                        if (testBehaviour.SpawnedCount < minCount)
+                        {
+                            return false;
+                        }
+                    }
+                }
+                return true;
+            }
+
+            /// <summary>
+            /// When we are done with all tests, we finally destroy the persisted objects
+            /// </summary>
+            public void CleanInstances()
+            {
+                while (PrefabInstances.Count > 0)
+                {
+                    var instance = PrefabInstances.Dequeue();
+                    Object.DestroyImmediate(instance);
+                }
+            }
+
+            public void DeregisterHandler()
+            {
+                if (m_NetworkManager != null && m_NetworkManager.PrefabHandler != null)
+                {
+                    m_NetworkManager.PrefabHandler.RemoveHandler(m_NetworkPrefab);
+                }
+            }
+
+            public NetworkObject GetInstance()
+            {
+                var instanceToReturn = (NetworkObject)null;
+                if (PrefabInstances.Count == 0)
+                {
+                    instanceToReturn = Object.Instantiate(m_NetworkPrefab).GetComponent<NetworkObject>();
+                    instanceToReturn.SetSceneObjectStatus(false);
+                    instanceToReturn.gameObject.SetActive(true);
+                }
+                else
+                {
+                    instanceToReturn = PrefabInstances.Dequeue().GetComponent<NetworkObject>();
+                    instanceToReturn.gameObject.SetActive(true);
+                    SceneManager.MoveGameObjectToScene(instanceToReturn.gameObject, SceneManager.GetActiveScene());
+                }
+                return instanceToReturn;
+            }
+
+            public NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaternion rotation)
+            {
+                return GetInstance();
+            }
+
+            public void Destroy(NetworkObject networkObject)
+            {
+                if (m_NetworkPrefab != null && m_NetworkPrefab.gameObject == networkObject.gameObject)
+                {
+                    return;
+                }
+                Object.DontDestroyOnLoad(networkObject.gameObject);
+                networkObject.gameObject.SetActive(false);
+                PrefabInstances.Enqueue(networkObject.gameObject);
+            }
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableBaseInitializesWhenPersisted.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableBaseInitializesWhenPersisted.cs.meta
new file mode 100644
index 0000000000..160261ff3a
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableBaseInitializesWhenPersisted.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 3f68143136bcd1643a564952c2d48e2c
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableCollectionsTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableCollectionsTests.cs
similarity index 76%
rename from com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableCollectionsTests.cs
rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableCollectionsTests.cs
index 7d7e785575..3276b3d3df 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableCollectionsTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableCollectionsTests.cs
@@ -5,12 +5,14 @@
 using System.Text;
 using NUnit.Framework;
 using Unity.Netcode.TestHelpers.Runtime;
+using UnityEngine;
 using UnityEngine.TestTools;
 using Random = UnityEngine.Random;
 
 namespace Unity.Netcode.RuntimeTests
 {
     /// <summary>
+    /// Client-Server only test
     /// Validates using managed collections with NetworkVariable.
     /// Managed Collections Tested:
     /// - List
@@ -19,23 +21,22 @@ namespace Unity.Netcode.RuntimeTests
     /// This also does some testing on nested collections, but does
     /// not test every possible combination.
     /// </summary>
-    [TestFixture(HostOrServer.Host, CollectionTypes.List)]
-    [TestFixture(HostOrServer.Server, CollectionTypes.List)]
+    [TestFixture(HostOrServer.Host)]
+    [TestFixture(HostOrServer.Server)]
     public class NetworkVariableCollectionsTests : NetcodeIntegrationTest
     {
-        public enum CollectionTypes
-        {
-            Dictionary,
-            List,
-        }
-
         protected override int NumberOfClients => 2;
 
-        private CollectionTypes m_CollectionType;
+        private bool m_EnableDebug;
 
-        public NetworkVariableCollectionsTests(HostOrServer hostOrServer, CollectionTypes collectionType) : base(hostOrServer)
+        public NetworkVariableCollectionsTests(HostOrServer hostOrServer) : base(hostOrServer)
         {
-            m_CollectionType = collectionType;
+            m_EnableDebug = false;
+        }
+
+        protected override bool OnSetVerboseDebug()
+        {
+            return m_EnableDebug;
         }
 
         protected override IEnumerator OnSetup()
@@ -50,15 +51,21 @@ protected override IEnumerator OnSetup()
             return base.OnSetup();
         }
 
+        private void AddPlayerComponent<T>() where T : ListTestHelperBase
+        {
+            var component = m_PlayerPrefab.AddComponent<T>();
+            component.SetDebugMode(m_EnableDebug);
+        }
+
         protected override void OnCreatePlayerPrefab()
         {
-            m_PlayerPrefab.AddComponent<ListTestHelperInt>();
-            m_PlayerPrefab.AddComponent<ListTestHelperListInt>();
-            m_PlayerPrefab.AddComponent<ListTestHelperSerializableObject>();
-            m_PlayerPrefab.AddComponent<ListTestHelperListSerializableObject>();
-            m_PlayerPrefab.AddComponent<DictionaryTestHelper>();
-            m_PlayerPrefab.AddComponent<NestedDictionaryTestHelper>();
-            m_PlayerPrefab.AddComponent<HashSetBaseTypeTestHelper>();
+            AddPlayerComponent<ListTestHelperInt>();
+            AddPlayerComponent<ListTestHelperListInt>();
+            AddPlayerComponent<ListTestHelperSerializableObject>();
+            AddPlayerComponent<ListTestHelperListSerializableObject>();
+            AddPlayerComponent<DictionaryTestHelper>();
+            AddPlayerComponent<NestedDictionaryTestHelper>();
+            AddPlayerComponent<HashSetBaseTypeTestHelper>();
             base.OnCreatePlayerPrefab();
         }
 
@@ -90,6 +97,7 @@ public IEnumerator TestListBuiltInTypeCollections()
             {
                 ///////////////////////////////////////////////////////////////////////////
                 // List<int> Single dimension list
+
                 compInt = client.LocalClient.PlayerObject.GetComponent<ListTestHelperInt>();
                 compIntServer = m_PlayerNetworkObjects[NetworkManager.ServerClientId][client.LocalClientId].GetComponent<ListTestHelperInt>();
                 yield return WaitForConditionOrTimeOut(() => compInt.ValidateInstances());
@@ -99,16 +107,34 @@ public IEnumerator TestListBuiltInTypeCollections()
                 AssertOnTimeout($"[Server] Not all instances of client-{compIntServer.OwnerClientId}'s {nameof(ListTestHelperInt)} {compIntServer.name} component match!");
                 var randomInt = Random.Range(int.MinValue, int.MaxValue);
 
+                // Only test restore on non-host clients (otherwise a host is both server and client/owner)
+                if (!client.IsServer)
+                {
+                    //////////////////////////////////
+                    // No Write Owner Add Int
+                    compIntServer.Add(randomInt, ListTestHelperBase.Targets.Owner);
+                }
+
                 //////////////////////////////////
                 // Owner Add int
                 compInt.Add(randomInt, ListTestHelperBase.Targets.Owner);
                 yield return WaitForConditionOrTimeOut(() => compInt.CompareTrackedChanges(ListTestHelperBase.Targets.Owner));
                 AssertOnTimeout($"Client-{client.LocalClientId} add failed to synchronize on {nameof(ListTestHelperInt)} {compInt.name}!");
+
+                // Only test restore on non-host clients (otherwise a host is both server and client/owner)
+                if (!client.IsServer)
+                {
+                    //////////////////////////////////
+                    // No Write Server Add Int
+                    compInt.Add(randomInt, ListTestHelperBase.Targets.Server);
+                }
+
                 //////////////////////////////////
                 // Server Add int
                 compIntServer.Add(randomInt, ListTestHelperBase.Targets.Server);
                 yield return WaitForConditionOrTimeOut(() => compIntServer.CompareTrackedChanges(ListTestHelperBase.Targets.Server));
                 AssertOnTimeout($"Server add failed to synchronize on {nameof(ListTestHelperInt)} {compIntServer.name}!");
+
                 //////////////////////////////////
                 // Owner Remove int
                 var index = Random.Range(0, compInt.ListCollectionOwner.Value.Count - 1);
@@ -131,12 +157,39 @@ public IEnumerator TestListBuiltInTypeCollections()
                 ////////////////////////////////////
                 // Owner Change int
                 var valueIntChange = Random.Range(int.MinValue, int.MaxValue);
+
+                // Only test restore on non-host clients (otherwise a host is both server and client/owner)
+                if (!client.IsServer)
+                {
+                    // No Write Server Change int with IsDirty restore
+                    compIntServer.ListCollectionOwner.Value[index] = valueIntChange;
+                    compIntServer.ListCollectionOwner.IsDirty();
+                    yield return WaitForConditionOrTimeOut(() => compIntServer.CompareTrackedChanges(ListTestHelperBase.Targets.Owner));
+                    AssertOnTimeout($"Server change failed to restore on {nameof(ListTestHelperInt)} {compInt.name}!");
+
+                    // No Write Server Change int with owner state update override
+                    compIntServer.ListCollectionOwner.Value[index] = valueIntChange;
+                }
                 compInt.ListCollectionOwner.Value[index] = valueIntChange;
                 compInt.ListCollectionOwner.CheckDirtyState();
                 yield return WaitForConditionOrTimeOut(() => compInt.CompareTrackedChanges(ListTestHelperBase.Targets.Owner));
                 AssertOnTimeout($"Client-{client.LocalClientId} change failed to synchronize on {nameof(ListTestHelperInt)} {compInt.name}!");
+
                 //////////////////////////////////
                 // Server Change int
+
+                // Only test restore on non-host clients (otherwise a host is both server and client/owner)
+                if (!client.IsServer)
+                {
+                    // No Write Client Change int with IsDirty restore
+                    compInt.ListCollectionServer.Value[index] = valueIntChange;
+                    compInt.ListCollectionServer.IsDirty();
+                    yield return WaitForConditionOrTimeOut(() => compInt.CompareTrackedChanges(ListTestHelperBase.Targets.Server));
+                    AssertOnTimeout($"Client-{client.LocalClientId} change failed to restore on {nameof(ListTestHelperInt)} {compInt.name}!");
+
+                    // No Write Client Change int with owner state update override
+                    compInt.ListCollectionServer.Value[index] = valueIntChange;
+                }
                 compIntServer.ListCollectionServer.Value[index] = valueIntChange;
                 compIntServer.ListCollectionServer.CheckDirtyState();
                 yield return WaitForConditionOrTimeOut(() => compIntServer.CompareTrackedChanges(ListTestHelperBase.Targets.Server));
@@ -165,7 +218,7 @@ public IEnumerator TestListBuiltInTypeCollections()
                 yield return WaitForConditionOrTimeOut(() => compInt.CompareTrackedChanges(ListTestHelperBase.Targets.Owner));
                 AssertOnTimeout($"Client-{client.LocalClientId} full set failed to synchronize on {nameof(ListTestHelperInt)} {compInt.name}!");
                 //////////////////////////////////
-                // Server Full Set    
+                // Server Full Set
                 compIntServer.FullSet(GetRandomIntList(5), ListTestHelperBase.Targets.Server);
                 yield return WaitForConditionOrTimeOut(() => compIntServer.CompareTrackedChanges(ListTestHelperBase.Targets.Server));
                 AssertOnTimeout($"Server full set failed to synchronize on {nameof(ListTestHelperInt)} {compIntServer.name}!");
@@ -211,13 +264,36 @@ public IEnumerator TestListBuiltInTypeCollections()
                 //////////////////////////////////
                 // Owner Remove List<int> item
                 index = Random.Range(0, compListInt.ListCollectionOwner.Value.Count - 1);
+
+                // Only test restore on non-host clients (otherwise a host is both server and client/owner)
+                if (!client.IsServer)
+                {
+                    compListIntServer.ListCollectionOwner.Value.Remove(compListIntServer.ListCollectionOwner.Value[index]);
+                    compListIntServer.ListCollectionOwner.IsDirty();
+                    yield return WaitForConditionOrTimeOut(() => compIntServer.CompareTrackedChanges(ListTestHelperBase.Targets.Owner));
+                    AssertOnTimeout($"Server remove failed to restore on {nameof(ListTestHelperListInt)} {compListIntServer.name}! {compListIntServer.GetLog()}");
+                    // No Write Server Remove List<int> item with update restore
+                    compListIntServer.ListCollectionOwner.Value.Remove(compListIntServer.ListCollectionOwner.Value[index]);
+                }
                 compListInt.Remove(compListInt.ListCollectionOwner.Value[index], ListTestHelperBase.Targets.Owner);
                 yield return WaitForConditionOrTimeOut(() => compInt.CompareTrackedChanges(ListTestHelperBase.Targets.Owner));
                 AssertOnTimeout($"Client-{client.LocalClientId} remove failed to synchronize on {nameof(ListTestHelperListInt)} {compListInt.name}! {compListInt.GetLog()}");
+
                 //////////////////////////////////
                 // Server Remove List<int> item
                 index = Random.Range(0, compListIntServer.ListCollectionServer.Value.Count - 1);
-                compListIntServer.Remove(compListIntServer.ListCollectionServer.Value[index], ListTestHelperBase.Targets.Owner);
+                // Only test restore on non-host clients (otherwise a host is both server and client/owner)
+                if (!client.IsServer)
+                {
+                    // No Write Client Remove List<int> item with CheckDirtyState restore
+                    compListInt.Remove(compListInt.ListCollectionServer.Value[index], ListTestHelperBase.Targets.Server);
+                    yield return WaitForConditionOrTimeOut(() => compListInt.CompareTrackedChanges(ListTestHelperBase.Targets.Server));
+                    AssertOnTimeout($"Client-{client.LocalClientId} remove failed to restore on {nameof(ListTestHelperListInt)} {compListIntServer.name}! {compListIntServer.GetLog()}");
+
+                    // No Write Client Remove List<int> item with update restore
+                    compListInt.Remove(compListInt.ListCollectionServer.Value[index], ListTestHelperBase.Targets.Server);
+                }
+                compListIntServer.Remove(compListIntServer.ListCollectionServer.Value[index], ListTestHelperBase.Targets.Server);
                 yield return WaitForConditionOrTimeOut(() => compListIntServer.CompareTrackedChanges(ListTestHelperBase.Targets.Server));
                 AssertOnTimeout($"Server remove failed to synchronize on {nameof(ListTestHelperListInt)} {compListIntServer.name}! {compListIntServer.GetLog()}");
 
@@ -370,12 +446,37 @@ public IEnumerator TestListSerializableObjectCollections()
 
                 ////////////////////////////////////
                 // Owner Change SerializableObject
+
+                // Only test restore on non-host clients (otherwise a host is both server and client/owner)
+                if (!client.IsServer)
+                {
+                    // No Write Server Remove Serializable item with IsDirty restore
+                    compObjectServer.ListCollectionOwner.Value[index] = SerializableObject.GetRandomObject();
+                    compObjectServer.ListCollectionOwner.IsDirty();
+                    yield return WaitForConditionOrTimeOut(() => compObjectServer.CompareTrackedChanges(ListTestHelperBase.Targets.Owner));
+                    AssertOnTimeout($"Server change failed to restore on {nameof(ListTestHelperSerializableObject)} {compObjectServer.name}!");
+
+                    // No Write Server Remove Serializable item with owner state update restore
+                    compObjectServer.ListCollectionOwner.Value[index] = SerializableObject.GetRandomObject();
+                }
                 compObject.ListCollectionOwner.Value[index] = SerializableObject.GetRandomObject();
                 compObject.ListCollectionOwner.CheckDirtyState();
                 yield return WaitForConditionOrTimeOut(() => compObject.CompareTrackedChanges(ListTestHelperBase.Targets.Owner));
                 AssertOnTimeout($"Client-{client.LocalClientId} change failed to synchronize on {nameof(ListTestHelperSerializableObject)} {compObject.name}!");
                 //////////////////////////////////
                 // Server Change SerializableObject
+                // Only test restore on non-host clients (otherwise a host is both server and client/owner)
+                if (!client.IsServer)
+                {
+                    // No Write Client Remove Serializable item with IsDirty restore
+                    compObject.ListCollectionServer.Value[index] = SerializableObject.GetRandomObject();
+                    compObject.ListCollectionServer.IsDirty();
+                    yield return WaitForConditionOrTimeOut(() => compObjectServer.CompareTrackedChanges(ListTestHelperBase.Targets.Server));
+                    AssertOnTimeout($"Client-{client.LocalClientId} change failed to restore on {nameof(ListTestHelperSerializableObject)} {compObjectServer.name}!");
+
+                    // No Write Client Remove Serializable item with owner state update restore
+                    compObject.ListCollectionServer.Value[index] = SerializableObject.GetRandomObject();
+                }
                 compObjectServer.ListCollectionServer.Value[index] = SerializableObject.GetRandomObject();
                 compObjectServer.ListCollectionServer.CheckDirtyState();
                 yield return WaitForConditionOrTimeOut(() => compObjectServer.CompareTrackedChanges(ListTestHelperBase.Targets.Server));
@@ -427,7 +528,7 @@ public IEnumerator TestListSerializableObjectCollections()
                 AssertOnTimeout($"[Server] Not all instances of client-{compObjectServer.OwnerClientId}'s {nameof(ListTestHelperSerializableObject)} {compObjectServer.name} component match!");
 
                 ///////////////////////////////////////////////////////////////////////////
-                // List<List<int>> Nested List Validation
+                // List<List<INetworkSerializable>> Nested List Validation
                 compListObject = client.LocalClient.PlayerObject.GetComponent<ListTestHelperListSerializableObject>();
                 compListObjectServer = m_PlayerNetworkObjects[NetworkManager.ServerClientId][client.LocalClientId].GetComponent<ListTestHelperListSerializableObject>();
                 yield return WaitForConditionOrTimeOut(() => compListObject.ValidateInstances());
@@ -437,24 +538,24 @@ public IEnumerator TestListSerializableObjectCollections()
                 AssertOnTimeout($"[Server] Not all instances of client-{compListObjectServer.OwnerClientId}'s {nameof(ListTestHelperListSerializableObject)} {compListObjectServer.name} component match! {compListObjectServer.GetLog()}");
 
                 //////////////////////////////////
-                // Owner Add List<int> item
+                // Owner Add List<INetworkSerializable> item
                 compListObject.Add(SerializableObject.GetListOfRandomObjects(5), ListTestHelperBase.Targets.Owner);
                 yield return WaitForConditionOrTimeOut(() => compListObject.CompareTrackedChanges(ListTestHelperBase.Targets.Owner));
                 AssertOnTimeout($"Client-{client.LocalClientId} add failed to synchronize on {nameof(ListTestHelperListSerializableObject)} {compListObject.name}! {compListObject.GetLog()}");
                 //////////////////////////////////
-                // Server Add List<int> item
+                // Server Add List<INetworkSerializable> item
                 compListObjectServer.Add(SerializableObject.GetListOfRandomObjects(5), ListTestHelperBase.Targets.Server);
                 yield return WaitForConditionOrTimeOut(() => compListObjectServer.CompareTrackedChanges(ListTestHelperBase.Targets.Server));
                 AssertOnTimeout($"Server add failed to synchronize on {nameof(ListTestHelperListSerializableObject)} {compListObjectServer.name}! {compListObjectServer.GetLog()}");
 
                 //////////////////////////////////
-                // Owner Remove List<int> item
+                // Owner Remove List<INetworkSerializable> item
                 index = Random.Range(0, compListObject.ListCollectionOwner.Value.Count - 1);
                 compListObject.Remove(compListObject.ListCollectionOwner.Value[index], ListTestHelperBase.Targets.Owner);
                 yield return WaitForConditionOrTimeOut(() => compListObject.CompareTrackedChanges(ListTestHelperBase.Targets.Owner));
                 AssertOnTimeout($"Client-{client.LocalClientId} remove failed to synchronize on {nameof(ListTestHelperListSerializableObject)} {compListObject.name}! {compListObject.GetLog()}");
                 //////////////////////////////////
-                // Server Remove List<int> item
+                // Server Remove List<INetworkSerializable> item
                 index = Random.Range(0, compListObjectServer.ListCollectionServer.Value.Count - 1);
                 compListObjectServer.Remove(compListObjectServer.ListCollectionServer.Value[index], ListTestHelperBase.Targets.Owner);
                 yield return WaitForConditionOrTimeOut(() => compListObjectServer.CompareTrackedChanges(ListTestHelperBase.Targets.Server));
@@ -468,7 +569,7 @@ public IEnumerator TestListSerializableObjectCollections()
                 AssertOnTimeout($"[Server] Not all instances of client-{compListObjectServer.OwnerClientId}'s {nameof(ListTestHelperListSerializableObject)} {compListObjectServer.name} component match! {compListObjectServer.GetLog()}");
 
                 ////////////////////////////////////
-                // Owner Change List<int> item
+                // Owner Change List<INetworkSerializable> item
                 index = Random.Range(0, compListObject.ListCollectionOwner.Value.Count - 1);
                 compListObject.ListCollectionOwner.Value[index] = SerializableObject.GetListOfRandomObjects(5);
                 compListObject.ListCollectionOwner.CheckDirtyState();
@@ -477,7 +578,7 @@ public IEnumerator TestListSerializableObjectCollections()
                 AssertOnTimeout($"Client-{client.LocalClientId} change index ({index}) failed to synchronize on {nameof(ListTestHelperListSerializableObject)} {compListObject.name}! {compListObject.GetLog()}");
 
                 //////////////////////////////////
-                // Server Change List<int> item
+                // Server Change List<INetworkSerializable> item
                 index = Random.Range(0, compListObjectServer.ListCollectionServer.Value.Count - 1);
                 compListObjectServer.ListCollectionServer.Value[index] = SerializableObject.GetListOfRandomObjects(5);
                 compListObjectServer.ListCollectionServer.CheckDirtyState();
@@ -486,12 +587,12 @@ public IEnumerator TestListSerializableObjectCollections()
                 AssertOnTimeout($"Server change failed to synchronize on {nameof(ListTestHelperListSerializableObject)} {compListObjectServer.name}! {compListObjectServer.GetLog()}");
 
                 ////////////////////////////////////
-                // Owner Add Range of List<int> items
+                // Owner Add Range of List<INetworkSerializable> items
                 compListObject.AddRange(SerializableObject.GetListOfListOfRandomObjects(5, 5), ListTestHelperBase.Targets.Owner);
                 yield return WaitForConditionOrTimeOut(() => compListObject.CompareTrackedChanges(ListTestHelperBase.Targets.Owner));
                 AssertOnTimeout($"Client-{client.LocalClientId} add range failed to synchronize on {nameof(ListTestHelperListSerializableObject)} {compListObject.name}! {compListObject.GetLog()}");
                 //////////////////////////////////
-                // Server Add Range of List<int> items
+                // Server Add Range of List<INetworkSerializable> items
                 compListObjectServer.AddRange(SerializableObject.GetListOfListOfRandomObjects(5, 5), ListTestHelperBase.Targets.Server);
                 yield return WaitForConditionOrTimeOut(() => compListObjectServer.CompareTrackedChanges(ListTestHelperBase.Targets.Server));
                 AssertOnTimeout($"Server add range failed to synchronize on {nameof(ListTestHelperListSerializableObject)} {compListObjectServer.name}! {compListObjectServer.GetLog()}");
@@ -503,23 +604,46 @@ public IEnumerator TestListSerializableObjectCollections()
                 AssertOnTimeout($"[Server] Not all instances of client-{compListObjectServer.OwnerClientId}'s {nameof(ListTestHelperListSerializableObject)} {compListObjectServer.name} component match!");
 
                 ////////////////////////////////////
-                // Owner Full Set List<List<int>>
+                // Owner Full Set List<List<INetworkSerializable>>
                 compListObject.FullSet(SerializableObject.GetListOfListOfRandomObjects(5, 5), ListTestHelperBase.Targets.Owner);
                 yield return WaitForConditionOrTimeOut(() => compListObject.CompareTrackedChanges(ListTestHelperBase.Targets.Owner));
                 AssertOnTimeout($"Client-{client.LocalClientId} full set failed to synchronize on {nameof(ListTestHelperListSerializableObject)} {compListObject.name}!");
                 //////////////////////////////////
-                // Server Full Set List<List<int>>
+                // Server Full Set List<List<INetworkSerializable>>
                 compListObjectServer.FullSet(SerializableObject.GetListOfListOfRandomObjects(5, 5), ListTestHelperBase.Targets.Server);
                 yield return WaitForConditionOrTimeOut(() => compListObjectServer.CompareTrackedChanges(ListTestHelperBase.Targets.Server));
                 AssertOnTimeout($"Server full set failed to synchronize on {nameof(ListTestHelperListSerializableObject)} {compListObjectServer.name}!");
 
                 ////////////////////////////////////
-                // Owner Clear List<List<int>>
+                // Owner Clear List<List<INetworkSerializable>>
+                // Only test restore on non-host clients (otherwise a host is both server and client/owner)
+                if (!client.IsServer)
+                {
+                    // Server Clear List<List<INetworkSerializable>> with IsDirty restore
+                    compListObjectServer.ListCollectionOwner.Value.Clear();
+                    compListObjectServer.ListCollectionOwner.IsDirty();
+                    yield return WaitForConditionOrTimeOut(() => compListObjectServer.CompareTrackedChanges(ListTestHelperBase.Targets.Owner));
+                    AssertOnTimeout($"Server clear owner collection failed to restore back to last known valid state on {nameof(ListTestHelperListSerializableObject)} {compListObject.name}!");
+                    // Server Clear List<List<INetworkSerializable>> with update state restore
+                    compListObjectServer.ListCollectionOwner.Value.Clear();
+                }
                 compListObject.Clear(ListTestHelperBase.Targets.Owner);
                 yield return WaitForConditionOrTimeOut(() => compListObject.CompareTrackedChanges(ListTestHelperBase.Targets.Owner));
                 AssertOnTimeout($"Client-{client.LocalClientId} clear failed to synchronize on {nameof(ListTestHelperListSerializableObject)} {compListObject.name}!");
                 //////////////////////////////////
-                // Server Clear List<List<int>>
+                // Server Clear List<List<INetworkSerializable>>
+                // Only test restore on non-host clients (otherwise a host is both server and client/owner)
+                if (!client.IsServer)
+                {
+                    // Client Clear List<List<INetworkSerializable>> with IsDirty restore
+                    compListObject.ListCollectionServer.Value.Clear();
+                    compListObject.ListCollectionServer.IsDirty();
+                    yield return WaitForConditionOrTimeOut(() => compListObject.CompareTrackedChanges(ListTestHelperBase.Targets.Server));
+                    AssertOnTimeout($"Client clear owner collection failed to restore back to last known valid state on {nameof(ListTestHelperListSerializableObject)} {compListObject.name}!");
+
+                    // Client Clear List<List<INetworkSerializable>> with update state restore
+                    compListObject.ListCollectionServer.Value.Clear();
+                }
                 compListObjectServer.Clear(ListTestHelperBase.Targets.Server);
                 yield return WaitForConditionOrTimeOut(() => compListObjectServer.CompareTrackedChanges(ListTestHelperBase.Targets.Server));
                 AssertOnTimeout($"Server clear failed to synchronize on {nameof(ListTestHelperListSerializableObject)} {compListObjectServer.name}!");
@@ -539,6 +663,111 @@ private int GetNextKey()
             return m_CurrentKey;
         }
 
+        private int m_Stage;
+
+        private List<NetworkManager> m_Clients;
+
+        private bool m_IsInitialized = false;
+        private StringBuilder m_InitializedStatus = new StringBuilder();
+
+        private IEnumerator ValidateClients(NetworkManager clientBeingTested, bool initialize = false)
+        {
+            VerboseDebug($">>>>>>>>>>>>>>>>>>>>>>>>>[Client-{clientBeingTested.LocalClientId}][{m_Stage}][Validation]<<<<<<<<<<<<<<<<<<<<<<<<< ");
+            m_Stage++;
+            var compDictionary = (DictionaryTestHelper)null;
+            var compDictionaryServer = (DictionaryTestHelper)null;
+            var className = $"{nameof(DictionaryTestHelper)}";
+            var clientsInitialized = new Dictionary<ulong, bool>();
+
+            var validateTimeout = new TimeoutHelper(0.25f);
+
+            foreach (var client in m_Clients)
+            {
+                var ownerInitialized = false;
+                var serverInitialized = false;
+                ///////////////////////////////////////////////////////////////////////////
+                // Dictionary<int, Dictionary<int,SerializableObject>> nested dictionaries
+                compDictionary = client.LocalClient.PlayerObject.GetComponent<DictionaryTestHelper>();
+                compDictionaryServer = m_PlayerNetworkObjects[NetworkManager.ServerClientId][client.LocalClientId].GetComponent<DictionaryTestHelper>();
+                yield return WaitForConditionOrTimeOut(() => compDictionary.ValidateInstances(), validateTimeout);
+                if (initialize)
+                {
+                    if (validateTimeout.HasTimedOut())
+                    {
+                        m_InitializedStatus.AppendLine($"[Client -{client.LocalClientId}][Owner] Failed validation: {compDictionary.GetLog()}");
+                    }
+                    else
+                    {
+                        m_InitializedStatus.AppendLine($"[Client -{client.LocalClientId}][Owner] Passed validation!");
+                    }
+                    ownerInitialized = !validateTimeout.HasTimedOut();
+                }
+                else
+                {
+                    AssertOnTimeout($"[Owner] Not all instances of client-{compDictionary.OwnerClientId}'s {className} {compDictionary.name} component match! {compDictionary.GetLog()}");
+                }
+
+                yield return WaitForConditionOrTimeOut(() => compDictionaryServer.ValidateInstances(), validateTimeout);
+                if (initialize)
+                {
+                    if (validateTimeout.HasTimedOut())
+                    {
+                        m_InitializedStatus.AppendLine($"[Client -{client.LocalClientId}][Server] Failed validation: {compDictionaryServer.GetLog()}");
+                    }
+                    else
+                    {
+                        m_InitializedStatus.AppendLine($"[Client -{client.LocalClientId}][Server] Passed validation!");
+                    }
+                    serverInitialized = !validateTimeout.HasTimedOut();
+                }
+                else
+                {
+                    AssertOnTimeout($"[Server] Not all instances of client-{compDictionaryServer.OwnerClientId}'s {className} {compDictionaryServer.name} component match! {compDictionaryServer.GetLog()}");
+                }
+
+                if (initialize)
+                {
+                    clientsInitialized.Add(client.LocalClientId, ownerInitialized & serverInitialized);
+                }
+            }
+
+            if (initialize)
+            {
+                m_IsInitialized = true;
+                foreach (var entry in clientsInitialized)
+                {
+                    if (!entry.Value)
+                    {
+                        m_IsInitialized = false;
+                        break;
+                    }
+                }
+            }
+        }
+
+        private void ValidateClientsFlat(NetworkManager clientBeingTested)
+        {
+            if (!m_EnableDebug)
+            {
+                return;
+            }
+            VerboseDebug($">>>>>>>>>>>>>>>>>>>>>>>>>[{clientBeingTested.name}][{m_Stage}][Validation]<<<<<<<<<<<<<<<<<<<<<<<<< ");
+            m_Stage++;
+            var compDictionary = (DictionaryTestHelper)null;
+            var compDictionaryServer = (DictionaryTestHelper)null;
+            var className = $"{nameof(DictionaryTestHelper)}";
+            foreach (var client in m_Clients)
+            {
+                ///////////////////////////////////////////////////////////////////////////
+                // Dictionary<int, Dictionary<int,SerializableObject>> nested dictionaries
+                compDictionary = client.LocalClient.PlayerObject.GetComponent<DictionaryTestHelper>();
+                compDictionaryServer = m_PlayerNetworkObjects[NetworkManager.ServerClientId][client.LocalClientId].GetComponent<DictionaryTestHelper>();
+                Assert.True(compDictionary.ValidateInstances(), $"[Owner] Not all instances of client-{compDictionary.OwnerClientId}'s {className} {compDictionary.name} component match! {compDictionary.GetLog()}");
+                Assert.True(compDictionaryServer.ValidateInstances(), $"[Server] Not all instances of client-{compDictionaryServer.OwnerClientId}'s {className} {compDictionaryServer.name} component match! {compDictionaryServer.GetLog()}");
+            }
+        }
+
+
         [UnityTest]
         public IEnumerator TestDictionaryCollections()
         {
@@ -546,15 +775,47 @@ public IEnumerator TestDictionaryCollections()
             var compDictionaryServer = (DictionaryTestHelper)null;
             var className = $"{nameof(DictionaryTestHelper)}";
 
-            var clientList = m_ClientNetworkManagers.ToList();
+            m_Clients = m_ClientNetworkManagers.ToList();
             if (m_ServerNetworkManager.IsHost)
             {
-                clientList.Insert(0, m_ServerNetworkManager);
+                m_Clients.Insert(0, m_ServerNetworkManager);
             }
 
             m_CurrentKey = 1000;
 
-            foreach (var client in clientList)
+            if (m_EnableDebug)
+            {
+                VerboseDebug(">>>>>>>>>>>>>>>>>>>>>>>>>>>>> Init Values <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<");
+                foreach (var client in m_Clients)
+                {
+                    compDictionary = client.LocalClient.PlayerObject.GetComponent<DictionaryTestHelper>();
+                    compDictionary.InitValues();
+                    compDictionaryServer = m_PlayerNetworkObjects[NetworkManager.ServerClientId][client.LocalClientId].GetComponent<DictionaryTestHelper>();
+                    compDictionaryServer.InitValues();
+                }
+                VerboseDebug(">>>>>>>>>>>>>>>>>>>>>>>>>>>>> Init Check <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<");
+                var count = 0;
+                while (count < 3)
+                {
+                    m_InitializedStatus.Clear();
+                    foreach (var client in m_Clients)
+                    {
+                        yield return ValidateClients(client, true);
+                    }
+                    if (m_IsInitialized)
+                    {
+                        break;
+                    }
+                    count++;
+                    m_Stage = 0;
+                }
+
+                Assert.IsTrue(m_IsInitialized, $"Not all clients synchronized properly!\n {m_InitializedStatus.ToString()}");
+                VerboseDebug(m_InitializedStatus.ToString());
+            }
+
+            VerboseDebug(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> BEGIN <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<");
+            foreach (var client in m_Clients)
             {
                 ///////////////////////////////////////////////////////////////////////////
                 // Dictionary<int, Dictionary<int,SerializableObject>> nested dictionaries
@@ -562,18 +823,55 @@ public IEnumerator TestDictionaryCollections()
                 compDictionaryServer = m_PlayerNetworkObjects[NetworkManager.ServerClientId][client.LocalClientId].GetComponent<DictionaryTestHelper>();
                 yield return WaitForConditionOrTimeOut(() => compDictionary.ValidateInstances());
                 AssertOnTimeout($"[Owner] Not all instances of client-{compDictionary.OwnerClientId}'s {className} {compDictionary.name} component match! {compDictionary.GetLog()}");
-
                 yield return WaitForConditionOrTimeOut(() => compDictionaryServer.ValidateInstances());
                 AssertOnTimeout($"[Server] Not all instances of client-{compDictionaryServer.OwnerClientId}'s {className} {compDictionaryServer.name} component match! {compDictionaryServer.GetLog()}");
 
                 //////////////////////////////////
                 // Owner Add SerializableObject Entry
-                compDictionary.Add((GetNextKey(), SerializableObject.GetRandomObject()), ListTestHelperBase.Targets.Owner);
+                var newEntry = (GetNextKey(), SerializableObject.GetRandomObject());
+                // Only test restore on non-host clients (otherwise a host is both server and client/owner)
+                if (!client.IsServer)
+                {
+                    // Server-side add same key and SerializableObject prior to being added to the owner side
+                    compDictionaryServer.ListCollectionOwner.Value.Add(newEntry.Item1, newEntry.Item2);
+                    // Checking if dirty on server side should revert back to origina known current dictionary state
+                    compDictionaryServer.ListCollectionOwner.IsDirty();
+                    yield return WaitForConditionOrTimeOut(() => compDictionaryServer.CompareTrackedChanges(ListTestHelperBase.Targets.Owner));
+                    AssertOnTimeout($"Server add to owner write collection property failed to restore on {className} {compDictionaryServer.name}! {compDictionaryServer.GetLog()}");
+                    // Server-side add the same key and SerializableObject to owner write permission (would throw key exists exception too if previous failed)
+                    compDictionaryServer.ListCollectionOwner.Value.Add(newEntry.Item1, newEntry.Item2);
+                    // Server-side add a completely new key and SerializableObject to to owner write permission property
+                    compDictionaryServer.ListCollectionOwner.Value.Add(GetNextKey(), SerializableObject.GetRandomObject());
+                    // Both should be overridden by the owner-side update
+
+                }
+                VerboseDebug($"[{compDictionary.name}][Owner] Adding Key: {newEntry.Item1}");
+                // Add key and SerializableObject to owner side
+                compDictionary.Add(newEntry, ListTestHelperBase.Targets.Owner);
                 yield return WaitForConditionOrTimeOut(() => compDictionary.CompareTrackedChanges(ListTestHelperBase.Targets.Owner));
                 AssertOnTimeout($"Client-{client.LocalClientId} add failed to synchronize on {className} {compDictionary.name}! {compDictionary.GetLog()}");
+
+                ValidateClientsFlat(client);
                 //////////////////////////////////
                 // Server Add SerializableObject Entry
-                compDictionaryServer.Add((GetNextKey(), SerializableObject.GetRandomObject()), ListTestHelperBase.Targets.Server);
+                newEntry = (GetNextKey(), SerializableObject.GetRandomObject());
+                // Only test restore on non-host clients (otherwise a host is both server and client/owner)
+                if (!client.IsServer)
+                {
+                    // Client-side add same key and SerializableObject to server write permission property
+                    compDictionary.ListCollectionServer.Value.Add(newEntry.Item1, newEntry.Item2);
+                    // Checking if dirty on client side should revert back to origina known current dictionary state
+                    compDictionary.ListCollectionServer.IsDirty();
+                    yield return WaitForConditionOrTimeOut(() => compDictionary.CompareTrackedChanges(ListTestHelperBase.Targets.Server));
+                    AssertOnTimeout($"Client-{client.LocalClientId} add to server write collection property failed to restore on {className} {compDictionary.name}! {compDictionary.GetLog()}");
+                    // Client-side add the same key and SerializableObject to server write permission property (would throw key exists exception too if previous failed)
+                    compDictionary.ListCollectionServer.Value.Add(newEntry.Item1, newEntry.Item2);
+                    // Client-side add a completely new key and SerializableObject to to server write permission property
+                    compDictionary.ListCollectionServer.Value.Add(GetNextKey(), SerializableObject.GetRandomObject());
+                    // Both should be overridden by the server-side update
+                }
+                VerboseDebug($"[{compDictionaryServer.name}][Server] Adding Key: {newEntry.Item1}");
+                compDictionaryServer.Add(newEntry, ListTestHelperBase.Targets.Server);
                 yield return WaitForConditionOrTimeOut(() => compDictionaryServer.CompareTrackedChanges(ListTestHelperBase.Targets.Server));
                 AssertOnTimeout($"Server add failed to synchronize on {className} {compDictionaryServer.name}! {compDictionaryServer.GetLog()}");
                 //////////////////////////////////
@@ -583,10 +881,11 @@ public IEnumerator TestDictionaryCollections()
                 compDictionary.Remove(valueInt, ListTestHelperBase.Targets.Owner);
                 yield return WaitForConditionOrTimeOut(() => compDictionary.CompareTrackedChanges(ListTestHelperBase.Targets.Owner));
                 AssertOnTimeout($"Client-{client.LocalClientId} remove failed to synchronize on {className} {compDictionary.name}! {compDictionary.GetLog()}");
+
                 //////////////////////////////////
                 // Server Remove SerializableObject Entry
-                index = Random.Range(0, compDictionary.ListCollectionOwner.Value.Keys.Count - 1);
-                valueInt = compDictionary.ListCollectionOwner.Value.Keys.ToList()[index];
+                index = Random.Range(0, compDictionary.ListCollectionServer.Value.Keys.Count - 1);
+                valueInt = compDictionary.ListCollectionServer.Value.Keys.ToList()[index];
                 compDictionaryServer.Remove(valueInt, ListTestHelperBase.Targets.Server);
                 yield return WaitForConditionOrTimeOut(() => compDictionaryServer.CompareTrackedChanges(ListTestHelperBase.Targets.Server));
                 AssertOnTimeout($"Server remove failed to synchronize on {className} {compDictionaryServer.name}! {compDictionaryServer.GetLog()}");
@@ -597,41 +896,101 @@ public IEnumerator TestDictionaryCollections()
                 yield return WaitForConditionOrTimeOut(() => compDictionaryServer.ValidateInstances());
                 AssertOnTimeout($"[Server] Not all instances of client-{compDictionaryServer.OwnerClientId}'s {className} {compDictionaryServer.name} component match! {compDictionaryServer.GetLog()}");
 
+                ValidateClientsFlat(client);
                 ////////////////////////////////////
                 // Owner Change SerializableObject Entry
-                index = Random.Range(0, compDictionary.ListCollectionOwner.Value.Keys.Count - 1);
-                valueInt = compDictionary.ListCollectionOwner.Value.Keys.ToList()[index];
-                compDictionary.ListCollectionOwner.Value[valueInt] = SerializableObject.GetRandomObject();
-                compDictionary.ListCollectionOwner.CheckDirtyState();
-                yield return WaitForConditionOrTimeOut(() => compDictionary.CompareTrackedChanges(ListTestHelperBase.Targets.Owner));
-                AssertOnTimeout($"Client-{client.LocalClientId} change failed to synchronize on {className} {compDictionary.name}! {compDictionary.GetLog()}");
+                var randomObject = SerializableObject.GetRandomObject();
+                if (compDictionary.ListCollectionOwner.Value.Keys.Count != 0)
+                {
+                    if (compDictionary.ListCollectionOwner.Value.Keys.Count == 1)
+                    {
+                        index = 0;
+                        valueInt = compDictionary.ListCollectionOwner.Value.Keys.ToList()[0];
+                    }
+                    else
+                    {
+                        index = Random.Range(0, compDictionary.ListCollectionOwner.Value.Keys.Count - 1);
+                        valueInt = compDictionary.ListCollectionOwner.Value.Keys.ToList()[index];
+                    }
+
+                    // Only test restore on non-host clients (otherwise a host is both server and client/owner)
+                    if (!client.IsServer)
+                    {
+                        // Server-side update same key value prior to being updated to the owner side
+                        compDictionaryServer.ListCollectionOwner.Value[valueInt] = randomObject;
+                        // Checking if dirty on server side should revert back to origina known current dictionary state
+                        compDictionaryServer.ListCollectionOwner.IsDirty();
+                        yield return WaitForConditionOrTimeOut(() => compDictionaryServer.CompareTrackedChanges(ListTestHelperBase.Targets.Owner));
+                        AssertOnTimeout($"Server update collection entry value to local owner write collection property failed to restore on {className} {compDictionaryServer.name}! {compDictionaryServer.GetLog()}");
+
+                        // Server-side update same key but with different value prior to being updated to the owner side
+                        compDictionaryServer.ListCollectionOwner.Value[valueInt] = SerializableObject.GetRandomObject();
+                        if (compDictionaryServer.ListCollectionOwner.Value.Keys.Count > 1)
+                        {
+                            // Server-side update different key with different value prior to being updated to the owner side
+                            compDictionaryServer.ListCollectionOwner.Value[compDictionaryServer.ListCollectionOwner.Value.Keys.ToList()[(index + 1) % compDictionaryServer.ListCollectionOwner.Value.Keys.Count]] = SerializableObject.GetRandomObject();
+                        }
+                        // Owner-side update should force restore to current known value before updating to the owner's state update of the original index and SerializableObject
+                    }
+
+                    compDictionary.ListCollectionOwner.Value[valueInt] = randomObject;
+                    compDictionary.ListCollectionOwner.CheckDirtyState();
+                    yield return WaitForConditionOrTimeOut(() => compDictionary.CompareTrackedChanges(ListTestHelperBase.Targets.Owner));
+                    AssertOnTimeout($"Client-{client.LocalClientId} change failed to synchronize on {className} {compDictionary.name}! {compDictionary.GetLog()}");
+                }
+
                 //////////////////////////////////
                 // Server Change SerializableObject
-                index = Random.Range(0, compDictionaryServer.ListCollectionOwner.Value.Keys.Count - 1);
-                valueInt = compDictionaryServer.ListCollectionOwner.Value.Keys.ToList()[index];
-                compDictionaryServer.ListCollectionServer.Value[valueInt] = SerializableObject.GetRandomObject();
-                compDictionaryServer.ListCollectionServer.CheckDirtyState();
-                yield return WaitForConditionOrTimeOut(() => compDictionaryServer.CompareTrackedChanges(ListTestHelperBase.Targets.Server));
-                AssertOnTimeout($"Server change failed to synchronize on {className} {compDictionaryServer.name}! {compDictionaryServer.GetLog()}");
+                if (compDictionaryServer.ListCollectionServer.Value.Keys.Count != 0)
+                {
+                    if (compDictionaryServer.ListCollectionServer.Value.Keys.Count == 1)
+                    {
+                        index = 0;
+                        valueInt = compDictionaryServer.ListCollectionServer.Value.Keys.ToList()[0];
+                    }
+                    else
+                    {
+                        index = Random.Range(0, compDictionaryServer.ListCollectionServer.Value.Keys.Count - 1);
+                        valueInt = compDictionaryServer.ListCollectionServer.Value.Keys.ToList()[index];
+                    }
 
-                ////////////////////////////////////
-                // Owner Full Set Dictionary
-                compDictionary.FullSet(DictionaryTestHelper.GetDictionaryValues(), ListTestHelperBase.Targets.Owner);
-                yield return WaitForConditionOrTimeOut(() => compDictionary.CompareTrackedChanges(ListTestHelperBase.Targets.Owner));
-                AssertOnTimeout($"Client-{client.LocalClientId} full set failed to synchronize on {className} {compDictionary.name}! {compDictionary.GetLog()}");
-                //////////////////////////////////
-                // Server Full Set Dictionary
-                compDictionaryServer.FullSet(DictionaryTestHelper.GetDictionaryValues(), ListTestHelperBase.Targets.Server);
-                yield return WaitForConditionOrTimeOut(() => compDictionaryServer.CompareTrackedChanges(ListTestHelperBase.Targets.Server));
-                AssertOnTimeout($"Server full set failed to synchronize on {className} {compDictionaryServer.name}! {compDictionaryServer.GetLog()}");
+                    // Only test restore on non-host clients (otherwise a host is both server and client/owner)
+                    if (!client.IsServer)
+                    {
+                        // Owner-side update same key value prior to being updated to the server side
+                        compDictionary.ListCollectionServer.Value[valueInt] = randomObject;
+                        // Checking if dirty on owner side should revert back to origina known current dictionary state
+                        compDictionary.ListCollectionServer.IsDirty();
+                        yield return WaitForConditionOrTimeOut(() => compDictionary.CompareTrackedChanges(ListTestHelperBase.Targets.Server));
+                        AssertOnTimeout($"Client-{client.LocalClientId} update collection entry value to local server write collection property failed to restore on {className} {compDictionary.name}! {compDictionary.GetLog()}");
+
+                        // Owner-side update same key but with different value prior to being updated to the server side
+                        compDictionary.ListCollectionServer.Value[valueInt] = SerializableObject.GetRandomObject();
+
+                        if (compDictionary.ListCollectionServer.Value.Keys.Count > 1)
+                        {
+                            // Owner-side update different key with different value prior to being updated to the server side
+                            compDictionary.ListCollectionServer.Value[compDictionary.ListCollectionServer.Value.Keys.ToList()[(index + 1) % compDictionary.ListCollectionServer.Value.Keys.Count]] = SerializableObject.GetRandomObject();
+                        }
+                        // Server-side update should force restore to current known value before updating to the server's state update of the original index and SerializableObject
+                    }
+
+                    compDictionaryServer.ListCollectionServer.Value[valueInt] = SerializableObject.GetRandomObject();
+                    compDictionaryServer.ListCollectionServer.CheckDirtyState();
+                    yield return WaitForConditionOrTimeOut(() => compDictionaryServer.CompareTrackedChanges(ListTestHelperBase.Targets.Server));
+                    AssertOnTimeout($"Server change failed to synchronize on {className} {compDictionaryServer.name}! {compDictionaryServer.GetLog()}");
+                }
+                ValidateClientsFlat(client);
 
                 ////////////////////////////////////
                 // Owner Clear
                 compDictionary.Clear(ListTestHelperBase.Targets.Owner);
+                VerboseDebug($"[{compDictionary.name}] Clearing dictionary..");
                 yield return WaitForConditionOrTimeOut(() => compDictionary.CompareTrackedChanges(ListTestHelperBase.Targets.Owner));
                 AssertOnTimeout($"Client-{client.LocalClientId} clear failed to synchronize on {className} {compDictionary.name}! {compDictionary.GetLog()}");
                 //////////////////////////////////
                 // Server Clear
+                VerboseDebug($"[{compDictionaryServer.name}] Clearing dictionary..");
                 compDictionaryServer.Clear(ListTestHelperBase.Targets.Server);
                 yield return WaitForConditionOrTimeOut(() => compDictionaryServer.CompareTrackedChanges(ListTestHelperBase.Targets.Server));
                 AssertOnTimeout($"Server clear failed to synchronize on {className} {compDictionaryServer.name}! {compDictionaryServer.GetLog()}");
@@ -641,6 +1000,22 @@ public IEnumerator TestDictionaryCollections()
 
                 yield return WaitForConditionOrTimeOut(() => compDictionaryServer.ValidateInstances());
                 AssertOnTimeout($"[Server] Not all instances of client-{compDictionaryServer.OwnerClientId}'s {className} {compDictionaryServer.name} component match! {compDictionaryServer.GetLog()}");
+
+                ////////////////////////////////////
+                // Owner Full Set Dictionary
+                compDictionary.FullSet(DictionaryTestHelper.GetDictionaryValues(), ListTestHelperBase.Targets.Owner);
+                yield return WaitForConditionOrTimeOut(() => compDictionary.CompareTrackedChanges(ListTestHelperBase.Targets.Owner));
+                AssertOnTimeout($"Client-{client.LocalClientId} full set failed to synchronize on {className} {compDictionary.name}! {compDictionary.GetLog()}");
+                //////////////////////////////////
+                // Server Full Set Dictionary
+                compDictionaryServer.FullSet(DictionaryTestHelper.GetDictionaryValues(), ListTestHelperBase.Targets.Server);
+                yield return WaitForConditionOrTimeOut(() => compDictionaryServer.CompareTrackedChanges(ListTestHelperBase.Targets.Server));
+                AssertOnTimeout($"Server full set failed to synchronize on {className} {compDictionaryServer.name}! {compDictionaryServer.GetLog()}");
+                if (m_EnableDebug)
+                {
+                    yield return ValidateClients(client);
+                    m_Stage = 0;
+                }
             }
         }
 
@@ -837,6 +1212,505 @@ public IEnumerator TestHashSetBuiltInTypeCollections()
         }
     }
 
+    [TestFixture(HostOrServer.DAHost, CollectionTypes.List)]
+    [TestFixture(HostOrServer.DAHost, CollectionTypes.Dictionary)]
+    [TestFixture(HostOrServer.Host, CollectionTypes.List)]
+    [TestFixture(HostOrServer.Host, CollectionTypes.Dictionary)]
+    [TestFixture(HostOrServer.Server, CollectionTypes.List)]
+    [TestFixture(HostOrServer.Server, CollectionTypes.Dictionary)]
+    public class NetworkVariableCollectionsChangingTests : NetcodeIntegrationTest
+    {
+        protected override int NumberOfClients => 2;
+        public enum CollectionTypes
+        {
+            Dictionary,
+            List,
+        }
+        private StringBuilder m_ErrorLog = new StringBuilder();
+        private CollectionTypes m_CollectionType;
+        private GameObject m_TestPrefab;
+        private NetworkObject m_Instance;
+
+        public NetworkVariableCollectionsChangingTests(HostOrServer hostOrServer, CollectionTypes collectionType) : base(hostOrServer)
+        {
+            m_CollectionType = collectionType;
+        }
+
+        protected override void OnServerAndClientsCreated()
+        {
+            m_TestPrefab = CreateNetworkObjectPrefab("TestObject");
+            if (m_CollectionType == CollectionTypes.Dictionary)
+            {
+                m_TestPrefab.AddComponent<DictionaryCollectionUpdateHelper>();
+            }
+            else
+            {
+                m_TestPrefab.AddComponent<ListCollectionUpdateHelper>();
+            }
+            if (m_DistributedAuthority)
+            {
+                var networkObject = m_TestPrefab.GetComponent<NetworkObject>();
+                networkObject.SetOwnershipStatus(NetworkObject.OwnershipStatus.Transferable);
+            }
+            base.OnServerAndClientsCreated();
+        }
+
+        private bool AllInstancesSpawned()
+        {
+            if (!UseCMBService())
+            {
+                if (!m_ServerNetworkManager.SpawnManager.SpawnedObjects.ContainsKey(m_Instance.NetworkObjectId))
+                {
+                    return false;
+                }
+            }
+
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                if (!client.SpawnManager.SpawnedObjects.ContainsKey(m_Instance.NetworkObjectId))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        private Dictionary<ulong, NetworkManager> m_NetworkManagers = new Dictionary<ulong, NetworkManager>();
+
+        private bool ValidateAllInstances()
+        {
+            if (!m_NetworkManagers.ContainsKey(m_Instance.OwnerClientId))
+            {
+                return false;
+            }
+
+            if (!m_NetworkManagers[m_Instance.OwnerClientId].SpawnManager.SpawnedObjects.ContainsKey(m_Instance.NetworkObjectId))
+            {
+                return false;
+            }
+
+            var ownerNetworkManager = m_NetworkManagers[m_Instance.OwnerClientId];
+
+            var ownerClientInstance = m_NetworkManagers[m_Instance.OwnerClientId].SpawnManager.SpawnedObjects[m_Instance.NetworkObjectId].GetComponent<BaseCollectionUpdateHelper>();
+
+            foreach (var client in m_NetworkManagers)
+            {
+                if (client.Value == ownerNetworkManager)
+                {
+                    continue;
+                }
+
+                var otherInstance = client.Value.SpawnManager.SpawnedObjects[m_Instance.NetworkObjectId].GetComponent<BaseCollectionUpdateHelper>();
+                if (!ownerClientInstance.ValidateAgainst(otherInstance))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        private bool OwnershipChangedOnAllClients(ulong expectedOwner)
+        {
+            m_ErrorLog.Clear();
+            foreach (var client in m_NetworkManagers)
+            {
+                var otherInstance = client.Value.SpawnManager.SpawnedObjects[m_Instance.NetworkObjectId].GetComponent<BaseCollectionUpdateHelper>();
+                if (otherInstance.OwnerClientId != expectedOwner)
+                {
+                    m_ErrorLog.AppendLine($"Client-{client.Value.LocalClientId} instance of {m_Instance.name} still shows the owner is Client-{otherInstance.OwnerClientId} when it should be Client-{expectedOwner}!");
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        private BaseCollectionUpdateHelper GetOwnerInstance()
+        {
+            var ownerNetworkManager = m_NetworkManagers[m_Instance.OwnerClientId];
+            return m_NetworkManagers[m_Instance.OwnerClientId].SpawnManager.SpawnedObjects[m_Instance.NetworkObjectId].GetComponent<BaseCollectionUpdateHelper>();
+        }
+
+        /// <summary>
+        /// Gets the authority instance.
+        /// Client-Server: will always return the server-side instance
+        /// Distributed Authority: will always return the owner
+        /// </summary>
+        /// <returns>authority instance</returns>
+        private BaseCollectionUpdateHelper GetAuthorityInstance()
+        {
+            if (m_DistributedAuthority)
+            {
+                return GetOwnerInstance();
+            }
+            else
+            {
+                return m_ServerNetworkManager.SpawnManager.SpawnedObjects[m_Instance.NetworkObjectId].GetComponent<BaseCollectionUpdateHelper>();
+            }
+        }
+
+        [UnityTest]
+        public IEnumerator CollectionAndOwnershipChangingTest()
+        {
+            BaseCollectionUpdateHelper.VerboseMode = m_EnableVerboseDebug;
+            var runWaitPeriod = new WaitForSeconds(0.5f);
+            m_NetworkManagers.Clear();
+            if (!UseCMBService() && m_UseHost)
+            {
+                m_NetworkManagers.Add(m_ServerNetworkManager.LocalClientId, m_ServerNetworkManager);
+            }
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                m_NetworkManagers.Add(client.LocalClientId, client);
+            }
+
+            var authorityNetworkManager = UseCMBService() || !m_UseHost ? m_ClientNetworkManagers[0] : m_ServerNetworkManager;
+
+            var instance = SpawnObject(m_TestPrefab, authorityNetworkManager);
+            m_Instance = instance.GetComponent<NetworkObject>();
+            var helper = instance.GetComponent<BaseCollectionUpdateHelper>();
+            var currentOwner = helper.OwnerClientId;
+            yield return WaitForConditionOrTimeOut(AllInstancesSpawned);
+            AssertOnTimeout($"[Pre][1st Phase] Timed out waiting for all clients to spawn {m_Instance.name}!");
+            helper.SetState(BaseCollectionUpdateHelper.HelperStates.Start);
+            yield return runWaitPeriod;
+
+            // Update values, validate values, change owner, updates values, and repeat until all clients have been the owner at least once
+            for (int i = 0; i < 4; i++)
+            {
+                helper.SetState(BaseCollectionUpdateHelper.HelperStates.Pause);
+                yield return WaitForConditionOrTimeOut(ValidateAllInstances);
+                AssertOnTimeout($"[1st Phase] Timed out waiting for all clients to validdate their values!");
+                helper.SetState(BaseCollectionUpdateHelper.HelperStates.Start);
+                yield return s_DefaultWaitForTick;
+
+                currentOwner = GetAuthorityInstance().ChangeOwner();
+                Assert.IsFalse(currentOwner == ulong.MaxValue, "A non-authority instance attempted to change ownership!");
+
+                yield return WaitForConditionOrTimeOut(() => OwnershipChangedOnAllClients(currentOwner));
+                AssertOnTimeout($"[1st Phase] Timed out waiting for all clients to change ownership!\n {m_ErrorLog.ToString()}");
+                helper = GetOwnerInstance();
+                yield return runWaitPeriod;
+            }
+
+            // Now reset the values
+            helper.SetState(BaseCollectionUpdateHelper.HelperStates.Pause);
+            helper.Clear();
+
+            // Validate all instances are reset
+            yield return WaitForConditionOrTimeOut(ValidateAllInstances);
+            AssertOnTimeout($"[Pre][2nd Phase]Timed out waiting for all clients to validdate their values!");
+            helper.SetState(BaseCollectionUpdateHelper.HelperStates.Start);
+
+            // Update, change ownership, and repeat until all clients have been the owner at least once
+            for (int i = 0; i < 4; i++)
+            {
+                yield return runWaitPeriod;
+                currentOwner = GetAuthorityInstance().ChangeOwner();
+                Assert.IsFalse(currentOwner == ulong.MaxValue, "A non-authority instance attempted to change ownership!");
+                yield return WaitForConditionOrTimeOut(() => OwnershipChangedOnAllClients(currentOwner));
+                AssertOnTimeout($"[2nd Phase] Timed out waiting for all clients to change ownership!");
+                helper = GetOwnerInstance();
+            }
+
+            helper.SetState(BaseCollectionUpdateHelper.HelperStates.Pause);
+            yield return WaitForConditionOrTimeOut(ValidateAllInstances);
+            AssertOnTimeout($"[Last Validate] Timed out waiting for all clients to validdate their values!");
+        }
+    }
+
+    #region COLLECTION CHANGING COMPONENTS
+    /// <summary>
+    /// Helper class to test adding <see cref="NetworkVariable{T}"/> dictionary entries rapidly with frequent ownership changes.
+    /// This includes a companion <see cref="NetworkVariable{T}"/> integer that is continually incremented and used as the key value for each entry.
+    /// </summary>
+    public class DictionaryCollectionUpdateHelper : BaseCollectionUpdateHelper
+    {
+        private NetworkVariable<Dictionary<int, int>> m_DictionaryCollection = new NetworkVariable<Dictionary<int, int>>(new Dictionary<int, int>(), NetworkVariableReadPermission.Everyone, NetworkVariableWritePermission.Owner);
+        private NetworkVariable<int> m_CurrentKeyValue = new NetworkVariable<int>(0, NetworkVariableReadPermission.Everyone, NetworkVariableWritePermission.Owner);
+
+        protected override bool OnValidateAgainst(BaseCollectionUpdateHelper otherHelper)
+        {
+            var otherListHelper = otherHelper as DictionaryCollectionUpdateHelper;
+            var localValues = m_DictionaryCollection.Value;
+            var otherValues = otherListHelper.m_DictionaryCollection.Value;
+
+            if (localValues.Count != otherValues.Count)
+            {
+                return false;
+            }
+
+            foreach (var entry in m_DictionaryCollection.Value)
+            {
+                if (!otherValues.ContainsKey(entry.Key))
+                {
+                    return false;
+                }
+
+                if (entry.Value != otherValues[entry.Key])
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+        protected override void OnClear()
+        {
+            m_DictionaryCollection.Value.Clear();
+            m_DictionaryCollection.CheckDirtyState();
+            base.OnClear();
+        }
+
+        protected override void AddItem()
+        {
+            m_DictionaryCollection.Value.Add(m_CurrentKeyValue.Value, m_CurrentKeyValue.Value);
+            m_DictionaryCollection.CheckDirtyState();
+            m_CurrentKeyValue.Value++;
+        }
+    }
+
+    /// <summary>
+    /// Helper class to test adding list entries rapidly with frequent ownership changes
+    /// </summary>
+    public class ListCollectionUpdateHelper : BaseCollectionUpdateHelper
+    {
+        private NetworkVariable<List<int>> m_ListCollection = new NetworkVariable<List<int>>(new List<int>(), NetworkVariableReadPermission.Everyone, NetworkVariableWritePermission.Owner);
+
+
+        protected override bool OnValidateAgainst(BaseCollectionUpdateHelper otherHelper)
+        {
+            var otherListHelper = otherHelper as ListCollectionUpdateHelper;
+            var localValues = m_ListCollection.Value;
+            var otherValues = otherListHelper.m_ListCollection.Value;
+
+            if (localValues.Count != otherValues.Count)
+            {
+                return false;
+            }
+
+            for (int i = 0; i < localValues.Count - 1; i++)
+            {
+                if (localValues[i] != i)
+                {
+                    return false;
+                }
+
+                if (localValues[i] != otherValues[i])
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        protected override void OnClear()
+        {
+            m_ListCollection.Value.Clear();
+            m_ListCollection.CheckDirtyState();
+            base.OnClear();
+        }
+
+        protected override void AddItem()
+        {
+            m_ListCollection.Value.Add(m_ListCollection.Value.Count);
+            m_ListCollection.CheckDirtyState();
+        }
+    }
+
+    /// <summary>
+    /// The base class to test rapidly adding items to a collection type
+    /// </summary>
+    public class BaseCollectionUpdateHelper : NetworkBehaviour
+    {
+        public static bool VerboseMode;
+        private const int k_OwnershipTickDelay = 1;
+
+        public enum HelperStates
+        {
+            Stop,
+            Start,
+            Pause,
+            ClearToChangeOwner,
+            ChangingOwner
+        }
+        public HelperStates HelperState { get; private set; }
+
+        private int m_SendClearForOwnershipOnTick;
+        private ulong m_NextClient = 0;
+        private ulong m_ClientToSendClear = 0;
+
+        public void SetState(HelperStates helperState)
+        {
+            HelperState = helperState;
+        }
+
+        protected virtual bool OnValidateAgainst(BaseCollectionUpdateHelper otherHelper)
+        {
+            return true;
+        }
+
+        public bool ValidateAgainst(BaseCollectionUpdateHelper otherHelper)
+        {
+            return OnValidateAgainst(otherHelper);
+        }
+
+        public override void OnNetworkSpawn()
+        {
+            // Register for tick updates
+            NetworkManager.NetworkTickSystem.Tick += OnNetworkTick;
+
+            base.OnNetworkSpawn();
+        }
+        public override void OnNetworkDespawn()
+        {
+            NetworkManager.NetworkTickSystem.Tick -= OnNetworkTick;
+            base.OnNetworkDespawn();
+        }
+
+        protected virtual void OnClear()
+        {
+        }
+
+        public void Clear()
+        {
+            OnClear();
+        }
+
+        protected virtual void AddItem()
+        {
+        }
+
+        private bool CanUpdate()
+        {
+            return HelperState == HelperStates.Start;
+        }
+
+        private void Update()
+        {
+            // Exit early if not spawn, updating is not enabled, or is not the owner
+            if (!IsSpawned || !CanUpdate() || !IsOwner)
+            {
+                return;
+            }
+
+            AddItem();
+        }
+
+        protected override void OnOwnershipChanged(ulong previous, ulong current)
+        {
+            // When the ownership changes and the client is the owner, then immediately add an item to the collection
+            if (NetworkManager.LocalClientId == current)
+            {
+                AddItem();
+            }
+            base.OnOwnershipChanged(previous, current);
+        }
+
+
+        /// <summary>
+        /// Sets the tick delay period of time to provide all in-flight deltas to be processed.
+        /// </summary>
+        private void SetTickDelay()
+        {
+            m_SendClearForOwnershipOnTick = NetworkManager.ServerTime.Tick + k_OwnershipTickDelay;
+        }
+
+        /// <summary>
+        /// Changes the ownership
+        /// </summary>
+        /// <returns>next owner or ulong.MaxValue that means the authority did not invoke this method</returns>
+        public ulong ChangeOwner()
+        {
+            if (HasAuthority && !IsOwnershipChanging())
+            {
+                var index = NetworkManager.ConnectedClientsIds.ToList().IndexOf(OwnerClientId);
+                index++;
+                index = index % NetworkManager.ConnectedClientsIds.Count;
+                m_NextClient = NetworkManager.ConnectedClientsIds[index];
+
+                // If we are in distributed authority and the authority or we are in client-server and the server, then make the change ourselves.
+                if (OwnerClientId == NetworkManager.LocalClientId && (NetworkManager.DistributedAuthorityMode || (!NetworkManager.DistributedAuthorityMode && NetworkManager.IsServer)))
+                {
+                    HelperState = HelperStates.ChangingOwner;
+                    SetTickDelay();
+                    Log($"Locally changing ownership to Client-{m_NextClient}");
+                }
+
+                if (!NetworkManager.DistributedAuthorityMode && NetworkManager.IsServer && OwnerClientId != NetworkManager.LocalClientId)
+                {
+                    // If we are transitioning between a client to the host or client to client,
+                    // send a "heads-up" Rpc to the client prior to changing ownership. The client
+                    // will stop updating for the tick delay period and then send a confirmation
+                    // to the host that it is clear to change ownership.
+                    ChangingOwnershipRpc(RpcTarget.Single(OwnerClientId, RpcTargetUse.Temp));
+                    Log($"Remotely changing ownership to Client-{m_NextClient}");
+                }
+
+                return m_NextClient;
+            }
+
+            return ulong.MaxValue;
+        }
+
+        /// <summary>
+        /// Sent by the host to a client when ownership is transitioning from a client to
+        /// the host or to another client.
+        /// </summary>
+        [Rpc(SendTo.SpecifiedInParams)]
+        private void ChangingOwnershipRpc(RpcParams rpcParams = default)
+        {
+            // The sender is who we respond to that it is clear to change ownership
+            m_ClientToSendClear = rpcParams.Receive.SenderClientId;
+            HelperState = HelperStates.ClearToChangeOwner;
+            SetTickDelay();
+        }
+
+        /// <summary>
+        /// Notification that the current owner has stopped updating and ownership
+        /// updates can occur without missed updates.
+        /// </summary>
+        /// <param name="rpcParams"></param>
+        [Rpc(SendTo.SpecifiedInParams)]
+        private void ChangingOwnershipClearRpc(RpcParams rpcParams = default)
+        {
+            HelperState = HelperStates.ChangingOwner;
+            SetTickDelay();
+            Log($"Changing ownership to Client-{m_NextClient} based on ready request.");
+        }
+
+        private bool IsOwnershipChanging()
+        {
+            return HelperState == HelperStates.ClearToChangeOwner || HelperState == HelperStates.ChangingOwner;
+        }
+
+        private void OnNetworkTick()
+        {
+            if (!IsSpawned || !IsOwnershipChanging() || m_SendClearForOwnershipOnTick > NetworkManager.ServerTime.Tick)
+            {
+                return;
+            }
+
+            if (HelperState == HelperStates.ChangingOwner)
+            {
+                NetworkObject.ChangeOwnership(m_NextClient);
+                Log($"Local Change ownership to Client-{m_NextClient} complete! New Owner is {NetworkObject.OwnerClientId} | Expected {m_NextClient}");
+            }
+            else
+            {
+                ChangingOwnershipClearRpc(RpcTarget.Single(m_ClientToSendClear, RpcTargetUse.Temp));
+            }
+            HelperState = HelperStates.Stop;
+        }
+
+        protected void Log(string msg)
+        {
+            if (VerboseMode)
+            {
+                Debug.Log($"[Client-{NetworkManager.LocalClientId}] {msg}");
+            }
+        }
+    }
+    #endregion
+
     #region HASHSET COMPONENT HELPERS
     public class HashSetBaseTypeTestHelper : ListTestHelperBase, IHashSetTestHelperBase<int>
     {
@@ -1649,6 +2523,14 @@ protected override void OnNetworkPostSpawn()
             ListCollectionServer.OnValueChanged += OnServerListValuesChanged;
             ListCollectionOwner.OnValueChanged += OnOwnerListValuesChanged;
 
+            if (!IsDebugMode)
+            {
+                InitValues();
+            }
+        }
+
+        public void InitValues()
+        {
             if (IsServer)
             {
                 ListCollectionServer.Value = OnSetServerValues();
@@ -1660,8 +2542,8 @@ protected override void OnNetworkPostSpawn()
                 ListCollectionOwner.Value = OnSetOwnerValues();
                 ListCollectionOwner.CheckDirtyState();
             }
-            base.OnNetworkPostSpawn();
         }
+
         public override void OnNetworkDespawn()
         {
             ListCollectionServer.OnValueChanged -= OnServerListValuesChanged;
@@ -1705,12 +2587,15 @@ public static List<List<SerializableObject>> GetListOfListOfRandomObjects(int nu
             return list;
         }
 
-
-
         public int IntValue;
         public long LongValue;
         public float FloatValue;
 
+        public override string ToString()
+        {
+            return $"{IntValue},{LongValue},{FloatValue}";
+        }
+
         public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReaderWriter
         {
             serializer.SerializeValue(ref IntValue);
@@ -2602,7 +3487,6 @@ public static void ResetState()
             Instances.Clear();
         }
 
-
         public NetworkVariable<List<int>> ListCollectionServer = new NetworkVariable<List<int>>(new List<int>(), NetworkVariableReadPermission.Everyone, NetworkVariableWritePermission.Server);
         public NetworkVariable<List<int>> ListCollectionOwner = new NetworkVariable<List<int>>(new List<int>(), NetworkVariableReadPermission.Everyone, NetworkVariableWritePermission.Owner);
         // This tracks what has changed per instance which is used to compare to all other instances
@@ -2865,6 +3749,8 @@ public override void OnNetworkDespawn()
     #region BASE TEST COMPONENT HELPERS
     public class ListTestHelperBase : NetworkBehaviour
     {
+        protected static bool IsDebugMode { get; private set; }
+
         public enum Targets
         {
             Server,
@@ -2897,6 +3783,10 @@ protected void LogStart()
             m_StringBuilder.AppendLine($"[Client-{NetworkManager.LocalClientId}][{name}] Log Started.");
         }
 
+        public void SetDebugMode(bool isDebug)
+        {
+            IsDebugMode = isDebug;
+        }
 
         public virtual bool CompareTrackedChanges(Targets target)
         {
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableCollectionsTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableCollectionsTests.cs.meta
new file mode 100644
index 0000000000..32c6910baf
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableCollectionsTests.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 7d01969a8bbbd7146a24490a5190ea7e
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableInheritanceTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableInheritanceTests.cs
new file mode 100644
index 0000000000..1a3a6d3513
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableInheritanceTests.cs
@@ -0,0 +1,165 @@
+#if !NGO_MINIMALPROJECT
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using NUnit.Framework;
+using Unity.Netcode.TestHelpers.Runtime;
+using UnityEngine;
+using UnityEngine.TestTools;
+
+namespace Unity.Netcode.RuntimeTests
+{
+    [TestFixtureSource(nameof(TestDataSource))]
+    internal class NetworkVariableInheritanceTests : NetcodeIntegrationTest
+    {
+        public NetworkVariableInheritanceTests(HostOrServer hostOrServer)
+            : base(hostOrServer)
+        {
+        }
+
+        protected override int NumberOfClients => 2;
+
+        public static IEnumerable<TestFixtureData> TestDataSource() =>
+            Enum.GetValues(typeof(HostOrServer)).OfType<HostOrServer>().Select(x => new TestFixtureData(x));
+
+        internal class ComponentA : NetworkBehaviour
+        {
+            public NetworkVariable<int> PublicFieldA = new NetworkVariable<int>(1);
+            protected NetworkVariable<int> m_ProtectedFieldA = new NetworkVariable<int>(2);
+            private NetworkVariable<int> m_PrivateFieldA = new NetworkVariable<int>(3);
+
+            public void ChangeValuesA(int pub, int pro, int pri)
+            {
+                PublicFieldA.Value = pub;
+                m_ProtectedFieldA.Value = pro;
+                m_PrivateFieldA.Value = pri;
+            }
+
+            public bool CompareValuesA(ComponentA other)
+            {
+                return PublicFieldA.Value == other.PublicFieldA.Value &&
+                    m_ProtectedFieldA.Value == other.m_ProtectedFieldA.Value &&
+                    m_PrivateFieldA.Value == other.m_PrivateFieldA.Value;
+            }
+        }
+
+        internal class ComponentB : ComponentA
+        {
+            public NetworkVariable<int> PublicFieldB = new NetworkVariable<int>(11);
+            protected NetworkVariable<int> m_ProtectedFieldB = new NetworkVariable<int>(22);
+            private NetworkVariable<int> m_PrivateFieldB = new NetworkVariable<int>(33);
+
+            public void ChangeValuesB(int pub, int pro, int pri)
+            {
+                PublicFieldB.Value = pub;
+                m_ProtectedFieldB.Value = pro;
+                m_PrivateFieldB.Value = pri;
+            }
+
+            public bool CompareValuesB(ComponentB other)
+            {
+                return PublicFieldB.Value == other.PublicFieldB.Value &&
+                    m_ProtectedFieldB.Value == other.m_ProtectedFieldB.Value &&
+                    m_PrivateFieldB.Value == other.m_PrivateFieldB.Value;
+            }
+        }
+
+        internal class ComponentC : ComponentB
+        {
+            public NetworkVariable<int> PublicFieldC = new NetworkVariable<int>(111);
+            protected NetworkVariable<int> m_ProtectedFieldC = new NetworkVariable<int>(222);
+            private NetworkVariable<int> m_PrivateFieldC = new NetworkVariable<int>(333);
+
+            public void ChangeValuesC(int pub, int pro, int pri)
+            {
+                PublicFieldC.Value = pub;
+                m_ProtectedFieldA.Value = pro;
+                m_PrivateFieldC.Value = pri;
+            }
+
+            public bool CompareValuesC(ComponentC other)
+            {
+                return PublicFieldC.Value == other.PublicFieldC.Value &&
+                    m_ProtectedFieldC.Value == other.m_ProtectedFieldC.Value &&
+                    m_PrivateFieldC.Value == other.m_PrivateFieldC.Value;
+            }
+        }
+
+        private GameObject m_TestObjectPrefab;
+        private ulong m_TestObjectId = 0;
+
+        protected override void OnOneTimeSetup()
+        {
+            NetworkVariableBase.IgnoreInitializeWarning = true;
+            base.OnOneTimeSetup();
+        }
+
+        protected override void OnOneTimeTearDown()
+        {
+            NetworkVariableBase.IgnoreInitializeWarning = false;
+            base.OnOneTimeTearDown();
+        }
+
+        protected override void OnServerAndClientsCreated()
+        {
+            m_TestObjectPrefab = CreateNetworkObjectPrefab($"[{nameof(NetworkVariableInheritanceTests)}.{nameof(m_TestObjectPrefab)}]");
+            m_TestObjectPrefab.AddComponent<ComponentA>();
+            m_TestObjectPrefab.AddComponent<ComponentB>();
+            m_TestObjectPrefab.AddComponent<ComponentC>();
+        }
+
+        protected override IEnumerator OnServerAndClientsConnected()
+        {
+            var serverTestObject = SpawnObject(m_TestObjectPrefab, m_ServerNetworkManager).GetComponent<NetworkObject>();
+            m_TestObjectId = serverTestObject.NetworkObjectId;
+
+            var serverTestComponentA = serverTestObject.GetComponent<ComponentA>();
+            var serverTestComponentB = serverTestObject.GetComponent<ComponentB>();
+            var serverTestComponentC = serverTestObject.GetComponent<ComponentC>();
+
+            serverTestComponentA.ChangeValuesA(1000, 2000, 3000);
+            serverTestComponentB.ChangeValuesA(1000, 2000, 3000);
+            serverTestComponentB.ChangeValuesB(1100, 2200, 3300);
+            serverTestComponentC.ChangeValuesA(1000, 2000, 3000);
+            serverTestComponentC.ChangeValuesB(1100, 2200, 3300);
+            serverTestComponentC.ChangeValuesC(1110, 2220, 3330);
+
+            yield return WaitForTicks(m_ServerNetworkManager, 2);
+        }
+
+        private bool CheckTestObjectComponentValuesOnAll()
+        {
+            var serverTestObject = m_ServerNetworkManager.SpawnManager.SpawnedObjects[m_TestObjectId];
+            var serverTestComponentA = serverTestObject.GetComponent<ComponentA>();
+            var serverTestComponentB = serverTestObject.GetComponent<ComponentB>();
+            var serverTestComponentC = serverTestObject.GetComponent<ComponentC>();
+            foreach (var clientNetworkManager in m_ClientNetworkManagers)
+            {
+                var clientTestObject = clientNetworkManager.SpawnManager.SpawnedObjects[m_TestObjectId];
+                var clientTestComponentA = clientTestObject.GetComponent<ComponentA>();
+                var clientTestComponentB = clientTestObject.GetComponent<ComponentB>();
+                var clientTestComponentC = clientTestObject.GetComponent<ComponentC>();
+                if (!serverTestComponentA.CompareValuesA(clientTestComponentA) ||
+                    !serverTestComponentB.CompareValuesA(clientTestComponentB) ||
+                    !serverTestComponentB.CompareValuesB(clientTestComponentB) ||
+                    !serverTestComponentC.CompareValuesA(clientTestComponentC) ||
+                    !serverTestComponentC.CompareValuesB(clientTestComponentC) ||
+                    !serverTestComponentC.CompareValuesC(clientTestComponentC))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        [UnityTest]
+        public IEnumerator TestInheritedFields()
+        {
+            yield return WaitForConditionOrTimeOut(CheckTestObjectComponentValuesOnAll);
+            Assert.IsFalse(s_GlobalTimeoutHelper.TimedOut, nameof(CheckTestObjectComponentValuesOnAll));
+        }
+    }
+}
+#endif
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableInheritanceTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableInheritanceTests.cs.meta
new file mode 100644
index 0000000000..3102d68e20
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableInheritanceTests.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 41d4aef8f33a8eb4e87879075f868e66
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariablePermissionTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariablePermissionTests.cs
new file mode 100644
index 0000000000..73481fd02c
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariablePermissionTests.cs
@@ -0,0 +1,306 @@
+#if !NGO_MINIMALPROJECT
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using NUnit.Framework;
+using Unity.Netcode.TestHelpers.Runtime;
+using UnityEngine;
+using UnityEngine.TestTools;
+using Random = UnityEngine.Random;
+
+namespace Unity.Netcode.RuntimeTests
+{
+    [TestFixtureSource(nameof(TestDataSource))]
+    internal class NetworkVariablePermissionTests : NetcodeIntegrationTest
+    {
+        public static IEnumerable<TestFixtureData> TestDataSource()
+        {
+            NetworkVariableBase.IgnoreInitializeWarning = true;
+            foreach (HostOrServer hostOrServer in Enum.GetValues(typeof(HostOrServer)))
+            {
+                // DANGO-EXP TODO: Add support for distributed authority mode
+                if (hostOrServer == HostOrServer.DAHost)
+                {
+                    continue;
+                }
+                yield return new TestFixtureData(hostOrServer);
+            }
+
+            NetworkVariableBase.IgnoreInitializeWarning = false;
+        }
+
+        protected override int NumberOfClients => 3;
+
+        public NetworkVariablePermissionTests(HostOrServer hostOrServer) : base(hostOrServer) { }
+
+        private GameObject m_TestObjPrefab;
+        private ulong m_TestObjId = 0;
+
+        protected override void OnServerAndClientsCreated()
+        {
+            m_TestObjPrefab = CreateNetworkObjectPrefab($"[{nameof(NetworkVariablePermissionTests)}.{nameof(m_TestObjPrefab)}]");
+            var testComp = m_TestObjPrefab.AddComponent<NetVarPermTestComp>();
+        }
+
+        protected override IEnumerator OnServerAndClientsConnected()
+        {
+            m_TestObjId = SpawnObject(m_TestObjPrefab, m_ServerNetworkManager).GetComponent<NetworkObject>().NetworkObjectId;
+            yield return null;
+        }
+
+        private IEnumerator WaitForPositionsAreEqual(NetworkVariable<Vector3> netvar, Vector3 expected)
+        {
+            yield return WaitForConditionOrTimeOut(() => netvar.Value == expected);
+            Assert.IsFalse(s_GlobalTimeoutHelper.TimedOut);
+        }
+
+        private IEnumerator WaitForOwnerWritableAreEqualOnAll()
+        {
+            yield return WaitForConditionOrTimeOut(CheckOwnerWritableAreEqualOnAll);
+            Assert.IsFalse(s_GlobalTimeoutHelper.TimedOut);
+        }
+
+        private bool CheckOwnerWritableAreEqualOnAll()
+        {
+            var testObjServer = m_ServerNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
+            var testCompServer = testObjServer.GetComponent<NetVarPermTestComp>();
+            foreach (var clientNetworkManager in m_ClientNetworkManagers)
+            {
+                var testObjClient = clientNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
+                var testCompClient = testObjClient.GetComponent<NetVarPermTestComp>();
+                if (testObjServer.OwnerClientId != testObjClient.OwnerClientId ||
+                    testCompServer.OwnerWritable_Position.Value != testCompClient.OwnerWritable_Position.Value ||
+                    testCompServer.OwnerWritable_Position.ReadPerm != testCompClient.OwnerWritable_Position.ReadPerm ||
+                    testCompServer.OwnerWritable_Position.WritePerm != testCompClient.OwnerWritable_Position.WritePerm)
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        private IEnumerator WaitForServerWritableAreEqualOnAll()
+        {
+            yield return WaitForConditionOrTimeOut(CheckServerWritableAreEqualOnAll);
+            Assert.IsFalse(s_GlobalTimeoutHelper.TimedOut);
+        }
+
+        private bool CheckServerWritableAreEqualOnAll()
+        {
+            var testObjServer = m_ServerNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
+            var testCompServer = testObjServer.GetComponent<NetVarPermTestComp>();
+            foreach (var clientNetworkManager in m_ClientNetworkManagers)
+            {
+                var testObjClient = clientNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
+                var testCompClient = testObjClient.GetComponent<NetVarPermTestComp>();
+                if (testCompServer.ServerWritable_Position.Value != testCompClient.ServerWritable_Position.Value ||
+                    testCompServer.ServerWritable_Position.ReadPerm != testCompClient.ServerWritable_Position.ReadPerm ||
+                    testCompServer.ServerWritable_Position.WritePerm != testCompClient.ServerWritable_Position.WritePerm)
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        private bool CheckOwnerReadWriteAreEqualOnOwnerAndServer()
+        {
+            var testObjServer = m_ServerNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
+            var testCompServer = testObjServer.GetComponent<NetVarPermTestComp>();
+            foreach (var clientNetworkManager in m_ClientNetworkManagers)
+            {
+                var testObjClient = clientNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
+                var testCompClient = testObjClient.GetComponent<NetVarPermTestComp>();
+                if (testObjServer.OwnerClientId == testObjClient.OwnerClientId &&
+                    testCompServer.OwnerReadWrite_Position.Value == testCompClient.ServerWritable_Position.Value &&
+                    testCompServer.OwnerReadWrite_Position.ReadPerm == testCompClient.ServerWritable_Position.ReadPerm &&
+                    testCompServer.OwnerReadWrite_Position.WritePerm == testCompClient.ServerWritable_Position.WritePerm)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        private bool CheckOwnerReadWriteAreNotEqualOnNonOwnerClients(NetVarPermTestComp ownerReadWriteObject)
+        {
+            foreach (var clientNetworkManager in m_ClientNetworkManagers)
+            {
+                var testObjClient = clientNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
+                var testCompClient = testObjClient.GetComponent<NetVarPermTestComp>();
+                if (testObjClient.OwnerClientId != ownerReadWriteObject.OwnerClientId ||
+                    ownerReadWriteObject.OwnerReadWrite_Position.Value == testCompClient.ServerWritable_Position.Value ||
+                    ownerReadWriteObject.OwnerReadWrite_Position.ReadPerm != testCompClient.ServerWritable_Position.ReadPerm ||
+                    ownerReadWriteObject.OwnerReadWrite_Position.WritePerm != testCompClient.ServerWritable_Position.WritePerm)
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        [UnityTest]
+        public IEnumerator ServerChangesOwnerWritableNetVar()
+        {
+            yield return WaitForOwnerWritableAreEqualOnAll();
+
+            var testObjServer = m_ServerNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
+            var testCompServer = testObjServer.GetComponent<NetVarPermTestComp>();
+
+            var oldValue = testCompServer.OwnerWritable_Position.Value;
+            var newValue = oldValue + new Vector3(Random.Range(0, 100.0f), Random.Range(0, 100.0f), Random.Range(0, 100.0f));
+
+            testCompServer.OwnerWritable_Position.Value = newValue;
+            yield return WaitForPositionsAreEqual(testCompServer.OwnerWritable_Position, newValue);
+
+            yield return WaitForOwnerWritableAreEqualOnAll();
+        }
+
+        [UnityTest]
+        public IEnumerator ServerChangesServerWritableNetVar()
+        {
+            yield return WaitForServerWritableAreEqualOnAll();
+
+            var testObjServer = m_ServerNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
+            var testCompServer = testObjServer.GetComponent<NetVarPermTestComp>();
+
+            var oldValue = testCompServer.ServerWritable_Position.Value;
+            var newValue = oldValue + new Vector3(Random.Range(0, 100.0f), Random.Range(0, 100.0f), Random.Range(0, 100.0f));
+
+            testCompServer.ServerWritable_Position.Value = newValue;
+            yield return WaitForPositionsAreEqual(testCompServer.ServerWritable_Position, newValue);
+
+            yield return WaitForServerWritableAreEqualOnAll();
+        }
+
+        [UnityTest]
+        public IEnumerator ClientChangesOwnerWritableNetVar()
+        {
+            yield return WaitForOwnerWritableAreEqualOnAll();
+
+            var testObjServer = m_ServerNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
+
+            int clientManagerIndex = m_ClientNetworkManagers.Length - 1;
+            var newOwnerClientId = m_ClientNetworkManagers[clientManagerIndex].LocalClientId;
+            testObjServer.ChangeOwnership(newOwnerClientId);
+            yield return WaitForTicks(m_ServerNetworkManager, 2);
+
+            yield return WaitForOwnerWritableAreEqualOnAll();
+
+            var testObjClient = m_ClientNetworkManagers[clientManagerIndex].SpawnManager.SpawnedObjects[m_TestObjId];
+            var testCompClient = testObjClient.GetComponent<NetVarPermTestComp>();
+
+            var oldValue = testCompClient.OwnerWritable_Position.Value;
+            var newValue = oldValue + new Vector3(Random.Range(0, 100.0f), Random.Range(0, 100.0f), Random.Range(0, 100.0f));
+
+            testCompClient.OwnerWritable_Position.Value = newValue;
+            yield return WaitForPositionsAreEqual(testCompClient.OwnerWritable_Position, newValue);
+
+            yield return WaitForOwnerWritableAreEqualOnAll();
+        }
+
+        /// <summary>
+        /// This tests the scenario where a client owner has both read and write
+        /// permissions set. The server should be the only instance that can read
+        /// the NetworkVariable.  ServerCannotChangeOwnerWritableNetVar performs
+        /// the same check to make sure the server cannot write to a client owner
+        /// NetworkVariable with owner write permissions.
+        /// </summary>
+        [UnityTest]
+        public IEnumerator ClientOwnerWithReadWriteChangesNetVar()
+        {
+            yield return WaitForOwnerWritableAreEqualOnAll();
+
+            var testObjServer = m_ServerNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
+
+            int clientManagerIndex = m_ClientNetworkManagers.Length - 1;
+            var newOwnerClientId = m_ClientNetworkManagers[clientManagerIndex].LocalClientId;
+            testObjServer.ChangeOwnership(newOwnerClientId);
+            yield return WaitForTicks(m_ServerNetworkManager, 2);
+
+            yield return WaitForOwnerWritableAreEqualOnAll();
+
+            var testObjClient = m_ClientNetworkManagers[clientManagerIndex].SpawnManager.SpawnedObjects[m_TestObjId];
+            var testCompClient = testObjClient.GetComponent<NetVarPermTestComp>();
+
+            var oldValue = testCompClient.OwnerReadWrite_Position.Value;
+            var newValue = oldValue + new Vector3(Random.Range(0, 100.0f), Random.Range(0, 100.0f), Random.Range(0, 100.0f));
+
+            testCompClient.OwnerWritable_Position.Value = newValue;
+            yield return WaitForPositionsAreEqual(testCompClient.OwnerWritable_Position, newValue);
+
+            // Verify the client owner and server match
+            yield return CheckOwnerReadWriteAreEqualOnOwnerAndServer();
+
+            // Verify the non-owner clients do not have the same Value but do have the same permissions
+            yield return CheckOwnerReadWriteAreNotEqualOnNonOwnerClients(testCompClient);
+        }
+
+
+        [UnityTest]
+        public IEnumerator ClientCannotChangeServerWritableNetVar()
+        {
+            yield return WaitForServerWritableAreEqualOnAll();
+
+            var testObjServer = m_ServerNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
+            var testCompServer = testObjServer.GetComponent<NetVarPermTestComp>();
+
+            int clientManagerIndex = m_ClientNetworkManagers.Length - 1;
+            var newOwnerClientId = m_ClientNetworkManagers[clientManagerIndex].LocalClientId;
+            testObjServer.ChangeOwnership(newOwnerClientId);
+            yield return WaitForTicks(m_ServerNetworkManager, 2);
+
+            yield return WaitForServerWritableAreEqualOnAll();
+
+            var testObjClient = m_ClientNetworkManagers[clientManagerIndex].SpawnManager.SpawnedObjects[m_TestObjId];
+            var testCompClient = testObjClient.GetComponent<NetVarPermTestComp>();
+
+            var oldValue = testCompClient.ServerWritable_Position.Value;
+            var newValue = oldValue + new Vector3(Random.Range(0, 100.0f), Random.Range(0, 100.0f), Random.Range(0, 100.0f));
+            LogAssert.Expect(LogType.Error, testCompClient.ServerWritable_Position.GetWritePermissionError());
+            testCompClient.ServerWritable_Position.Value = newValue;
+            yield return WaitForPositionsAreEqual(testCompServer.ServerWritable_Position, oldValue);
+
+            yield return WaitForServerWritableAreEqualOnAll();
+
+            testCompServer.ServerWritable_Position.Value = newValue;
+            yield return WaitForPositionsAreEqual(testCompServer.ServerWritable_Position, newValue);
+
+            yield return WaitForServerWritableAreEqualOnAll();
+        }
+
+        [UnityTest]
+        public IEnumerator ServerCannotChangeOwnerWritableNetVar()
+        {
+            yield return WaitForOwnerWritableAreEqualOnAll();
+
+            var testObjServer = m_ServerNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
+            var testCompServer = testObjServer.GetComponent<NetVarPermTestComp>();
+
+            int clientManagerIndex = m_ClientNetworkManagers.Length - 1;
+            var newOwnerClientId = m_ClientNetworkManagers[clientManagerIndex].LocalClientId;
+            testObjServer.ChangeOwnership(newOwnerClientId);
+            yield return WaitForTicks(m_ServerNetworkManager, 4);
+
+            yield return WaitForOwnerWritableAreEqualOnAll();
+
+            var oldValue = testCompServer.OwnerWritable_Position.Value;
+            var newValue = oldValue + new Vector3(Random.Range(0, 100.0f), Random.Range(0, 100.0f), Random.Range(0, 100.0f));
+
+            LogAssert.Expect(LogType.Error, testCompServer.OwnerWritable_Position.GetWritePermissionError());
+            testCompServer.OwnerWritable_Position.Value = newValue;
+            yield return WaitForPositionsAreEqual(testCompServer.OwnerWritable_Position, oldValue);
+
+            yield return WaitForOwnerWritableAreEqualOnAll();
+
+            var testObjClient = m_ClientNetworkManagers[clientManagerIndex].SpawnManager.SpawnedObjects[m_TestObjId];
+            var testCompClient = testObjClient.GetComponent<NetVarPermTestComp>();
+
+            testCompClient.OwnerWritable_Position.Value = newValue;
+            yield return WaitForPositionsAreEqual(testCompClient.OwnerWritable_Position, newValue);
+
+            yield return WaitForOwnerWritableAreEqualOnAll();
+        }
+    }
+}
+#endif
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariablePermissionTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariablePermissionTests.cs.meta
new file mode 100644
index 0000000000..d06c83fb5f
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariablePermissionTests.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 60d49d322bef8ff4ebb8c4abf57e18e3
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableTests.cs
similarity index 92%
rename from com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTests.cs
rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableTests.cs
index 2029fa1e05..35718a474a 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableTests.cs
@@ -1,3 +1,4 @@
+#if !NGO_MINIMALPROJECT
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -11,296 +12,7 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    [TestFixtureSource(nameof(TestDataSource))]
-    public class NetworkVariablePermissionTests : NetcodeIntegrationTest
-    {
-        public static IEnumerable<TestFixtureData> TestDataSource()
-        {
-            foreach (HostOrServer hostOrServer in Enum.GetValues(typeof(HostOrServer)))
-            {
-                yield return new TestFixtureData(hostOrServer);
-            }
-        }
-
-        protected override int NumberOfClients => 3;
-
-        public NetworkVariablePermissionTests(HostOrServer hostOrServer)
-            : base(hostOrServer)
-        {
-        }
-
-        private GameObject m_TestObjPrefab;
-        private ulong m_TestObjId = 0;
-
-        protected override void OnServerAndClientsCreated()
-        {
-            m_TestObjPrefab = CreateNetworkObjectPrefab($"[{nameof(NetworkVariablePermissionTests)}.{nameof(m_TestObjPrefab)}]");
-            var testComp = m_TestObjPrefab.AddComponent<NetVarPermTestComp>();
-        }
-
-        protected override IEnumerator OnServerAndClientsConnected()
-        {
-            m_TestObjId = SpawnObject(m_TestObjPrefab, m_ServerNetworkManager).GetComponent<NetworkObject>().NetworkObjectId;
-            yield return null;
-        }
-
-        private IEnumerator WaitForPositionsAreEqual(NetworkVariable<Vector3> netvar, Vector3 expected)
-        {
-            yield return WaitForConditionOrTimeOut(() => netvar.Value == expected);
-            Assert.IsFalse(s_GlobalTimeoutHelper.TimedOut);
-        }
-
-        private IEnumerator WaitForOwnerWritableAreEqualOnAll()
-        {
-            yield return WaitForConditionOrTimeOut(CheckOwnerWritableAreEqualOnAll);
-            Assert.IsFalse(s_GlobalTimeoutHelper.TimedOut);
-        }
-
-        private bool CheckOwnerWritableAreEqualOnAll()
-        {
-            var testObjServer = m_ServerNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
-            var testCompServer = testObjServer.GetComponent<NetVarPermTestComp>();
-            foreach (var clientNetworkManager in m_ClientNetworkManagers)
-            {
-                var testObjClient = clientNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
-                var testCompClient = testObjClient.GetComponent<NetVarPermTestComp>();
-                if (testObjServer.OwnerClientId != testObjClient.OwnerClientId ||
-                    testCompServer.OwnerWritable_Position.Value != testCompClient.OwnerWritable_Position.Value ||
-                    testCompServer.OwnerWritable_Position.ReadPerm != testCompClient.OwnerWritable_Position.ReadPerm ||
-                    testCompServer.OwnerWritable_Position.WritePerm != testCompClient.OwnerWritable_Position.WritePerm)
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        private IEnumerator WaitForServerWritableAreEqualOnAll()
-        {
-            yield return WaitForConditionOrTimeOut(CheckServerWritableAreEqualOnAll);
-            Assert.IsFalse(s_GlobalTimeoutHelper.TimedOut);
-        }
-
-        private bool CheckServerWritableAreEqualOnAll()
-        {
-            var testObjServer = m_ServerNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
-            var testCompServer = testObjServer.GetComponent<NetVarPermTestComp>();
-            foreach (var clientNetworkManager in m_ClientNetworkManagers)
-            {
-                var testObjClient = clientNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
-                var testCompClient = testObjClient.GetComponent<NetVarPermTestComp>();
-                if (testCompServer.ServerWritable_Position.Value != testCompClient.ServerWritable_Position.Value ||
-                    testCompServer.ServerWritable_Position.ReadPerm != testCompClient.ServerWritable_Position.ReadPerm ||
-                    testCompServer.ServerWritable_Position.WritePerm != testCompClient.ServerWritable_Position.WritePerm)
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        private bool CheckOwnerReadWriteAreEqualOnOwnerAndServer()
-        {
-            var testObjServer = m_ServerNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
-            var testCompServer = testObjServer.GetComponent<NetVarPermTestComp>();
-            foreach (var clientNetworkManager in m_ClientNetworkManagers)
-            {
-                var testObjClient = clientNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
-                var testCompClient = testObjClient.GetComponent<NetVarPermTestComp>();
-                if (testObjServer.OwnerClientId == testObjClient.OwnerClientId &&
-                    testCompServer.OwnerReadWrite_Position.Value == testCompClient.ServerWritable_Position.Value &&
-                    testCompServer.OwnerReadWrite_Position.ReadPerm == testCompClient.ServerWritable_Position.ReadPerm &&
-                    testCompServer.OwnerReadWrite_Position.WritePerm == testCompClient.ServerWritable_Position.WritePerm)
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        private bool CheckOwnerReadWriteAreNotEqualOnNonOwnerClients(NetVarPermTestComp ownerReadWriteObject)
-        {
-            foreach (var clientNetworkManager in m_ClientNetworkManagers)
-            {
-                var testObjClient = clientNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
-                var testCompClient = testObjClient.GetComponent<NetVarPermTestComp>();
-                if (testObjClient.OwnerClientId != ownerReadWriteObject.OwnerClientId ||
-                    ownerReadWriteObject.OwnerReadWrite_Position.Value == testCompClient.ServerWritable_Position.Value ||
-                    ownerReadWriteObject.OwnerReadWrite_Position.ReadPerm != testCompClient.ServerWritable_Position.ReadPerm ||
-                    ownerReadWriteObject.OwnerReadWrite_Position.WritePerm != testCompClient.ServerWritable_Position.WritePerm)
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        [UnityTest]
-        public IEnumerator ServerChangesOwnerWritableNetVar()
-        {
-            yield return WaitForOwnerWritableAreEqualOnAll();
-
-            var testObjServer = m_ServerNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
-            var testCompServer = testObjServer.GetComponent<NetVarPermTestComp>();
-
-            var oldValue = testCompServer.OwnerWritable_Position.Value;
-            var newValue = oldValue + new Vector3(Random.Range(0, 100.0f), Random.Range(0, 100.0f), Random.Range(0, 100.0f));
-
-            testCompServer.OwnerWritable_Position.Value = newValue;
-            yield return WaitForPositionsAreEqual(testCompServer.OwnerWritable_Position, newValue);
-
-            yield return WaitForOwnerWritableAreEqualOnAll();
-        }
-
-        [UnityTest]
-        public IEnumerator ServerChangesServerWritableNetVar()
-        {
-            yield return WaitForServerWritableAreEqualOnAll();
-
-            var testObjServer = m_ServerNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
-            var testCompServer = testObjServer.GetComponent<NetVarPermTestComp>();
-
-            var oldValue = testCompServer.ServerWritable_Position.Value;
-            var newValue = oldValue + new Vector3(Random.Range(0, 100.0f), Random.Range(0, 100.0f), Random.Range(0, 100.0f));
-
-            testCompServer.ServerWritable_Position.Value = newValue;
-            yield return WaitForPositionsAreEqual(testCompServer.ServerWritable_Position, newValue);
-
-            yield return WaitForServerWritableAreEqualOnAll();
-        }
-
-        [UnityTest]
-        public IEnumerator ClientChangesOwnerWritableNetVar()
-        {
-            yield return WaitForOwnerWritableAreEqualOnAll();
-
-            var testObjServer = m_ServerNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
-
-            int clientManagerIndex = m_ClientNetworkManagers.Length - 1;
-            var newOwnerClientId = m_ClientNetworkManagers[clientManagerIndex].LocalClientId;
-            testObjServer.ChangeOwnership(newOwnerClientId);
-            yield return WaitForTicks(m_ServerNetworkManager, 2);
-
-            yield return WaitForOwnerWritableAreEqualOnAll();
-
-            var testObjClient = m_ClientNetworkManagers[clientManagerIndex].SpawnManager.SpawnedObjects[m_TestObjId];
-            var testCompClient = testObjClient.GetComponent<NetVarPermTestComp>();
-
-            var oldValue = testCompClient.OwnerWritable_Position.Value;
-            var newValue = oldValue + new Vector3(Random.Range(0, 100.0f), Random.Range(0, 100.0f), Random.Range(0, 100.0f));
-
-            testCompClient.OwnerWritable_Position.Value = newValue;
-            yield return WaitForPositionsAreEqual(testCompClient.OwnerWritable_Position, newValue);
-
-            yield return WaitForOwnerWritableAreEqualOnAll();
-        }
-
-        /// <summary>
-        /// This tests the scenario where a client owner has both read and write
-        /// permissions set. The server should be the only instance that can read
-        /// the NetworkVariable.  ServerCannotChangeOwnerWritableNetVar performs
-        /// the same check to make sure the server cannot write to a client owner
-        /// NetworkVariable with owner write permissions.
-        /// </summary>
-        [UnityTest]
-        public IEnumerator ClientOwnerWithReadWriteChangesNetVar()
-        {
-            yield return WaitForOwnerWritableAreEqualOnAll();
-
-            var testObjServer = m_ServerNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
-
-            int clientManagerIndex = m_ClientNetworkManagers.Length - 1;
-            var newOwnerClientId = m_ClientNetworkManagers[clientManagerIndex].LocalClientId;
-            testObjServer.ChangeOwnership(newOwnerClientId);
-            yield return WaitForTicks(m_ServerNetworkManager, 2);
-
-            yield return WaitForOwnerWritableAreEqualOnAll();
-
-            var testObjClient = m_ClientNetworkManagers[clientManagerIndex].SpawnManager.SpawnedObjects[m_TestObjId];
-            var testCompClient = testObjClient.GetComponent<NetVarPermTestComp>();
-
-            var oldValue = testCompClient.OwnerReadWrite_Position.Value;
-            var newValue = oldValue + new Vector3(Random.Range(0, 100.0f), Random.Range(0, 100.0f), Random.Range(0, 100.0f));
-
-            testCompClient.OwnerWritable_Position.Value = newValue;
-            yield return WaitForPositionsAreEqual(testCompClient.OwnerWritable_Position, newValue);
-
-            // Verify the client owner and server match
-            yield return CheckOwnerReadWriteAreEqualOnOwnerAndServer();
-
-            // Verify the non-owner clients do not have the same Value but do have the same permissions
-            yield return CheckOwnerReadWriteAreNotEqualOnNonOwnerClients(testCompClient);
-        }
-
-
-        [UnityTest]
-        public IEnumerator ClientCannotChangeServerWritableNetVar()
-        {
-            yield return WaitForServerWritableAreEqualOnAll();
-
-            var testObjServer = m_ServerNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
-            var testCompServer = testObjServer.GetComponent<NetVarPermTestComp>();
-
-            int clientManagerIndex = m_ClientNetworkManagers.Length - 1;
-            var newOwnerClientId = m_ClientNetworkManagers[clientManagerIndex].LocalClientId;
-            testObjServer.ChangeOwnership(newOwnerClientId);
-            yield return WaitForTicks(m_ServerNetworkManager, 2);
-
-            yield return WaitForServerWritableAreEqualOnAll();
-
-            var testObjClient = m_ClientNetworkManagers[clientManagerIndex].SpawnManager.SpawnedObjects[m_TestObjId];
-            var testCompClient = testObjClient.GetComponent<NetVarPermTestComp>();
-
-            var oldValue = testCompClient.ServerWritable_Position.Value;
-            var newValue = oldValue + new Vector3(Random.Range(0, 100.0f), Random.Range(0, 100.0f), Random.Range(0, 100.0f));
-
-            LogAssert.Expect(LogType.Error, testCompClient.ServerWritable_Position.GetWritePermissionError());
-            testCompClient.ServerWritable_Position.Value = newValue;
-            yield return WaitForPositionsAreEqual(testCompServer.ServerWritable_Position, oldValue);
-
-            yield return WaitForServerWritableAreEqualOnAll();
-
-            testCompServer.ServerWritable_Position.Value = newValue;
-            yield return WaitForPositionsAreEqual(testCompServer.ServerWritable_Position, newValue);
-
-            yield return WaitForServerWritableAreEqualOnAll();
-        }
-
-        [UnityTest]
-        public IEnumerator ServerCannotChangeOwnerWritableNetVar()
-        {
-            yield return WaitForOwnerWritableAreEqualOnAll();
-
-            var testObjServer = m_ServerNetworkManager.SpawnManager.SpawnedObjects[m_TestObjId];
-            var testCompServer = testObjServer.GetComponent<NetVarPermTestComp>();
-
-            int clientManagerIndex = m_ClientNetworkManagers.Length - 1;
-            var newOwnerClientId = m_ClientNetworkManagers[clientManagerIndex].LocalClientId;
-            testObjServer.ChangeOwnership(newOwnerClientId);
-            yield return WaitForTicks(m_ServerNetworkManager, 2);
-
-            yield return WaitForOwnerWritableAreEqualOnAll();
-
-            var oldValue = testCompServer.OwnerWritable_Position.Value;
-            var newValue = oldValue + new Vector3(Random.Range(0, 100.0f), Random.Range(0, 100.0f), Random.Range(0, 100.0f));
-
-            LogAssert.Expect(LogType.Error, testCompServer.OwnerWritable_Position.GetWritePermissionError());
-            testCompServer.OwnerWritable_Position.Value = newValue;
-            yield return WaitForPositionsAreEqual(testCompServer.OwnerWritable_Position, oldValue);
-
-            yield return WaitForOwnerWritableAreEqualOnAll();
-
-            var testObjClient = m_ClientNetworkManagers[clientManagerIndex].SpawnManager.SpawnedObjects[m_TestObjId];
-            var testCompClient = testObjClient.GetComponent<NetVarPermTestComp>();
-
-            testCompClient.OwnerWritable_Position.Value = newValue;
-            yield return WaitForPositionsAreEqual(testCompClient.OwnerWritable_Position, newValue);
-
-            yield return WaitForOwnerWritableAreEqualOnAll();
-        }
-    }
-
-    public struct TestStruct : INetworkSerializable, IEquatable<TestStruct>
+    internal struct TestStruct : INetworkSerializable, IEquatable<TestStruct>
     {
         public uint SomeInt;
         public bool SomeBool;
@@ -340,7 +52,7 @@ public override int GetHashCode()
         }
     }
 
-    public class TestClass : INetworkSerializable, IEquatable<TestClass>
+    internal class TestClass : INetworkSerializable, IEquatable<TestClass>
     {
         public uint SomeInt;
         public bool SomeBool;
@@ -382,15 +94,15 @@ public override int GetHashCode()
 
     // Used just to create a NetworkVariable in the templated NetworkBehaviour type that isn't referenced anywhere else
     // Please do not reference this class anywhere else!
-    public class TestClass_ReferencedOnlyByTemplateNetworkBehavourType : TestClass, IEquatable<TestClass_ReferencedOnlyByTemplateNetworkBehavourType>
+    internal class TestClass_ReferencedOnlyByTemplateNetworkBehaviourType : TestClass, IEquatable<TestClass_ReferencedOnlyByTemplateNetworkBehaviourType>
     {
-        public bool Equals(TestClass_ReferencedOnlyByTemplateNetworkBehavourType other)
+        public bool Equals(TestClass_ReferencedOnlyByTemplateNetworkBehaviourType other)
         {
             return Equals((TestClass)other);
         }
     }
 
-    public class NetworkVariableTest : NetworkBehaviour
+    internal class NetworkVariableTest : NetworkBehaviour
     {
         public enum SomeEnum
         {
@@ -434,84 +146,348 @@ public override void OnNetworkSpawn()
         }
     }
 
-    [TestFixture(true)]
-    [TestFixture(false)]
-    public class NetworkVariableTests : NetcodeIntegrationTest
+    /// <summary>
+    /// Handles the more generic conditional logic for NetworkList tests
+    /// which can be used with the <see cref="NetcodeIntegrationTest.WaitForConditionOrTimeOut"/>
+    /// that accepts anything derived from the <see cref="ConditionalPredicateBase"/> class
+    /// as a parameter.
+    /// </summary>
+    internal class NetworkListTestPredicate : ConditionalPredicateBase
     {
-        private const string k_StringTestValue = "abcdefghijklmnopqrstuvwxyz";
-        private static readonly FixedString32Bytes k_FixedStringTestValue = k_StringTestValue;
-        protected override int NumberOfClients => 2;
-
-        private const uint k_TestUInt = 0x12345678;
-
-        private const int k_TestVal1 = 111;
-        private const int k_TestVal2 = 222;
-        private const int k_TestVal3 = 333;
-
-        protected override bool m_EnableTimeTravel => true;
-        protected override bool m_SetupIsACoroutine => false;
-        protected override bool m_TearDownIsACoroutine => false;
+        private const int k_MaxRandomValue = 1000;
 
-        private static List<NetworkVariableTest> s_ClientNetworkVariableTestInstances = new List<NetworkVariableTest>();
-        public static void ClientNetworkVariableTestSpawned(NetworkVariableTest networkVariableTest)
-        {
-            s_ClientNetworkVariableTestInstances.Add(networkVariableTest);
-        }
+        private Dictionary<NetworkListTestStates, Func<bool>> m_StateFunctions;
 
-        // Player1 component on the server
+        // Player1 component on the Server
         private NetworkVariableTest m_Player1OnServer;
 
         // Player1 component on client1
         private NetworkVariableTest m_Player1OnClient1;
 
-        private NetworkListTestPredicate m_NetworkListPredicateHandler;
+        private string m_TestStageFailedMessage;
 
-        private readonly bool m_EnsureLengthSafety;
+        public enum NetworkListTestStates
+        {
+            Add,
+            ContainsLarge,
+            Contains,
+            VerifyData,
+            IndexOf,
+        }
 
-        public NetworkVariableTests(bool ensureLengthSafety)
+        private NetworkListTestStates m_NetworkListTestState;
+
+        public void SetNetworkListTestState(NetworkListTestStates networkListTestState)
         {
-            m_EnsureLengthSafety = ensureLengthSafety;
+            m_NetworkListTestState = networkListTestState;
         }
 
-        protected override bool CanStartServerAndClients()
+        /// <summary>
+        /// Determines if the condition has been reached for the current NetworkListTestState
+        /// </summary>
+        protected override bool OnHasConditionBeenReached()
         {
-            return false;
+            var isStateRegistered = m_StateFunctions.ContainsKey(m_NetworkListTestState);
+            Assert.IsTrue(isStateRegistered);
+            return m_StateFunctions[m_NetworkListTestState].Invoke();
         }
 
         /// <summary>
-        /// This is an adjustment to how the server and clients are started in order
-        /// to avoid timing issues when running in a stand alone test runner build.
+        /// Provides all information about the players for both sides for simplicity and informative sake.
         /// </summary>
-        private void InitializeServerAndClients(HostOrServer useHost)
+        /// <returns></returns>
+        private string ConditionFailedInfo()
         {
-            s_ClientNetworkVariableTestInstances.Clear();
-            m_PlayerPrefab.AddComponent<NetworkVariableTest>();
+            return $"{m_NetworkListTestState} condition test failed:\n Server List Count: {m_Player1OnServer.TheList.Count} vs  Client List Count: {m_Player1OnClient1.TheList.Count}\n" +
+                $"Server List Count: {m_Player1OnServer.TheLargeList.Count} vs  Client List Count: {m_Player1OnClient1.TheLargeList.Count}\n" +
+                $"Server Delegate Triggered: {m_Player1OnServer.ListDelegateTriggered} | Client Delegate Triggered: {m_Player1OnClient1.ListDelegateTriggered}\n";
+        }
 
-            m_PlayerPrefab.AddComponent<ClassHavingNetworkBehaviour>();
-            m_PlayerPrefab.AddComponent<ClassHavingNetworkBehaviour2>();
-            m_PlayerPrefab.AddComponent<StructHavingNetworkBehaviour>();
+        /// <summary>
+        /// When finished, check if a time out occurred and if so assert and provide meaningful information to troubleshoot why
+        /// </summary>
+        protected override void OnFinished()
+        {
+            Assert.IsFalse(TimedOut, $"{nameof(NetworkListTestPredicate)} timed out waiting for the {m_NetworkListTestState} condition to be reached! \n" + ConditionFailedInfo());
+        }
 
-            m_ServerNetworkManager.NetworkConfig.EnsureNetworkVariableLengthSafety = m_EnsureLengthSafety;
-            m_ServerNetworkManager.NetworkConfig.PlayerPrefab = m_PlayerPrefab;
-            foreach (var client in m_ClientNetworkManagers)
+        // Uses the ArrayOperator and validates that on both sides the count and values are the same
+        private bool OnVerifyData()
+        {
+            // Wait until both sides have the same number of elements
+            if (m_Player1OnServer.TheList.Count != m_Player1OnClient1.TheList.Count)
             {
-                client.NetworkConfig.EnsureNetworkVariableLengthSafety = m_EnsureLengthSafety;
-                client.NetworkConfig.PlayerPrefab = m_PlayerPrefab;
+                return false;
             }
 
-            Assert.True(NetcodeIntegrationTestHelpers.Start(useHost == HostOrServer.Host, m_ServerNetworkManager, m_ClientNetworkManagers), "Failed to start server and client instances");
-
-            RegisterSceneManagerHandler();
+            // Check the client values against the server values to make sure they match
+            for (int i = 0; i < m_Player1OnServer.TheList.Count; i++)
+            {
+                if (m_Player1OnServer.TheList[i] != m_Player1OnClient1.TheList[i])
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
 
-            // Wait for connection on client and server side
-            var success = WaitForClientsConnectedOrTimeOutWithTimeTravel();
-            Assert.True(success, $"Timed-out waiting for all clients to connect!");
+        /// <summary>
+        /// Verifies the data count, values, and that the ListDelegate on both sides was triggered
+        /// </summary>
+        private bool OnAdd()
+        {
+            bool wasTriggerred = m_Player1OnServer.ListDelegateTriggered && m_Player1OnClient1.ListDelegateTriggered;
+            return wasTriggerred && OnVerifyData();
+        }
 
-            // These are the *SERVER VERSIONS* of the *CLIENT PLAYER 1 & 2*
-            var result = new NetcodeIntegrationTestHelpers.ResultWrapper<NetworkObject>();
+        /// <summary>
+        /// The current version of this test only verified the count of the large list, so that is what this does
+        /// </summary>
+        private bool OnContainsLarge()
+        {
+            return m_Player1OnServer.TheLargeList.Count == m_Player1OnClient1.TheLargeList.Count;
+        }
 
-            NetcodeIntegrationTestHelpers.GetNetworkObjectByRepresentationWithTimeTravel(
-                x => x.IsPlayerObject && x.OwnerClientId == m_ClientNetworkManagers[0].LocalClientId,
+        /// <summary>
+        /// Tests NetworkList.Contains which also verifies all values are the same on both sides
+        /// </summary>
+        private bool OnContains()
+        {
+            // Wait until both sides have the same number of elements
+            if (m_Player1OnServer.TheList.Count != m_Player1OnClient1.TheList.Count)
+            {
+                return false;
+            }
+
+            // Parse through all server values and use the NetworkList.Contains method to check if the value is in the list on the client side
+            foreach (var serverValue in m_Player1OnServer.TheList)
+            {
+                if (!m_Player1OnClient1.TheList.Contains(serverValue))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Tests NetworkList.IndexOf and verifies that all values are aligned on both sides
+        /// </summary>
+        private bool OnIndexOf()
+        {
+            foreach (var serverSideValue in m_Player1OnServer.TheList)
+            {
+                var indexToTest = m_Player1OnServer.TheList.IndexOf(serverSideValue);
+                if (indexToTest != m_Player1OnServer.TheList.IndexOf(serverSideValue))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        public NetworkListTestPredicate(NetworkVariableTest player1OnServer, NetworkVariableTest player1OnClient1, NetworkListTestStates networkListTestState, int elementCount)
+        {
+            m_NetworkListTestState = networkListTestState;
+            m_Player1OnServer = player1OnServer;
+            m_Player1OnClient1 = player1OnClient1;
+            m_StateFunctions = new Dictionary<NetworkListTestStates, Func<bool>>
+            {
+                { NetworkListTestStates.Add, OnAdd },
+                { NetworkListTestStates.ContainsLarge, OnContainsLarge },
+                { NetworkListTestStates.Contains, OnContains },
+                { NetworkListTestStates.VerifyData, OnVerifyData },
+                { NetworkListTestStates.IndexOf, OnIndexOf }
+            };
+
+            if (networkListTestState == NetworkListTestStates.ContainsLarge)
+            {
+                for (var i = 0; i < elementCount; ++i)
+                {
+                    m_Player1OnServer.TheLargeList.Add(new FixedString128Bytes());
+                }
+            }
+            else
+            {
+                for (int i = 0; i < elementCount; i++)
+                {
+                    m_Player1OnServer.TheList.Add(Random.Range(0, k_MaxRandomValue));
+                }
+            }
+        }
+    }
+
+    internal class NetvarDespawnShutdown : NetworkBehaviour
+    {
+        private NetworkVariable<int> m_IntNetworkVariable = new NetworkVariable<int>();
+        private NetworkList<int> m_IntList;
+
+        private void Awake()
+        {
+            m_IntList = new NetworkList<int>();
+        }
+
+        public override void OnNetworkDespawn()
+        {
+            if (IsServer)
+            {
+                m_IntNetworkVariable.Value = 5;
+                for (int i = 0; i < 10; i++)
+                {
+                    m_IntList.Add(i);
+                }
+            }
+            base.OnNetworkDespawn();
+        }
+    }
+
+    /// <summary>
+    /// Validates that setting values for NetworkVariable or NetworkList during the
+    /// OnNetworkDespawn method will not cause an exception to occur.
+    /// </summary>
+    internal class NetworkVariableModifyOnNetworkDespawn : NetcodeIntegrationTest
+    {
+        protected override int NumberOfClients => 1;
+
+        private GameObject m_TestPrefab;
+
+        protected override void OnOneTimeSetup()
+        {
+            NetworkVariableBase.IgnoreInitializeWarning = true;
+            base.OnOneTimeSetup();
+        }
+
+        protected override void OnOneTimeTearDown()
+        {
+            NetworkVariableBase.IgnoreInitializeWarning = false;
+            base.OnOneTimeTearDown();
+        }
+
+        protected override void OnServerAndClientsCreated()
+        {
+            m_TestPrefab = CreateNetworkObjectPrefab("NetVarDespawn");
+            m_TestPrefab.AddComponent<NetvarDespawnShutdown>();
+            base.OnServerAndClientsCreated();
+        }
+
+        private bool OnClientSpawnedTestPrefab(ulong networkObjectId)
+        {
+            var clientId = m_ClientNetworkManagers[0].LocalClientId;
+            if (!s_GlobalNetworkObjects.ContainsKey(clientId))
+            {
+                return false;
+            }
+
+            if (!s_GlobalNetworkObjects[clientId].ContainsKey(networkObjectId))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        [UnityTest]
+        public IEnumerator ModifyNetworkVariableOrListOnNetworkDespawn()
+        {
+            var instance = SpawnObject(m_TestPrefab, m_ServerNetworkManager);
+            yield return WaitForConditionOrTimeOut(() => OnClientSpawnedTestPrefab(instance.GetComponent<NetworkObject>().NetworkObjectId));
+            m_ServerNetworkManager.Shutdown();
+            // As long as no excetptions occur, the test passes.
+        }
+    }
+
+#if !MULTIPLAYER_TOOLS
+    [TestFixture(true)]
+#endif
+    [TestFixture(false)]
+    internal class NetworkVariableTests : NetcodeIntegrationTest
+    {
+        private const string k_StringTestValue = "abcdefghijklmnopqrstuvwxyz";
+        private static readonly FixedString32Bytes k_FixedStringTestValue = k_StringTestValue;
+        protected override int NumberOfClients => 2;
+
+        private const uint k_TestUInt = 0x12345678;
+
+        private const int k_TestVal1 = 111;
+        private const int k_TestVal2 = 222;
+        private const int k_TestVal3 = 333;
+
+        protected override bool m_EnableTimeTravel => true;
+        protected override bool m_SetupIsACoroutine => false;
+        protected override bool m_TearDownIsACoroutine => false;
+
+        private static List<NetworkVariableTest> s_ClientNetworkVariableTestInstances = new List<NetworkVariableTest>();
+        public static void ClientNetworkVariableTestSpawned(NetworkVariableTest networkVariableTest)
+        {
+            s_ClientNetworkVariableTestInstances.Add(networkVariableTest);
+        }
+
+        // Player1 component on the server
+        private NetworkVariableTest m_Player1OnServer;
+
+        // Player1 component on client1
+        private NetworkVariableTest m_Player1OnClient1;
+
+        private NetworkListTestPredicate m_NetworkListPredicateHandler;
+
+        private readonly bool m_EnsureLengthSafety;
+
+        public NetworkVariableTests(bool ensureLengthSafety)
+        {
+            m_EnsureLengthSafety = ensureLengthSafety;
+        }
+
+        protected override bool CanStartServerAndClients()
+        {
+            return false;
+        }
+
+        protected override void OnOneTimeSetup()
+        {
+            NetworkVariableBase.IgnoreInitializeWarning = true;
+            base.OnOneTimeSetup();
+        }
+
+        protected override void OnOneTimeTearDown()
+        {
+            NetworkVariableBase.IgnoreInitializeWarning = false;
+            base.OnOneTimeTearDown();
+        }
+
+        /// <summary>
+        /// This is an adjustment to how the server and clients are started in order
+        /// to avoid timing issues when running in a stand alone test runner build.
+        /// </summary>
+        private void InitializeServerAndClients(HostOrServer useHost)
+        {
+            s_ClientNetworkVariableTestInstances.Clear();
+            m_PlayerPrefab.AddComponent<NetworkVariableTest>();
+
+            m_PlayerPrefab.AddComponent<ClassHavingNetworkBehaviour>();
+            m_PlayerPrefab.AddComponent<ClassHavingNetworkBehaviour2>();
+            m_PlayerPrefab.AddComponent<StructHavingNetworkBehaviour>();
+
+            m_ServerNetworkManager.NetworkConfig.EnsureNetworkVariableLengthSafety = m_EnsureLengthSafety;
+            m_ServerNetworkManager.NetworkConfig.PlayerPrefab = m_PlayerPrefab;
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                client.NetworkConfig.EnsureNetworkVariableLengthSafety = m_EnsureLengthSafety;
+                client.NetworkConfig.PlayerPrefab = m_PlayerPrefab;
+            }
+
+            Assert.True(NetcodeIntegrationTestHelpers.Start(useHost == HostOrServer.Host, m_ServerNetworkManager, m_ClientNetworkManagers), "Failed to start server and client instances");
+
+            RegisterSceneManagerHandler();
+
+            // Wait for connection on client and server side
+            var success = WaitForClientsConnectedOrTimeOutWithTimeTravel();
+            Assert.True(success, $"Timed-out waiting for all clients to connect!");
+
+            // These are the *SERVER VERSIONS* of the *CLIENT PLAYER 1 & 2*
+            var result = new NetcodeIntegrationTestHelpers.ResultWrapper<NetworkObject>();
+
+            NetcodeIntegrationTestHelpers.GetNetworkObjectByRepresentationWithTimeTravel(
+                x => x.IsPlayerObject && x.OwnerClientId == m_ClientNetworkManagers[0].LocalClientId,
                 m_ServerNetworkManager, result);
 
             // Assign server-side client's player
@@ -545,6 +521,7 @@ private void InitializeServerAndClients(HostOrServer useHost)
             TimeTravelToNextTick();
         }
 
+#if !MULTIPLAYER_TOOLS
         /// <summary>
         /// Runs generalized tests on all predefined NetworkVariable types
         /// </summary>
@@ -591,6 +568,8 @@ public void ClientWritePermissionTest([Values] HostOrServer useHost)
         {
             InitializeServerAndClients(useHost);
 
+            // client must not be allowed to write to a server auth variable
+
             LogAssert.Expect(LogType.Error, m_Player1OnClient1.TheScalar.GetWritePermissionError());
             m_Player1OnClient1.TheScalar.Value = k_TestVal1;
         }
@@ -904,7 +883,7 @@ bool VerifyClass()
                        m_Player1OnClient1.GetComponent<ClassHavingNetworkBehaviour2>().TheVar.Value.SomeInt == m_Player1OnServer.GetComponent<ClassHavingNetworkBehaviour2>().TheVar.Value.SomeInt;
             }
 
-            m_Player1OnServer.GetComponent<ClassHavingNetworkBehaviour2>().TheVar.Value = new TestClass_ReferencedOnlyByTemplateNetworkBehavourType { SomeInt = k_TestUInt, SomeBool = false };
+            m_Player1OnServer.GetComponent<ClassHavingNetworkBehaviour2>().TheVar.Value = new TestClass_ReferencedOnlyByTemplateNetworkBehaviourType { SomeInt = k_TestUInt, SomeBool = false };
             m_Player1OnServer.GetComponent<ClassHavingNetworkBehaviour2>().TheVar.SetDirty(true);
 
             // Wait for the client-side to notify it is finished initializing and spawning.
@@ -963,6 +942,7 @@ public void TestINetworkSerializableClassCallsNetworkSerialize([Values] HostOrSe
             // Wait for the client-side to notify it is finished initializing and spawning.
             Assert.True(WaitForConditionOrTimeOutWithTimeTravel(VerifyCallback));
         }
+#endif
 
         [Test]
         public void TestINetworkSerializableStructCallsNetworkSerialize([Values] HostOrServer useHost)
@@ -2179,6 +2159,7 @@ public string ArrayStr<T>(NativeArray<T> arr) where T : unmanaged
         }
 
         [Test]
+        [UnityPlatform(exclude = new[] { RuntimePlatform.Android, RuntimePlatform.IPhonePlayer })] // Ignored test tracked in MTT-11343
         [Repeat(5)]
         public void WhenSerializingAndDeserializingVeryLargeValueTypeNativeArrayNetworkVariables_ValuesAreSerializedCorrectly(
 
@@ -2632,6 +2613,7 @@ public string DictionaryStr<TKey, TVal>(Dictionary<TKey, TVal> list)
         }
 
         [Test]
+        [UnityPlatform(exclude = new[] { RuntimePlatform.Android, RuntimePlatform.IPhonePlayer })] // Ignored test tracked in MTT-11343
         [Repeat(5)]
         public void WhenSerializingAndDeserializingVeryLargeListNetworkVariables_ValuesAreSerializedCorrectly(
 
@@ -2818,6 +2800,7 @@ public void WhenSerializingAndDeserializingVeryLargeListNetworkVariables_ValuesA
         }
 
         [Test]
+        [UnityPlatform(exclude = new[] { RuntimePlatform.Android, RuntimePlatform.IPhonePlayer })] // Ignored test tracked in MTT-11343
         [Repeat(5)]
         public void WhenSerializingAndDeserializingVeryLargeHashSetNetworkVariables_ValuesAreSerializedCorrectly(
 
@@ -2973,6 +2956,7 @@ public void WhenSerializingAndDeserializingVeryLargeHashSetNetworkVariables_Valu
         }
 
         [Test]
+        [UnityPlatform(exclude = new[] { RuntimePlatform.Android, RuntimePlatform.IPhonePlayer })] // Ignored test tracked in MTT-11343
         [Repeat(5)]
         public void WhenSerializingAndDeserializingVeryLargeDictionaryNetworkVariables_ValuesAreSerializedCorrectly(
 
@@ -3955,7 +3939,7 @@ public string NativeHashMapStr<TKey, TVal>(NativeHashMap<TKey, TVal> list)
 
             for (var i = 0; i < changed2Removes; ++i)
             {
-                var which = rand.Next(changed2.Count());
+                var which = rand.Next(changed2.Count);
                 T toRemove = default;
                 foreach (var check in changed2)
                 {
@@ -4028,7 +4012,7 @@ public string NativeHashMapStr<TKey, TVal>(NativeHashMap<TKey, TVal> list)
 
             for (var i = 0; i < changed2Removes; ++i)
             {
-                var which = rand.Next(changed2.Count());
+                var which = rand.Next(changed2.Count);
                 TKey toRemove = default;
                 foreach (var check in changed2)
                 {
@@ -4045,7 +4029,7 @@ public string NativeHashMapStr<TKey, TVal>(NativeHashMap<TKey, TVal> list)
 
             for (var i = 0; i < changed2Changes; ++i)
             {
-                var which = rand.Next(changed2.Count());
+                var which = rand.Next(changed2.Count);
                 TKey key = default;
                 foreach (var check in changed2)
                 {
@@ -5092,382 +5076,5 @@ protected override IEnumerator OnTearDown()
             yield return base.OnTearDown();
         }
     }
-
-    /// <summary>
-    /// Handles the more generic conditional logic for NetworkList tests
-    /// which can be used with the <see cref="NetcodeIntegrationTest.WaitForConditionOrTimeOut"/>
-    /// that accepts anything derived from the <see cref="ConditionalPredicateBase"/> class
-    /// as a parameter.
-    /// </summary>
-    public class NetworkListTestPredicate : ConditionalPredicateBase
-    {
-        private const int k_MaxRandomValue = 1000;
-
-        private Dictionary<NetworkListTestStates, Func<bool>> m_StateFunctions;
-
-        // Player1 component on the Server
-        private NetworkVariableTest m_Player1OnServer;
-
-        // Player1 component on client1
-        private NetworkVariableTest m_Player1OnClient1;
-
-        private string m_TestStageFailedMessage;
-
-        public enum NetworkListTestStates
-        {
-            Add,
-            ContainsLarge,
-            Contains,
-            VerifyData,
-            IndexOf,
-        }
-
-        private NetworkListTestStates m_NetworkListTestState;
-
-        public void SetNetworkListTestState(NetworkListTestStates networkListTestState)
-        {
-            m_NetworkListTestState = networkListTestState;
-        }
-
-        /// <summary>
-        /// Determines if the condition has been reached for the current NetworkListTestState
-        /// </summary>
-        protected override bool OnHasConditionBeenReached()
-        {
-            var isStateRegistered = m_StateFunctions.ContainsKey(m_NetworkListTestState);
-            Assert.IsTrue(isStateRegistered);
-            return m_StateFunctions[m_NetworkListTestState].Invoke();
-        }
-
-        /// <summary>
-        /// Provides all information about the players for both sides for simplicity and informative sake.
-        /// </summary>
-        /// <returns></returns>
-        private string ConditionFailedInfo()
-        {
-            return $"{m_NetworkListTestState} condition test failed:\n Server List Count: {m_Player1OnServer.TheList.Count} vs  Client List Count: {m_Player1OnClient1.TheList.Count}\n" +
-                $"Server List Count: {m_Player1OnServer.TheLargeList.Count} vs  Client List Count: {m_Player1OnClient1.TheLargeList.Count}\n" +
-                $"Server Delegate Triggered: {m_Player1OnServer.ListDelegateTriggered} | Client Delegate Triggered: {m_Player1OnClient1.ListDelegateTriggered}\n";
-        }
-
-        /// <summary>
-        /// When finished, check if a time out occurred and if so assert and provide meaningful information to troubleshoot why
-        /// </summary>
-        protected override void OnFinished()
-        {
-            Assert.IsFalse(TimedOut, $"{nameof(NetworkListTestPredicate)} timed out waiting for the {m_NetworkListTestState} condition to be reached! \n" + ConditionFailedInfo());
-        }
-
-        // Uses the ArrayOperator and validates that on both sides the count and values are the same
-        private bool OnVerifyData()
-        {
-            // Wait until both sides have the same number of elements
-            if (m_Player1OnServer.TheList.Count != m_Player1OnClient1.TheList.Count)
-            {
-                return false;
-            }
-
-            // Check the client values against the server values to make sure they match
-            for (int i = 0; i < m_Player1OnServer.TheList.Count; i++)
-            {
-                if (m_Player1OnServer.TheList[i] != m_Player1OnClient1.TheList[i])
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        /// <summary>
-        /// Verifies the data count, values, and that the ListDelegate on both sides was triggered
-        /// </summary>
-        private bool OnAdd()
-        {
-            bool wasTriggerred = m_Player1OnServer.ListDelegateTriggered && m_Player1OnClient1.ListDelegateTriggered;
-            return wasTriggerred && OnVerifyData();
-        }
-
-        /// <summary>
-        /// The current version of this test only verified the count of the large list, so that is what this does
-        /// </summary>
-        private bool OnContainsLarge()
-        {
-            return m_Player1OnServer.TheLargeList.Count == m_Player1OnClient1.TheLargeList.Count;
-        }
-
-        /// <summary>
-        /// Tests NetworkList.Contains which also verifies all values are the same on both sides
-        /// </summary>
-        private bool OnContains()
-        {
-            // Wait until both sides have the same number of elements
-            if (m_Player1OnServer.TheList.Count != m_Player1OnClient1.TheList.Count)
-            {
-                return false;
-            }
-
-            // Parse through all server values and use the NetworkList.Contains method to check if the value is in the list on the client side
-            foreach (var serverValue in m_Player1OnServer.TheList)
-            {
-                if (!m_Player1OnClient1.TheList.Contains(serverValue))
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        /// <summary>
-        /// Tests NetworkList.IndexOf and verifies that all values are aligned on both sides
-        /// </summary>
-        private bool OnIndexOf()
-        {
-            foreach (var serverSideValue in m_Player1OnServer.TheList)
-            {
-                var indexToTest = m_Player1OnServer.TheList.IndexOf(serverSideValue);
-                if (indexToTest != m_Player1OnServer.TheList.IndexOf(serverSideValue))
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        public NetworkListTestPredicate(NetworkVariableTest player1OnServer, NetworkVariableTest player1OnClient1, NetworkListTestStates networkListTestState, int elementCount)
-        {
-            m_NetworkListTestState = networkListTestState;
-            m_Player1OnServer = player1OnServer;
-            m_Player1OnClient1 = player1OnClient1;
-            m_StateFunctions = new Dictionary<NetworkListTestStates, Func<bool>>
-            {
-                { NetworkListTestStates.Add, OnAdd },
-                { NetworkListTestStates.ContainsLarge, OnContainsLarge },
-                { NetworkListTestStates.Contains, OnContains },
-                { NetworkListTestStates.VerifyData, OnVerifyData },
-                { NetworkListTestStates.IndexOf, OnIndexOf }
-            };
-
-            if (networkListTestState == NetworkListTestStates.ContainsLarge)
-            {
-                for (var i = 0; i < elementCount; ++i)
-                {
-                    m_Player1OnServer.TheLargeList.Add(new FixedString128Bytes());
-                }
-            }
-            else
-            {
-                for (int i = 0; i < elementCount; i++)
-                {
-                    m_Player1OnServer.TheList.Add(Random.Range(0, k_MaxRandomValue));
-                }
-            }
-        }
-    }
-
-    [TestFixtureSource(nameof(TestDataSource))]
-    public class NetworkVariableInheritanceTests : NetcodeIntegrationTest
-    {
-        public NetworkVariableInheritanceTests(HostOrServer hostOrServer)
-            : base(hostOrServer)
-        {
-        }
-
-        protected override int NumberOfClients => 2;
-
-        public static IEnumerable<TestFixtureData> TestDataSource() =>
-            Enum.GetValues(typeof(HostOrServer)).OfType<HostOrServer>().Select(x => new TestFixtureData(x));
-
-        public class ComponentA : NetworkBehaviour
-        {
-            public NetworkVariable<int> PublicFieldA = new NetworkVariable<int>(1);
-            protected NetworkVariable<int> m_ProtectedFieldA = new NetworkVariable<int>(2);
-            private NetworkVariable<int> m_PrivateFieldA = new NetworkVariable<int>(3);
-
-            public void ChangeValuesA(int pub, int pro, int pri)
-            {
-                PublicFieldA.Value = pub;
-                m_ProtectedFieldA.Value = pro;
-                m_PrivateFieldA.Value = pri;
-            }
-
-            public bool CompareValuesA(ComponentA other)
-            {
-                return PublicFieldA.Value == other.PublicFieldA.Value &&
-                    m_ProtectedFieldA.Value == other.m_ProtectedFieldA.Value &&
-                    m_PrivateFieldA.Value == other.m_PrivateFieldA.Value;
-            }
-        }
-
-        public class ComponentB : ComponentA
-        {
-            public NetworkVariable<int> PublicFieldB = new NetworkVariable<int>(11);
-            protected NetworkVariable<int> m_ProtectedFieldB = new NetworkVariable<int>(22);
-            private NetworkVariable<int> m_PrivateFieldB = new NetworkVariable<int>(33);
-
-            public void ChangeValuesB(int pub, int pro, int pri)
-            {
-                PublicFieldB.Value = pub;
-                m_ProtectedFieldB.Value = pro;
-                m_PrivateFieldB.Value = pri;
-            }
-
-            public bool CompareValuesB(ComponentB other)
-            {
-                return PublicFieldB.Value == other.PublicFieldB.Value &&
-                    m_ProtectedFieldB.Value == other.m_ProtectedFieldB.Value &&
-                    m_PrivateFieldB.Value == other.m_PrivateFieldB.Value;
-            }
-        }
-
-        public class ComponentC : ComponentB
-        {
-            public NetworkVariable<int> PublicFieldC = new NetworkVariable<int>(111);
-            protected NetworkVariable<int> m_ProtectedFieldC = new NetworkVariable<int>(222);
-            private NetworkVariable<int> m_PrivateFieldC = new NetworkVariable<int>(333);
-
-            public void ChangeValuesC(int pub, int pro, int pri)
-            {
-                PublicFieldC.Value = pub;
-                m_ProtectedFieldA.Value = pro;
-                m_PrivateFieldC.Value = pri;
-            }
-
-            public bool CompareValuesC(ComponentC other)
-            {
-                return PublicFieldC.Value == other.PublicFieldC.Value &&
-                    m_ProtectedFieldC.Value == other.m_ProtectedFieldC.Value &&
-                    m_PrivateFieldC.Value == other.m_PrivateFieldC.Value;
-            }
-        }
-
-        private GameObject m_TestObjectPrefab;
-        private ulong m_TestObjectId = 0;
-
-        protected override void OnServerAndClientsCreated()
-        {
-            m_TestObjectPrefab = CreateNetworkObjectPrefab($"[{nameof(NetworkVariableInheritanceTests)}.{nameof(m_TestObjectPrefab)}]");
-            m_TestObjectPrefab.AddComponent<ComponentA>();
-            m_TestObjectPrefab.AddComponent<ComponentB>();
-            m_TestObjectPrefab.AddComponent<ComponentC>();
-        }
-
-        protected override IEnumerator OnServerAndClientsConnected()
-        {
-            var serverTestObject = SpawnObject(m_TestObjectPrefab, m_ServerNetworkManager).GetComponent<NetworkObject>();
-            m_TestObjectId = serverTestObject.NetworkObjectId;
-
-            var serverTestComponentA = serverTestObject.GetComponent<ComponentA>();
-            var serverTestComponentB = serverTestObject.GetComponent<ComponentB>();
-            var serverTestComponentC = serverTestObject.GetComponent<ComponentC>();
-
-            serverTestComponentA.ChangeValuesA(1000, 2000, 3000);
-            serverTestComponentB.ChangeValuesA(1000, 2000, 3000);
-            serverTestComponentB.ChangeValuesB(1100, 2200, 3300);
-            serverTestComponentC.ChangeValuesA(1000, 2000, 3000);
-            serverTestComponentC.ChangeValuesB(1100, 2200, 3300);
-            serverTestComponentC.ChangeValuesC(1110, 2220, 3330);
-
-            yield return WaitForTicks(m_ServerNetworkManager, 2);
-        }
-
-        private bool CheckTestObjectComponentValuesOnAll()
-        {
-            var serverTestObject = m_ServerNetworkManager.SpawnManager.SpawnedObjects[m_TestObjectId];
-            var serverTestComponentA = serverTestObject.GetComponent<ComponentA>();
-            var serverTestComponentB = serverTestObject.GetComponent<ComponentB>();
-            var serverTestComponentC = serverTestObject.GetComponent<ComponentC>();
-            foreach (var clientNetworkManager in m_ClientNetworkManagers)
-            {
-                var clientTestObject = clientNetworkManager.SpawnManager.SpawnedObjects[m_TestObjectId];
-                var clientTestComponentA = clientTestObject.GetComponent<ComponentA>();
-                var clientTestComponentB = clientTestObject.GetComponent<ComponentB>();
-                var clientTestComponentC = clientTestObject.GetComponent<ComponentC>();
-                if (!serverTestComponentA.CompareValuesA(clientTestComponentA) ||
-                    !serverTestComponentB.CompareValuesA(clientTestComponentB) ||
-                    !serverTestComponentB.CompareValuesB(clientTestComponentB) ||
-                    !serverTestComponentC.CompareValuesA(clientTestComponentC) ||
-                    !serverTestComponentC.CompareValuesB(clientTestComponentC) ||
-                    !serverTestComponentC.CompareValuesC(clientTestComponentC))
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        [UnityTest]
-        public IEnumerator TestInheritedFields()
-        {
-            yield return WaitForConditionOrTimeOut(CheckTestObjectComponentValuesOnAll);
-            Assert.IsFalse(s_GlobalTimeoutHelper.TimedOut, nameof(CheckTestObjectComponentValuesOnAll));
-        }
-    }
-
-    public class NetvarDespawnShutdown : NetworkBehaviour
-    {
-        private NetworkVariable<int> m_IntNetworkVariable = new NetworkVariable<int>();
-        private NetworkList<int> m_IntList;
-
-        private void Awake()
-        {
-            m_IntList = new NetworkList<int>();
-        }
-
-        public override void OnNetworkDespawn()
-        {
-            if (IsServer)
-            {
-                m_IntNetworkVariable.Value = 5;
-                for (int i = 0; i < 10; i++)
-                {
-                    m_IntList.Add(i);
-                }
-            }
-            base.OnNetworkDespawn();
-        }
-    }
-
-    /// <summary>
-    /// Validates that setting values for NetworkVariable or NetworkList during the
-    /// OnNetworkDespawn method will not cause an exception to occur.
-    /// </summary>
-    public class NetworkVariableModifyOnNetworkDespawn : NetcodeIntegrationTest
-    {
-        protected override int NumberOfClients => 1;
-
-        private GameObject m_TestPrefab;
-
-        protected override void OnServerAndClientsCreated()
-        {
-            m_TestPrefab = CreateNetworkObjectPrefab("NetVarDespawn");
-            m_TestPrefab.AddComponent<NetvarDespawnShutdown>();
-            base.OnServerAndClientsCreated();
-        }
-
-        private bool OnClientSpawnedTestPrefab(ulong networkObjectId)
-        {
-            var clientId = m_ClientNetworkManagers[0].LocalClientId;
-            if (!s_GlobalNetworkObjects.ContainsKey(clientId))
-            {
-                return false;
-            }
-
-            if (!s_GlobalNetworkObjects[clientId].ContainsKey(networkObjectId))
-            {
-                return false;
-            }
-
-            return true;
-        }
-
-        [UnityTest]
-        public IEnumerator ModifyNetworkVariableOrListOnNetworkDespawn()
-        {
-            var instance = SpawnObject(m_TestPrefab, m_ServerNetworkManager);
-            yield return WaitForConditionOrTimeOut(() => OnClientSpawnedTestPrefab(instance.GetComponent<NetworkObject>().NetworkObjectId));
-            m_ServerNetworkManager.Shutdown();
-            // As long as no excetptions occur, the test passes.
-        }
-    }
 }
+#endif
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableTests.cs.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTests.cs.meta
rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableTests.cs.meta
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTestsHelperTypes.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableTestsHelperTypes.cs
similarity index 95%
rename from com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTestsHelperTypes.cs
rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableTestsHelperTypes.cs
index 67d54cd20d..f50811ba1f 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTestsHelperTypes.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableTestsHelperTypes.cs
@@ -5,24 +5,24 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class NetVarPermTestComp : NetworkBehaviour
+    internal class NetVarPermTestComp : NetworkBehaviour
     {
         public NetworkVariable<Vector3> OwnerWritable_Position = new NetworkVariable<Vector3>(Vector3.one, NetworkVariableBase.DefaultReadPerm, NetworkVariableWritePermission.Owner);
         public NetworkVariable<Vector3> ServerWritable_Position = new NetworkVariable<Vector3>(Vector3.one, NetworkVariableBase.DefaultReadPerm, NetworkVariableWritePermission.Server);
         public NetworkVariable<Vector3> OwnerReadWrite_Position = new NetworkVariable<Vector3>(Vector3.one, NetworkVariableReadPermission.Owner, NetworkVariableWritePermission.Owner);
     }
 
-    public class NetworkVariableMiddleclass<TMiddleclassName> : NetworkVariable<TMiddleclassName>
+    internal class NetworkVariableMiddleclass<TMiddleclassName> : NetworkVariable<TMiddleclassName>
     {
 
     }
 
-    public class NetworkVariableSubclass<TSubclassName> : NetworkVariableMiddleclass<TSubclassName>
+    internal class NetworkVariableSubclass<TSubclassName> : NetworkVariableMiddleclass<TSubclassName>
     {
 
     }
 
-    public class NetworkBehaviourWithNetVarArray : NetworkBehaviour
+    internal class NetworkBehaviourWithNetVarArray : NetworkBehaviour
     {
         public NetworkVariable<int> Int0 = new NetworkVariable<int>();
         public NetworkVariable<int> Int1 = new NetworkVariable<int>();
@@ -123,7 +123,7 @@ public void Foo()
         }
     }
 
-    public struct TemplatedValueOnlyReferencedByNetworkVariableSubclass<T> : INetworkSerializeByMemcpy
+    internal struct TemplatedValueOnlyReferencedByNetworkVariableSubclass<T> : INetworkSerializeByMemcpy
         where T : unmanaged
     {
         public T Value;
@@ -178,7 +178,7 @@ public enum ULongEnum : ulong
         C = ulong.MaxValue
     }
 
-    public struct HashableNetworkVariableTestStruct : INetworkSerializeByMemcpy, IEquatable<HashableNetworkVariableTestStruct>
+    internal struct HashableNetworkVariableTestStruct : INetworkSerializeByMemcpy, IEquatable<HashableNetworkVariableTestStruct>
     {
         public byte A;
         public short B;
@@ -220,7 +220,7 @@ public override int GetHashCode()
         }
     }
 
-    public struct HashMapKeyStruct : INetworkSerializeByMemcpy, IEquatable<HashMapKeyStruct>
+    internal struct HashMapKeyStruct : INetworkSerializeByMemcpy, IEquatable<HashMapKeyStruct>
     {
         public byte A;
         public short B;
@@ -262,7 +262,7 @@ public override int GetHashCode()
         }
     }
 
-    public struct HashMapValStruct : INetworkSerializeByMemcpy, IEquatable<HashMapValStruct>
+    internal struct HashMapValStruct : INetworkSerializeByMemcpy, IEquatable<HashMapValStruct>
     {
         public byte A;
         public short B;
@@ -304,7 +304,7 @@ public override int GetHashCode()
         }
     }
 
-    public struct NetworkVariableTestStruct : INetworkSerializeByMemcpy
+    internal struct NetworkVariableTestStruct : INetworkSerializeByMemcpy
     {
         public byte A;
         public short B;
@@ -342,7 +342,7 @@ public static NetworkVariableTestStruct GetTestStruct()
     }
 
 
-    public class HashableNetworkVariableTestClass : INetworkSerializable, IEquatable<HashableNetworkVariableTestClass>
+    internal class HashableNetworkVariableTestClass : INetworkSerializable, IEquatable<HashableNetworkVariableTestClass>
     {
         public HashableNetworkVariableTestStruct Data;
 
@@ -367,7 +367,7 @@ public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReade
         }
     }
 
-    public class HashMapKeyClass : INetworkSerializable, IEquatable<HashMapKeyClass>
+    internal class HashMapKeyClass : INetworkSerializable, IEquatable<HashMapKeyClass>
     {
         public HashMapKeyStruct Data;
 
@@ -392,7 +392,7 @@ public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReade
         }
     }
 
-    public class HashMapValClass : INetworkSerializable, IEquatable<HashMapValClass>
+    internal class HashMapValClass : INetworkSerializable, IEquatable<HashMapValClass>
     {
         public HashMapValStruct Data;
 
@@ -417,7 +417,7 @@ public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReade
         }
     }
 
-    public class NetworkVariableTestClass : INetworkSerializable, IEquatable<NetworkVariableTestClass>
+    internal class NetworkVariableTestClass : INetworkSerializable, IEquatable<NetworkVariableTestClass>
     {
         public NetworkVariableTestStruct Data;
 
@@ -446,7 +446,7 @@ public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReade
 
     // The ILPP code for NetworkVariables to determine how to serialize them relies on them existing as fields of a NetworkBehaviour to find them.
     // Some of the tests below create NetworkVariables on the stack, so this class is here just to make sure the relevant types are all accounted for.
-    public class NetVarILPPClassForTests : NetworkBehaviour
+    internal class NetVarILPPClassForTests : NetworkBehaviour
     {
         public NetworkVariable<byte> ByteVar;
         public NetworkVariable<NativeArray<byte>> ByteArrayVar;
@@ -887,33 +887,34 @@ public class NetVarILPPClassForTests : NetworkBehaviour
         public NetworkVariableSubclass<TemplatedValueOnlyReferencedByNetworkVariableSubclass<int>> SubclassVar;
     }
 
-    public class TemplateNetworkBehaviourType<T> : NetworkBehaviour
+    internal class TemplateNetworkBehaviourType<T> : NetworkBehaviour
     {
         public NetworkVariable<T> TheVar;
     }
 
-    public class IntermediateNetworkBehavior<T> : TemplateNetworkBehaviourType<T>
+    internal class IntermediateNetworkBehavior<T> : TemplateNetworkBehaviourType<T>
     {
         public NetworkVariable<T> TheVar2;
     }
-
-    public class ClassHavingNetworkBehaviour : IntermediateNetworkBehavior<TestClass>
+#if !NGO_MINIMALPROJECT
+    internal class ClassHavingNetworkBehaviour : IntermediateNetworkBehavior<TestClass>
     {
 
     }
 
     // Please do not reference TestClass_ReferencedOnlyByTemplateNetworkBehavourType anywhere other than here!
-    public class ClassHavingNetworkBehaviour2 : TemplateNetworkBehaviourType<TestClass_ReferencedOnlyByTemplateNetworkBehavourType>
+    internal class ClassHavingNetworkBehaviour2 : TemplateNetworkBehaviourType<TestClass_ReferencedOnlyByTemplateNetworkBehaviourType>
     {
 
     }
 
-    public class StructHavingNetworkBehaviour : TemplateNetworkBehaviourType<TestStruct>
+    internal class StructHavingNetworkBehaviour : TemplateNetworkBehaviourType<TestStruct>
     {
 
     }
+#endif
 
-    public struct StructUsedOnlyInNetworkList : IEquatable<StructUsedOnlyInNetworkList>, INetworkSerializeByMemcpy
+    internal struct StructUsedOnlyInNetworkList : IEquatable<StructUsedOnlyInNetworkList>, INetworkSerializeByMemcpy
     {
         public int Value;
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTestsHelperTypes.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableTestsHelperTypes.cs.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTestsHelperTypes.cs.meta
rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableTestsHelperTypes.cs.meta
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTraitsTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableTraitsTests.cs
similarity index 97%
rename from com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTraitsTests.cs
rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableTraitsTests.cs
index 1c3872ac3a..66c326cb99 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTraitsTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableTraitsTests.cs
@@ -5,12 +5,12 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class NetworkVariableTraitsComponent : NetworkBehaviour
+    internal class NetworkVariableTraitsComponent : NetworkBehaviour
     {
         public NetworkVariable<float> TheVariable = new NetworkVariable<float>();
     }
 
-    public class NetworkVariableTraitsTests : NetcodeIntegrationTest
+    internal class NetworkVariableTraitsTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 2;
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableTraitsTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableTraitsTests.cs.meta
new file mode 100644
index 0000000000..3bfb25d690
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableTraitsTests.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 49f46ca2b4327464498a7465891647bb
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableUserSerializableTypesTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableUserSerializableTypesTests.cs
similarity index 95%
rename from com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableUserSerializableTypesTests.cs
rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableUserSerializableTypesTests.cs
index 984c95a401..c261bdf032 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableUserSerializableTypesTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableUserSerializableTypesTests.cs
@@ -9,15 +9,15 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public struct MyTypeOne
+    internal struct MyTypeOne
     {
         public int Value;
     }
-    public struct MyTypeTwo
+    internal struct MyTypeTwo
     {
         public int Value;
     }
-    public struct MyTypeThree
+    internal struct MyTypeThree
     {
         public int Value;
     }
@@ -25,7 +25,7 @@ public struct MyTypeThree
     /// <summary>
     /// Used to help track instances of any child derived class
     /// </summary>
-    public class WorkingUserNetworkVariableComponentBase : NetworkBehaviour
+    internal class WorkingUserNetworkVariableComponentBase : NetworkBehaviour
     {
         private static Dictionary<ulong, WorkingUserNetworkVariableComponentBase> s_Instances = new Dictionary<ulong, WorkingUserNetworkVariableComponentBase>();
 
@@ -68,16 +68,16 @@ public override void OnNetworkDespawn()
         }
     }
 
-    public class WorkingUserNetworkVariableComponent : WorkingUserNetworkVariableComponentBase
+    internal class WorkingUserNetworkVariableComponent : WorkingUserNetworkVariableComponentBase
     {
         public NetworkVariable<MyTypeOne> NetworkVariable = new NetworkVariable<MyTypeOne>();
     }
 
-    public class WorkingUserNetworkVariableComponentUsingExtensionMethod : WorkingUserNetworkVariableComponentBase
+    internal class WorkingUserNetworkVariableComponentUsingExtensionMethod : WorkingUserNetworkVariableComponentBase
     {
         public NetworkVariable<MyTypeTwo> NetworkVariable = new NetworkVariable<MyTypeTwo>();
     }
-    public class NonWorkingUserNetworkVariableComponent : NetworkBehaviour
+    internal class NonWorkingUserNetworkVariableComponent : NetworkBehaviour
     {
         public NetworkVariable<MyTypeThree> NetworkVariable = new NetworkVariable<MyTypeThree>();
     }
@@ -96,7 +96,7 @@ public static void ReadValueSafe(this FastBufferReader reader, out MyTypeTwo val
         }
     }
 
-    public class NetworkVariableUserSerializableTypesTests : NetcodeIntegrationTest
+    internal class NetworkVariableUserSerializableTypesTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 1;
 
@@ -260,3 +260,4 @@ protected override IEnumerator OnTearDown()
         }
     }
 }
+
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableUserSerializableTypesTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableUserSerializableTypesTests.cs.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableUserSerializableTypesTests.cs.meta
rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableUserSerializableTypesTests.cs.meta
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/OwnerModifiedTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/OwnerModifiedTests.cs
similarity index 82%
rename from com.unity.netcode.gameobjects/Tests/Runtime/OwnerModifiedTests.cs
rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/OwnerModifiedTests.cs
index cc7b37e3de..3a925b9332 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/OwnerModifiedTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/OwnerModifiedTests.cs
@@ -12,12 +12,14 @@ namespace Unity.Netcode.RuntimeTests
     // Where the NetworkVariable updates would be repeated on some clients.
     // The twist comes fom the updates needing to happens very specifically for the issue to repro in tests
 
-    public class OwnerModifiedObject : NetworkBehaviour, INetworkUpdateSystem
+    internal class OwnerModifiedObject : NetworkBehaviour, INetworkUpdateSystem
     {
         public NetworkList<int> MyNetworkList;
 
         internal static int Updates = 0;
 
+        public static bool EnableVerbose;
+
         private void Awake()
         {
             MyNetworkList = new NetworkList<int>(new List<int>(), NetworkVariableReadPermission.Everyone, NetworkVariableWritePermission.Owner);
@@ -34,7 +36,11 @@ public void Changed(NetworkListEvent<int> listEvent)
                 expected++;
                 listString += i.ToString();
             }
-            Debug.Log($"[{NetworkManager.LocalClientId}] Value changed to {listString}");
+            if (EnableVerbose)
+            {
+                Debug.Log($"[{NetworkManager.LocalClientId}] Value changed to {listString}");
+            }
+
             Updates++;
         }
 
@@ -68,10 +74,14 @@ public void InitializeLastCient()
         }
     }
 
-    public class OwnerModifiedTests : NetcodeIntegrationTest
+    [TestFixture(HostOrServer.DAHost)]
+    [TestFixture(HostOrServer.Host)]
+    internal class OwnerModifiedTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 2;
 
+        public OwnerModifiedTests(HostOrServer hostOrServer) : base(hostOrServer) { }
+
         protected override void OnCreatePlayerPrefab()
         {
             m_PlayerPrefab.AddComponent<OwnerModifiedObject>();
@@ -80,6 +90,7 @@ protected override void OnCreatePlayerPrefab()
         [UnityTest]
         public IEnumerator OwnerModifiedTest()
         {
+            OwnerModifiedObject.EnableVerbose = m_EnableVerboseDebug;
             // We use this to assure we are the "last client" connected.
             yield return CreateAndStartNewClient();
             var ownerModLastClient = m_ClientNetworkManagers[2].LocalClient.PlayerObject.GetComponent<OwnerModifiedObject>();
@@ -89,7 +100,7 @@ public IEnumerator OwnerModifiedTest()
             foreach (var updateLoopType in System.Enum.GetValues(typeof(NetworkUpdateStage)))
             {
                 ownerModLastClient.NetworkUpdateStageToCheck = (NetworkUpdateStage)updateLoopType;
-                Debug.Log($"Testing Update Stage: {ownerModLastClient.NetworkUpdateStageToCheck}");
+                VerboseDebug($"Testing Update Stage: {ownerModLastClient.NetworkUpdateStageToCheck}");
                 ownerModLastClient.AddValues = true;
                 yield return WaitForTicks(m_ServerNetworkManager, 5);
             }
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/OwnerModifiedTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/OwnerModifiedTests.cs.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Tests/Runtime/OwnerModifiedTests.cs.meta
rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/OwnerModifiedTests.cs.meta
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/OwnerPermissionTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/OwnerPermissionTests.cs
similarity index 96%
rename from com.unity.netcode.gameobjects/Tests/Runtime/OwnerPermissionTests.cs
rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/OwnerPermissionTests.cs
index 0d8f36e0bd..01878e11f4 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/OwnerPermissionTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/OwnerPermissionTests.cs
@@ -6,7 +6,7 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class OwnerPermissionObject : NetworkBehaviour
+    internal class OwnerPermissionObject : NetworkBehaviour
     {
         // indexed by [object, machine]
         public static OwnerPermissionObject[,] Objects = new OwnerPermissionObject[3, 3];
@@ -49,7 +49,6 @@ public static void VerifyConsistency()
         public override void OnNetworkSpawn()
         {
             Objects[CurrentlySpawning, NetworkManager.LocalClientId] = GetComponent<OwnerPermissionObject>();
-            Debug.Log($"Object index ({CurrentlySpawning}) spawned on client {NetworkManager.LocalClientId}");
         }
 
         private void Awake()
@@ -84,7 +83,9 @@ public void ListServerChanged(NetworkListEvent<int> listEvent)
         }
     }
 
-    public class OwnerPermissionHideTests : NetcodeIntegrationTest
+
+
+    internal class OwnerPermissionHideTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 2;
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/OwnerPermissionTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/OwnerPermissionTests.cs.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Tests/Runtime/OwnerPermissionTests.cs.meta
rename to com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/OwnerPermissionTests.cs.meta
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableAnticipationTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableAnticipationTests.cs.meta
deleted file mode 100644
index ea2f140426..0000000000
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableAnticipationTests.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 43cd37f850534b7db07e20281442f10d
-timeCreated: 1706288570
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTraitsTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTraitsTests.cs.meta
deleted file mode 100644
index 4b0b040971..0000000000
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTraitsTests.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: c4ca75209dbd43f48930e4887392bafd
-timeCreated: 1706826268
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVisibilityTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVisibilityTests.cs
index 5d8b65138a..670bd9d091 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVisibilityTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVisibilityTests.cs
@@ -7,22 +7,20 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    [TestFixture(SceneManagementState.SceneManagementEnabled)]
-    [TestFixture(SceneManagementState.SceneManagementDisabled)]
-    public class NetworkVisibilityTests : NetcodeIntegrationTest
+    [TestFixture(SceneManagementState.SceneManagementEnabled, NetworkTopologyTypes.DistributedAuthority)]
+    [TestFixture(SceneManagementState.SceneManagementDisabled, NetworkTopologyTypes.DistributedAuthority)]
+    [TestFixture(SceneManagementState.SceneManagementEnabled, NetworkTopologyTypes.ClientServer)]
+    [TestFixture(SceneManagementState.SceneManagementDisabled, NetworkTopologyTypes.ClientServer)]
+    internal class NetworkVisibilityTests : NetcodeIntegrationTest
     {
-        public enum SceneManagementState
-        {
-            SceneManagementEnabled,
-            SceneManagementDisabled
-        }
-        protected override int NumberOfClients => 1;
+
+        protected override int NumberOfClients => 2;
         private GameObject m_TestNetworkPrefab;
         private bool m_SceneManagementEnabled;
-
         private GameObject m_SpawnedObject;
+        private NetworkManager m_SessionOwner;
 
-        public NetworkVisibilityTests(SceneManagementState sceneManagementState)
+        public NetworkVisibilityTests(SceneManagementState sceneManagementState, NetworkTopologyTypes networkTopologyType) : base(networkTopologyType)
         {
             m_SceneManagementEnabled = sceneManagementState == SceneManagementState.SceneManagementEnabled;
         }
@@ -31,7 +29,11 @@ protected override void OnServerAndClientsCreated()
         {
             m_TestNetworkPrefab = CreateNetworkObjectPrefab("Object");
             m_TestNetworkPrefab.AddComponent<NetworkVisibilityComponent>();
-            m_ServerNetworkManager.NetworkConfig.EnableSceneManagement = m_SceneManagementEnabled;
+            if (!UseCMBService())
+            {
+                m_ServerNetworkManager.NetworkConfig.EnableSceneManagement = m_SceneManagementEnabled;
+            }
+
             foreach (var clientNetworkManager in m_ClientNetworkManagers)
             {
                 clientNetworkManager.NetworkConfig.EnableSceneManagement = m_SceneManagementEnabled;
@@ -42,7 +44,8 @@ protected override void OnServerAndClientsCreated()
 
         protected override IEnumerator OnServerAndClientsConnected()
         {
-            m_SpawnedObject = SpawnObject(m_TestNetworkPrefab, m_ServerNetworkManager);
+            m_SessionOwner = UseCMBService() ? m_ClientNetworkManagers[0] : m_ServerNetworkManager;
+            m_SpawnedObject = SpawnObject(m_TestNetworkPrefab, m_SessionOwner);
 
             yield return base.OnServerAndClientsConnected();
         }
@@ -50,46 +53,47 @@ protected override IEnumerator OnServerAndClientsConnected()
         [UnityTest]
         public IEnumerator HiddenObjectsTest()
         {
+            var expectedCount = UseCMBService() ? 2 : 3;
 #if UNITY_2023_1_OR_NEWER
-            yield return WaitForConditionOrTimeOut(() => Object.FindObjectsByType<NetworkVisibilityComponent>(FindObjectsSortMode.None).Where((c) => c.IsSpawned).Count() == 2);
+            yield return WaitForConditionOrTimeOut(() => Object.FindObjectsByType<NetworkVisibilityComponent>(FindObjectsSortMode.None).Where((c) => c.IsSpawned).Count() == expectedCount);
 #else
-            yield return WaitForConditionOrTimeOut(() => Object.FindObjectsOfType<NetworkVisibilityComponent>().Where((c) => c.IsSpawned).Count() == 2);
+            yield return WaitForConditionOrTimeOut(() => Object.FindObjectsOfType<NetworkVisibilityComponent>().Where((c) => c.IsSpawned).Count() == expectedCount);
 #endif
 
-            AssertOnTimeout("Timed out waiting for the visible object count to equal 2!");
+            Assert.IsFalse(s_GlobalTimeoutHelper.TimedOut, "Timed out waiting for the visible object count to equal 2!");
         }
 
-
         [UnityTest]
         public IEnumerator HideShowAndDeleteTest()
         {
+            var expectedCount = UseCMBService() ? 2 : 3;
 #if UNITY_2023_1_OR_NEWER
-            yield return WaitForConditionOrTimeOut(() => Object.FindObjectsByType<NetworkVisibilityComponent>(FindObjectsSortMode.None).Where((c) => c.IsSpawned).Count() == 2);
+            yield return WaitForConditionOrTimeOut(() => Object.FindObjectsByType<NetworkVisibilityComponent>(FindObjectsSortMode.None).Where((c) => c.IsSpawned).Count() == expectedCount);
 #else
-            yield return WaitForConditionOrTimeOut(() => Object.FindObjectsOfType<NetworkVisibilityComponent>().Where((c) => c.IsSpawned).Count() == 2);
+            yield return WaitForConditionOrTimeOut(() => Object.FindObjectsOfType<NetworkVisibilityComponent>().Where((c) => c.IsSpawned).Count() == expectedCount);
 #endif
             AssertOnTimeout("Timed out waiting for the visible object count to equal 2!");
 
-            var serverNetworkObject = m_SpawnedObject.GetComponent<NetworkObject>();
-
-            serverNetworkObject.NetworkHide(m_ClientNetworkManagers[0].LocalClientId);
-
+            var sessionOwnerNetworkObject = m_SpawnedObject.GetComponent<NetworkObject>();
+            var clientIndex = UseCMBService() ? 1 : 0;
+            sessionOwnerNetworkObject.NetworkHide(m_ClientNetworkManagers[clientIndex].LocalClientId);
 #if UNITY_2023_1_OR_NEWER
-            yield return WaitForConditionOrTimeOut(() => Object.FindObjectsByType<NetworkVisibilityComponent>(FindObjectsSortMode.None).Where((c) => c.IsSpawned).Count() == 1);
+            yield return WaitForConditionOrTimeOut(() => Object.FindObjectsByType<NetworkVisibilityComponent>(FindObjectsSortMode.None).Where((c) => c.IsSpawned).Count() == expectedCount - 1);
 #else
-            yield return WaitForConditionOrTimeOut(() => Object.FindObjectsOfType<NetworkVisibilityComponent>().Where((c) => c.IsSpawned).Count() == 1);
+            yield return WaitForConditionOrTimeOut(() => Object.FindObjectsOfType<NetworkVisibilityComponent>().Where((c) => c.IsSpawned).Count() == expectedCount - 1);
 #endif
             AssertOnTimeout($"Timed out waiting for {m_SpawnedObject.name} to be hidden from client!");
-            var networkObjectId = serverNetworkObject.NetworkObjectId;
-            serverNetworkObject.NetworkShow(m_ClientNetworkManagers[0].LocalClientId);
-            serverNetworkObject.Despawn(true);
+            var networkObjectId = sessionOwnerNetworkObject.NetworkObjectId;
+            sessionOwnerNetworkObject.NetworkShow(m_ClientNetworkManagers[clientIndex].LocalClientId);
+            sessionOwnerNetworkObject.Despawn(true);
 
-            // Expect no exceptions
-            yield return s_DefaultWaitForTick;
+            // Expect no exceptions while waiting to show the object and wait for the client id to be removed
+            yield return WaitForConditionOrTimeOut(() => !m_SessionOwner.SpawnManager.ObjectsToShowToClient.ContainsKey(m_ClientNetworkManagers[clientIndex].LocalClientId));
+            AssertOnTimeout($"Timed out waiting for client-{m_ClientNetworkManagers[clientIndex].LocalClientId} to be removed from the {nameof(NetworkSpawnManager.ObjectsToShowToClient)} table!");
 
             // Now force a scenario where it normally would have caused an exception
-            m_ServerNetworkManager.SpawnManager.ObjectsToShowToClient.Add(m_ClientNetworkManagers[0].LocalClientId, new System.Collections.Generic.List<NetworkObject>());
-            m_ServerNetworkManager.SpawnManager.ObjectsToShowToClient[m_ClientNetworkManagers[0].LocalClientId].Add(null);
+            m_SessionOwner.SpawnManager.ObjectsToShowToClient.Add(m_ClientNetworkManagers[clientIndex].LocalClientId, new System.Collections.Generic.List<NetworkObject>());
+            m_SessionOwner.SpawnManager.ObjectsToShowToClient[m_ClientNetworkManagers[clientIndex].LocalClientId].Add(null);
 
             // Expect no exceptions
             yield return s_DefaultWaitForTick;
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/ParentingDuringSpawnTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/ParentingDuringSpawnTests.cs
new file mode 100644
index 0000000000..9623c997a8
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/ParentingDuringSpawnTests.cs
@@ -0,0 +1,165 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Text;
+using NUnit.Framework;
+using Unity.Netcode.TestHelpers.Runtime;
+using UnityEngine;
+using UnityEngine.TestTools;
+
+namespace Unity.Netcode.RuntimeTests
+{
+    [TestFixture(NetworkTopologyTypes.ClientServer, NetworkSpawnTypes.OnNetworkSpawn)]
+    [TestFixture(NetworkTopologyTypes.ClientServer, NetworkSpawnTypes.OnNetworkPostSpawn)]
+    [TestFixture(NetworkTopologyTypes.DistributedAuthority, NetworkSpawnTypes.OnNetworkSpawn)]
+    [TestFixture(NetworkTopologyTypes.DistributedAuthority, NetworkSpawnTypes.OnNetworkPostSpawn)]
+    internal class ParentingDuringSpawnTests : IntegrationTestWithApproximation
+    {
+        protected override int NumberOfClients => 2;
+
+        public enum NetworkSpawnTypes
+        {
+            OnNetworkSpawn,
+            OnNetworkPostSpawn,
+        }
+
+        private NetworkSpawnTypes m_NetworkSpawnType;
+
+        private GameObject m_ParentPrefab;
+        private GameObject m_ChildPrefab;
+        private NetworkObject m_AuthorityInstance;
+        private List<NetworkManager> m_NetworkManagers = new List<NetworkManager>();
+        private StringBuilder m_Errors = new StringBuilder();
+
+        public class ParentDuringSpawnBehaviour : NetworkBehaviour
+        {
+            public GameObject ChildToSpawn;
+
+            public NetworkSpawnTypes NetworkSpawnType;
+
+            public Transform ChildSpawnPoint;
+
+            private void SpawnThenParent()
+            {
+                var child = NetworkObject.InstantiateAndSpawn(ChildToSpawn, NetworkManager, position: ChildSpawnPoint.position, rotation: ChildSpawnPoint.rotation);
+                if (!child.TrySetParent(NetworkObject))
+                {
+                    var errorMessage = $"[{ChildToSpawn}] Failed to parent child {child.name} under parent {gameObject.name}!";
+                    Debug.LogError(errorMessage);
+                }
+            }
+
+            public override void OnNetworkSpawn()
+            {
+                if (HasAuthority && NetworkSpawnType == NetworkSpawnTypes.OnNetworkSpawn)
+                {
+                    SpawnThenParent();
+                }
+
+                base.OnNetworkSpawn();
+            }
+
+            protected override void OnNetworkPostSpawn()
+            {
+                if (HasAuthority && NetworkSpawnType == NetworkSpawnTypes.OnNetworkPostSpawn)
+                {
+                    SpawnThenParent();
+                }
+                base.OnNetworkPostSpawn();
+            }
+        }
+
+        public ParentingDuringSpawnTests(NetworkTopologyTypes networkTopology, NetworkSpawnTypes networkSpawnType) : base(networkTopology)
+        {
+            m_NetworkSpawnType = networkSpawnType;
+        }
+
+        protected override void OnServerAndClientsCreated()
+        {
+            m_ParentPrefab = CreateNetworkObjectPrefab("Parent");
+            m_ChildPrefab = CreateNetworkObjectPrefab("Child");
+            var parentComponet = m_ParentPrefab.AddComponent<ParentDuringSpawnBehaviour>();
+            parentComponet.ChildToSpawn = m_ChildPrefab;
+            var spawnPoint = new GameObject();
+            parentComponet.ChildSpawnPoint = spawnPoint.transform;
+            parentComponet.ChildSpawnPoint.position = GetRandomVector3(-5.0f, 5.0f);
+            var rotation = parentComponet.ChildSpawnPoint.rotation;
+            rotation.eulerAngles = GetRandomVector3(-180.0f, 180.0f);
+            parentComponet.ChildSpawnPoint.rotation = rotation;
+            base.OnServerAndClientsCreated();
+        }
+
+        private bool NonAuthorityInstancesSpawnedParent()
+        {
+            foreach (var networkManager in m_NetworkManagers)
+            {
+                if (!networkManager.SpawnManager.SpawnedObjects.ContainsKey(m_AuthorityInstance.NetworkObjectId))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        private bool NonAuthorityInstancesParentedChild()
+        {
+            m_Errors.Clear();
+            if (m_AuthorityInstance.transform.childCount == 0)
+            {
+                return false;
+            }
+            var authorityChildObject = m_AuthorityInstance.transform.GetChild(0).GetComponent<NetworkObject>();
+
+            foreach (var networkManager in m_NetworkManagers)
+            {
+                if (!networkManager.SpawnManager.SpawnedObjects.ContainsKey(authorityChildObject.NetworkObjectId))
+                {
+                    m_Errors.AppendLine($"{networkManager.name} has not spawned the child {authorityChildObject.name}!");
+                    return false;
+                }
+                var childObject = networkManager.SpawnManager.SpawnedObjects[authorityChildObject.NetworkObjectId];
+
+                if (childObject.transform.parent == null)
+                {
+                    m_Errors.AppendLine($"{childObject.name} does not have a parent!");
+                    return false;
+                }
+
+                if (!Approximately(authorityChildObject.transform.position, childObject.transform.position))
+                {
+                    m_Errors.AppendLine($"{childObject.name} position {GetVector3Values(childObject.transform.position)} does " +
+                        $"not match the authority's position {GetVector3Values(authorityChildObject.transform.position)}!");
+                    return false;
+                }
+
+                if (!Approximately(authorityChildObject.transform.rotation, childObject.transform.rotation))
+                {
+                    m_Errors.AppendLine($"{childObject.name} rotation {GetVector3Values(childObject.transform.rotation.eulerAngles)} does " +
+                        $"not match the authority's position {GetVector3Values(authorityChildObject.transform.rotation.eulerAngles)}!");
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        [UnityTest]
+        public IEnumerator ParentDuringSpawn()
+        {
+            m_NetworkManagers.Clear();
+            var authorityNetworkManager = m_DistributedAuthority ? m_ClientNetworkManagers[0] : m_ServerNetworkManager;
+
+            m_NetworkManagers.AddRange(m_ClientNetworkManagers);
+            if (!UseCMBService())
+            {
+                m_NetworkManagers.Add(m_ServerNetworkManager);
+            }
+
+            m_AuthorityInstance = SpawnObject(m_ParentPrefab, authorityNetworkManager).GetComponent<NetworkObject>();
+
+            yield return WaitForConditionOrTimeOut(NonAuthorityInstancesSpawnedParent);
+            AssertOnTimeout($"Not all clients spawned the parent {nameof(NetworkObject)}!");
+
+            yield return WaitForConditionOrTimeOut(NonAuthorityInstancesParentedChild);
+            AssertOnTimeout($"Non-Authority instance had a mismatched value: \n {m_Errors}");
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/ParentingDuringSpawnTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/ParentingDuringSpawnTests.cs.meta
new file mode 100644
index 0000000000..abf773ea1c
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/ParentingDuringSpawnTests.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 1d708e3d4d5f1794aa0a924eaa9445d6
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/PeerDisconnectCallbackTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/PeerDisconnectCallbackTests.cs
index 227b72ef79..896aa90bf5 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/PeerDisconnectCallbackTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/PeerDisconnectCallbackTests.cs
@@ -21,7 +21,7 @@ namespace Unity.Netcode.RuntimeTests
     /// </summary>
     [TestFixture(HostOrServer.Server)]
     [TestFixture(HostOrServer.Host)]
-    public class PeerDisconnectCallbackTests : NetcodeIntegrationTest
+    internal class PeerDisconnectCallbackTests : NetcodeIntegrationTest
     {
 
         public enum ClientDisconnectType
@@ -133,6 +133,7 @@ public IEnumerator TestPeerDisconnectCallback([Values] ClientDisconnectType clie
             }
 
             yield return WaitForConditionOrTimeOut(hooks);
+
             Assert.False(s_GlobalTimeoutHelper.TimedOut);
 
             foreach (var client in m_ClientNetworkManagers)
@@ -144,18 +145,18 @@ public IEnumerator TestPeerDisconnectCallback([Values] ClientDisconnectType clie
                 }
                 if (m_UseHost)
                 {
-                    Assert.IsTrue(client.ConnectedClientsIds.Contains(0ul));
+                    Assert.IsTrue(client.ConnectedClientsIds.Contains(0ul), $"[Client-{client.LocalClientId}][Connected ({client.IsConnectedClient})] Still has client identifier 0!");
                 }
 
                 for (var i = 1ul; i < 3ul; ++i)
                 {
                     if (i == disconnectedClient)
                     {
-                        Assert.IsFalse(client.ConnectedClientsIds.Contains(i));
+                        Assert.IsFalse(client.ConnectedClientsIds.Contains(i), $"[Client-{client.LocalClientId}][Connected ({client.IsConnectedClient})] Still has client identifier {i}!");
                     }
                     else
                     {
-                        Assert.IsTrue(client.ConnectedClientsIds.Contains(i));
+                        Assert.IsTrue(client.ConnectedClientsIds.Contains(i), $"[Client-{client.LocalClientId}][Connected ({client.IsConnectedClient})] Still has client identifier {i}!");
                     }
                 }
             }
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Physics/NetworkRigidbody2DTest.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Physics/NetworkRigidbody2DTest.cs
index f92cab975c..089eeee542 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Physics/NetworkRigidbody2DTest.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Physics/NetworkRigidbody2DTest.cs
@@ -8,12 +8,12 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class NetworkRigidbody2DDynamicTest : NetworkRigidbody2DTestBase
+    internal class NetworkRigidbody2DDynamicTest : NetworkRigidbody2DTestBase
     {
         public override bool Kinematic => false;
     }
 
-    public class NetworkRigidbody2DKinematicTest : NetworkRigidbody2DTestBase
+    internal class NetworkRigidbody2DKinematicTest : NetworkRigidbody2DTestBase
     {
         public override bool Kinematic => true;
     }
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Physics/NetworkRigidbodyTest.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Physics/NetworkRigidbodyTest.cs
index cb0b608c29..601a1baccb 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Physics/NetworkRigidbodyTest.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Physics/NetworkRigidbodyTest.cs
@@ -1,5 +1,7 @@
 #if COM_UNITY_MODULES_PHYSICS
 using System.Collections;
+using System.Collections.Generic;
+using System.Text;
 using NUnit.Framework;
 using Unity.Netcode.Components;
 using Unity.Netcode.TestHelpers.Runtime;
@@ -8,16 +10,33 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class NetworkRigidbodyTest : NetcodeIntegrationTest
+    [TestFixture(RigidbodyInterpolation.Interpolate, true, true)] // This should be allowed under all condistions when using Rigidbody motion
+    [TestFixture(RigidbodyInterpolation.Extrapolate, true, true)] // This should not allow extrapolation on non-auth instances when using Rigidbody motion & NT interpolation
+    [TestFixture(RigidbodyInterpolation.Extrapolate, false, true)] // This should allow extrapolation on non-auth instances when using Rigidbody & NT has no interpolation
+    [TestFixture(RigidbodyInterpolation.Interpolate, true, false)] // This should not allow kinematic instances to have Rigidbody interpolation enabled
+    [TestFixture(RigidbodyInterpolation.Interpolate, false, false)] // Testing that rigid body interpolation remains the same if NT interpolate is disabled
+    internal class NetworkRigidbodyTest : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 1;
+        private bool m_NetworkTransformInterpolate;
+        private bool m_UseRigidBodyForMotion;
+        private RigidbodyInterpolation m_RigidbodyInterpolation;
+
+        public NetworkRigidbodyTest(RigidbodyInterpolation rigidbodyInterpolation, bool networkTransformInterpolate, bool useRigidbodyForMotion)
+        {
+            m_RigidbodyInterpolation = rigidbodyInterpolation;
+            m_NetworkTransformInterpolate = networkTransformInterpolate;
+            m_UseRigidBodyForMotion = useRigidbodyForMotion;
+        }
 
         protected override void OnCreatePlayerPrefab()
         {
-            m_PlayerPrefab.AddComponent<NetworkTransform>();
-            m_PlayerPrefab.AddComponent<Rigidbody>();
-            m_PlayerPrefab.AddComponent<NetworkRigidbody>();
-            m_PlayerPrefab.GetComponent<Rigidbody>().interpolation = RigidbodyInterpolation.Interpolate;
+            var networkTransform = m_PlayerPrefab.AddComponent<NetworkTransform>();
+            networkTransform.Interpolate = m_NetworkTransformInterpolate;
+            var rigidbody = m_PlayerPrefab.AddComponent<Rigidbody>();
+            rigidbody.interpolation = m_RigidbodyInterpolation;
+            var networkRigidbody = m_PlayerPrefab.AddComponent<NetworkRigidbody>();
+            networkRigidbody.UseRigidBodyForMotion = m_UseRigidBodyForMotion;
         }
 
         /// <summary>
@@ -28,39 +47,448 @@ protected override void OnCreatePlayerPrefab()
         public IEnumerator TestRigidbodyKinematicEnableDisable()
         {
             // This is the *SERVER VERSION* of the *CLIENT PLAYER*
-            var serverClientPlayerResult = new NetcodeIntegrationTestHelpers.ResultWrapper<NetworkObject>();
-            yield return NetcodeIntegrationTestHelpers.GetNetworkObjectByRepresentation((x => x.IsPlayerObject && x.OwnerClientId == m_ClientNetworkManagers[0].LocalClientId), m_ServerNetworkManager, serverClientPlayerResult);
-            var serverPlayer = serverClientPlayerResult.Result.gameObject;
+            var serverClientPlayerInstance = m_ServerNetworkManager.ConnectedClients[m_ClientNetworkManagers[0].LocalClientId].PlayerObject;
 
             // This is the *CLIENT VERSION* of the *CLIENT PLAYER*
-            var clientClientPlayerResult = new NetcodeIntegrationTestHelpers.ResultWrapper<NetworkObject>();
-            yield return NetcodeIntegrationTestHelpers.GetNetworkObjectByRepresentation((x => x.IsPlayerObject && x.OwnerClientId == m_ClientNetworkManagers[0].LocalClientId), m_ClientNetworkManagers[0], clientClientPlayerResult);
-            var clientPlayer = clientClientPlayerResult.Result.gameObject;
+            var clientPlayerInstance = m_ClientNetworkManagers[0].LocalClient.PlayerObject;
+
+            Assert.IsNotNull(serverClientPlayerInstance, $"{nameof(serverClientPlayerInstance)} is null!");
+            Assert.IsNotNull(clientPlayerInstance, $"{nameof(clientPlayerInstance)} is null!");
+
+            var serverClientInstanceRigidBody = serverClientPlayerInstance.GetComponent<Rigidbody>();
+            var clientRigidBody = clientPlayerInstance.GetComponent<Rigidbody>();
+
+            if (m_UseRigidBodyForMotion)
+            {
+                var interpolateCompareNonAuthoritative = m_NetworkTransformInterpolate ? RigidbodyInterpolation.Interpolate : m_RigidbodyInterpolation;
+
+                // Server authoritative NT should yield non-kinematic mode for the server-side player instance
+                Assert.False(serverClientInstanceRigidBody.isKinematic, $"[Server-Side] Client-{m_ClientNetworkManagers[0].LocalClientId} player's {nameof(Rigidbody)} is kinematic!");
+
+                // The authoritative instance can be None, Interpolate, or Extrapolate for the Rigidbody interpolation settings.
+                Assert.AreEqual(m_RigidbodyInterpolation, serverClientInstanceRigidBody.interpolation, $"[Server-Side] Client-{m_ClientNetworkManagers[0].LocalClientId} " +
+                    $"player's {nameof(Rigidbody)}'s interpolation is {serverClientInstanceRigidBody.interpolation} and not {m_RigidbodyInterpolation}!");
 
-            Assert.IsNotNull(serverPlayer, "serverPlayer is not null");
-            Assert.IsNotNull(clientPlayer, "clientPlayer is not null");
+                // Server authoritative NT should yield kinematic mode for the client-side player instance
+                Assert.True(clientRigidBody.isKinematic, $"[Client-Side] Client-{m_ClientNetworkManagers[0].LocalClientId} player's {nameof(Rigidbody)} is not kinematic!");
 
-            yield return WaitForTicks(m_ServerNetworkManager, 3);
+                // When using Rigidbody motion, authoritative and non-authoritative Rigidbody interpolation settings should be preserved (except when extrapolation is used
+                Assert.AreEqual(interpolateCompareNonAuthoritative, clientRigidBody.interpolation, $"[Client-Side] Client-{m_ClientNetworkManagers[0].LocalClientId} " +
+                    $"player's {nameof(Rigidbody)}'s interpolation is {clientRigidBody.interpolation} and not {interpolateCompareNonAuthoritative}!");
+            }
+            else
+            {
+                // server rigidbody has authority and should not be kinematic
+                Assert.False(serverClientInstanceRigidBody.isKinematic, $"[Server-Side] Client-{m_ClientNetworkManagers[0].LocalClientId} player's {nameof(Rigidbody)} is kinematic!");
+                Assert.AreEqual(RigidbodyInterpolation.Interpolate, serverClientInstanceRigidBody.interpolation, $"[Server-Side] Client-{m_ClientNetworkManagers[0].LocalClientId} " +
+                    $"player's {nameof(Rigidbody)}'s interpolation is {serverClientInstanceRigidBody.interpolation} and not {nameof(RigidbodyInterpolation.Interpolate)}!");
 
-            // server rigidbody has authority and should not be kinematic
-            Assert.True(serverPlayer.GetComponent<Rigidbody>().isKinematic == false, "serverPlayer kinematic");
-            Assert.AreEqual(RigidbodyInterpolation.Interpolate, serverPlayer.GetComponent<Rigidbody>().interpolation, "server equal interpolate");
+                // Server authoritative NT should yield kinematic mode for the client-side player instance
+                Assert.True(clientRigidBody.isKinematic, $"[Client-Side] Client-{m_ClientNetworkManagers[0].LocalClientId} player's {nameof(Rigidbody)} is not kinematic!");
 
-            // client rigidbody has no authority and should have a kinematic mode of true
-            Assert.True(clientPlayer.GetComponent<Rigidbody>().isKinematic, "clientPlayer kinematic");
-            Assert.AreEqual(RigidbodyInterpolation.None, clientPlayer.GetComponent<Rigidbody>().interpolation, "client equal interpolate");
+                // client rigidbody has no authority with NT interpolation disabled should allow Rigidbody interpolation
+                if (!m_NetworkTransformInterpolate)
+                {
+                    Assert.AreEqual(RigidbodyInterpolation.Interpolate, clientRigidBody.interpolation, $"[Client-Side] Client-{m_ClientNetworkManagers[0].LocalClientId} " +
+                        $"player's {nameof(Rigidbody)}'s interpolation is {clientRigidBody.interpolation} and not {nameof(RigidbodyInterpolation.Interpolate)}!");
+                }
+                else
+                {
+                    Assert.AreEqual(RigidbodyInterpolation.None, clientRigidBody.interpolation, $"[Client-Side] Client-{m_ClientNetworkManagers[0].LocalClientId} " +
+                        $"player's {nameof(Rigidbody)}'s interpolation is {clientRigidBody.interpolation} and not {nameof(RigidbodyInterpolation.None)}!");
+                }
+            }
 
             // despawn the server player (but keep it around on the server)
-            serverPlayer.GetComponent<NetworkObject>().Despawn(false);
+            serverClientPlayerInstance.Despawn(false);
 
-            yield return WaitForTicks(m_ServerNetworkManager, 3);
+            yield return WaitForConditionOrTimeOut(() => !serverClientPlayerInstance.IsSpawned && !clientPlayerInstance.IsSpawned);
+            AssertOnTimeout("Timed out waiting for client player to despawn on both server and client!");
 
             // When despawned, we should always be kinematic (i.e. don't apply physics when despawned)
-            Assert.IsTrue(serverPlayer.GetComponent<Rigidbody>().isKinematic == true, "serverPlayer second kinematic");
+            Assert.True(serverClientInstanceRigidBody.isKinematic, $"[Server-Side][Despawned] Client-{m_ClientNetworkManagers[0].LocalClientId} player's {nameof(Rigidbody)} is not kinematic when despawned!");
+            Assert.IsTrue(clientPlayerInstance == null, $"[Client-Side] Player {nameof(NetworkObject)} is not null!");
+        }
+    }
+
+    internal class ContactEventTransformHelperWithInfo : ContactEventTransformHelper, IContactEventHandlerWithInfo
+    {
+        public ContactEventHandlerInfo GetContactEventHandlerInfo()
+        {
+            var contactEventHandlerInfo = new ContactEventHandlerInfo()
+            {
+                HasContactEventPriority = IsOwner,
+                ProvideNonRigidBodyContactEvents = m_EnableNonRigidbodyContacts.Value,
+            };
+            return contactEventHandlerInfo;
+        }
+
+        protected override void OnRegisterForContactEvents(bool isRegistering)
+        {
+            RigidbodyContactEventManager.Instance.RegisterHandler(this, isRegistering);
+        }
+    }
+
+
+    internal class ContactEventTransformHelper : NetworkTransform, IContactEventHandler
+    {
+        public static Vector3 SessionOwnerSpawnPoint;
+        public static Vector3 ClientSpawnPoint;
+        public static bool VerboseDebug;
+        public enum HelperStates
+        {
+            None,
+            MoveForward,
+        }
+
+        private HelperStates m_HelperState;
+
+        public void SetHelperState(HelperStates state)
+        {
+            m_HelperState = state;
+            if (!m_NetworkRigidbody.IsKinematic())
+            {
+                m_NetworkRigidbody.Rigidbody.angularVelocity = Vector3.zero;
+                m_NetworkRigidbody.Rigidbody.linearVelocity = Vector3.zero;
+            }
+            m_NetworkRigidbody.Rigidbody.isKinematic = m_HelperState == HelperStates.None;
+            if (!m_NetworkRigidbody.IsKinematic())
+            {
+                m_NetworkRigidbody.Rigidbody.angularVelocity = Vector3.zero;
+                m_NetworkRigidbody.Rigidbody.linearVelocity = Vector3.zero;
+            }
+
+        }
+
+        protected struct ContactEventInfo
+        {
+            public ulong EventId;
+            public Vector3 AveragedCollisionNormal;
+            public Rigidbody CollidingBody;
+            public Vector3 ContactPoint;
+        }
+
+        protected List<ContactEventInfo> m_ContactEvents = new List<ContactEventInfo>();
+
+        protected NetworkVariable<bool> m_EnableNonRigidbodyContacts = new NetworkVariable<bool>(false, NetworkVariableReadPermission.Everyone, NetworkVariableWritePermission.Owner);
+
+        protected NetworkRigidbody m_NetworkRigidbody;
+        public ContactEventTransformHelper Target;
+
+        public bool HasContactEvents()
+        {
+            return m_ContactEvents.Count > 0;
+        }
+
+        public Rigidbody GetRigidbody()
+        {
+            return m_NetworkRigidbody.Rigidbody;
+        }
+
+        public bool HadContactWith(ContactEventTransformHelper otherObject)
+        {
+            if (otherObject == null)
+            {
+                return false;
+            }
+            foreach (var contactEvent in m_ContactEvents)
+            {
+                if (contactEvent.CollidingBody == otherObject.m_NetworkRigidbody.Rigidbody)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        protected virtual void CheckToStopMoving()
+        {
+            SetHelperState(HadContactWith(Target) ? HelperStates.None : HelperStates.MoveForward);
+        }
+
+        public void ContactEvent(ulong eventId, Vector3 averagedCollisionNormal, Rigidbody collidingBody, Vector3 contactPoint, bool hasCollisionStay = false, Vector3 averagedCollisionStayNormal = default)
+        {
+            if (Target == null)
+            {
+                return;
+            }
+
+            if (collidingBody != null)
+            {
+                Log($">>>>>>> contact event with {collidingBody.name}!");
+            }
+            else
+            {
+                Log($">>>>>>> contact event with non-rigidbody!");
+            }
+
+            m_ContactEvents.Add(new ContactEventInfo()
+            {
+                EventId = eventId,
+                AveragedCollisionNormal = averagedCollisionNormal,
+                CollidingBody = collidingBody,
+                ContactPoint = contactPoint,
+            });
+            CheckToStopMoving();
+        }
+
+        private void SetInitialPositionClientServer()
+        {
+            if (IsServer)
+            {
+                if (!NetworkManager.DistributedAuthorityMode && !IsLocalPlayer)
+                {
+                    transform.position = ClientSpawnPoint;
+                    m_NetworkRigidbody.Rigidbody.position = ClientSpawnPoint;
+                }
+                else
+                {
+                    transform.position = SessionOwnerSpawnPoint;
+                    m_NetworkRigidbody.Rigidbody.position = SessionOwnerSpawnPoint;
+                }
+            }
+            else
+            {
+                transform.position = ClientSpawnPoint;
+                m_NetworkRigidbody.Rigidbody.position = ClientSpawnPoint;
+            }
+        }
+
+        private void SetInitialPositionDistributedAuthority()
+        {
+            if (HasAuthority)
+            {
+                if (IsSessionOwner)
+                {
+                    transform.position = SessionOwnerSpawnPoint;
+                    m_NetworkRigidbody.Rigidbody.position = SessionOwnerSpawnPoint;
+                }
+                else
+                {
+                    transform.position = ClientSpawnPoint;
+                    m_NetworkRigidbody.Rigidbody.position = ClientSpawnPoint;
+                }
+            }
+        }
+
+        public override void OnNetworkSpawn()
+        {
+            m_NetworkRigidbody = GetComponent<NetworkRigidbody>();
 
-            yield return WaitForTicks(m_ServerNetworkManager, 3);
+            m_NetworkRigidbody.Rigidbody.maxLinearVelocity = 15;
+            m_NetworkRigidbody.Rigidbody.maxAngularVelocity = 10;
+
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                SetInitialPositionDistributedAuthority();
+            }
+            else
+            {
+                SetInitialPositionClientServer();
+            }
+            if (IsLocalPlayer)
+            {
+                RegisterForContactEvents(true);
+            }
+            else
+            {
+                m_NetworkRigidbody.Rigidbody.detectCollisions = false;
+            }
+            base.OnNetworkSpawn();
+        }
+
+        protected virtual void OnRegisterForContactEvents(bool isRegistering)
+        {
+            RigidbodyContactEventManager.Instance.RegisterHandler(this, isRegistering);
+        }
+
+        public void RegisterForContactEvents(bool isRegistering)
+        {
+            OnRegisterForContactEvents(isRegistering);
+        }
+
+        private void FixedUpdate()
+        {
+            if (!IsSpawned || !IsOwner || m_HelperState != HelperStates.MoveForward)
+            {
+                return;
+            }
+            var distance = Vector3.Distance(Target.transform.position, transform.position);
+            var moveAmount = Mathf.Max(1.2f, distance);
+            // Head towards our target
+            var dir = (Target.transform.position - transform.position).normalized;
+            var deltaMove = dir * moveAmount * Time.fixedDeltaTime;
+            m_NetworkRigidbody.Rigidbody.MovePosition(m_NetworkRigidbody.Rigidbody.position + deltaMove);
+
+
+            Log($" Loc: {transform.position} | Dest: {Target.transform.position} | Dist: {distance} | MoveDelta: {deltaMove}");
+        }
+
+        protected void Log(string msg)
+        {
+            if (VerboseDebug)
+            {
+                Debug.Log($"Client-{OwnerClientId} {msg}");
+            }
+        }
+    }
+
+    [TestFixture(HostOrServer.Host, ContactEventTypes.Default)]
+    [TestFixture(HostOrServer.DAHost, ContactEventTypes.Default)]
+    [TestFixture(HostOrServer.Host, ContactEventTypes.WithInfo)]
+    [TestFixture(HostOrServer.DAHost, ContactEventTypes.WithInfo)]
+    internal class RigidbodyContactEventManagerTests : IntegrationTestWithApproximation
+    {
+        protected override int NumberOfClients => 1;
+
+
+        private GameObject m_RigidbodyContactEventManager;
+
+        public enum ContactEventTypes
+        {
+            Default,
+            WithInfo
+        }
+
+        private ContactEventTypes m_ContactEventType;
+        private StringBuilder m_ErrorLogger = new StringBuilder();
+
+        public RigidbodyContactEventManagerTests(HostOrServer hostOrServer, ContactEventTypes contactEventType) : base(hostOrServer)
+        {
+            m_ContactEventType = contactEventType;
+        }
+
+        protected override void OnCreatePlayerPrefab()
+        {
+            ContactEventTransformHelper.SessionOwnerSpawnPoint = GetRandomVector3(-4, -3);
+            ContactEventTransformHelper.ClientSpawnPoint = GetRandomVector3(3, 4);
+            if (m_ContactEventType == ContactEventTypes.Default)
+            {
+                var helper = m_PlayerPrefab.AddComponent<ContactEventTransformHelper>();
+                helper.AuthorityMode = NetworkTransform.AuthorityModes.Owner;
+            }
+            else
+            {
+                var helperWithInfo = m_PlayerPrefab.AddComponent<ContactEventTransformHelperWithInfo>();
+                helperWithInfo.AuthorityMode = NetworkTransform.AuthorityModes.Owner;
+            }
+
+            var rigidbody = m_PlayerPrefab.AddComponent<Rigidbody>();
+            rigidbody.useGravity = false;
+            rigidbody.isKinematic = true;
+            rigidbody.mass = 5.0f;
+            rigidbody.collisionDetectionMode = CollisionDetectionMode.Continuous;
+            var sphereCollider = m_PlayerPrefab.AddComponent<SphereCollider>();
+            sphereCollider.radius = 0.5f;
+            sphereCollider.providesContacts = true;
+
+            var networkRigidbody = m_PlayerPrefab.AddComponent<NetworkRigidbody>();
+            networkRigidbody.UseRigidBodyForMotion = true;
+            networkRigidbody.AutoUpdateKinematicState = false;
+
+            m_RigidbodyContactEventManager = new GameObject();
+            m_RigidbodyContactEventManager.AddComponent<RigidbodyContactEventManager>();
+        }
+
+
+
+        private bool PlayersSpawnedInRightLocation()
+        {
+            var position = m_ServerNetworkManager.LocalClient.PlayerObject.transform.position;
+            if (!Approximately(ContactEventTransformHelper.SessionOwnerSpawnPoint, position))
+            {
+                m_ErrorLogger.AppendLine($"Client-{m_ServerNetworkManager.LocalClientId} player position {position} does not match the assigned player position {ContactEventTransformHelper.SessionOwnerSpawnPoint}!");
+                return false;
+            }
+
+            position = m_ClientNetworkManagers[0].LocalClient.PlayerObject.transform.position;
+            if (!Approximately(ContactEventTransformHelper.ClientSpawnPoint, position))
+            {
+                m_ErrorLogger.AppendLine($"Client-{m_ClientNetworkManagers[0].LocalClientId} player position {position} does not match the assigned player position {ContactEventTransformHelper.ClientSpawnPoint}!");
+                return false;
+            }
+            var playerObject = (NetworkObject)null;
+            if (!m_ServerNetworkManager.SpawnManager.SpawnedObjects.ContainsKey(m_ClientNetworkManagers[0].LocalClient.PlayerObject.NetworkObjectId))
+            {
+                m_ErrorLogger.AppendLine($"Client-{m_ServerNetworkManager.LocalClientId} cannot find a local spawned instance of Client-{m_ClientNetworkManagers[0].LocalClientId}'s player object!");
+                return false;
+            }
+            playerObject = m_ServerNetworkManager.SpawnManager.SpawnedObjects[m_ClientNetworkManagers[0].LocalClient.PlayerObject.NetworkObjectId];
+            position = playerObject.transform.position;
+
+            if (!Approximately(ContactEventTransformHelper.ClientSpawnPoint, position))
+            {
+                m_ErrorLogger.AppendLine($"Client-{m_ServerNetworkManager.LocalClientId} player position {position} for Client-{playerObject.OwnerClientId} does not match the assigned player position {ContactEventTransformHelper.ClientSpawnPoint}!");
+                return false;
+            }
+
+            if (!m_ClientNetworkManagers[0].SpawnManager.SpawnedObjects.ContainsKey(m_ServerNetworkManager.LocalClient.PlayerObject.NetworkObjectId))
+            {
+                m_ErrorLogger.AppendLine($"Client-{m_ClientNetworkManagers[0].LocalClientId} cannot find a local spawned instance of Client-{m_ServerNetworkManager.LocalClientId}'s player object!");
+                return false;
+            }
+            playerObject = m_ClientNetworkManagers[0].SpawnManager.SpawnedObjects[m_ServerNetworkManager.LocalClient.PlayerObject.NetworkObjectId];
+            position = playerObject.transform.position;
+            if (!Approximately(ContactEventTransformHelper.SessionOwnerSpawnPoint, playerObject.transform.position))
+            {
+                m_ErrorLogger.AppendLine($"Client-{m_ClientNetworkManagers[0].LocalClientId} player position {position} for Client-{playerObject.OwnerClientId} does not match the assigned player position {ContactEventTransformHelper.SessionOwnerSpawnPoint}!");
+                return false;
+            }
+            return true;
+        }
+
+
+        [UnityTest]
+        public IEnumerator TestContactEvents()
+        {
+            ContactEventTransformHelper.VerboseDebug = m_EnableVerboseDebug;
+
+            m_PlayerPrefab.SetActive(false);
+            m_ErrorLogger.Clear();
+            // Validate all instances are spawned in the right location
+            yield return WaitForConditionOrTimeOut(PlayersSpawnedInRightLocation);
+            AssertOnTimeout($"Timed out waiting for all player instances to spawn in the corect location:\n {m_ErrorLogger}");
+            m_ErrorLogger.Clear();
+
+            var sessionOwnerPlayer = m_ContactEventType == ContactEventTypes.Default ? m_ServerNetworkManager.LocalClient.PlayerObject.GetComponent<ContactEventTransformHelper>() :
+                m_ServerNetworkManager.LocalClient.PlayerObject.GetComponent<ContactEventTransformHelperWithInfo>();
+            var clientPlayer = m_ContactEventType == ContactEventTypes.Default ? m_ClientNetworkManagers[0].LocalClient.PlayerObject.GetComponent<ContactEventTransformHelper>() :
+                m_ClientNetworkManagers[0].LocalClient.PlayerObject.GetComponent<ContactEventTransformHelperWithInfo>();
+
+            // Get both players to point towards each other
+            sessionOwnerPlayer.Target = clientPlayer;
+            clientPlayer.Target = sessionOwnerPlayer;
+
+            sessionOwnerPlayer.SetHelperState(ContactEventTransformHelper.HelperStates.MoveForward);
+            clientPlayer.SetHelperState(ContactEventTransformHelper.HelperStates.MoveForward);
+
+
+            yield return WaitForConditionOrTimeOut(() => sessionOwnerPlayer.HadContactWith(clientPlayer) || clientPlayer.HadContactWith(sessionOwnerPlayer));
+            AssertOnTimeout("Timed out waiting for a player to collide with another player!");
+
+            clientPlayer.RegisterForContactEvents(false);
+            sessionOwnerPlayer.RegisterForContactEvents(false);
+            var otherPlayer = m_ContactEventType == ContactEventTypes.Default ? m_ServerNetworkManager.SpawnManager.SpawnedObjects[clientPlayer.NetworkObjectId].GetComponent<ContactEventTransformHelper>() :
+                m_ServerNetworkManager.SpawnManager.SpawnedObjects[clientPlayer.NetworkObjectId].GetComponent<ContactEventTransformHelperWithInfo>();
+            otherPlayer.RegisterForContactEvents(false);
+            otherPlayer = m_ContactEventType == ContactEventTypes.Default ? m_ClientNetworkManagers[0].SpawnManager.SpawnedObjects[sessionOwnerPlayer.NetworkObjectId].GetComponent<ContactEventTransformHelper>() :
+                m_ClientNetworkManagers[0].SpawnManager.SpawnedObjects[sessionOwnerPlayer.NetworkObjectId].GetComponent<ContactEventTransformHelperWithInfo>();
+            otherPlayer.RegisterForContactEvents(false);
+
+            Object.Destroy(m_RigidbodyContactEventManager);
+            m_RigidbodyContactEventManager = null;
+        }
+
+        protected override IEnumerator OnTearDown()
+        {
+            // In case of a test failure
+            if (m_RigidbodyContactEventManager)
+            {
+                Object.Destroy(m_RigidbodyContactEventManager);
+                m_RigidbodyContactEventManager = null;
+            }
 
-            Assert.IsTrue(clientPlayer == null, "clientPlayer being null"); // safety check that object is actually despawned.
+            return base.OnTearDown();
         }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/PlayerObjectTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/PlayerObjectTests.cs
index 0fb3b9ea69..4ffb78395b 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/PlayerObjectTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/PlayerObjectTests.cs
@@ -1,5 +1,7 @@
 using System.Collections;
+using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using NUnit.Framework;
 using Unity.Netcode.TestHelpers.Runtime;
 using UnityEngine;
@@ -7,11 +9,12 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
+    [TestFixture(HostOrServer.DAHost)]
     [TestFixture(HostOrServer.Host)]
     [TestFixture(HostOrServer.Server)]
-    public class PlayerObjectTests : NetcodeIntegrationTest
+    internal class PlayerObjectTests : NetcodeIntegrationTest
     {
-        protected override int NumberOfClients => 1;
+        protected override int NumberOfClients => 2;
 
         protected GameObject m_NewPlayerToSpawn;
 
@@ -26,6 +29,8 @@ protected override void OnServerAndClientsCreated()
         [UnityTest]
         public IEnumerator SpawnAndReplaceExistingPlayerObject()
         {
+            yield return WaitForConditionOrTimeOut(() => m_PlayerNetworkObjects[m_ServerNetworkManager.LocalClientId].ContainsKey(m_ClientNetworkManagers[0].LocalClientId));
+            AssertOnTimeout("Timed out waiting for client-side player object to spawn!");
             // Get the server-side player NetworkObject
             var originalPlayer = m_PlayerNetworkObjects[m_ServerNetworkManager.LocalClientId][m_ClientNetworkManagers[0].LocalClientId];
             // Get the client-side player NetworkObject
@@ -34,7 +39,8 @@ public IEnumerator SpawnAndReplaceExistingPlayerObject()
             // Create a new player prefab instance
             var newPlayer = Object.Instantiate(m_NewPlayerToSpawn);
             var newPlayerNetworkObject = newPlayer.GetComponent<NetworkObject>();
-            newPlayerNetworkObject.NetworkManagerOwner = m_ServerNetworkManager;
+            // In distributed authority mode, the client owner spawns its new player
+            newPlayerNetworkObject.NetworkManagerOwner = m_DistributedAuthority ? m_ClientNetworkManagers[0] : m_ServerNetworkManager;
             // Spawn this instance as a new player object for the client who already has an assigned player object
             newPlayerNetworkObject.SpawnAsPlayerObject(m_ClientNetworkManagers[0].LocalClientId);
 
@@ -54,6 +60,7 @@ public IEnumerator SpawnAndReplaceExistingPlayerObject()
     /// Validate that when auto-player spawning but SpawnWithObservers is disabled,
     /// the player instantiated is only spawned on the authority side.
     /// </summary>
+    [TestFixture(HostOrServer.DAHost)]
     [TestFixture(HostOrServer.Host)]
     [TestFixture(HostOrServer.Server)]
     internal class PlayerSpawnNoObserversTest : NetcodeIntegrationTest
@@ -79,15 +86,40 @@ public IEnumerator SpawnWithNoObservers()
         {
             yield return s_DefaultWaitForTick;
 
-            var playerObjects = m_ServerNetworkManager.SpawnManager.SpawnedObjectsList.Where((c) => c.IsPlayerObject).ToList();
-
-            // Make sure clients did not spawn their player object on any of the clients including the owner.
-            foreach (var client in m_ClientNetworkManagers)
+            if (!m_DistributedAuthority)
             {
-                foreach (var playerObject in playerObjects)
+                // Make sure clients did not spawn their player object on any of the clients including the owner.
+                foreach (var client in m_ClientNetworkManagers)
+                {
+                    foreach (var playerObject in m_ServerNetworkManager.SpawnManager.PlayerObjects)
+                    {
+                        Assert.IsFalse(client.SpawnManager.SpawnedObjects.ContainsKey(playerObject.NetworkObjectId), $"Client-{client.LocalClientId} spawned player object for Client-{playerObject.NetworkObjectId}!");
+                    }
+                }
+            }
+            else
+            {
+                // For distributed authority, we want to make sure the player object is only spawned on the authority side and all non-authority instances did not spawn it.
+                var playerObjectId = m_ServerNetworkManager.LocalClient.PlayerObject.NetworkObjectId;
+                foreach (var client in m_ClientNetworkManagers)
                 {
-                    Assert.IsFalse(client.SpawnManager.SpawnedObjects.ContainsKey(playerObject.NetworkObjectId), $"Client-{client.LocalClientId} spawned player object for Client-{playerObject.NetworkObjectId}!");
+                    Assert.IsFalse(client.SpawnManager.SpawnedObjects.ContainsKey(playerObjectId), $"Client-{client.LocalClientId} spawned player object for Client-{m_ServerNetworkManager.LocalClientId}!");
                 }
+
+                foreach (var clientPlayer in m_ClientNetworkManagers)
+                {
+                    playerObjectId = clientPlayer.LocalClient.PlayerObject.NetworkObjectId;
+                    Assert.IsFalse(m_ServerNetworkManager.SpawnManager.SpawnedObjects.ContainsKey(playerObjectId), $"Client-{m_ServerNetworkManager.LocalClientId} spawned player object for Client-{clientPlayer.LocalClientId}!");
+                    foreach (var client in m_ClientNetworkManagers)
+                    {
+                        if (clientPlayer == client)
+                        {
+                            continue;
+                        }
+                        Assert.IsFalse(client.SpawnManager.SpawnedObjects.ContainsKey(playerObjectId), $"Client-{client.LocalClientId} spawned player object for Client-{clientPlayer.LocalClientId}!");
+                    }
+                }
+
             }
         }
     }
@@ -96,16 +128,14 @@ public IEnumerator SpawnWithNoObservers()
     /// This test validates the player position and rotation is correct
     /// relative to the prefab's initial settings if no changes are applied.
     /// </summary>
+    [TestFixture(HostOrServer.DAHost)]
     [TestFixture(HostOrServer.Host)]
     [TestFixture(HostOrServer.Server)]
     internal class PlayerSpawnPositionTests : IntegrationTestWithApproximation
     {
         protected override int NumberOfClients => 2;
 
-        public PlayerSpawnPositionTests(HostOrServer hostOrServer)
-        {
-            m_UseHost = hostOrServer == HostOrServer.Host;
-        }
+        public PlayerSpawnPositionTests(HostOrServer hostOrServer) : base(hostOrServer) { }
 
         private Vector3 m_PlayerPosition;
         private Quaternion m_PlayerRotation;
@@ -157,4 +187,150 @@ public IEnumerator PlayerSpawnPosition()
             }
         }
     }
+
+    /// <summary>
+    /// This test validates that when a player is spawned it has all observers
+    /// properly set and the spawned and player object lists are properly populated.
+    /// It also validates that when a player is despawned and the client is still connected
+    /// that the client maintains its observers for other players.
+    /// </summary>
+    [TestFixture(HostOrServer.DAHost)]
+    [TestFixture(HostOrServer.Host)]
+    [TestFixture(HostOrServer.Server)]
+    internal class PlayerSpawnAndDespawnTests : NetcodeIntegrationTest
+    {
+        protected override int NumberOfClients => 4;
+
+        private StringBuilder m_ErrorLog = new StringBuilder();
+
+        public PlayerSpawnAndDespawnTests(HostOrServer hostOrServer) : base(hostOrServer) { }
+
+        private bool ValidateObservers(ulong playerClientId, NetworkObject player, ref List<NetworkManager> networkManagers)
+        {
+            foreach (var networkManager in networkManagers)
+            {
+                if (player != null && player.IsSpawned)
+                {
+                    if (!networkManager.SpawnManager.SpawnedObjects.ContainsKey(player.NetworkObjectId))
+                    {
+                        m_ErrorLog.AppendLine($"Client-{networkManager.LocalClientId} does not contain a spawned object entry {nameof(NetworkObject)}-{player.NetworkObjectId} for Client-{playerClientId}!");
+                        return false;
+                    }
+
+                    var playerClone = networkManager.SpawnManager.SpawnedObjects[player.NetworkObjectId];
+                    foreach (var clientId in networkManager.ConnectedClientsIds)
+                    {
+                        if (!playerClone.IsNetworkVisibleTo(clientId))
+                        {
+                            m_ErrorLog.AppendLine($"Client-{networkManager.LocalClientId} failed visibility check for Client-{clientId} on {nameof(NetworkObject)}-{player.NetworkObjectId} for Client-{playerClientId}!");
+                            return false;
+                        }
+                    }
+
+                    var foundPlayerClone = (NetworkObject)null;
+                    foreach (var playerObject in networkManager.SpawnManager.PlayerObjects)
+                    {
+                        if (playerObject.OwnerClientId == playerClientId && playerObject.NetworkObjectId == player.NetworkObjectId)
+                        {
+                            foundPlayerClone = playerObject;
+                            break;
+                        }
+                    }
+                    if (!foundPlayerClone)
+                    {
+                        m_ErrorLog.AppendLine($"Client-{networkManager.LocalClientId} does not contain a player entry for {nameof(NetworkObject)}-{player.NetworkObjectId} for Client-{playerClientId}!");
+                        return false;
+                    }
+
+                }
+                else
+                {
+                    // If the player client in question is despawned, then no NetworkManager instance
+                    // should contain a clone of that (or the client's NetworkManager instance as well)
+                    foreach (var playerClone in networkManager.SpawnManager.PlayerObjects)
+                    {
+                        if (playerClone.OwnerClientId == playerClientId)
+                        {
+                            m_ErrorLog.AppendLine($"Client-{networkManager.LocalClientId} contains a player {nameof(NetworkObject)}-{playerClone.NetworkObjectId} for Client-{playerClientId} when it should be despawned!");
+                            return false;
+                        }
+                    }
+                }
+            }
+            return true;
+        }
+
+        private bool ValidateAllClientPlayerObservers()
+        {
+            var networkManagers = new List<NetworkManager>();
+
+            if (m_ServerNetworkManager.IsHost)
+            {
+                networkManagers.Add(m_ServerNetworkManager);
+            }
+            foreach (var networkManager in m_ClientNetworkManagers)
+            {
+                networkManagers.Add(networkManager);
+            }
+
+            m_ErrorLog.Clear();
+            var success = true;
+            foreach (var networkManager in networkManagers)
+            {
+                var spawnedOrNot = networkManager.LocalClient.PlayerObject == null ? "despawned" : "spawned";
+                m_ErrorLog.AppendLine($"Validating Client-{networkManager.LocalClientId} {spawnedOrNot} player.");
+                if (networkManager.LocalClient == null)
+                {
+                    m_ErrorLog.AppendLine($"No {nameof(NetworkClient)} found for Client-{networkManager.LocalClientId}!");
+                    success = false;
+                    break;
+                }
+                if (!ValidateObservers(networkManager.LocalClientId, networkManager.LocalClient.PlayerObject, ref networkManagers))
+                {
+                    m_ErrorLog.AppendLine($"Client-{networkManager.LocalClientId} validation pass failed.");
+                    success = false;
+                    break;
+                }
+            }
+            networkManagers.Clear();
+            return success;
+        }
+
+
+        [UnityTest]
+        public IEnumerator PlayerSpawnDespawn()
+        {
+            // Validate all observers are properly set with all players spawned
+            yield return WaitForConditionOrTimeOut(ValidateAllClientPlayerObservers);
+            AssertOnTimeout($"First Validation Failed:\n {m_ErrorLog}");
+            var selectedClient = m_ClientNetworkManagers[Random.Range(0, m_ClientNetworkManagers.Count() - 1)];
+            var playerSelected = selectedClient.LocalClient.PlayerObject;
+
+            if (m_DistributedAuthority)
+            {
+                playerSelected.Despawn(false);
+            }
+            else
+            {
+                m_ServerNetworkManager.SpawnManager.SpawnedObjects[playerSelected.NetworkObjectId].Despawn(true);
+            }
+
+            // Validate all observers are properly set with one of the players despawned
+            yield return WaitForConditionOrTimeOut(ValidateAllClientPlayerObservers);
+            AssertOnTimeout($"Second Validation Failed:\n {m_ErrorLog}");
+
+            if (m_DistributedAuthority)
+            {
+                playerSelected.SpawnAsPlayerObject(selectedClient.LocalClientId, false);
+            }
+            else
+            {
+                SpawnPlayerObject(m_ServerNetworkManager.NetworkConfig.PlayerPrefab, selectedClient);
+            }
+
+            // Validate all observers are properly set when the client's player is respawned.
+            yield return WaitForConditionOrTimeOut(ValidateAllClientPlayerObservers);
+            AssertOnTimeout($"Third Validation Failed:\n {m_ErrorLog}");
+        }
+    }
 }
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Prefabs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Prefabs.meta
new file mode 100644
index 0000000000..588c42fb5b
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Prefabs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 83133d71f2112db45ba626157c46e7f8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/AddNetworkPrefabTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/AddNetworkPrefabTests.cs
similarity index 97%
rename from com.unity.netcode.gameobjects/Tests/Runtime/AddNetworkPrefabTests.cs
rename to com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/AddNetworkPrefabTests.cs
index c00126e9ae..4627143c22 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/AddNetworkPrefabTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/AddNetworkPrefabTests.cs
@@ -7,9 +7,9 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class AddNetworkPrefabTest : NetcodeIntegrationTest
+    internal class AddNetworkPrefabTest : NetcodeIntegrationTest
     {
-        public class EmptyComponent : NetworkBehaviour
+        internal class EmptyComponent : NetworkBehaviour
         {
 
         }
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/AddNetworkPrefabTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/AddNetworkPrefabTests.cs.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Tests/Runtime/AddNetworkPrefabTests.cs.meta
rename to com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/AddNetworkPrefabTests.cs.meta
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkPrefabHandlerTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/NetworkPrefabHandlerTests.cs
similarity index 96%
rename from com.unity.netcode.gameobjects/Tests/Runtime/NetworkPrefabHandlerTests.cs
rename to com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/NetworkPrefabHandlerTests.cs
index 1e2378b7cf..c66c843abf 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkPrefabHandlerTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/NetworkPrefabHandlerTests.cs
@@ -14,7 +14,7 @@ namespace Unity.Netcode.RuntimeTests
     /// Destroying a newly spawned NetworkObject instance works
     /// Removing a INetworkPrefabInstanceHandler is removed and can be verified (very last check)
     /// </summary>
-    public class NetworkPrefabHandlerTests
+    internal class NetworkPrefabHandlerTests
     {
 
         private const string k_TestPrefabObjectName = "NetworkPrefabTestObject";
@@ -85,9 +85,14 @@ public void NetworkConfigInvalidNetworkPrefabTest()
         private const string k_PrefabObjectName = "NetworkPrefabHandlerTestObject";
 
         [Test]
-        public void NetworkPrefabHandlerClass()
+        public void NetworkPrefabHandlerClass([Values] bool distributedAuthority)
         {
-            Assert.IsTrue(NetworkManagerHelper.StartNetworkManager(out _));
+            var networkConfig = new NetworkConfig()
+            {
+                NetworkTopology = distributedAuthority ? NetworkTopologyTypes.DistributedAuthority : NetworkTopologyTypes.ClientServer,
+            };
+
+            Assert.IsTrue(NetworkManagerHelper.StartNetworkManager(out _, networkConfig: networkConfig));
             var testPrefabObjectName = k_PrefabObjectName;
 
             Guid baseObjectID = NetworkManagerHelper.AddGameNetworkObject(testPrefabObjectName);
@@ -203,7 +208,7 @@ public void TearDown()
     /// <summary>
     /// The Prefab instance handler to use for this test
     /// </summary>
-    public class NetworkPrefaInstanceHandler : INetworkPrefabInstanceHandler
+    internal class NetworkPrefaInstanceHandler : INetworkPrefabInstanceHandler
     {
         private NetworkObject m_NetworkObject;
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkPrefabHandlerTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/NetworkPrefabHandlerTests.cs.meta
similarity index 100%
rename from com.unity.netcode.gameobjects/Tests/Runtime/NetworkPrefabHandlerTests.cs.meta
rename to com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/NetworkPrefabHandlerTests.cs.meta
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/NetworkPrefabOverrideTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/NetworkPrefabOverrideTests.cs
new file mode 100644
index 0000000000..f016286ac0
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/NetworkPrefabOverrideTests.cs
@@ -0,0 +1,345 @@
+using System.Collections;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using Unity.Netcode.TestHelpers.Runtime;
+using UnityEngine;
+using UnityEngine.TestTools;
+
+namespace Unity.Netcode.RuntimeTests
+{
+    /// <summary>
+    /// Integration test that validates spawning instances of <see cref="NetworkPrefab"/>s with overrides and
+    /// <see cref="NetworkPrefabHandler"/> registered overrides.
+    /// </summary>
+    [TestFixture(NetworkTopologyTypes.ClientServer, HostOrServer.Server)]
+    [TestFixture(NetworkTopologyTypes.ClientServer, HostOrServer.Host)]
+    [TestFixture(NetworkTopologyTypes.DistributedAuthority, HostOrServer.DAHost)]
+    internal class NetworkPrefabOverrideTests : NetcodeIntegrationTest
+    {
+        private const string k_PrefabRootName = "PrefabObj";
+        protected override int NumberOfClients => 2;
+
+        private NetworkPrefab m_ClientSidePlayerPrefab;
+        private NetworkPrefab m_PrefabOverride;
+
+        public NetworkPrefabOverrideTests(NetworkTopologyTypes networkTopologyType, HostOrServer hostOrServer) : base(networkTopologyType, hostOrServer) { }
+
+        /// <summary>
+        /// Prefab override handler that will instantiate the ServerSideInstance (m_PlayerPrefab) only on server instances
+        /// and will spawn the ClientSideInstance (m_ClientSidePlayerPrefab.Prefab) only on clients and/or a host.
+        /// </summary>
+        public class TestPrefabOverrideHandler : MonoBehaviour, INetworkPrefabInstanceHandler
+        {
+            public GameObject ServerSideInstance;
+            public GameObject ClientSideInstance;
+            private NetworkManager m_NetworkManager;
+
+            private void Start()
+            {
+                m_NetworkManager = GetComponent<NetworkManager>();
+                m_NetworkManager.PrefabHandler.AddHandler(ServerSideInstance, this);
+            }
+
+            private void OnDestroy()
+            {
+                if (m_NetworkManager != null && m_NetworkManager.PrefabHandler != null)
+                {
+                    m_NetworkManager.PrefabHandler.RemoveHandler(ServerSideInstance);
+                }
+            }
+
+            public NetworkObject Instantiate(ulong ownerClientId, Vector3 position, Quaternion rotation)
+            {
+                var instance = m_NetworkManager.IsClient ? Instantiate(ClientSideInstance) : Instantiate(ServerSideInstance);
+                return instance.GetComponent<NetworkObject>();
+            }
+
+            public void Destroy(NetworkObject networkObject)
+            {
+                Object.Destroy(networkObject);
+            }
+        }
+
+
+        internal class SpawnDespawnDestroyNotifications : NetworkBehaviour
+        {
+
+            public int Despawned { get; private set; }
+            public int Destroyed { get; private set; }
+
+            private bool m_WasSpawned;
+
+            private ulong m_LocalClientId;
+
+            public override void OnNetworkSpawn()
+            {
+                m_WasSpawned = true;
+                m_LocalClientId = NetworkManager.LocalClientId;
+                base.OnNetworkSpawn();
+            }
+
+            public override void OnNetworkDespawn()
+            {
+                Assert.True(Destroyed == 0, $"{name} on client-{m_LocalClientId} should have a destroy invocation count of 0 but it is {Destroyed}!");
+                Assert.True(Despawned == 0, $"{name} on client-{m_LocalClientId} should have a despawn invocation count of 0 but it is {Despawned}!");
+                Despawned++;
+                base.OnNetworkDespawn();
+            }
+
+            public override void OnDestroy()
+            {
+                // When the original prefabs are destroyed, we want to ignore this check (those instances are never spawned)
+                if (m_WasSpawned)
+                {
+                    Assert.True(Despawned == 1, $"{name} on client-{m_LocalClientId} should have a despawn invocation count of 1 but it is {Despawned}!");
+                    Assert.True(Destroyed == 0, $"{name} on client-{m_LocalClientId} should have a destroy invocation count of 0 but it is {Destroyed}!");
+                }
+                Destroyed++;
+
+                base.OnDestroy();
+            }
+        }
+
+        /// <summary>
+        /// Mock component for testing that the client-side player is using the right
+        /// network prefab.
+        /// </summary>
+        public class ClientSideOnlyComponent : MonoBehaviour
+        {
+
+        }
+
+        /// <summary>
+        /// When we create the player prefab, make a modified instance that will be used
+        /// with the <see cref="TestPrefabOverrideHandler"/>.
+        /// </summary>
+        protected override void OnCreatePlayerPrefab()
+        {
+            var clientPlayer = Object.Instantiate(m_PlayerPrefab);
+            clientPlayer.AddComponent<ClientSideOnlyComponent>();
+            Object.DontDestroyOnLoad(clientPlayer);
+            m_ClientSidePlayerPrefab = new NetworkPrefab()
+            {
+                Prefab = clientPlayer,
+            };
+
+            base.OnCreatePlayerPrefab();
+        }
+
+        /// <summary>
+        /// Add the additional <see cref="NetworkPrefab"/>s and <see cref="TestPrefabOverrideHandler"/>s to
+        /// all <see cref="NetworkManager"/> instances.
+        /// </summary>
+        protected override void OnServerAndClientsCreated()
+        {
+            // Create a NetworkPrefab with an override
+            var basePrefab = NetcodeIntegrationTestHelpers.CreateNetworkObject($"{k_PrefabRootName}-base", m_ServerNetworkManager, true);
+            basePrefab.AddComponent<SpawnDespawnDestroyNotifications>();
+            var targetPrefab = NetcodeIntegrationTestHelpers.CreateNetworkObject($"{k_PrefabRootName}-over", m_ServerNetworkManager, true);
+            targetPrefab.AddComponent<SpawnDespawnDestroyNotifications>();
+            m_PrefabOverride = new NetworkPrefab()
+            {
+                Prefab = basePrefab,
+                Override = NetworkPrefabOverride.Prefab,
+                SourcePrefabToOverride = basePrefab,
+                OverridingTargetPrefab = targetPrefab,
+            };
+
+            // Add the prefab override handler for instance specific player prefabs to the server side
+            var playerPrefabOverrideHandler = m_ServerNetworkManager.gameObject.AddComponent<TestPrefabOverrideHandler>();
+            playerPrefabOverrideHandler.ServerSideInstance = m_PlayerPrefab;
+            playerPrefabOverrideHandler.ClientSideInstance = m_ClientSidePlayerPrefab.Prefab;
+
+            // Add the NetworkPrefab with override
+            m_ServerNetworkManager.NetworkConfig.Prefabs.Add(m_PrefabOverride);
+            // Add the client player prefab that will be used on clients (and the host)
+            m_ServerNetworkManager.NetworkConfig.Prefabs.Add(m_ClientSidePlayerPrefab);
+
+            foreach (var networkManager in m_ClientNetworkManagers)
+            {
+                // Add the prefab override handler for instance specific player prefabs to the client side
+                playerPrefabOverrideHandler = networkManager.gameObject.AddComponent<TestPrefabOverrideHandler>();
+                playerPrefabOverrideHandler.ServerSideInstance = m_PlayerPrefab;
+                playerPrefabOverrideHandler.ClientSideInstance = m_ClientSidePlayerPrefab.Prefab;
+
+                // Add the NetworkPrefab with override
+                networkManager.NetworkConfig.Prefabs.Add(m_PrefabOverride);
+                // Add the client player prefab that will be used on clients (and the host)
+                networkManager.NetworkConfig.Prefabs.Add(m_ClientSidePlayerPrefab);
+            }
+
+            m_PrefabOverride.Prefab.GetComponent<NetworkObject>().IsSceneObject = false;
+            m_PrefabOverride.SourcePrefabToOverride.GetComponent<NetworkObject>().IsSceneObject = false;
+            m_PrefabOverride.OverridingTargetPrefab.GetComponent<NetworkObject>().IsSceneObject = false;
+            m_ClientSidePlayerPrefab.Prefab.GetComponent<NetworkObject>().IsSceneObject = false;
+
+            base.OnServerAndClientsCreated();
+        }
+
+        protected override IEnumerator OnTearDown()
+        {
+            if (m_PrefabOverride != null)
+            {
+                if (m_PrefabOverride.SourcePrefabToOverride)
+                {
+                    Object.Destroy(m_PrefabOverride.SourcePrefabToOverride);
+                }
+
+                if (m_PrefabOverride.OverridingTargetPrefab)
+                {
+                    Object.Destroy(m_PrefabOverride.OverridingTargetPrefab);
+                }
+            }
+
+            if (m_ClientSidePlayerPrefab != null)
+            {
+                if (m_ClientSidePlayerPrefab.Prefab)
+                {
+                    Object.Destroy(m_ClientSidePlayerPrefab.Prefab);
+                }
+            }
+            m_ClientSidePlayerPrefab = null;
+            m_PrefabOverride = null;
+
+            yield return base.OnTearDown();
+        }
+
+
+        private GameObject GetPlayerNetworkPrefabObject(NetworkManager networkManager)
+        {
+            return networkManager.IsClient ? m_ClientSidePlayerPrefab.Prefab : m_PlayerPrefab;
+        }
+
+        [UnityTest]
+        public IEnumerator PrefabOverrideTests()
+        {
+            var prefabNetworkObject = (NetworkObject)null;
+            var spawnedGlobalObjectId = (uint)0;
+
+            var networkManagers = m_ClientNetworkManagers.ToList();
+            if (m_UseHost)
+            {
+                networkManagers.Insert(0, m_ServerNetworkManager);
+            }
+            else
+            {
+                // If running as just a server, validate that all player prefab clone instances are the server side version
+                prefabNetworkObject = GetPlayerNetworkPrefabObject(m_ServerNetworkManager).GetComponent<NetworkObject>();
+                foreach (var playerEntry in m_PlayerNetworkObjects[m_ServerNetworkManager.LocalClientId])
+                {
+                    spawnedGlobalObjectId = playerEntry.Value.GlobalObjectIdHash;
+                    Assert.IsTrue(prefabNetworkObject.GlobalObjectIdHash == spawnedGlobalObjectId, $"Server-Side {playerEntry.Value.name} was spawned as prefab ({spawnedGlobalObjectId}) but we expected ({prefabNetworkObject.GlobalObjectIdHash})!");
+                }
+            }
+
+            // Validates prefab overrides via the NetworkPrefabHandler.
+            // Validate the player prefab instance clones relative to all NetworkManagers.
+            foreach (var networkManager in networkManagers)
+            {
+                // Get the expected player prefab to be spawned based on the NetworkManager
+                prefabNetworkObject = GetPlayerNetworkPrefabObject(networkManager).GetComponent<NetworkObject>();
+                if (networkManager.IsClient)
+                {
+                    spawnedGlobalObjectId = networkManager.LocalClient.PlayerObject.GlobalObjectIdHash;
+                    Assert.IsTrue(prefabNetworkObject.GlobalObjectIdHash == spawnedGlobalObjectId, $"{networkManager.name} spawned player prefab ({spawnedGlobalObjectId}) did not match the expected one ({prefabNetworkObject.GlobalObjectIdHash})!");
+                }
+
+                foreach (var playerEntry in m_PlayerNetworkObjects[networkManager.LocalClientId])
+                {
+                    // We already checked our locally spawned player prefab above
+                    if (playerEntry.Key == networkManager.LocalClientId)
+                    {
+                        continue;
+                    }
+                    spawnedGlobalObjectId = playerEntry.Value.GlobalObjectIdHash;
+                    Assert.IsTrue(prefabNetworkObject.GlobalObjectIdHash == spawnedGlobalObjectId, $"Client-{networkManager.LocalClientId} clone of {playerEntry.Value.name} was spawned as prefab ({spawnedGlobalObjectId}) but we expected ({prefabNetworkObject.GlobalObjectIdHash})!");
+                }
+            }
+
+            // Validates prefab overrides via NetworkPrefab configuration.
+            var spawnedInstance = (NetworkObject)null;
+            var networkManagerOwner = m_ServerNetworkManager;
+
+            if (m_DistributedAuthority)
+            {
+                networkManagerOwner = m_ClientNetworkManagers[0];
+            }
+
+            // Clients and Host will spawn the OverridingTargetPrefab while a dedicated server will spawn the SourcePrefabToOverride
+            var expectedServerGlobalObjectIdHash = networkManagerOwner.IsClient ? m_PrefabOverride.OverridingTargetPrefab.GetComponent<NetworkObject>().GlobalObjectIdHash : m_PrefabOverride.SourcePrefabToOverride.GetComponent<NetworkObject>().GlobalObjectIdHash;
+            var expectedClientGlobalObjectIdHash = m_PrefabOverride.OverridingTargetPrefab.GetComponent<NetworkObject>().GlobalObjectIdHash;
+
+            spawnedInstance = NetworkObject.InstantiateAndSpawn(m_PrefabOverride.SourcePrefabToOverride, networkManagerOwner, networkManagerOwner.LocalClientId);
+            var builder = new StringBuilder();
+            bool ObjectSpawnedOnAllNetworkMangers()
+            {
+                builder.Clear();
+                if (!m_ServerNetworkManager.SpawnManager.SpawnedObjects.ContainsKey(spawnedInstance.NetworkObjectId))
+                {
+                    builder.AppendLine($"Client-{m_ServerNetworkManager.LocalClientId} failed to spawn {spawnedInstance.name}-{spawnedInstance.NetworkObjectId}!");
+                    return false;
+                }
+                var instanceGID = m_ServerNetworkManager.SpawnManager.SpawnedObjects[spawnedInstance.NetworkObjectId].GlobalObjectIdHash;
+                if (instanceGID != expectedServerGlobalObjectIdHash)
+                {
+                    builder.AppendLine($"Client-{m_ServerNetworkManager.LocalClientId} instance {spawnedInstance.name}-{spawnedInstance.NetworkObjectId} GID is {instanceGID} but was expected to be {expectedServerGlobalObjectIdHash}!");
+                    return false;
+                }
+
+                foreach (var networkManger in m_ClientNetworkManagers)
+                {
+                    if (!networkManger.SpawnManager.SpawnedObjects.ContainsKey(spawnedInstance.NetworkObjectId))
+                    {
+                        builder.AppendLine($"Client-{networkManger.LocalClientId} failed to spawn {spawnedInstance.name}-{spawnedInstance.NetworkObjectId}!");
+                        return false;
+                    }
+                    instanceGID = networkManger.SpawnManager.SpawnedObjects[spawnedInstance.NetworkObjectId].GlobalObjectIdHash;
+                    if (instanceGID != expectedClientGlobalObjectIdHash)
+                    {
+                        builder.AppendLine($"Client-{networkManger.LocalClientId} instance {spawnedInstance.name}-{spawnedInstance.NetworkObjectId} GID is {instanceGID} but was expected to be {expectedClientGlobalObjectIdHash}!");
+                        return false;
+                    }
+                }
+                return true;
+            }
+
+            yield return WaitForConditionOrTimeOut(ObjectSpawnedOnAllNetworkMangers);
+            AssertOnTimeout($"The spawned prefab override validation failed!\n {builder}");
+
+            // Verify that the despawn and destroy order of operations is correct for client owned NetworkObjects and the nunmber of times each is invoked is correct
+            expectedServerGlobalObjectIdHash = networkManagerOwner.IsClient ? m_PrefabOverride.OverridingTargetPrefab.GetComponent<NetworkObject>().GlobalObjectIdHash : m_PrefabOverride.SourcePrefabToOverride.GetComponent<NetworkObject>().GlobalObjectIdHash;
+            expectedClientGlobalObjectIdHash = m_PrefabOverride.OverridingTargetPrefab.GetComponent<NetworkObject>().GlobalObjectIdHash;
+
+            spawnedInstance = NetworkObject.InstantiateAndSpawn(m_PrefabOverride.SourcePrefabToOverride, networkManagerOwner, m_ClientNetworkManagers[0].LocalClientId);
+
+
+            yield return WaitForConditionOrTimeOut(ObjectSpawnedOnAllNetworkMangers);
+            AssertOnTimeout($"The spawned prefab override validation failed!\n {builder}");
+            var clientId = m_ClientNetworkManagers[0].LocalClientId;
+            m_ClientNetworkManagers[0].Shutdown();
+
+            // Wait until all of the client's owned objects are destroyed
+            // If no asserts occur, then the despawn & destroy order of operations and invocation count is correct
+            /// For more information look at: <see cref="SpawnDespawnDestroyNotifications"/>
+            bool ClientDisconnected(ulong clientId)
+            {
+                var clientOwnedObjects = m_ServerNetworkManager.SpawnManager.SpawnedObjects.Where((c) => c.Value.OwnerClientId == clientId).ToList();
+                if (clientOwnedObjects.Count > 0)
+                {
+                    return false;
+                }
+
+                clientOwnedObjects = m_ClientNetworkManagers[1].SpawnManager.SpawnedObjects.Where((c) => c.Value.OwnerClientId == clientId).ToList();
+                if (clientOwnedObjects.Count > 0)
+                {
+                    return false;
+                }
+                return true;
+            }
+
+            yield return WaitForConditionOrTimeOut(() => ClientDisconnected(clientId));
+            AssertOnTimeout($"Timed out waiting for client to disconnect!");
+        }
+    }
+}
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/NetworkPrefabOverrideTests.cs.meta b/com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/NetworkPrefabOverrideTests.cs.meta
new file mode 100644
index 0000000000..e0120dbf5c
--- /dev/null
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/NetworkPrefabOverrideTests.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: c5e27e24bc5f783458d6a45585308f87
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Profiling/NetworkVariableNameTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Profiling/NetworkVariableNameTests.cs
index 25d2e3bc14..1ec833369c 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Profiling/NetworkVariableNameTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Profiling/NetworkVariableNameTests.cs
@@ -4,7 +4,7 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public sealed class NetworkVariableNameTests
+    internal sealed class NetworkVariableNameTests
     {
         private NetworkVariableNameComponent m_NetworkVariableNameComponent;
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/RpcManyClientsTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/RpcManyClientsTests.cs
index 40de8a185a..5af6daa6c0 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/RpcManyClientsTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/RpcManyClientsTests.cs
@@ -7,7 +7,7 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class RpcManyClientsObject : NetworkBehaviour
+    internal class RpcManyClientsObject : NetworkBehaviour
     {
         public int Count = 0;
         public List<ulong> ReceivedFrom = new List<ulong>();
@@ -43,7 +43,7 @@ public void WithParamsClientRpc(ClientRpcParams param)
         }
     }
 
-    public class RpcManyClientsTests : NetcodeIntegrationTest
+    internal class RpcManyClientsTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 10;
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/RpcQueueTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/RpcQueueTests.cs
index dfa5f5ec9a..5d7775fa95 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/RpcQueueTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/RpcQueueTests.cs
@@ -13,7 +13,7 @@ namespace Unity.Netcode.RuntimeTests
     ///     - That all RPCs invoke at the appropriate `NetworkUpdateStage` (Client and Server)
     ///     - A lower level `MessageQueueContainer` test that validates `MessageQueueFrameItems` after they have been put into the queue
     /// </summary>
-    public class RpcQueueTests
+    internal class RpcQueueTests
     {
         [SetUp]
         public void Setup()
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/RpcTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/RpcTests.cs
index b26d5b2486..23c546e4fa 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/RpcTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/RpcTests.cs
@@ -5,19 +5,18 @@
 using Unity.Collections;
 using Unity.Netcode.TestHelpers.Runtime;
 using UnityEngine.TestTools;
-using Debug = UnityEngine.Debug;
 using Vector3 = UnityEngine.Vector3;
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class RpcTests : NetcodeIntegrationTest
+    internal class RpcTests : NetcodeIntegrationTest
     {
-        public class CompileTimeNoRpcsBaseClassTest : NetworkBehaviour
+        internal class CompileTimeNoRpcsBaseClassTest : NetworkBehaviour
         {
 
         }
 
-        public class CompileTimeHasRpcsChildClassDerivedFromNoRpcsBaseClassTest : CompileTimeNoRpcsBaseClassTest
+        internal class CompileTimeHasRpcsChildClassDerivedFromNoRpcsBaseClassTest : CompileTimeNoRpcsBaseClassTest
         {
             [ServerRpc]
             public void SomeDummyServerRpc()
@@ -26,7 +25,7 @@ public void SomeDummyServerRpc()
             }
         }
 
-        public class GenericRpcTestNB<T> : NetworkBehaviour where T : unmanaged
+        internal class GenericRpcTestNB<T> : NetworkBehaviour where T : unmanaged
         {
             public event Action<T, ServerRpcParams> OnServer_Rpc;
 
@@ -37,11 +36,11 @@ public void MyServerRpc(T clientId, ServerRpcParams param = default)
             }
         }
 
-        public class RpcTestNBFloat : GenericRpcTestNB<float>
+        internal class RpcTestNBFloat : GenericRpcTestNB<float>
         {
         }
 
-        public class RpcTestNB : GenericRpcTestNB<ulong>
+        internal class RpcTestNB : GenericRpcTestNB<ulong>
         {
 #if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
             public event Action<NativeList<ulong>, ServerRpcParams> OnNativeListServer_Rpc;
@@ -121,7 +120,7 @@ public IEnumerator TestRpcs()
 
             localClienRpcTestNB.OnClient_Rpc += () =>
             {
-                Debug.Log("ClientRpc received on client object");
+                VerboseDebug("ClientRpc received on client object");
                 hasReceivedClientRpcRemotely = true;
             };
 
@@ -139,14 +138,14 @@ public IEnumerator TestRpcs()
 
             serverClientRpcTestNB.OnServer_Rpc += (clientId, param) =>
             {
-                Debug.Log("ServerRpc received on server object");
+                VerboseDebug("ServerRpc received on server object");
                 Assert.True(param.Receive.SenderClientId == clientId);
                 hasReceivedServerRpc = true;
             };
 
             serverClientRpcTestNBFloat.OnServer_Rpc += (clientId, param) =>
             {
-                Debug.Log("ServerRpc (float) received on server object");
+                VerboseDebug("ServerRpc (float) received on server object");
                 Assert.True(param.Receive.SenderClientId == clientId);
                 hasReceivedFloatServerRpc = true;
             };
@@ -154,7 +153,7 @@ public IEnumerator TestRpcs()
             serverClientRpcTestNB.OnClient_Rpc += () =>
             {
                 // The RPC invoked locally. (Weaver failure?)
-                Debug.Log("ClientRpc received on server object");
+                VerboseDebug("ClientRpc received on server object");
                 hasReceivedClientRpcLocally = true;
             };
 
@@ -167,7 +166,7 @@ public IEnumerator TestRpcs()
 #endif
                 param4) =>
             {
-                Debug.Log("TypedServerRpc received on server object");
+                VerboseDebug("TypedServerRpc received on server object");
                 Assert.AreEqual(param1, vector3);
                 Assert.AreEqual(param2.Length, vector3s.Length);
                 Assert.AreEqual(param2[0], vector3s[0]);
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/RpcTypeSerializationTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/RpcTypeSerializationTests.cs
index 6016779cb1..8da15ccbe8 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/RpcTypeSerializationTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/RpcTypeSerializationTests.cs
@@ -1,9 +1,11 @@
 using System;
+using System.Collections;
 using System.Linq;
 using NUnit.Framework;
 using Unity.Collections;
 using Unity.Netcode.TestHelpers.Runtime;
 using UnityEngine;
+using UnityEngine.TestTools;
 using Quaternion = UnityEngine.Quaternion;
 using Vector2 = UnityEngine.Vector2;
 using Vector3 = UnityEngine.Vector3;
@@ -12,18 +14,14 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class RpcTypeSerializationTests : NetcodeIntegrationTest
+    internal class RpcTypeSerializationTests : NetcodeIntegrationTest
     {
         public RpcTypeSerializationTests()
         {
             m_UseHost = false;
         }
 
-        protected override bool m_EnableTimeTravel => true;
-        protected override bool m_SetupIsACoroutine => true;
-        protected override bool m_TearDownIsACoroutine => true;
-
-        public class RpcTestNB : NetworkBehaviour
+        internal class RpcTestNB : NetworkBehaviour
         {
             public delegate void OnReceivedDelegate(object obj);
             public OnReceivedDelegate OnReceived;
@@ -868,7 +866,7 @@ protected override void OnCreatePlayerPrefab()
             m_PlayerPrefab.AddComponent<RpcTestNB>();
         }
 
-        public void TestValueType<T>(T firstTest, T secondTest) where T : unmanaged
+        public IEnumerator TestValueType<T>(T firstTest, T secondTest) where T : unmanaged
         {
             var methods = typeof(RpcTestNB).GetMethods();
             foreach (var method in methods)
@@ -891,12 +889,12 @@ public void TestValueType<T>(T firstTest, T secondTest) where T : unmanaged
                     clientObject.OnReceived = o =>
                     {
                         receivedValue = o;
-                        Debug.Log($"Received value {o}");
+                        VerboseDebug($"Received value {o}");
                     };
-                    Debug.Log($"Sending first RPC with {firstTest}");
+                    VerboseDebug($"Sending first RPC with {firstTest}");
                     method.Invoke(serverObject, new object[] { firstTest });
 
-                    WaitForMessageReceivedWithTimeTravel<ClientRpcMessage>(m_ClientNetworkManagers.ToList());
+                    yield return WaitForMessageReceived<ClientRpcMessage>(m_ClientNetworkManagers.ToList());
 
                     Assert.IsNotNull(receivedValue);
 
@@ -906,23 +904,23 @@ public void TestValueType<T>(T firstTest, T secondTest) where T : unmanaged
 
                     receivedValue = null;
 
-                    Debug.Log($"Sending second RPC with {secondTest}");
+                    VerboseDebug($"Sending second RPC with {secondTest}");
                     method.Invoke(serverObject, new object[] { secondTest });
 
-                    WaitForMessageReceivedWithTimeTravel<ClientRpcMessage>(m_ClientNetworkManagers.ToList());
+                    yield return WaitForMessageReceived<ClientRpcMessage>(m_ClientNetworkManagers.ToList());
 
                     Assert.IsNotNull(receivedValue);
 
                     Assert.AreEqual(receivedValue.GetType(), typeof(T));
                     value = (T)receivedValue;
                     Assert.IsTrue(NetworkVariableSerialization<T>.AreEqual(ref value, ref secondTest));
-                    return;
+                    yield break;
                 }
             }
             Assert.Fail($"Could not find RPC function for {typeof(T).Name}");
         }
 
-        public void TestValueTypeArray<T>(T[] firstTest, T[] secondTest) where T : unmanaged
+        public IEnumerator TestValueTypeArray<T>(T[] firstTest, T[] secondTest) where T : unmanaged
         {
             var methods = typeof(RpcTestNB).GetMethods();
             foreach (var method in methods)
@@ -945,12 +943,12 @@ public void TestValueTypeArray<T>(T[] firstTest, T[] secondTest) where T : unman
                     clientObject.OnReceived = o =>
                     {
                         receivedValue = o;
-                        Debug.Log($"Received value {o}");
+                        VerboseDebug($"Received value {o}");
                     };
-                    Debug.Log($"Sending first RPC with {firstTest}");
+                    VerboseDebug($"Sending first RPC with {firstTest}");
                     method.Invoke(serverObject, new object[] { firstTest });
 
-                    WaitForMessageReceivedWithTimeTravel<ClientRpcMessage>(m_ClientNetworkManagers.ToList());
+                    yield return WaitForMessageReceived<ClientRpcMessage>(m_ClientNetworkManagers.ToList());
 
                     Assert.IsNotNull(receivedValue);
 
@@ -960,10 +958,10 @@ public void TestValueTypeArray<T>(T[] firstTest, T[] secondTest) where T : unman
 
                     receivedValue = null;
 
-                    Debug.Log($"Sending second RPC with {secondTest}");
+                    VerboseDebug($"Sending second RPC with {secondTest}");
                     method.Invoke(serverObject, new object[] { secondTest });
 
-                    WaitForMessageReceivedWithTimeTravel<ClientRpcMessage>(m_ClientNetworkManagers.ToList());
+                    yield return WaitForMessageReceived<ClientRpcMessage>(m_ClientNetworkManagers.ToList());
 
                     Assert.IsNotNull(receivedValue);
 
@@ -973,16 +971,16 @@ public void TestValueTypeArray<T>(T[] firstTest, T[] secondTest) where T : unman
 
                     method.Invoke(serverObject, new object[] { null });
 
-                    WaitForMessageReceivedWithTimeTravel<ClientRpcMessage>(m_ClientNetworkManagers.ToList());
+                    yield return WaitForMessageReceived<ClientRpcMessage>(m_ClientNetworkManagers.ToList());
 
                     Assert.IsNull(receivedValue);
-                    return;
+                    yield break;
                 }
             }
             Assert.Fail($"Could not find RPC function for {typeof(T).Name}");
         }
 
-        public void TestValueTypeNativeArray<T>(NativeArray<T> firstTest, NativeArray<T> secondTest) where T : unmanaged
+        public IEnumerator TestValueTypeNativeArray<T>(NativeArray<T> firstTest, NativeArray<T> secondTest) where T : unmanaged
         {
             var methods = typeof(RpcTestNB).GetMethods();
             foreach (var method in methods)
@@ -1007,12 +1005,12 @@ public void TestValueTypeNativeArray<T>(NativeArray<T> firstTest, NativeArray<T>
                         Assert.AreEqual(o.GetType(), typeof(NativeArray<T>));
                         var oAsArray = (NativeArray<T>)o;
                         receivedValue = new NativeArray<T>(oAsArray, Allocator.Persistent);
-                        Debug.Log($"Received value {o}");
+                        VerboseDebug($"Received value {o}");
                     };
-                    Debug.Log($"Sending first RPC with {firstTest}");
+                    VerboseDebug($"Sending first RPC with {firstTest}");
                     method.Invoke(serverObject, new object[] { firstTest });
 
-                    WaitForMessageReceivedWithTimeTravel<ClientRpcMessage>(m_ClientNetworkManagers.ToList());
+                    yield return WaitForMessageReceived<ClientRpcMessage>(m_ClientNetworkManagers.ToList());
 
                     Assert.IsTrue(receivedValue.IsCreated);
 
@@ -1022,24 +1020,24 @@ public void TestValueTypeNativeArray<T>(NativeArray<T> firstTest, NativeArray<T>
 
                     receivedValue = new NativeArray<T>();
 
-                    Debug.Log($"Sending second RPC with {secondTest}");
+                    VerboseDebug($"Sending second RPC with {secondTest}");
                     method.Invoke(serverObject, new object[] { secondTest });
 
-                    WaitForMessageReceivedWithTimeTravel<ClientRpcMessage>(m_ClientNetworkManagers.ToList());
+                    yield return WaitForMessageReceived<ClientRpcMessage>(m_ClientNetworkManagers.ToList());
 
                     Assert.IsTrue(receivedValue.IsCreated);
 
                     Assert.IsTrue(NetworkVariableSerialization<NativeArray<T>>.AreEqual(ref receivedValue, ref secondTest));
                     receivedValue.Dispose();
                     secondTest.Dispose();
-                    return;
+                    yield break;
                 }
             }
             Assert.Fail($"Could not find RPC function for {typeof(T).Name}");
         }
 
 #if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
-        public void TestValueTypeNativeList<T>(NativeList<T> firstTest, NativeList<T> secondTest) where T : unmanaged
+        public IEnumerator TestValueTypeNativeList<T>(NativeList<T> firstTest, NativeList<T> secondTest) where T : unmanaged
         {
             var methods = typeof(RpcTestNB).GetMethods();
             foreach (var method in methods)
@@ -1068,12 +1066,12 @@ public void TestValueTypeNativeList<T>(NativeList<T> firstTest, NativeList<T> se
                         {
                             receivedValue.Add(item);
                         }
-                        Debug.Log($"Received value {o}");
+                        VerboseDebug($"Received value {o}");
                     };
-                    Debug.Log($"Sending first RPC with {firstTest}");
+                    VerboseDebug($"Sending first RPC with {firstTest}");
                     method.Invoke(serverObject, new object[] { firstTest });
 
-                    WaitForMessageReceivedWithTimeTravel<ClientRpcMessage>(m_ClientNetworkManagers.ToList());
+                    yield return WaitForMessageReceived<ClientRpcMessage>(m_ClientNetworkManagers.ToList());
 
                     Assert.IsTrue(receivedValue.IsCreated);
 
@@ -1083,25 +1081,25 @@ public void TestValueTypeNativeList<T>(NativeList<T> firstTest, NativeList<T> se
 
                     receivedValue = new NativeList<T>();
 
-                    Debug.Log($"Sending second RPC with {secondTest}");
+                    VerboseDebug($"Sending second RPC with {secondTest}");
                     method.Invoke(serverObject, new object[] { secondTest });
 
-                    WaitForMessageReceivedWithTimeTravel<ClientRpcMessage>(m_ClientNetworkManagers.ToList());
+                    yield return WaitForMessageReceived<ClientRpcMessage>(m_ClientNetworkManagers.ToList());
 
                     Assert.IsTrue(receivedValue.IsCreated);
 
                     Assert.IsTrue(NetworkVariableSerialization<NativeList<T>>.AreEqual(ref receivedValue, ref secondTest));
                     receivedValue.Dispose();
                     secondTest.Dispose();
-                    return;
+                    yield break;
                 }
             }
             Assert.Fail($"Could not find RPC function for {typeof(T).Name}");
         }
 #endif
 
-        [Test]
-        public void WhenSendingAValueTypeOverAnRpc_ValuesAreSerializedCorrectly(
+        [UnityTest]
+        public IEnumerator WhenSendingAValueTypeOverAnRpc_ValuesAreSerializedCorrectly(
 
             [Values(typeof(byte), typeof(sbyte), typeof(short), typeof(ushort), typeof(int), typeof(uint),
                 typeof(long), typeof(ulong), typeof(bool), typeof(char), typeof(float), typeof(double),
@@ -1113,156 +1111,156 @@ public void WhenSendingAValueTypeOverAnRpc_ValuesAreSerializedCorrectly(
         {
             if (testType == typeof(byte))
             {
-                TestValueType<byte>(byte.MinValue + 5, byte.MaxValue);
+                yield return TestValueType<byte>(byte.MinValue + 5, byte.MaxValue);
             }
             else if (testType == typeof(sbyte))
             {
-                TestValueType<sbyte>(sbyte.MinValue + 5, sbyte.MaxValue);
+                yield return TestValueType<sbyte>(sbyte.MinValue + 5, sbyte.MaxValue);
             }
             else if (testType == typeof(short))
             {
-                TestValueType<short>(short.MinValue + 5, short.MaxValue);
+                yield return TestValueType<short>(short.MinValue + 5, short.MaxValue);
             }
             else if (testType == typeof(ushort))
             {
-                TestValueType<ushort>(ushort.MinValue + 5, ushort.MaxValue);
+                yield return TestValueType<ushort>(ushort.MinValue + 5, ushort.MaxValue);
             }
             else if (testType == typeof(int))
             {
-                TestValueType(int.MinValue + 5, int.MaxValue);
+                yield return TestValueType(int.MinValue + 5, int.MaxValue);
             }
             else if (testType == typeof(uint))
             {
-                TestValueType(uint.MinValue + 5, uint.MaxValue);
+                yield return TestValueType(uint.MinValue + 5, uint.MaxValue);
             }
             else if (testType == typeof(long))
             {
-                TestValueType(long.MinValue + 5, long.MaxValue);
+                yield return TestValueType(long.MinValue + 5, long.MaxValue);
             }
             else if (testType == typeof(ulong))
             {
-                TestValueType(ulong.MinValue + 5, ulong.MaxValue);
+                yield return TestValueType(ulong.MinValue + 5, ulong.MaxValue);
             }
             else if (testType == typeof(bool))
             {
-                TestValueType(true, false);
+                yield return TestValueType(true, false);
             }
             else if (testType == typeof(char))
             {
-                TestValueType('z', ' ');
+                yield return TestValueType('z', ' ');
             }
             else if (testType == typeof(float))
             {
-                TestValueType(float.MinValue + 5.12345678f, float.MaxValue);
+                yield return TestValueType(float.MinValue + 5.12345678f, float.MaxValue);
             }
             else if (testType == typeof(double))
             {
-                TestValueType(double.MinValue + 5.12345678, double.MaxValue);
+                yield return TestValueType(double.MinValue + 5.12345678, double.MaxValue);
             }
             else if (testType == typeof(ByteEnum))
             {
-                TestValueType(ByteEnum.B, ByteEnum.C);
+                yield return TestValueType(ByteEnum.B, ByteEnum.C);
             }
             else if (testType == typeof(SByteEnum))
             {
-                TestValueType(SByteEnum.B, SByteEnum.C);
+                yield return TestValueType(SByteEnum.B, SByteEnum.C);
             }
             else if (testType == typeof(ShortEnum))
             {
-                TestValueType(ShortEnum.B, ShortEnum.C);
+                yield return TestValueType(ShortEnum.B, ShortEnum.C);
             }
             else if (testType == typeof(UShortEnum))
             {
-                TestValueType(UShortEnum.B, UShortEnum.C);
+                yield return TestValueType(UShortEnum.B, UShortEnum.C);
             }
             else if (testType == typeof(IntEnum))
             {
-                TestValueType(IntEnum.B, IntEnum.C);
+                yield return TestValueType(IntEnum.B, IntEnum.C);
             }
             else if (testType == typeof(UIntEnum))
             {
-                TestValueType(UIntEnum.B, UIntEnum.C);
+                yield return TestValueType(UIntEnum.B, UIntEnum.C);
             }
             else if (testType == typeof(LongEnum))
             {
-                TestValueType(LongEnum.B, LongEnum.C);
+                yield return TestValueType(LongEnum.B, LongEnum.C);
             }
             else if (testType == typeof(ULongEnum))
             {
-                TestValueType(ULongEnum.B, ULongEnum.C);
+                yield return TestValueType(ULongEnum.B, ULongEnum.C);
             }
             else if (testType == typeof(Vector2))
             {
-                TestValueType(
+                yield return TestValueType(
                     new Vector2(5, 10),
                     new Vector2(15, 20));
             }
             else if (testType == typeof(Vector3))
             {
-                TestValueType(
+                yield return TestValueType(
                     new Vector3(5, 10, 15),
                     new Vector3(20, 25, 30));
             }
             else if (testType == typeof(Vector2Int))
             {
-                TestValueType(
+                yield return TestValueType(
                     new Vector2Int(5, 10),
                     new Vector2Int(15, 20));
             }
             else if (testType == typeof(Vector3Int))
             {
-                TestValueType(
+                yield return TestValueType(
                     new Vector3Int(5, 10, 15),
                     new Vector3Int(20, 25, 30));
             }
             else if (testType == typeof(Vector4))
             {
-                TestValueType(
+                yield return TestValueType(
                     new Vector4(5, 10, 15, 20),
                     new Vector4(25, 30, 35, 40));
             }
             else if (testType == typeof(Quaternion))
             {
-                TestValueType(
+                yield return TestValueType(
                     new Quaternion(5, 10, 15, 20),
                     new Quaternion(25, 30, 35, 40));
             }
             else if (testType == typeof(Color))
             {
-                TestValueType(
+                yield return TestValueType(
                     new Color(1, 0, 0),
                     new Color(0, 1, 1));
             }
             else if (testType == typeof(Color32))
             {
-                TestValueType(
+                yield return TestValueType(
                     new Color32(255, 0, 0, 128),
                     new Color32(0, 255, 255, 255));
             }
             else if (testType == typeof(Ray))
             {
-                TestValueType(
+                yield return TestValueType(
                     new Ray(new Vector3(0, 1, 2), new Vector3(3, 4, 5)),
                     new Ray(new Vector3(6, 7, 8), new Vector3(9, 10, 11)));
             }
             else if (testType == typeof(Ray2D))
             {
-                TestValueType(
+                yield return TestValueType(
                     new Ray2D(new Vector2(0, 1), new Vector2(2, 3)),
                     new Ray2D(new Vector2(4, 5), new Vector2(6, 7)));
             }
             else if (testType == typeof(NetworkVariableTestStruct))
             {
-                TestValueType(NetworkVariableTestStruct.GetTestStruct(), NetworkVariableTestStruct.GetTestStruct());
+                yield return TestValueType(NetworkVariableTestStruct.GetTestStruct(), NetworkVariableTestStruct.GetTestStruct());
             }
             else if (testType == typeof(FixedString32Bytes))
             {
-                TestValueType(new FixedString32Bytes("foobar"), new FixedString32Bytes("12345678901234567890123456789"));
+                yield return TestValueType(new FixedString32Bytes("foobar"), new FixedString32Bytes("12345678901234567890123456789"));
             }
         }
 
-        [Test]
-        public void WhenSendingAnArrayOfValueTypesOverAnRpc_ValuesAreSerializedCorrectly(
+        [UnityTest]
+        public IEnumerator WhenSendingAnArrayOfValueTypesOverAnRpc_ValuesAreSerializedCorrectly(
 
             [Values(typeof(byte), typeof(sbyte), typeof(short), typeof(ushort), typeof(int), typeof(uint),
                 typeof(long), typeof(ulong), typeof(bool), typeof(char), typeof(float), typeof(double),
@@ -1274,175 +1272,175 @@ public void WhenSendingAnArrayOfValueTypesOverAnRpc_ValuesAreSerializedCorrectly
         {
             if (testType == typeof(byte))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new byte[] { byte.MinValue + 5, byte.MaxValue },
                     new byte[] { 0, byte.MinValue + 10, byte.MaxValue - 10 });
             }
             else if (testType == typeof(sbyte))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new sbyte[] { sbyte.MinValue + 5, sbyte.MaxValue },
                     new sbyte[] { 0, sbyte.MinValue + 10, sbyte.MaxValue - 10 });
             }
             else if (testType == typeof(short))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new short[] { short.MinValue + 5, short.MaxValue },
                     new short[] { 0, short.MinValue + 10, short.MaxValue - 10 });
             }
             else if (testType == typeof(ushort))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new ushort[] { ushort.MinValue + 5, ushort.MaxValue },
                     new ushort[] { 0, ushort.MinValue + 10, ushort.MaxValue - 10 });
             }
             else if (testType == typeof(int))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new int[] { int.MinValue + 5, int.MaxValue },
                     new int[] { 0, int.MinValue + 10, int.MaxValue - 10 });
             }
             else if (testType == typeof(uint))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new uint[] { uint.MinValue + 5, uint.MaxValue },
                     new uint[] { 0, uint.MinValue + 10, uint.MaxValue - 10 });
             }
             else if (testType == typeof(long))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new long[] { long.MinValue + 5, long.MaxValue },
                     new long[] { 0, long.MinValue + 10, long.MaxValue - 10 });
             }
             else if (testType == typeof(ulong))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new ulong[] { ulong.MinValue + 5, ulong.MaxValue },
                     new ulong[] { 0, ulong.MinValue + 10, ulong.MaxValue - 10 });
             }
             else if (testType == typeof(bool))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new bool[] { true, false, true },
                     new bool[] { false, true, false, true, false });
             }
             else if (testType == typeof(char))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new char[] { 'z', ' ', '?' },
                     new char[] { 'n', 'e', 'w', ' ', 'v', 'a', 'l', 'u', 'e' });
             }
             else if (testType == typeof(float))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new float[] { float.MinValue + 5.12345678f, float.MaxValue },
                     new float[] { 0, float.MinValue + 10.987654321f, float.MaxValue - 10.135792468f });
             }
             else if (testType == typeof(double))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new double[] { double.MinValue + 5.12345678, double.MaxValue },
                     new double[] { 0, double.MinValue + 10.987654321, double.MaxValue - 10.135792468 });
             }
             else if (testType == typeof(ByteEnum))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new ByteEnum[] { ByteEnum.C, ByteEnum.B, ByteEnum.A },
                     new ByteEnum[] { ByteEnum.B, ByteEnum.C, ByteEnum.B, ByteEnum.A, ByteEnum.C });
             }
             else if (testType == typeof(SByteEnum))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new SByteEnum[] { SByteEnum.C, SByteEnum.B, SByteEnum.A },
                     new SByteEnum[] { SByteEnum.B, SByteEnum.C, SByteEnum.B, SByteEnum.A, SByteEnum.C });
             }
             else if (testType == typeof(ShortEnum))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new ShortEnum[] { ShortEnum.C, ShortEnum.B, ShortEnum.A },
                     new ShortEnum[] { ShortEnum.B, ShortEnum.C, ShortEnum.B, ShortEnum.A, ShortEnum.C });
             }
             else if (testType == typeof(UShortEnum))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new UShortEnum[] { UShortEnum.C, UShortEnum.B, UShortEnum.A },
                     new UShortEnum[] { UShortEnum.B, UShortEnum.C, UShortEnum.B, UShortEnum.A, UShortEnum.C });
             }
             else if (testType == typeof(IntEnum))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new IntEnum[] { IntEnum.C, IntEnum.B, IntEnum.A },
                     new IntEnum[] { IntEnum.B, IntEnum.C, IntEnum.B, IntEnum.A, IntEnum.C });
             }
             else if (testType == typeof(UIntEnum))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new UIntEnum[] { UIntEnum.C, UIntEnum.B, UIntEnum.A },
                     new UIntEnum[] { UIntEnum.B, UIntEnum.C, UIntEnum.B, UIntEnum.A, UIntEnum.C });
             }
             else if (testType == typeof(LongEnum))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new LongEnum[] { LongEnum.C, LongEnum.B, LongEnum.A },
                     new LongEnum[] { LongEnum.B, LongEnum.C, LongEnum.B, LongEnum.A, LongEnum.C });
             }
             else if (testType == typeof(ULongEnum))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new ULongEnum[] { ULongEnum.C, ULongEnum.B, ULongEnum.A },
                     new ULongEnum[] { ULongEnum.B, ULongEnum.C, ULongEnum.B, ULongEnum.A, ULongEnum.C });
             }
             else if (testType == typeof(Vector2))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new Vector2[] { new Vector2(5, 10), new Vector2(15, 20) },
                     new Vector2[] { new Vector2(25, 30), new Vector2(35, 40), new Vector2(45, 50) });
             }
             else if (testType == typeof(Vector3))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new Vector3[] { new Vector3(5, 10, 15), new Vector3(20, 25, 30) },
                     new Vector3[] { new Vector3(35, 40, 45), new Vector3(50, 55, 60), new Vector3(65, 70, 75) });
             }
             else if (testType == typeof(Vector2Int))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new Vector2Int[] { new Vector2Int(5, 10), new Vector2Int(15, 20) },
                     new Vector2Int[] { new Vector2Int(25, 30), new Vector2Int(35, 40), new Vector2Int(45, 50) });
             }
             else if (testType == typeof(Vector3Int))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new Vector3Int[] { new Vector3Int(5, 10, 15), new Vector3Int(20, 25, 30) },
                     new Vector3Int[] { new Vector3Int(35, 40, 45), new Vector3Int(50, 55, 60), new Vector3Int(65, 70, 75) });
             }
             else if (testType == typeof(Vector4))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new Vector4[] { new Vector4(5, 10, 15, 20), new Vector4(25, 30, 35, 40) },
                     new Vector4[] { new Vector4(45, 50, 55, 60), new Vector4(65, 70, 75, 80), new Vector4(85, 90, 95, 100) });
             }
             else if (testType == typeof(Quaternion))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new Quaternion[] { new Quaternion(5, 10, 15, 20), new Quaternion(25, 30, 35, 40) },
                     new Quaternion[] { new Quaternion(45, 50, 55, 60), new Quaternion(65, 70, 75, 80), new Quaternion(85, 90, 95, 100) });
             }
             else if (testType == typeof(Color))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new Color[] { new Color(.5f, .10f, .15f), new Color(.20f, .25f, .30f) },
                     new Color[] { new Color(.35f, .40f, .45f), new Color(.50f, .55f, .60f), new Color(.65f, .70f, .75f) });
             }
             else if (testType == typeof(Color32))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new Color32[] { new Color32(5, 10, 15, 20), new Color32(25, 30, 35, 40) },
                     new Color32[] { new Color32(45, 50, 55, 60), new Color32(65, 70, 75, 80), new Color32(85, 90, 95, 100) });
             }
             else if (testType == typeof(Ray))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new Ray[]
                     {
                         new Ray(new Vector3(0, 1, 2), new Vector3(3, 4, 5)),
@@ -1457,7 +1455,7 @@ public void WhenSendingAnArrayOfValueTypesOverAnRpc_ValuesAreSerializedCorrectly
             }
             else if (testType == typeof(Ray2D))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new Ray2D[]
                     {
                         new Ray2D(new Vector2(0, 1), new Vector2(3, 4)),
@@ -1472,7 +1470,7 @@ public void WhenSendingAnArrayOfValueTypesOverAnRpc_ValuesAreSerializedCorrectly
             }
             else if (testType == typeof(NetworkVariableTestStruct))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new NetworkVariableTestStruct[]
                     {
                         NetworkVariableTestStruct.GetTestStruct(),
@@ -1487,7 +1485,7 @@ public void WhenSendingAnArrayOfValueTypesOverAnRpc_ValuesAreSerializedCorrectly
             }
             else if (testType == typeof(FixedString32Bytes))
             {
-                TestValueTypeArray(
+                yield return TestValueTypeArray(
                     new FixedString32Bytes[]
                     {
                         new FixedString32Bytes("foobar"),
@@ -1502,8 +1500,8 @@ public void WhenSendingAnArrayOfValueTypesOverAnRpc_ValuesAreSerializedCorrectly
             }
         }
 
-        [Test]
-        public void WhenSendingANativeArrayOfValueTypesOverAnRpc_ValuesAreSerializedCorrectly(
+        [UnityTest]
+        public IEnumerator WhenSendingANativeArrayOfValueTypesOverAnRpc_ValuesAreSerializedCorrectly(
 
             [Values(typeof(byte), typeof(sbyte), typeof(short), typeof(ushort), typeof(int), typeof(uint),
                 typeof(long), typeof(ulong), typeof(bool), typeof(char), typeof(float), typeof(double),
@@ -1515,175 +1513,175 @@ public void WhenSendingANativeArrayOfValueTypesOverAnRpc_ValuesAreSerializedCorr
         {
             if (testType == typeof(byte))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<byte>(new byte[] { byte.MinValue + 5, byte.MaxValue }, Allocator.Persistent),
                     new NativeArray<byte>(new byte[] { 0, byte.MinValue + 10, byte.MaxValue - 10 }, Allocator.Persistent));
             }
             else if (testType == typeof(sbyte))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<sbyte>(new sbyte[] { sbyte.MinValue + 5, sbyte.MaxValue }, Allocator.Persistent),
                     new NativeArray<sbyte>(new sbyte[] { 0, sbyte.MinValue + 10, sbyte.MaxValue - 10 }, Allocator.Persistent));
             }
             else if (testType == typeof(short))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<short>(new short[] { short.MinValue + 5, short.MaxValue }, Allocator.Persistent),
                     new NativeArray<short>(new short[] { 0, short.MinValue + 10, short.MaxValue - 10 }, Allocator.Persistent));
             }
             else if (testType == typeof(ushort))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<ushort>(new ushort[] { ushort.MinValue + 5, ushort.MaxValue }, Allocator.Persistent),
                     new NativeArray<ushort>(new ushort[] { 0, ushort.MinValue + 10, ushort.MaxValue - 10 }, Allocator.Persistent));
             }
             else if (testType == typeof(int))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<int>(new int[] { int.MinValue + 5, int.MaxValue }, Allocator.Persistent),
                     new NativeArray<int>(new int[] { 0, int.MinValue + 10, int.MaxValue - 10 }, Allocator.Persistent));
             }
             else if (testType == typeof(uint))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<uint>(new uint[] { uint.MinValue + 5, uint.MaxValue }, Allocator.Persistent),
                     new NativeArray<uint>(new uint[] { 0, uint.MinValue + 10, uint.MaxValue - 10 }, Allocator.Persistent));
             }
             else if (testType == typeof(long))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<long>(new long[] { long.MinValue + 5, long.MaxValue }, Allocator.Persistent),
                     new NativeArray<long>(new long[] { 0, long.MinValue + 10, long.MaxValue - 10 }, Allocator.Persistent));
             }
             else if (testType == typeof(ulong))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<ulong>(new ulong[] { ulong.MinValue + 5, ulong.MaxValue }, Allocator.Persistent),
                     new NativeArray<ulong>(new ulong[] { 0, ulong.MinValue + 10, ulong.MaxValue - 10 }, Allocator.Persistent));
             }
             else if (testType == typeof(bool))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<bool>(new bool[] { true, false, true }, Allocator.Persistent),
                     new NativeArray<bool>(new bool[] { false, true, false, true, false }, Allocator.Persistent));
             }
             else if (testType == typeof(char))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<char>(new char[] { 'z', ' ', '?' }, Allocator.Persistent),
                     new NativeArray<char>(new char[] { 'n', 'e', 'w', ' ', 'v', 'a', 'l', 'u', 'e' }, Allocator.Persistent));
             }
             else if (testType == typeof(float))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<float>(new float[] { float.MinValue + 5.12345678f, float.MaxValue }, Allocator.Persistent),
                     new NativeArray<float>(new float[] { 0, float.MinValue + 10.987654321f, float.MaxValue - 10.135792468f }, Allocator.Persistent));
             }
             else if (testType == typeof(double))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<double>(new double[] { double.MinValue + 5.12345678, double.MaxValue }, Allocator.Persistent),
                     new NativeArray<double>(new double[] { 0, double.MinValue + 10.987654321, double.MaxValue - 10.135792468 }, Allocator.Persistent));
             }
             else if (testType == typeof(ByteEnum))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<ByteEnum>(new ByteEnum[] { ByteEnum.C, ByteEnum.B, ByteEnum.A }, Allocator.Persistent),
                     new NativeArray<ByteEnum>(new ByteEnum[] { ByteEnum.B, ByteEnum.C, ByteEnum.B, ByteEnum.A, ByteEnum.C }, Allocator.Persistent));
             }
             else if (testType == typeof(SByteEnum))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<SByteEnum>(new SByteEnum[] { SByteEnum.C, SByteEnum.B, SByteEnum.A }, Allocator.Persistent),
                     new NativeArray<SByteEnum>(new SByteEnum[] { SByteEnum.B, SByteEnum.C, SByteEnum.B, SByteEnum.A, SByteEnum.C }, Allocator.Persistent));
             }
             else if (testType == typeof(ShortEnum))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<ShortEnum>(new ShortEnum[] { ShortEnum.C, ShortEnum.B, ShortEnum.A }, Allocator.Persistent),
                     new NativeArray<ShortEnum>(new ShortEnum[] { ShortEnum.B, ShortEnum.C, ShortEnum.B, ShortEnum.A, ShortEnum.C }, Allocator.Persistent));
             }
             else if (testType == typeof(UShortEnum))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<UShortEnum>(new UShortEnum[] { UShortEnum.C, UShortEnum.B, UShortEnum.A }, Allocator.Persistent),
                     new NativeArray<UShortEnum>(new UShortEnum[] { UShortEnum.B, UShortEnum.C, UShortEnum.B, UShortEnum.A, UShortEnum.C }, Allocator.Persistent));
             }
             else if (testType == typeof(IntEnum))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<IntEnum>(new IntEnum[] { IntEnum.C, IntEnum.B, IntEnum.A }, Allocator.Persistent),
                     new NativeArray<IntEnum>(new IntEnum[] { IntEnum.B, IntEnum.C, IntEnum.B, IntEnum.A, IntEnum.C }, Allocator.Persistent));
             }
             else if (testType == typeof(UIntEnum))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<UIntEnum>(new UIntEnum[] { UIntEnum.C, UIntEnum.B, UIntEnum.A }, Allocator.Persistent),
                     new NativeArray<UIntEnum>(new UIntEnum[] { UIntEnum.B, UIntEnum.C, UIntEnum.B, UIntEnum.A, UIntEnum.C }, Allocator.Persistent));
             }
             else if (testType == typeof(LongEnum))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<LongEnum>(new LongEnum[] { LongEnum.C, LongEnum.B, LongEnum.A }, Allocator.Persistent),
                     new NativeArray<LongEnum>(new LongEnum[] { LongEnum.B, LongEnum.C, LongEnum.B, LongEnum.A, LongEnum.C }, Allocator.Persistent));
             }
             else if (testType == typeof(ULongEnum))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<ULongEnum>(new ULongEnum[] { ULongEnum.C, ULongEnum.B, ULongEnum.A }, Allocator.Persistent),
                     new NativeArray<ULongEnum>(new ULongEnum[] { ULongEnum.B, ULongEnum.C, ULongEnum.B, ULongEnum.A, ULongEnum.C }, Allocator.Persistent));
             }
             else if (testType == typeof(Vector2))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<Vector2>(new Vector2[] { new Vector2(5, 10), new Vector2(15, 20) }, Allocator.Persistent),
                     new NativeArray<Vector2>(new Vector2[] { new Vector2(25, 30), new Vector2(35, 40), new Vector2(45, 50) }, Allocator.Persistent));
             }
             else if (testType == typeof(Vector3))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<Vector3>(new Vector3[] { new Vector3(5, 10, 15), new Vector3(20, 25, 30) }, Allocator.Persistent),
                     new NativeArray<Vector3>(new Vector3[] { new Vector3(35, 40, 45), new Vector3(50, 55, 60), new Vector3(65, 70, 75) }, Allocator.Persistent));
             }
             else if (testType == typeof(Vector2Int))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<Vector2Int>(new Vector2Int[] { new Vector2Int(5, 10), new Vector2Int(15, 20) }, Allocator.Persistent),
                     new NativeArray<Vector2Int>(new Vector2Int[] { new Vector2Int(25, 30), new Vector2Int(35, 40), new Vector2Int(45, 50) }, Allocator.Persistent));
             }
             else if (testType == typeof(Vector3Int))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<Vector3Int>(new Vector3Int[] { new Vector3Int(5, 10, 15), new Vector3Int(20, 25, 30) }, Allocator.Persistent),
                     new NativeArray<Vector3Int>(new Vector3Int[] { new Vector3Int(35, 40, 45), new Vector3Int(50, 55, 60), new Vector3Int(65, 70, 75) }, Allocator.Persistent));
             }
             else if (testType == typeof(Vector4))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<Vector4>(new Vector4[] { new Vector4(5, 10, 15, 20), new Vector4(25, 30, 35, 40) }, Allocator.Persistent),
                     new NativeArray<Vector4>(new Vector4[] { new Vector4(45, 50, 55, 60), new Vector4(65, 70, 75, 80), new Vector4(85, 90, 95, 100) }, Allocator.Persistent));
             }
             else if (testType == typeof(Quaternion))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<Quaternion>(new Quaternion[] { new Quaternion(5, 10, 15, 20), new Quaternion(25, 30, 35, 40) }, Allocator.Persistent),
                     new NativeArray<Quaternion>(new Quaternion[] { new Quaternion(45, 50, 55, 60), new Quaternion(65, 70, 75, 80), new Quaternion(85, 90, 95, 100) }, Allocator.Persistent));
             }
             else if (testType == typeof(Color))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<Color>(new Color[] { new Color(.5f, .10f, .15f), new Color(.20f, .25f, .30f) }, Allocator.Persistent),
                     new NativeArray<Color>(new Color[] { new Color(.35f, .40f, .45f), new Color(.50f, .55f, .60f), new Color(.65f, .70f, .75f) }, Allocator.Persistent));
             }
             else if (testType == typeof(Color32))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<Color32>(new Color32[] { new Color32(5, 10, 15, 20), new Color32(25, 30, 35, 40) }, Allocator.Persistent),
                     new NativeArray<Color32>(new Color32[] { new Color32(45, 50, 55, 60), new Color32(65, 70, 75, 80), new Color32(85, 90, 95, 100) }, Allocator.Persistent));
             }
             else if (testType == typeof(Ray))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<Ray>(new Ray[]
                     {
                         new Ray(new Vector3(0, 1, 2), new Vector3(3, 4, 5)),
@@ -1698,7 +1696,7 @@ public void WhenSendingANativeArrayOfValueTypesOverAnRpc_ValuesAreSerializedCorr
             }
             else if (testType == typeof(Ray2D))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<Ray2D>(new Ray2D[]
                     {
                         new Ray2D(new Vector2(0, 1), new Vector2(3, 4)),
@@ -1713,7 +1711,7 @@ public void WhenSendingANativeArrayOfValueTypesOverAnRpc_ValuesAreSerializedCorr
             }
             else if (testType == typeof(NetworkVariableTestStruct))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<NetworkVariableTestStruct>(new NetworkVariableTestStruct[]
                     {
                         NetworkVariableTestStruct.GetTestStruct(),
@@ -1728,7 +1726,7 @@ public void WhenSendingANativeArrayOfValueTypesOverAnRpc_ValuesAreSerializedCorr
             }
             else if (testType == typeof(FixedString32Bytes))
             {
-                TestValueTypeNativeArray(
+                yield return TestValueTypeNativeArray(
                     new NativeArray<FixedString32Bytes>(new FixedString32Bytes[]
                     {
                         new FixedString32Bytes("foobar"),
@@ -1744,8 +1742,8 @@ public void WhenSendingANativeArrayOfValueTypesOverAnRpc_ValuesAreSerializedCorr
         }
 
 #if UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
-        [Test]
-        public void WhenSendingANativeListOfValueTypesOverAnRpc_ValuesAreSerializedCorrectly(
+        [UnityTest]
+        public IEnumerator WhenSendingANativeListOfValueTypesOverAnRpc_ValuesAreSerializedCorrectly(
 
             [Values(typeof(byte), typeof(sbyte), typeof(short), typeof(ushort), typeof(int), typeof(uint),
                 typeof(long), typeof(ulong), typeof(bool), typeof(char), typeof(float), typeof(double),
@@ -1757,175 +1755,175 @@ public void WhenSendingANativeListOfValueTypesOverAnRpc_ValuesAreSerializedCorre
         {
             if (testType == typeof(byte))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<byte>(Allocator.Persistent) { byte.MinValue + 5, byte.MaxValue },
                     new NativeList<byte>(Allocator.Persistent) { 0, byte.MinValue + 10, byte.MaxValue - 10 });
             }
             else if (testType == typeof(sbyte))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<sbyte>(Allocator.Persistent) { sbyte.MinValue + 5, sbyte.MaxValue },
                     new NativeList<sbyte>(Allocator.Persistent) { 0, sbyte.MinValue + 10, sbyte.MaxValue - 10 });
             }
             else if (testType == typeof(short))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<short>(Allocator.Persistent) { short.MinValue + 5, short.MaxValue },
                     new NativeList<short>(Allocator.Persistent) { 0, short.MinValue + 10, short.MaxValue - 10 });
             }
             else if (testType == typeof(ushort))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<ushort>(Allocator.Persistent) { ushort.MinValue + 5, ushort.MaxValue },
                     new NativeList<ushort>(Allocator.Persistent) { 0, ushort.MinValue + 10, ushort.MaxValue - 10 });
             }
             else if (testType == typeof(int))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<int>(Allocator.Persistent) { int.MinValue + 5, int.MaxValue },
                     new NativeList<int>(Allocator.Persistent) { 0, int.MinValue + 10, int.MaxValue - 10 });
             }
             else if (testType == typeof(uint))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<uint>(Allocator.Persistent) { uint.MinValue + 5, uint.MaxValue },
                     new NativeList<uint>(Allocator.Persistent) { 0, uint.MinValue + 10, uint.MaxValue - 10 });
             }
             else if (testType == typeof(long))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<long>(Allocator.Persistent) { long.MinValue + 5, long.MaxValue },
                     new NativeList<long>(Allocator.Persistent) { 0, long.MinValue + 10, long.MaxValue - 10 });
             }
             else if (testType == typeof(ulong))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<ulong>(Allocator.Persistent) { ulong.MinValue + 5, ulong.MaxValue },
                     new NativeList<ulong>(Allocator.Persistent) { 0, ulong.MinValue + 10, ulong.MaxValue - 10 });
             }
             else if (testType == typeof(bool))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<bool>(Allocator.Persistent) { true, false, true },
                     new NativeList<bool>(Allocator.Persistent) { false, true, false, true, false });
             }
             else if (testType == typeof(char))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<char>(Allocator.Persistent) { 'z', ' ', '?' },
                     new NativeList<char>(Allocator.Persistent) { 'n', 'e', 'w', ' ', 'v', 'a', 'l', 'u', 'e' });
             }
             else if (testType == typeof(float))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<float>(Allocator.Persistent) { float.MinValue + 5.12345678f, float.MaxValue },
                     new NativeList<float>(Allocator.Persistent) { 0, float.MinValue + 10.987654321f, float.MaxValue - 10.135792468f });
             }
             else if (testType == typeof(double))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<double>(Allocator.Persistent) { double.MinValue + 5.12345678, double.MaxValue },
                     new NativeList<double>(Allocator.Persistent) { 0, double.MinValue + 10.987654321, double.MaxValue - 10.135792468 });
             }
             else if (testType == typeof(ByteEnum))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<ByteEnum>(Allocator.Persistent) { ByteEnum.C, ByteEnum.B, ByteEnum.A },
                     new NativeList<ByteEnum>(Allocator.Persistent) { ByteEnum.B, ByteEnum.C, ByteEnum.B, ByteEnum.A, ByteEnum.C });
             }
             else if (testType == typeof(SByteEnum))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<SByteEnum>(Allocator.Persistent) { SByteEnum.C, SByteEnum.B, SByteEnum.A },
                     new NativeList<SByteEnum>(Allocator.Persistent) { SByteEnum.B, SByteEnum.C, SByteEnum.B, SByteEnum.A, SByteEnum.C });
             }
             else if (testType == typeof(ShortEnum))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<ShortEnum>(Allocator.Persistent) { ShortEnum.C, ShortEnum.B, ShortEnum.A },
                     new NativeList<ShortEnum>(Allocator.Persistent) { ShortEnum.B, ShortEnum.C, ShortEnum.B, ShortEnum.A, ShortEnum.C });
             }
             else if (testType == typeof(UShortEnum))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<UShortEnum>(Allocator.Persistent) { UShortEnum.C, UShortEnum.B, UShortEnum.A },
                     new NativeList<UShortEnum>(Allocator.Persistent) { UShortEnum.B, UShortEnum.C, UShortEnum.B, UShortEnum.A, UShortEnum.C });
             }
             else if (testType == typeof(IntEnum))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<IntEnum>(Allocator.Persistent) { IntEnum.C, IntEnum.B, IntEnum.A },
                     new NativeList<IntEnum>(Allocator.Persistent) { IntEnum.B, IntEnum.C, IntEnum.B, IntEnum.A, IntEnum.C });
             }
             else if (testType == typeof(UIntEnum))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<UIntEnum>(Allocator.Persistent) { UIntEnum.C, UIntEnum.B, UIntEnum.A },
                     new NativeList<UIntEnum>(Allocator.Persistent) { UIntEnum.B, UIntEnum.C, UIntEnum.B, UIntEnum.A, UIntEnum.C });
             }
             else if (testType == typeof(LongEnum))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<LongEnum>(Allocator.Persistent) { LongEnum.C, LongEnum.B, LongEnum.A },
                     new NativeList<LongEnum>(Allocator.Persistent) { LongEnum.B, LongEnum.C, LongEnum.B, LongEnum.A, LongEnum.C });
             }
             else if (testType == typeof(ULongEnum))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<ULongEnum>(Allocator.Persistent) { ULongEnum.C, ULongEnum.B, ULongEnum.A },
                     new NativeList<ULongEnum>(Allocator.Persistent) { ULongEnum.B, ULongEnum.C, ULongEnum.B, ULongEnum.A, ULongEnum.C });
             }
             else if (testType == typeof(Vector2))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<Vector2>(Allocator.Persistent) { new Vector2(5, 10), new Vector2(15, 20) },
                     new NativeList<Vector2>(Allocator.Persistent) { new Vector2(25, 30), new Vector2(35, 40), new Vector2(45, 50) });
             }
             else if (testType == typeof(Vector3))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<Vector3>(Allocator.Persistent) { new Vector3(5, 10, 15), new Vector3(20, 25, 30) },
                     new NativeList<Vector3>(Allocator.Persistent) { new Vector3(35, 40, 45), new Vector3(50, 55, 60), new Vector3(65, 70, 75) });
             }
             else if (testType == typeof(Vector2Int))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<Vector2Int>(Allocator.Persistent) { new Vector2Int(5, 10), new Vector2Int(15, 20) },
                     new NativeList<Vector2Int>(Allocator.Persistent) { new Vector2Int(25, 30), new Vector2Int(35, 40), new Vector2Int(45, 50) });
             }
             else if (testType == typeof(Vector3Int))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<Vector3Int>(Allocator.Persistent) { new Vector3Int(5, 10, 15), new Vector3Int(20, 25, 30) },
                     new NativeList<Vector3Int>(Allocator.Persistent) { new Vector3Int(35, 40, 45), new Vector3Int(50, 55, 60), new Vector3Int(65, 70, 75) });
             }
             else if (testType == typeof(Vector4))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<Vector4>(Allocator.Persistent) { new Vector4(5, 10, 15, 20), new Vector4(25, 30, 35, 40) },
                     new NativeList<Vector4>(Allocator.Persistent) { new Vector4(45, 50, 55, 60), new Vector4(65, 70, 75, 80), new Vector4(85, 90, 95, 100) });
             }
             else if (testType == typeof(Quaternion))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<Quaternion>(Allocator.Persistent) { new Quaternion(5, 10, 15, 20), new Quaternion(25, 30, 35, 40) },
                     new NativeList<Quaternion>(Allocator.Persistent) { new Quaternion(45, 50, 55, 60), new Quaternion(65, 70, 75, 80), new Quaternion(85, 90, 95, 100) });
             }
             else if (testType == typeof(Color))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<Color>(Allocator.Persistent) { new Color(.5f, .10f, .15f), new Color(.20f, .25f, .30f) },
                     new NativeList<Color>(Allocator.Persistent) { new Color(.35f, .40f, .45f), new Color(.50f, .55f, .60f), new Color(.65f, .70f, .75f) });
             }
             else if (testType == typeof(Color32))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<Color32>(Allocator.Persistent) { new Color32(5, 10, 15, 20), new Color32(25, 30, 35, 40) },
                     new NativeList<Color32>(Allocator.Persistent) { new Color32(45, 50, 55, 60), new Color32(65, 70, 75, 80), new Color32(85, 90, 95, 100) });
             }
             else if (testType == typeof(Ray))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<Ray>(Allocator.Persistent)
                     {
                         new Ray(new Vector3(0, 1, 2), new Vector3(3, 4, 5)),
@@ -1940,7 +1938,7 @@ public void WhenSendingANativeListOfValueTypesOverAnRpc_ValuesAreSerializedCorre
             }
             else if (testType == typeof(Ray2D))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<Ray2D>(Allocator.Persistent)
                     {
                         new Ray2D(new Vector2(0, 1), new Vector2(3, 4)),
@@ -1955,7 +1953,7 @@ public void WhenSendingANativeListOfValueTypesOverAnRpc_ValuesAreSerializedCorre
             }
             else if (testType == typeof(NetworkVariableTestStruct))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<NetworkVariableTestStruct>(Allocator.Persistent)
                     {
                         NetworkVariableTestStruct.GetTestStruct(),
@@ -1970,7 +1968,7 @@ public void WhenSendingANativeListOfValueTypesOverAnRpc_ValuesAreSerializedCorre
             }
             else if (testType == typeof(FixedString32Bytes))
             {
-                TestValueTypeNativeList(
+                yield return TestValueTypeNativeList(
                     new NativeList<FixedString32Bytes>(Allocator.Persistent)
                     {
                         new FixedString32Bytes("foobar"),
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Serialization/NetworkBehaviourReferenceTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Serialization/NetworkBehaviourReferenceTests.cs
index 8cf3edcae3..6b7d497738 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Serialization/NetworkBehaviourReferenceTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Serialization/NetworkBehaviourReferenceTests.cs
@@ -13,7 +13,7 @@ namespace Unity.Netcode.RuntimeTests
     /// - Deserializing NetworkObjectReference to NetworkObject
     /// - Implicit operators of NetworkObjectReference
     /// </summary>
-    public class NetworkBehaviourReferenceTests : IDisposable
+    internal class NetworkBehaviourReferenceTests : IDisposable
     {
         private class TestNetworkBehaviour : NetworkBehaviour
         {
@@ -127,7 +127,6 @@ public IEnumerator TestRpcImplicitNetworkBehaviour()
             Assert.AreEqual(testNetworkBehaviour, testNetworkBehaviour.RpcReceivedBehaviour);
         }
 
-
         [Test]
         public void TestNetworkVariable()
         {
@@ -186,7 +185,7 @@ public NetworkBehaviourReferenceTests()
     /// <summary>
     /// Integration tests for NetworkBehaviourReference
     /// </summary>
-    public class NetworkBehaviourReferenceIntegrationTests : NetcodeIntegrationTest
+    internal class NetworkBehaviourReferenceIntegrationTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 1;
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Serialization/NetworkObjectReferenceTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Serialization/NetworkObjectReferenceTests.cs
index ef459dea4e..ab347f435f 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Serialization/NetworkObjectReferenceTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Serialization/NetworkObjectReferenceTests.cs
@@ -15,11 +15,12 @@ namespace Unity.Netcode.RuntimeTests
     /// - Deserializing NetworkObjectReference to NetworkObject
     /// - Implicit operators of NetworkObjectReference
     /// </summary>
-    public class NetworkObjectReferenceTests : IDisposable
+    internal class NetworkObjectReferenceTests : IDisposable
     {
         private class TestNetworkBehaviour : NetworkBehaviour
         {
             public static bool ReceivedRPC;
+
             public NetworkVariable<NetworkObjectReference> TestVariable = new NetworkVariable<NetworkObjectReference>();
 
             public NetworkObject RpcReceivedNetworkObject;
@@ -378,7 +379,7 @@ public NetworkObjectReferenceTests()
     /// Helper method for tests to create and destroy Unity Objects.
     /// </summary>
     /// <typeparam name="T">The type of Object this context incorporates.</typeparam>
-    public class UnityObjectContext<T> : UnityObjectContext where T : Object
+    internal class UnityObjectContext<T> : UnityObjectContext where T : Object
     {
         private T m_Object;
 
@@ -391,7 +392,7 @@ internal UnityObjectContext(T unityObject, Object root)
         public T Object => m_Object;
     }
 
-    public class UnityObjectContext : IDisposable
+    internal class UnityObjectContext : IDisposable
     {
         private Object m_Root;
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/StartStopTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/StartStopTests.cs
index 403404d33c..bb928e1746 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/StartStopTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/StartStopTests.cs
@@ -3,7 +3,7 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class StartStopTests
+    internal class StartStopTests
     {
         private NetworkManager m_NetworkManager;
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/StopStartRuntimeTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/StopStartRuntimeTests.cs
index 8d52f1fc63..8ec1c37473 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/StopStartRuntimeTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/StopStartRuntimeTests.cs
@@ -5,7 +5,7 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class StopStartRuntimeTests : NetcodeIntegrationTest
+    internal class StopStartRuntimeTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 1;
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Timing/NetworkTimeSystemTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Timing/NetworkTimeSystemTests.cs
index 047435fa26..7172feb302 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Timing/NetworkTimeSystemTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Timing/NetworkTimeSystemTests.cs
@@ -10,7 +10,7 @@ namespace Unity.Netcode.RuntimeTests
     /// <summary>
     /// Runtime tests to test the network time system with the Unity player loop.
     /// </summary>
-    public class NetworkTimeSystemTests
+    internal class NetworkTimeSystemTests
     {
         private MonoBehaviourTest<PlayerLoopFixedTimeTestComponent> m_PlayerLoopFixedTimeTestComponent; // cache for teardown
         private MonoBehaviourTest<PlayerLoopTimeTestComponent> m_PlayerLoopTimeTestComponent; // cache for teardown
@@ -62,7 +62,7 @@ public IEnumerator PlayerLoopTimeTest_WithDifferentTimeScale([Values(0.0f, 0.1f,
         public IEnumerator CorrectAmountTicksTest()
         {
             NetworkTickSystem tickSystem = NetworkManager.Singleton.NetworkTickSystem;
-            float delta = tickSystem.LocalTime.FixedDeltaTime;
+            double delta = tickSystem.LocalTime.FixedDeltaTimeAsDouble;
             int previous_localTickCalculated = 0;
             int previous_serverTickCalculated = 0;
 
@@ -79,7 +79,6 @@ public IEnumerator CorrectAmountTicksTest()
                     previous_localTickCalculated++;
                 }
 
-
                 tickCalculated = NetworkManager.Singleton.ServerTime.Time / delta;
                 previous_serverTickCalculated = (int)tickCalculated;
 
@@ -117,7 +116,7 @@ public void TearDown()
         }
     }
 
-    public class PlayerLoopFixedTimeTestComponent : MonoBehaviour, IMonoBehaviourTest
+    internal class PlayerLoopFixedTimeTestComponent : MonoBehaviour, IMonoBehaviourTest
     {
         public const int Passes = 100;
 
@@ -184,7 +183,7 @@ private void FixedUpdate()
         public bool IsTestFinished => m_UpdatePasses >= Passes;
     }
 
-    public class PlayerLoopTimeTestComponent : MonoBehaviour, IMonoBehaviourTest
+    internal class PlayerLoopTimeTestComponent : MonoBehaviour, IMonoBehaviourTest
     {
         public const int Passes = 100;
 
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Timing/TimeInitializationTest.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Timing/TimeInitializationTest.cs
index cbd7b99d9d..dc06c2877d 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Timing/TimeInitializationTest.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Timing/TimeInitializationTest.cs
@@ -9,7 +9,7 @@ namespace Unity.Netcode.RuntimeTests
     /// <summary>
     /// Tests that the time and tick system are initialized properly
     /// </summary>
-    public class TimeInitializationTest
+    internal class TimeInitializationTest
     {
         private int m_ClientTickCounter;
         private int m_ConnectedTick;
@@ -42,10 +42,11 @@ public IEnumerator TestClientTimeInitializationOnConnect([Values(0, 1f)] float s
             yield return new WaitUntil(() => server.NetworkTickSystem.ServerTime.Tick > 2);
 
             var serverTimePassed = server.NetworkTickSystem.ServerTime.Time;
-            var expectedServerTickCount = Mathf.FloorToInt((float)(serverTimePassed * 30));
 
+            // Use FixedDeltaTimeAsDouble and divide the tick frequency into the time passed to get the accurate tick count
+            var expectedServerTickCount = (int)System.Math.Floor(serverTimePassed / server.ServerTime.FixedDeltaTimeAsDouble);
             var ticksPassed = server.NetworkTickSystem.ServerTime.Tick - serverTick;
-            Assert.AreEqual(expectedServerTickCount, ticksPassed);
+            Assert.AreEqual(expectedServerTickCount, ticksPassed, $"Calculated tick failed: Tick ({expectedServerTickCount}) TicksPassed ({ticksPassed}) Server Tick ({server.NetworkTickSystem.ServerTime.Tick}) Prev-Server Tick ({serverTick})");
 
             yield return new WaitForSeconds(clientStartDelay);
 
@@ -80,7 +81,7 @@ public IEnumerator TestClientTimeInitializationOnConnect([Values(0, 1f)] float s
 
         private void NetworkTickSystemOnTick()
         {
-            Debug.Log(m_Client.NetworkTickSystem.ServerTime.Tick);
+            //Debug.Log(m_Client.NetworkTickSystem.ServerTime.Tick);
             m_ClientTickCounter++;
         }
 
@@ -88,7 +89,7 @@ private void ClientOnOnClientConnectedCallback(ulong id)
         {
             // client connected to server
             m_ConnectedTick = m_Client.NetworkTickSystem.ServerTime.Tick;
-            Debug.Log($"Connected tick: {m_ConnectedTick}");
+            //Debug.Log($"Connected tick: {m_ConnectedTick}");
         }
 
         [UnityTearDown]
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Timing/TimeIntegrationTest.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Timing/TimeIntegrationTest.cs
index a04430d4b1..f6f8147dc4 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Timing/TimeIntegrationTest.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Timing/TimeIntegrationTest.cs
@@ -1,6 +1,6 @@
+#if !MULTIPLAYER_TOOLS
 using System;
 using System.Collections;
-using System.Linq;
 using NUnit.Framework;
 using Unity.Netcode.TestHelpers.Runtime;
 using UnityEngine;
@@ -11,9 +11,9 @@ namespace Unity.Netcode.RuntimeTests
     /// <summary>
     /// Tests the times of two clients connecting to a server using the SIPTransport (returns 50ms RTT but has no latency simulation)
     /// </summary>
-    public class TimeIntegrationTest : NetcodeIntegrationTest
+    internal class TimeIntegrationTest : NetcodeIntegrationTest
     {
-        private const double k_AdditionalTimeTolerance = 0.3d; // magic number and in theory not needed but without this mac os test fail in Yamato because it looks like we get random framerate drops during unit test.
+        private const double k_AdditionalTimeTolerance = 0.3333d; // magic number and in theory not needed but without this mac os test fail in Yamato because it looks like we get random framerate drops during unit test.
 
         private NetworkTimeState m_ServerState;
         private NetworkTimeState m_Client1State;
@@ -26,17 +26,11 @@ protected override NetworkManagerInstatiationMode OnSetIntegrationTestMode()
             return NetworkManagerInstatiationMode.DoNotCreate;
         }
 
-        private void UpdateTimeStates(NetworkManager[] networkManagers)
+        private void UpdateTimeStates()
         {
-            var server = networkManagers.First(t => t.IsServer);
-            var firstClient = networkManagers.First(t => t.IsClient);
-            var secondClient = networkManagers.Last(t => t.IsClient);
-
-            Assert.AreNotEqual(firstClient, secondClient);
-
-            m_ServerState = new NetworkTimeState(server);
-            m_Client1State = new NetworkTimeState(firstClient);
-            m_Client2State = new NetworkTimeState(secondClient);
+            m_ServerState = new NetworkTimeState(m_ServerNetworkManager);
+            m_Client1State = new NetworkTimeState(m_ClientNetworkManagers[0]);
+            m_Client2State = new NetworkTimeState(m_ClientNetworkManagers[1]);
         }
 
         [UnityTest]
@@ -61,26 +55,21 @@ public IEnumerator TestTimeIntegrationTest(int targetFrameRate, uint tickRate)
             double frameInterval = 1d / targetFrameRate;
             double tickInterval = 1d / tickRate;
 
-            var networkManagers = NetcodeIntegrationTestHelpers.NetworkManagerInstances.ToArray();
-
-            var server = networkManagers.First(t => t.IsServer);
-            var firstClient = networkManagers.First(t => !t.IsServer);
-            var secondClient = networkManagers.Last(t => !t.IsServer);
-
-            Assert.AreNotEqual(firstClient, secondClient);
+            var server = m_ServerNetworkManager;
+            var firstClient = m_ClientNetworkManagers[0];
+            var secondClient = m_ClientNetworkManagers[1];
 
             // increase the buffer time of client 2 // the values for client 1 are 0.0333/0.0333 here
             secondClient.NetworkTimeSystem.LocalBufferSec = 0.2;
             secondClient.NetworkTimeSystem.ServerBufferSec = 0.1;
 
-            UpdateTimeStates(networkManagers);
-
-
-            // wait for at least one tick to pass
-            yield return new WaitUntil(() => m_ServerState.LocalTime.Tick != server.NetworkTickSystem.LocalTime.Tick);
-            yield return new WaitUntil(() => m_Client1State.LocalTime.Tick != firstClient.NetworkTickSystem.LocalTime.Tick);
-            yield return new WaitUntil(() => m_Client2State.LocalTime.Tick != secondClient.NetworkTickSystem.LocalTime.Tick);
+            UpdateTimeStates();
 
+            // wait for a few ticks to pass
+            for (int i = 0; i < 4; i++)
+            {
+                yield return s_DefaultWaitForTick;
+            }
 
             var framesToRun = 3d / frameInterval;
 
@@ -103,7 +92,7 @@ public IEnumerator TestTimeIntegrationTest(int targetFrameRate, uint tickRate)
                     currentAdjustment += additionalTimeTolerance * fpsAdjustment;
                 }
 
-                UpdateTimeStates(networkManagers);
+                UpdateTimeStates();
 
                 // compares whether client times have the correct offset to server
                 m_ServerState.AssertCheckDifference(m_Client1State, tickInterval, tickInterval, tickInterval * 2 + frameInterval * 2 + currentAdjustment);
@@ -211,3 +200,4 @@ public override int GetHashCode()
         }
     }
 }
+#endif
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/TransformInterpolationTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/TransformInterpolationTests.cs
index 48f0472e8d..840204d4a5 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/TransformInterpolationTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/TransformInterpolationTests.cs
@@ -1,3 +1,4 @@
+#if !MULTIPLAYER_TOOLS
 using System.Collections;
 using NUnit.Framework;
 using Unity.Netcode.Components;
@@ -8,12 +9,12 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class TransformInterpolationObject : NetworkTransform
+    internal class TransformInterpolationObject : NetworkTransform
     {
         public static bool TestComplete = false;
         // Set the minimum threshold which we will use as our margin of error
 #if UNITY_EDITOR
-        public const float MinThreshold = 0.005f;
+        public const float MinThreshold = 0.00555555f;
 #else
         // Add additional room for error on console tests
         public const float MinThreshold = 0.009999f;
@@ -62,14 +63,10 @@ public void StopMoving()
         private const int k_MaxThresholdFailures = 4;
         private int m_ExceededThresholdCount;
 
-        protected override void Update()
+        public override void OnUpdate()
         {
-            base.Update();
+            base.OnUpdate();
 
-            if (!IsSpawned || TestComplete)
-            {
-                return;
-            }
 
             // Check the position of the nested object on the client
             if (CheckPosition)
@@ -91,6 +88,17 @@ protected override void Update()
                     m_ExceededThresholdCount = 0;
                 }
             }
+        }
+
+        private void Update()
+        {
+            base.OnUpdate();
+
+            if (!IsSpawned || !CanCommitToTransform || TestComplete)
+            {
+                return;
+            }
+
 
             // Move the nested object on the server
             if (IsMoving)
@@ -135,11 +143,10 @@ protected override void Update()
                 Assert.True(CanCommitToTransform, $"Using non-authority instance to update transform!");
                 transform.position = new Vector3(1000.0f, 1000.0f, 1000.0f);
             }
-
         }
     }
 
-    public class TransformInterpolationTests : NetcodeIntegrationTest
+    internal class TransformInterpolationTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 1;
 
@@ -221,8 +228,9 @@ public IEnumerator TransformInterpolationTest()
             // and how they move
             var timeOutHelper = new TimeoutFrameCountHelper(10);
             yield return WaitForConditionOrTimeOut(spawnedObjectNetworkTransform.ReachedTargetLocalSpaceTransitionCount, timeOutHelper);
-            Debug.Log($"[TransformInterpolationTest] Wait condition reached or timed out. Frame Count ({timeOutHelper.GetFrameCount()}) | Time Elapsed ({timeOutHelper.GetTimeElapsed()})");
+            VerboseDebug($"[TransformInterpolationTest] Wait condition reached or timed out. Frame Count ({timeOutHelper.GetFrameCount()}) | Time Elapsed ({timeOutHelper.GetTimeElapsed()})");
             AssertOnTimeout($"Failed to reach desired local to world space transitions in the given time!", timeOutHelper);
         }
     }
 }
+#endif
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportConnectionTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportConnectionTests.cs
index 8effb7096c..3e2c746082 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportConnectionTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportConnectionTests.cs
@@ -10,7 +10,7 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class UnityTransportConnectionTests
+    internal class UnityTransportConnectionTests
     {
         // For tests using multiple clients.
         private const int k_NumClients = 5;
@@ -33,7 +33,7 @@ public IEnumerator Cleanup()
                 if (transport)
                 {
                     transport.Shutdown();
-                    UnityEngine.Object.DestroyImmediate(transport);
+                    UnityEngine.Object.DestroyImmediate(transport.gameObject);
                 }
             }
 
@@ -42,6 +42,7 @@ public IEnumerator Cleanup()
                 transportEvents?.Clear();
             }
 
+            UnityTransportTestComponent.CleanUp();
             yield return null;
         }
 
@@ -59,6 +60,7 @@ public void DetectInvalidEndpoint()
             Assert.False(m_Clients[0].StartClient(), "Client failed to detect invalid endpoint!");
             netcodeLogAssert.LogWasReceived(LogType.Error, $"Network listen address ({m_Server.ConnectionData.Address}) is Invalid!");
             netcodeLogAssert.LogWasReceived(LogType.Error, $"Target server network address ({m_Clients[0].ConnectionData.Address}) is Invalid!");
+            UnityTransportTestComponent.CleanUp();
         }
 
         // Check connection with a single client.
@@ -161,8 +163,6 @@ public IEnumerator ServerDisconnectMultipleClients()
             // Check that all clients got a Disconnect event.
             Assert.True(m_ClientsEvents.All(evs => evs.Count == 2));
             Assert.True(m_ClientsEvents.All(evs => evs[1].Type == NetworkEvent.Disconnect));
-
-            yield return null;
         }
 
         // Check client disconnection from a single client.
@@ -188,13 +188,11 @@ public IEnumerator ClientDisconnectMultipleClients()
         {
             InitializeTransport(out m_Server, out m_ServerEvents);
             m_Server.StartServer();
-
             for (int i = 0; i < k_NumClients; i++)
             {
                 InitializeTransport(out m_Clients[i], out m_ClientsEvents[i]);
                 m_Clients[i].StartClient();
             }
-
             yield return WaitForNetworkEvent(NetworkEvent.Connect, m_ClientsEvents[k_NumClients - 1]);
 
             // Disconnect a single client.
@@ -207,14 +205,11 @@ public IEnumerator ClientDisconnectMultipleClients()
             {
                 m_Clients[i].DisconnectLocalClient();
             }
-
-            yield return WaitForNetworkEvent(NetworkEvent.Disconnect, m_ServerEvents);
+            yield return WaitForNetworkEvent(NetworkEvent.Disconnect, m_ServerEvents, 5);
 
             // Check that we got the correct number of Disconnect events on the server.
             Assert.AreEqual(k_NumClients * 2, m_ServerEvents.Count);
             Assert.AreEqual(k_NumClients, m_ServerEvents.Count(e => e.Type == NetworkEvent.Disconnect));
-
-            yield return null;
         }
 
         // Check that server re-disconnects are no-ops.
@@ -244,8 +239,6 @@ public IEnumerator RepeatedServerDisconnectsNoop()
             // Check we haven't received anything else on the client or server.
             Assert.AreEqual(m_ServerEvents.Count, previousServerEventsCount);
             Assert.AreEqual(m_ClientsEvents[0].Count, previousClientEventsCount);
-
-            yield return null;
         }
 
         // Check that client re-disconnects are no-ops.
@@ -275,8 +268,6 @@ public IEnumerator RepeatedClientDisconnectsNoop()
             // Check we haven't received anything else on the client or server.
             Assert.AreEqual(m_ServerEvents.Count, previousServerEventsCount);
             Assert.AreEqual(m_ClientsEvents[0].Count, previousClientEventsCount);
-
-            yield return null;
         }
 
         // Check connection with different server/listen addresses.
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportDriverClient.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportDriverClient.cs
index e2d6ef16aa..b0ed59dccc 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportDriverClient.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportDriverClient.cs
@@ -15,7 +15,7 @@ namespace Unity.Netcode.RuntimeTests
     // The only reason it's defined as a MonoBehaviour is that OnDestroy is the only reliable way
     // to get the driver's Dispose method called from a UnityTest. Making it disposable would be
     // the preferred solution, but that doesn't always mesh well with coroutines.
-    public class UnityTransportDriverClient : MonoBehaviour
+    internal class UnityTransportDriverClient : MonoBehaviour
     {
         private NetworkDriver m_Driver;
         public NetworkDriver Driver => m_Driver;
@@ -64,11 +64,7 @@ private void OnDestroy()
 
         public void Connect()
         {
-#if UTP_TRANSPORT_2_0_ABOVE
             var endpoint = NetworkEndpoint.LoopbackIpv4;
-#else
-            var endpoint = NetworkEndPoint.LoopbackIpv4;
-#endif
             endpoint.Port = 7777;
 
             m_Connection = m_Driver.Connect(endpoint);
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportTestHelpers.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportTestHelpers.cs
index 75144f66c3..926b2fa7bc 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportTestHelpers.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportTestHelpers.cs
@@ -8,7 +8,7 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public static class UnityTransportTestHelpers
+    internal static class UnityTransportTestHelpers
     {
         // Half a second might seem like a very long time to wait for a network event, but in CI
         // many of the machines are underpowered (e.g. old Android devices or Macs) and there are
@@ -36,6 +36,24 @@ public static IEnumerator WaitForNetworkEvent(NetworkEvent type, List<TransportE
             Assert.Fail("Timed out while waiting for network event.");
         }
 
+        // Wait to ensure no event is sent.
+        public static IEnumerator EnsureNoNetworkEvent(List<TransportEvent> events, float timeout = MaxNetworkEventWaitTime)
+        {
+            int initialCount = events.Count;
+            float startTime = Time.realtimeSinceStartup;
+
+            while (Time.realtimeSinceStartup - startTime < timeout)
+            {
+                if (events.Count > initialCount)
+                {
+                    Assert.Fail("Received unexpected network event.");
+                }
+
+                yield return new WaitForSeconds(0.01f);
+            }
+        }
+
+
         // Common code to initialize a UnityTransport that logs its events.
         public static void InitializeTransport(out UnityTransport transport, out List<TransportEvent> events,
             int maxPayloadSize = UnityTransport.InitialMaxPayloadSize, int maxSendQueueSize = 0, NetworkFamily family = NetworkFamily.Ipv4)
@@ -43,7 +61,7 @@ public static void InitializeTransport(out UnityTransport transport, out List<Tr
             var logger = new TransportEventLogger();
             events = logger.Events;
 
-            transport = new GameObject().AddComponent<UnityTransport>();
+            transport = new GameObject().AddComponent<UnityTransportTestComponent>();
 
             transport.OnTransportEvent += logger.HandleEvent;
             transport.MaxPayloadSize = maxPayloadSize;
@@ -59,7 +77,7 @@ public static void InitializeTransport(out UnityTransport transport, out List<Tr
 
         // Information about an event generated by a transport (basically just the parameters that
         // are normally passed along to a TransportEventDelegate).
-        public struct TransportEvent
+        internal struct TransportEvent
         {
             public NetworkEvent Type;
             public ulong ClientID;
@@ -69,7 +87,7 @@ public struct TransportEvent
         // Utility class that logs events generated by a UnityTransport. Set it up by adding the
         // HandleEvent method as an OnTransportEvent delegate of the transport. The list of events
         // (in order in which they were generated) can be accessed through the Events property.
-        public class TransportEventLogger
+        internal class TransportEventLogger
         {
             private readonly List<TransportEvent> m_Events = new List<TransportEvent>();
             public List<TransportEvent> Events => m_Events;
@@ -91,5 +109,58 @@ public void HandleEvent(NetworkEvent type, ulong clientID, ArraySegment<byte> da
                 });
             }
         }
+
+        internal class UnityTransportTestComponent : UnityTransport, INetworkUpdateSystem
+        {
+            private static List<UnityTransportTestComponent> s_Instances = new List<UnityTransportTestComponent>();
+
+            public static void CleanUp()
+            {
+                for (int i = s_Instances.Count - 1; i >= 0; i--)
+                {
+                    var instance = s_Instances[i];
+                    instance.Shutdown();
+                    DestroyImmediate(instance.gameObject);
+                }
+                s_Instances.Clear();
+            }
+
+            /// <summary>
+            /// Simulate the <see cref="NetworkManager.NetworkUpdate"/> being invoked so <see cref="UnityTransport.EarlyUpdate"/>
+            /// and <see cref="UnityTransport.PostLateUpdate"/> are invoked.
+            /// </summary>
+            public void NetworkUpdate(NetworkUpdateStage updateStage)
+            {
+                switch (updateStage)
+                {
+                    case NetworkUpdateStage.EarlyUpdate:
+                        {
+                            EarlyUpdate();
+                            break;
+                        }
+                    case NetworkUpdateStage.PostLateUpdate:
+                        {
+                            PostLateUpdate();
+                            break;
+                        }
+                }
+            }
+
+            public override void Shutdown()
+            {
+                s_Instances.Remove(this);
+                base.Shutdown();
+                this.UnregisterAllNetworkUpdates();
+            }
+
+            public override void Initialize(NetworkManager networkManager = null)
+            {
+                base.Initialize(networkManager);
+                this.RegisterNetworkUpdate(NetworkUpdateStage.EarlyUpdate);
+                this.RegisterNetworkUpdate(NetworkUpdateStage.PreUpdate);
+                this.RegisterNetworkUpdate(NetworkUpdateStage.PostLateUpdate);
+                s_Instances.Add(this);
+            }
+        }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportTests.cs
index d2dcddf7ea..03bd6c2c4c 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/Transports/UnityTransportTests.cs
@@ -12,7 +12,7 @@
 
 namespace Unity.Netcode.RuntimeTests
 {
-    public class UnityTransportTests
+    internal class UnityTransportTests
     {
         // No need to test all reliable delivery methods since they all map to the same pipeline.
         private static readonly NetworkDelivery[] k_DeliveryParameters =
@@ -60,11 +60,11 @@ public IEnumerator Cleanup()
                 // Need to destroy the GameObject (all assigned components will get destroyed too)
                 UnityEngine.Object.DestroyImmediate(m_Client2.gameObject);
             }
-
             m_ServerEvents?.Clear();
             m_Client1Events?.Clear();
             m_Client2Events?.Clear();
 
+            UnityTransportTestComponent.CleanUp();
             yield return null;
         }
 
@@ -217,8 +217,6 @@ public IEnumerator MultipleSendsSingleFrame(
 
             Assert.AreEqual(33, m_ServerEvents[3].Data.First());
             Assert.AreEqual(10, m_ServerEvents[3].Data.Count);
-
-            yield return null;
         }
 
         // Check sending data to multiple clients.
@@ -260,8 +258,6 @@ public IEnumerator SendMultipleClients(
             byte c1Data = m_Client1Events[1].Data.First();
             byte c2Data = m_Client2Events[1].Data.First();
             Assert.That((c1Data == 11 && c2Data == 22) || (c1Data == 22 && c2Data == 11));
-
-            yield return null;
         }
 
         // Check receiving data from multiple clients.
@@ -299,8 +295,6 @@ public IEnumerator ReceiveMultipleClients(
             byte sData1 = m_ServerEvents[2].Data.First();
             byte sData2 = m_ServerEvents[3].Data.First();
             Assert.That((sData1 == 11 && sData2 == 22) || (sData1 == 22 && sData2 == 11));
-
-            yield return null;
         }
 
         // Check that we get disconnected when overflowing the reliable send queue.
@@ -317,6 +311,8 @@ public IEnumerator DisconnectOnReliableSendQueueOverflow()
 
             yield return WaitForNetworkEvent(NetworkEvent.Connect, m_Client1Events);
 
+            var serverClientId = m_Client1.ServerClientId;
+
             m_Server.Shutdown();
 
             var numSends = (maxSendQueueSize / 1024);
@@ -328,12 +324,10 @@ public IEnumerator DisconnectOnReliableSendQueueOverflow()
             }
 
             LogAssert.Expect(LogType.Error, "Couldn't add payload of size 1024 to reliable send queue. " +
-                $"Closing connection {m_Client1.ServerClientId} as reliability guarantees can't be maintained.");
+                $"Closing connection {serverClientId} as reliability guarantees can't be maintained.");
 
             Assert.AreEqual(2, m_Client1Events.Count);
             Assert.AreEqual(NetworkEvent.Disconnect, m_Client1Events[1].Type);
-
-            yield return null;
         }
 
         // Check that it's fine to overflow the unreliable send queue (traffic is flushed on overflow).
@@ -373,69 +367,48 @@ public IEnumerator SendCompletesOnUnreliableSendQueueOverflow()
                 Assert.AreEqual(NetworkEvent.Data, m_ServerEvents[i].Type);
                 Assert.AreEqual(1024, m_ServerEvents[i].Data.Count);
             }
-
-            yield return null;
         }
 
-#if !UTP_TRANSPORT_2_0_ABOVE
-        // Check that simulator parameters are effective. We only check with the drop rate, because
-        // that's easy to check and we only really want to make sure the simulator parameters are
-        // configured properly (the simulator pipeline stage is already well-tested in UTP).
         [UnityTest]
-        [UnityPlatform(include = new[] { RuntimePlatform.OSXEditor, RuntimePlatform.WindowsEditor, RuntimePlatform.LinuxEditor })]
-        public IEnumerator SimulatorParametersAreEffective()
+        public IEnumerator SendQueuesFlushedOnShutdown([ValueSource("k_DeliveryParameters")] NetworkDelivery delivery)
         {
             InitializeTransport(out m_Server, out m_ServerEvents);
             InitializeTransport(out m_Client1, out m_Client1Events);
 
-            m_Server.SetDebugSimulatorParameters(0, 0, 100);
-
             m_Server.StartServer();
             m_Client1.StartClient();
 
             yield return WaitForNetworkEvent(NetworkEvent.Connect, m_Client1Events);
 
             var data = new ArraySegment<byte>(new byte[] { 42 });
-            m_Client1.Send(m_Client1.ServerClientId, data, NetworkDelivery.Reliable);
-
-            yield return new WaitForSeconds(MaxNetworkEventWaitTime);
+            m_Client1.Send(m_Client1.ServerClientId, data, delivery);
 
-            Assert.AreEqual(1, m_ServerEvents.Count);
+            m_Client1.Shutdown();
 
-            yield return null;
+            yield return WaitForNetworkEvent(NetworkEvent.Data, m_ServerEvents);
         }
 
-        // Check that RTT is reported correctly.
         [UnityTest]
-        [UnityPlatform(include = new[] { RuntimePlatform.OSXEditor, RuntimePlatform.WindowsEditor, RuntimePlatform.LinuxEditor })]
-        public IEnumerator CurrentRttReportedCorrectly()
+        public IEnumerator SendQueuesFlushedOnLocalClientDisconnect([ValueSource("k_DeliveryParameters")] NetworkDelivery delivery)
         {
-            const int simulatedRtt = 25;
-
             InitializeTransport(out m_Server, out m_ServerEvents);
             InitializeTransport(out m_Client1, out m_Client1Events);
 
-            m_Server.SetDebugSimulatorParameters(simulatedRtt, 0, 0);
-
             m_Server.StartServer();
             m_Client1.StartClient();
 
             yield return WaitForNetworkEvent(NetworkEvent.Connect, m_Client1Events);
 
             var data = new ArraySegment<byte>(new byte[] { 42 });
-            m_Client1.Send(m_Client1.ServerClientId, data, NetworkDelivery.Reliable);
-
-            yield return WaitForNetworkEvent(NetworkEvent.Data, m_ServerEvents,
-                timeout: MaxNetworkEventWaitTime + (2 * simulatedRtt));
+            m_Client1.Send(m_Client1.ServerClientId, data, delivery);
 
-            Assert.GreaterOrEqual(m_Client1.GetCurrentRtt(m_Client1.ServerClientId), simulatedRtt);
+            m_Client1.DisconnectLocalClient();
 
-            yield return null;
+            yield return WaitForNetworkEvent(NetworkEvent.Data, m_ServerEvents);
         }
-#endif
 
         [UnityTest]
-        public IEnumerator SendQueuesFlushedOnShutdown([ValueSource("k_DeliveryParameters")] NetworkDelivery delivery)
+        public IEnumerator SendQueuesFlushedOnRemoteClientDisconnect([ValueSource("k_DeliveryParameters")] NetworkDelivery delivery)
         {
             InitializeTransport(out m_Server, out m_ServerEvents);
             InitializeTransport(out m_Client1, out m_Client1Events);
@@ -446,17 +419,15 @@ public IEnumerator SendQueuesFlushedOnShutdown([ValueSource("k_DeliveryParameter
             yield return WaitForNetworkEvent(NetworkEvent.Connect, m_Client1Events);
 
             var data = new ArraySegment<byte>(new byte[] { 42 });
-            m_Client1.Send(m_Client1.ServerClientId, data, delivery);
-
-            m_Client1.Shutdown();
+            m_Server.Send(m_Client1.ServerClientId, data, delivery);
 
-            yield return WaitForNetworkEvent(NetworkEvent.Data, m_ServerEvents);
+            m_Server.DisconnectRemoteClient(m_ServerEvents[0].ClientID);
 
-            yield return null;
+            yield return WaitForNetworkEvent(NetworkEvent.Data, m_Client1Events);
         }
 
         [UnityTest]
-        public IEnumerator SendQueuesFlushedOnLocalClientDisconnect([ValueSource("k_DeliveryParameters")] NetworkDelivery delivery)
+        public IEnumerator ReliablePayloadsCanBeLargerThanMaximum()
         {
             InitializeTransport(out m_Server, out m_ServerEvents);
             InitializeTransport(out m_Client1, out m_Client1Events);
@@ -466,18 +437,23 @@ public IEnumerator SendQueuesFlushedOnLocalClientDisconnect([ValueSource("k_Deli
 
             yield return WaitForNetworkEvent(NetworkEvent.Connect, m_Client1Events);
 
-            var data = new ArraySegment<byte>(new byte[] { 42 });
-            m_Client1.Send(m_Client1.ServerClientId, data, delivery);
+            var payloadSize = UnityTransport.InitialMaxPayloadSize + 1;
+            var data = new ArraySegment<byte>(new byte[payloadSize]);
 
-            m_Client1.DisconnectLocalClient();
+            m_Server.Send(m_Client1.ServerClientId, data, NetworkDelivery.Reliable);
 
-            yield return WaitForNetworkEvent(NetworkEvent.Data, m_ServerEvents);
+            yield return WaitForNetworkEvent(NetworkEvent.Data, m_Client1Events);
+        }
 
-            yield return null;
+        public enum AfterShutdownAction
+        {
+            Send,
+            DisconnectRemoteClient,
+            DisconnectLocalClient,
         }
 
         [UnityTest]
-        public IEnumerator SendQueuesFlushedOnRemoteClientDisconnect([ValueSource("k_DeliveryParameters")] NetworkDelivery delivery)
+        public IEnumerator DoesNotActAfterShutdown([Values] AfterShutdownAction afterShutdownAction)
         {
             InitializeTransport(out m_Server, out m_ServerEvents);
             InitializeTransport(out m_Client1, out m_Client1Events);
@@ -487,18 +463,31 @@ public IEnumerator SendQueuesFlushedOnRemoteClientDisconnect([ValueSource("k_Del
 
             yield return WaitForNetworkEvent(NetworkEvent.Connect, m_Client1Events);
 
-            var data = new ArraySegment<byte>(new byte[] { 42 });
-            m_Server.Send(m_Client1.ServerClientId, data, delivery);
+            m_Server.Shutdown();
 
-            m_Server.DisconnectRemoteClient(m_ServerEvents[0].ClientID);
+            if (afterShutdownAction == AfterShutdownAction.Send)
+            {
+                var data = new ArraySegment<byte>(new byte[16]);
+                m_Server.Send(m_Client1.ServerClientId, data, NetworkDelivery.Reliable);
 
-            yield return WaitForNetworkEvent(NetworkEvent.Data, m_Client1Events);
+                yield return EnsureNoNetworkEvent(m_Client1Events);
+            }
+            else if (afterShutdownAction == AfterShutdownAction.DisconnectRemoteClient)
+            {
+                m_Server.DisconnectRemoteClient(m_Client1.ServerClientId);
 
-            yield return null;
+                LogAssert.Expect(LogType.Warning, $"{nameof(UnityTransport.DisconnectRemoteClient)} should only be called on a listening server!");
+            }
+            else if (afterShutdownAction == AfterShutdownAction.DisconnectLocalClient)
+            {
+                m_Server.DisconnectLocalClient();
+
+                yield return EnsureNoNetworkEvent(m_Client1Events);
+            }
         }
 
         [UnityTest]
-        public IEnumerator ReliablePayloadsCanBeLargerThanMaximum()
+        public IEnumerator DoesNotAttemptToSendOnInvalidConnections()
         {
             InitializeTransport(out m_Server, out m_ServerEvents);
             InitializeTransport(out m_Client1, out m_Client1Events);
@@ -508,14 +497,10 @@ public IEnumerator ReliablePayloadsCanBeLargerThanMaximum()
 
             yield return WaitForNetworkEvent(NetworkEvent.Connect, m_Client1Events);
 
-            var payloadSize = UnityTransport.InitialMaxPayloadSize + 1;
-            var data = new ArraySegment<byte>(new byte[payloadSize]);
+            var data = new ArraySegment<byte>(new byte[42]);
+            m_Server.Send(0, data, NetworkDelivery.Reliable);
 
-            m_Server.Send(m_Client1.ServerClientId, data, NetworkDelivery.Reliable);
-
-            yield return WaitForNetworkEvent(NetworkEvent.Data, m_Client1Events);
-
-            yield return null;
+            yield return EnsureNoNetworkEvent(m_Client1Events);
         }
     }
 }
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/UniversalRpcTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/UniversalRpcTests.cs
index e157a3a212..3aeb06d05d 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/UniversalRpcTests.cs
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/UniversalRpcTests.cs
@@ -1,6 +1,5 @@
 #if !MULTIPLAYER_TOOLS && !NGO_MINIMALPROJECT
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -9,7 +8,6 @@
 using Unity.Collections;
 using Unity.Netcode.TestHelpers.Runtime;
 using UnityEngine;
-using UnityEngine.TestTools;
 using Object = UnityEngine.Object;
 using Random = System.Random;
 
@@ -21,7 +19,7 @@
 // I put them in their own namespace so they would be easier to navigate in the test list.
 namespace Unity.Netcode.RuntimeTests.UniversalRpcTests
 {
-    public class UniversalRpcNetworkBehaviour : NetworkBehaviour
+    internal class UniversalRpcNetworkBehaviour : NetworkBehaviour
     {
         public bool Stop = false;
         public string Received = string.Empty;
@@ -99,6 +97,18 @@ public void DefaultToClientsAndHostRpc()
             OnRpcReceived();
         }
 
+        [Rpc(SendTo.Authority)]
+        public void DefaultToAuthorityRpc()
+        {
+            OnRpcReceived();
+        }
+
+        [Rpc(SendTo.NotAuthority)]
+        public void DefaultToNotAuthorityRpc()
+        {
+            OnRpcReceived();
+        }
+
         // RPCs with parameters
 
         [Rpc(SendTo.Everyone)]
@@ -149,6 +159,18 @@ public void DefaultToClientsAndHostWithParamsRpc(int i, bool b, float f, string
             OnRpcReceivedWithParams(i, b, f, s);
         }
 
+        [Rpc(SendTo.Authority)]
+        public void DefaultToAuthorityWithParamsRpc(int i, bool b, float f, string s)
+        {
+            OnRpcReceivedWithParams(i, b, f, s);
+        }
+
+        [Rpc(SendTo.NotAuthority)]
+        public void DefaultToNotAuthorityWithParamsRpc(int i, bool b, float f, string s)
+        {
+            OnRpcReceivedWithParams(i, b, f, s);
+        }
+
         // RPCs with RPC parameters
 
         [Rpc(SendTo.Everyone)]
@@ -207,6 +229,19 @@ public void DefaultToClientsAndHostWithRpcParamsRpc(RpcParams rpcParams)
             ReceivedFrom = rpcParams.Receive.SenderClientId;
         }
 
+        [Rpc(SendTo.Authority)]
+        public void DefaultToAuthorityWithRpcParamsRpc(RpcParams rpcParams)
+        {
+            OnRpcReceived();
+            ReceivedFrom = rpcParams.Receive.SenderClientId;
+        }
+
+        [Rpc(SendTo.NotAuthority)]
+        public void DefaultToNotAuthorityWithRpcParamsRpc(RpcParams rpcParams)
+        {
+            OnRpcReceived();
+            ReceivedFrom = rpcParams.Receive.SenderClientId;
+        }
 
         // RPCs with parameters and RPC parameters
 
@@ -258,6 +293,18 @@ public void DefaultToClientsAndHostWithParamsAndRpcParamsRpc(int i, bool b, floa
             OnRpcReceivedWithParams(i, b, f, s);
         }
 
+        [Rpc(SendTo.Authority)]
+        public void DefaultToAuthorityWithParamsAndRpcParamsRpc(int i, bool b, float f, string s, RpcParams rpcParams)
+        {
+            OnRpcReceivedWithParams(i, b, f, s);
+        }
+
+        [Rpc(SendTo.NotAuthority)]
+        public void DefaultToNotAuthorityWithParamsAndRpcParamsRpc(int i, bool b, float f, string s, RpcParams rpcParams)
+        {
+            OnRpcReceivedWithParams(i, b, f, s);
+        }
+
         // RPCs with AllowTargetOverride = true
 
         // AllowTargetOverried is implied with SpecifiedInParams and does not need to be stated
@@ -316,6 +363,18 @@ public void DefaultToClientsAndHostAllowOverrideRpc(RpcParams rpcParams)
             OnRpcReceived();
         }
 
+        [Rpc(SendTo.Authority, AllowTargetOverride = true)]
+        public void DefaultToAuthorityAllowOverrideRpc(RpcParams rpcParams)
+        {
+            OnRpcReceived();
+        }
+
+        [Rpc(SendTo.NotAuthority, AllowTargetOverride = true)]
+        public void DefaultToNotAuthorityAllowOverrideRpc(RpcParams rpcParams)
+        {
+            OnRpcReceived();
+        }
+
         // RPCs with DeferLocal = true
 
         [Rpc(SendTo.Everyone, DeferLocal = true)]
@@ -360,6 +419,18 @@ public void DefaultToClientsAndHostDeferLocalRpc(RpcParams rpcParams)
             OnRpcReceived();
         }
 
+        [Rpc(SendTo.Authority, DeferLocal = true)]
+        public void DefaultToAuthorityDeferLocalRpc(RpcParams rpcParams)
+        {
+            OnRpcReceived();
+        }
+
+        [Rpc(SendTo.NotAuthority, DeferLocal = true)]
+        public void DefaultToNotAuthorityDeferLocalRpc(RpcParams rpcParams)
+        {
+            OnRpcReceived();
+        }
+
         // RPCs with RequireOwnership = true
 
         [Rpc(SendTo.Everyone, RequireOwnership = true)]
@@ -416,6 +487,17 @@ public void SpecifiedInParamsRequireOwnershipRpc(RpcParams rpcParams)
             OnRpcReceived();
         }
 
+        [Rpc(SendTo.Authority, RequireOwnership = true)]
+        public void DefaultToAuthorityRequireOwnershipRpc()
+        {
+            OnRpcReceived();
+        }
+
+        [Rpc(SendTo.NotAuthority, RequireOwnership = true)]
+        public void DefaultToNotAuthorityRequireOwnershipRpc()
+        {
+            OnRpcReceived();
+        }
 
         // Mutual RPC Recursion
 
@@ -452,11 +534,8 @@ public void SelfRecursiveRpc()
         }
     }
 
-    public class UniversalRpcTestsBase : NetcodeIntegrationTest
+    internal class UniversalRpcTestsBase : NetcodeIntegrationTest
     {
-        public static int YieldCheck = 0;
-        public const int YieldCycleCount = 10;
-
         protected override int NumberOfClients => 2;
 
         public UniversalRpcTestsBase(HostOrServer hostOrServer) : base(hostOrServer)
@@ -497,7 +576,6 @@ protected override void OnServerAndClientsCreated()
 
         protected override void OnInlineTearDown()
         {
-            MockTransport.ClearQueues();
             Clear();
         }
 
@@ -821,6 +899,26 @@ public void VerifySentToNotMe(ulong objectOwner, ulong sender, string methodName
             VerifySentToNotId(objectOwner, sender, sender, methodName, false);
         }
 
+        public void VerifySentToAuthority(ulong objectOwner, ulong sender, string methodName)
+        {
+            var receiver = objectOwner;
+            if (!m_DistributedAuthority)
+            {
+                receiver = NetworkManager.ServerClientId;
+            }
+            VerifySentToId(objectOwner, sender, receiver, methodName, false);
+        }
+
+        public void VerifySentToNotAuthority(ulong objectOwner, ulong sender, string methodName)
+        {
+            var receiver = objectOwner;
+            if (!m_DistributedAuthority)
+            {
+                receiver = NetworkManager.ServerClientId;
+            }
+            VerifySentToNotId(objectOwner, sender, receiver, methodName, false);
+        }
+
         public void VerifySentToOwnerWithReceivedFrom(ulong objectOwner, ulong sender, string methodName)
         {
             VerifySentToId(objectOwner, sender, objectOwner, methodName, true);
@@ -863,6 +961,26 @@ public void VerifySentToNotMeWithReceivedFrom(ulong objectOwner, ulong sender, s
             VerifySentToNotId(objectOwner, sender, sender, methodName, true);
         }
 
+        public void VerifySentToAuthorityWithReceivedFrom(ulong objectOwner, ulong sender, string methodName)
+        {
+            var receiver = objectOwner;
+            if (!m_DistributedAuthority)
+            {
+                receiver = NetworkManager.ServerClientId;
+            }
+            VerifySentToId(objectOwner, sender, receiver, methodName, true);
+        }
+
+        public void VerifySentToNotAuthorityWithReceivedFrom(ulong objectOwner, ulong sender, string methodName)
+        {
+            var receiver = objectOwner;
+            if (!m_DistributedAuthority)
+            {
+                receiver = NetworkManager.ServerClientId;
+            }
+            VerifySentToNotId(objectOwner, sender, receiver, methodName, true);
+        }
+
         public void VerifySentToOwnerWithParams(ulong objectOwner, ulong sender, string methodName, int i, bool b, float f, string s)
         {
             VerifySentToIdWithParams(objectOwner, sender, objectOwner, methodName, i, b, f, s);
@@ -905,6 +1023,26 @@ public void VerifySentToNotMeWithParams(ulong objectOwner, ulong sender, string
             VerifySentToNotIdWithParams(objectOwner, sender, sender, methodName, i, b, f, s);
         }
 
+        public void VerifySentToAuthorityWithParams(ulong objectOwner, ulong sender, string methodName, int i, bool b, float f, string s)
+        {
+            var receiver = objectOwner;
+            if (!m_DistributedAuthority)
+            {
+                receiver = NetworkManager.ServerClientId;
+            }
+            VerifySentToIdWithParams(objectOwner, sender, receiver, methodName, i, b, f, s);
+        }
+
+        public void VerifySentToNotAuthorityWithParams(ulong objectOwner, ulong sender, string methodName, int i, bool b, float f, string s)
+        {
+            var receiver = objectOwner;
+            if (!m_DistributedAuthority)
+            {
+                receiver = NetworkManager.ServerClientId;
+            }
+            VerifySentToNotIdWithParams(objectOwner, sender, receiver, methodName, i, b, f, s);
+        }
+
         public void RethrowTargetInvocationException(Action action)
         {
             try
@@ -918,6 +1056,7 @@ public void RethrowTargetInvocationException(Action action)
         }
     }
 
+    [TestFixture(HostOrServer.DAHost)]
     [TestFixture(HostOrServer.Host)]
     [TestFixture(HostOrServer.Server)]
     internal class UniversalRpcTestSendingNoOverride : UniversalRpcTestsBase
@@ -930,7 +1069,8 @@ public UniversalRpcTestSendingNoOverride(HostOrServer hostOrServer) : base(hostO
         [Test]
         public void TestSendingNoOverride(
             // Excludes SendTo.SpecifiedInParams
-            [Values(SendTo.Everyone, SendTo.Me, SendTo.Owner, SendTo.Server, SendTo.NotMe, SendTo.NotOwner, SendTo.NotServer, SendTo.ClientsAndHost)] SendTo sendTo,
+            [Values(SendTo.Everyone, SendTo.Me, SendTo.Owner, SendTo.Server, SendTo.NotMe, SendTo.NotOwner, SendTo.NotServer,
+            SendTo.ClientsAndHost, SendTo.Authority, SendTo.NotAuthority)] SendTo sendTo,
             [Values(0u, 1u, 2u)] ulong objectOwner,
             [Values(0u, 1u, 2u)] ulong sender
         )
@@ -948,6 +1088,7 @@ public void TestSendingNoOverride(
 
     }
 
+    [TestFixture(HostOrServer.DAHost)]
     [TestFixture(HostOrServer.Host)]
     [TestFixture(HostOrServer.Server)]
     internal class UniversalRpcTestSenderClientId : UniversalRpcTestsBase
@@ -960,7 +1101,7 @@ public UniversalRpcTestSenderClientId(HostOrServer hostOrServer) : base(hostOrSe
         [Test]
         public void TestSenderClientId(
             // Excludes SendTo.SpecifiedInParams
-            [Values(SendTo.Everyone, SendTo.Me, SendTo.Owner, SendTo.Server, SendTo.NotMe, SendTo.NotOwner, SendTo.NotServer, SendTo.ClientsAndHost)] SendTo sendTo,
+            [Values(SendTo.Everyone, SendTo.Me, SendTo.Owner, SendTo.Server, SendTo.NotMe, SendTo.NotOwner, SendTo.NotServer, SendTo.ClientsAndHost, SendTo.Authority, SendTo.NotAuthority)] SendTo sendTo,
             [Values(0u, 1u, 2u)] ulong objectOwner,
             [Values(0u, 1u, 2u)] ulong sender
         )
@@ -978,6 +1119,7 @@ public void TestSenderClientId(
 
     }
 
+    [TestFixture(HostOrServer.DAHost)]
     [TestFixture(HostOrServer.Host)]
     [TestFixture(HostOrServer.Server)]
     internal class UniversalRpcTestSendingNoOverrideWithParams : UniversalRpcTestsBase
@@ -990,7 +1132,7 @@ public UniversalRpcTestSendingNoOverrideWithParams(HostOrServer hostOrServer) :
         [Test]
         public void TestSendingNoOverrideWithParams(
             // Excludes SendTo.SpecifiedInParams
-            [Values(SendTo.Everyone, SendTo.Me, SendTo.Owner, SendTo.Server, SendTo.NotMe, SendTo.NotOwner, SendTo.NotServer, SendTo.ClientsAndHost)] SendTo sendTo,
+            [Values(SendTo.Everyone, SendTo.Me, SendTo.Owner, SendTo.Server, SendTo.NotMe, SendTo.NotOwner, SendTo.NotServer, SendTo.ClientsAndHost, SendTo.Authority, SendTo.NotAuthority)] SendTo sendTo,
             [Values(0u, 1u, 2u)] ulong objectOwner,
             [Values(0u, 1u, 2u)] ulong sender
         )
@@ -1020,6 +1162,7 @@ public void TestSendingNoOverrideWithParams(
 
     }
 
+    [TestFixture(HostOrServer.DAHost)]
     [TestFixture(HostOrServer.Host)]
     [TestFixture(HostOrServer.Server)]
     internal class UniversalRpcTestSendingNoOverrideWithParamsAndRpcParams : UniversalRpcTestsBase
@@ -1032,7 +1175,7 @@ public UniversalRpcTestSendingNoOverrideWithParamsAndRpcParams(HostOrServer host
         [Test]
         public void TestSendingNoOverrideWithParamsAndRpcParams(
             // Excludes SendTo.SpecifiedInParams
-            [Values(SendTo.Everyone, SendTo.Me, SendTo.Owner, SendTo.Server, SendTo.NotMe, SendTo.NotOwner, SendTo.NotServer, SendTo.ClientsAndHost)] SendTo sendTo,
+            [Values(SendTo.Everyone, SendTo.Me, SendTo.Owner, SendTo.Server, SendTo.NotMe, SendTo.NotOwner, SendTo.NotServer, SendTo.ClientsAndHost, SendTo.Authority, SendTo.NotAuthority)] SendTo sendTo,
             [Values(0u, 1u, 2u)] ulong objectOwner,
             [Values(0u, 1u, 2u)] ulong sender
         )
@@ -1062,6 +1205,8 @@ public void TestSendingNoOverrideWithParamsAndRpcParams(
 
     }
 
+
+    [TestFixture(HostOrServer.DAHost)]
     [TestFixture(HostOrServer.Host)]
     [TestFixture(HostOrServer.Server)]
     internal class UniversalRpcTestRequireOwnership : UniversalRpcTestsBase
@@ -1074,7 +1219,7 @@ public UniversalRpcTestRequireOwnership(HostOrServer hostOrServer) : base(hostOr
         [Test]
         public void TestRequireOwnership(
             // Excludes SendTo.SpecifiedInParams
-            [Values(SendTo.Everyone, SendTo.Me, SendTo.Owner, SendTo.Server, SendTo.NotMe, SendTo.NotOwner, SendTo.NotServer, SendTo.ClientsAndHost)] SendTo sendTo,
+            [Values(SendTo.Everyone, SendTo.Me, SendTo.Owner, SendTo.Server, SendTo.NotMe, SendTo.NotOwner, SendTo.NotServer, SendTo.ClientsAndHost, SendTo.Authority, SendTo.NotAuthority)] SendTo sendTo,
             [Values(0u, 1u, 2u)] ulong objectOwner,
             [Values(0u, 1u, 2u)] ulong sender
         )
@@ -1098,6 +1243,7 @@ public void TestRequireOwnership(
         }
     }
 
+    [TestFixture(HostOrServer.DAHost)]
     [TestFixture(HostOrServer.Host)]
     [TestFixture(HostOrServer.Server)]
     internal class UniversalRpcTestDisallowedOverride : UniversalRpcTestsBase
@@ -1107,10 +1253,11 @@ public UniversalRpcTestDisallowedOverride(HostOrServer hostOrServer) : base(host
 
         }
 
+        // Add both authority and nonauthority
         [Test]
         public void TestDisallowedOverride(
             // Excludes SendTo.SpecifiedInParams
-            [Values(SendTo.Everyone, SendTo.Me, SendTo.Owner, SendTo.Server, SendTo.NotMe, SendTo.NotOwner, SendTo.NotServer, SendTo.ClientsAndHost)] SendTo sendTo,
+            [Values(SendTo.Everyone, SendTo.Me, SendTo.Owner, SendTo.Server, SendTo.NotMe, SendTo.NotOwner, SendTo.NotServer, SendTo.ClientsAndHost, SendTo.Authority, SendTo.NotAuthority)] SendTo sendTo,
             [Values(0u, 1u, 2u)] ulong objectOwner,
             [Values(0u, 1u, 2u)] ulong sender)
         {
@@ -1142,6 +1289,7 @@ public UniversalRpcTestSendingWithTargetOverride(HostOrServer hostOrServer) : ba
 
         }
 
+        // Look at the implementations and add both
         [Test]
         public void TestSendingWithTargetOverride(
             [Values] SendTo defaultSendTo,
@@ -1175,40 +1323,27 @@ public UniversalRpcTestSendingWithSingleOverride(HostOrServer hostOrServer) : ba
 
         }
 
-        [UnityTest]
-        public IEnumerator TestSendingWithSingleOverride()
+        [Test]
+        public void TestSendingWithSingleOverride(
+            [Values] SendTo defaultSendTo,
+            [Values(0u, 1u, 2u)] ulong recipient,
+            [Values(0u, 1u, 2u)] ulong objectOwner,
+            [Values(0u, 1u, 2u)] ulong sender
+        )
         {
-            foreach (var defaultSendTo in Enum.GetValues(typeof(SendTo)))
-            {
-                for (ulong recipient = 0u; recipient <= 2u; ++recipient)
-                {
-                    for (ulong objectOwner = 0u; objectOwner <= 2u; ++objectOwner)
-                    {
-                        for (ulong sender = 0u; sender <= 2u; ++sender)
-                        {
-                            if (++YieldCheck % YieldCycleCount == 0)
-                            {
-                                yield return null;
-                            }
-                            OnInlineSetup();
-                            var sendMethodName = $"DefaultTo{defaultSendTo}AllowOverrideRpc";
-
-                            var senderObject = GetPlayerObject(objectOwner, sender);
-                            var target = senderObject.RpcTarget.Single(recipient, RpcTargetUse.Temp);
-                            var sendMethod = senderObject.GetType().GetMethod(sendMethodName);
-                            sendMethod.Invoke(senderObject, new object[] { (RpcParams)target });
-
-                            VerifyRemoteReceived(objectOwner, sender, sendMethodName, new[] { recipient }, false);
-                            VerifyNotReceived(objectOwner, s_ClientIds.Where(c => recipient != c).ToArray());
-
-                            // Pass some time to make sure that no other client ever receives this
-                            TimeTravel(1f, 30);
-                            VerifyNotReceived(objectOwner, s_ClientIds.Where(c => recipient != c).ToArray());
-                            OnInlineTearDown();
-                        }
-                    }
-                }
-            }
+            var sendMethodName = $"DefaultTo{defaultSendTo}AllowOverrideRpc";
+
+            var senderObject = GetPlayerObject(objectOwner, sender);
+            var target = senderObject.RpcTarget.Single(recipient, RpcTargetUse.Temp);
+            var sendMethod = senderObject.GetType().GetMethod(sendMethodName);
+            sendMethod.Invoke(senderObject, new object[] { (RpcParams)target });
+
+            VerifyRemoteReceived(objectOwner, sender, sendMethodName, new[] { recipient }, false);
+            VerifyNotReceived(objectOwner, s_ClientIds.Where(c => recipient != c).ToArray());
+
+            // Pass some time to make sure that no other client ever receives this
+            TimeTravel(1f, 30);
+            VerifyNotReceived(objectOwner, s_ClientIds.Where(c => recipient != c).ToArray());
         }
 
     }
@@ -1222,40 +1357,27 @@ public UniversalRpcTestSendingWithSingleNotOverride(HostOrServer hostOrServer) :
 
         }
 
-        [UnityTest]
-        public IEnumerator TestSendingWithSingleNotOverride()
+        [Test]
+        public void TestSendingWithSingleNotOverride(
+            [Values] SendTo defaultSendTo,
+            [Values(0u, 1u, 2u)] ulong recipient,
+            [Values(0u, 1u, 2u)] ulong objectOwner,
+            [Values(0u, 1u, 2u)] ulong sender
+        )
         {
-            foreach (var defaultSendTo in Enum.GetValues(typeof(SendTo)))
-            {
-                for (ulong recipient = 0u; recipient <= 2u; ++recipient)
-                {
-                    for (ulong objectOwner = 0u; objectOwner <= 2u; ++objectOwner)
-                    {
-                        for (ulong sender = 0u; sender <= 2u; ++sender)
-                        {
-                            if (++YieldCheck % YieldCycleCount == 0)
-                            {
-                                yield return null;
-                            }
-                            OnInlineSetup();
-                            var sendMethodName = $"DefaultTo{defaultSendTo}AllowOverrideRpc";
-
-                            var senderObject = GetPlayerObject(objectOwner, sender);
-                            var target = senderObject.RpcTarget.Not(recipient, RpcTargetUse.Temp);
-                            var sendMethod = senderObject.GetType().GetMethod(sendMethodName);
-                            sendMethod.Invoke(senderObject, new object[] { (RpcParams)target });
-
-                            VerifyRemoteReceived(objectOwner, sender, sendMethodName, s_ClientIds.Where(c => recipient != c).ToArray(), false);
-                            VerifyNotReceived(objectOwner, new[] { recipient });
-
-                            // Pass some time to make sure that no other client ever receives this
-                            TimeTravel(1f, 30);
-                            VerifyNotReceived(objectOwner, new[] { recipient });
-                            OnInlineTearDown();
-                        }
-                    }
-                }
-            }
+            var sendMethodName = $"DefaultTo{defaultSendTo}AllowOverrideRpc";
+
+            var senderObject = GetPlayerObject(objectOwner, sender);
+            var target = senderObject.RpcTarget.Not(recipient, RpcTargetUse.Temp);
+            var sendMethod = senderObject.GetType().GetMethod(sendMethodName);
+            sendMethod.Invoke(senderObject, new object[] { (RpcParams)target });
+
+            VerifyRemoteReceived(objectOwner, sender, sendMethodName, s_ClientIds.Where(c => recipient != c).ToArray(), false);
+            VerifyNotReceived(objectOwner, new[] { recipient });
+
+            // Pass some time to make sure that no other client ever receives this
+            TimeTravel(1f, 30);
+            VerifyNotReceived(objectOwner, new[] { recipient });
         }
 
     }
@@ -1285,80 +1407,56 @@ public enum AllocationType
             List
         }
 
-        // Extending timeout since the added yield return causes this test to commonly timeout
-        [Timeout(600000)]
-        [UnityTest]
-        public IEnumerator TestSendingWithGroupOverride()
+        [Test]
+        public void TestSendingWithGroupOverride(
+            [Values] SendTo defaultSendTo,
+            [ValueSource(nameof(RecipientGroups))] ulong[] recipient,
+            [Values(0u, 1u, 2u)] ulong objectOwner,
+            [Values(0u, 1u, 2u)] ulong sender,
+            [Values] AllocationType allocationType
+        )
         {
-            var waitFor = new WaitForFixedUpdate();
-            foreach (var defaultSendTo in Enum.GetValues(typeof(SendTo)))
-            {
-                m_EnableVerboseDebug = true;
-                VerboseDebug($"Processing: {defaultSendTo}");
-                m_EnableVerboseDebug = false;
+            var sendMethodName = $"DefaultTo{defaultSendTo}AllowOverrideRpc";
 
-                foreach (var recipient in RecipientGroups)
-                {
-                    for (ulong objectOwner = 0u; objectOwner <= 2u; ++objectOwner)
+            var senderObject = GetPlayerObject(objectOwner, sender);
+            BaseRpcTarget target = null;
+            switch (allocationType)
+            {
+                case AllocationType.Array:
+                    target = senderObject.RpcTarget.Group(recipient, RpcTargetUse.Temp);
+                    break;
+                case AllocationType.List:
+                    target = senderObject.RpcTarget.Group(recipient.ToList(), RpcTargetUse.Temp);
+                    break;
+                case AllocationType.NativeArray:
+                    var arr = new NativeArray<ulong>(recipient, Allocator.Temp);
+                    target = senderObject.RpcTarget.Group(arr, RpcTargetUse.Temp);
+                    arr.Dispose();
+                    break;
+                case AllocationType.NativeList:
+                    // For some reason on 2020.3, calling list.AsArray() and passing that to the next function
+                    // causes Allocator.Temp allocations to become invalid somehow. This is not an issue on later
+                    // versions of Unity.
+                    var list = new NativeList<ulong>(recipient.Length, Allocator.TempJob);
+                    foreach (var id in recipient)
                     {
-                        for (ulong sender = 0u; sender <= 2u; ++sender)
-                        {
-                            yield return waitFor;
-                            foreach (var allocationType in Enum.GetValues(typeof(AllocationType)))
-                            {
-                                //if (++YieldCheck % YieldCycleCount == 0)
-                                //{
-                                //    yield return null;
-                                //}
-                                OnInlineSetup();
-                                var sendMethodName = $"DefaultTo{defaultSendTo}AllowOverrideRpc";
-
-                                var senderObject = GetPlayerObject(objectOwner, sender);
-                                BaseRpcTarget target = null;
-                                switch (allocationType)
-                                {
-                                    case AllocationType.Array:
-                                        target = senderObject.RpcTarget.Group(recipient, RpcTargetUse.Temp);
-                                        break;
-                                    case AllocationType.List:
-                                        target = senderObject.RpcTarget.Group(recipient.ToList(), RpcTargetUse.Temp);
-                                        break;
-                                    case AllocationType.NativeArray:
-                                        var arr = new NativeArray<ulong>(recipient, Allocator.Temp);
-                                        target = senderObject.RpcTarget.Group(arr, RpcTargetUse.Temp);
-                                        arr.Dispose();
-                                        break;
-                                    case AllocationType.NativeList:
-                                        // For some reason on 2020.3, calling list.AsArray() and passing that to the next function
-                                        // causes Allocator.Temp allocations to become invalid somehow. This is not an issue on later
-                                        // versions of Unity.
-                                        var list = new NativeList<ulong>(recipient.Length, Allocator.TempJob);
-                                        foreach (var id in recipient)
-                                        {
-                                            list.Add(id);
-                                        }
-
-                                        target = senderObject.RpcTarget.Group(list, RpcTargetUse.Temp);
-                                        list.Dispose();
-                                        break;
-                                }
-
-                                var sendMethod = senderObject.GetType().GetMethod(sendMethodName);
-                                sendMethod.Invoke(senderObject, new object[] { (RpcParams)target });
-
-                                VerifyRemoteReceived(objectOwner, sender, sendMethodName, s_ClientIds.Where(c => recipient.Contains(c)).ToArray(), false);
-                                VerifyNotReceived(objectOwner, s_ClientIds.Where(c => !recipient.Contains(c)).ToArray());
-
-                                // Pass some time to make sure that no other client ever receives this
-                                TimeTravel(1f, 30);
-                                VerifyNotReceived(objectOwner, s_ClientIds.Where(c => !recipient.Contains(c)).ToArray());
-                                OnInlineTearDown();
-                            }
-                        }
+                        list.Add(id);
                     }
-                }
+                    target = senderObject.RpcTarget.Group(list, RpcTargetUse.Temp);
+                    list.Dispose();
+                    break;
             }
+            var sendMethod = senderObject.GetType().GetMethod(sendMethodName);
+            sendMethod.Invoke(senderObject, new object[] { (RpcParams)target });
+
+            VerifyRemoteReceived(objectOwner, sender, sendMethodName, s_ClientIds.Where(c => recipient.Contains(c)).ToArray(), false);
+            VerifyNotReceived(objectOwner, s_ClientIds.Where(c => !recipient.Contains(c)).ToArray());
+
+            // Pass some time to make sure that no other client ever receives this
+            TimeTravel(1f, 30);
+            VerifyNotReceived(objectOwner, s_ClientIds.Where(c => !recipient.Contains(c)).ToArray());
         }
+
     }
 
     [TestFixture(HostOrServer.Host)]
@@ -1386,78 +1484,54 @@ public enum AllocationType
             List
         }
 
-        // Extending timeout since the added yield return causes this test to commonly timeout
-        [Timeout(600000)]
-        [UnityTest]
-        public IEnumerator TestSendingWithGroupNotOverride()
+        [Test]
+        public void TestSendingWithGroupNotOverride(
+            [Values] SendTo defaultSendTo,
+            [ValueSource(nameof(RecipientGroups))] ulong[] recipient,
+            [Values(0u, 1u, 2u)] ulong objectOwner,
+            [Values(0u, 1u, 2u)] ulong sender,
+            [Values] AllocationType allocationType
+        )
         {
-            var waitFor = new WaitForFixedUpdate();
-            foreach (var defaultSendTo in Enum.GetValues(typeof(SendTo)))
+            var sendMethodName = $"DefaultTo{defaultSendTo}AllowOverrideRpc";
+
+            var senderObject = GetPlayerObject(objectOwner, sender);
+            BaseRpcTarget target = null;
+            switch (allocationType)
             {
-                m_EnableVerboseDebug = true;
-                VerboseDebug($"Processing: {defaultSendTo}");
-                m_EnableVerboseDebug = false;
-                foreach (var recipient in RecipientGroups)
-                {
-                    for (ulong objectOwner = 0u; objectOwner <= 2u; ++objectOwner)
+                case AllocationType.Array:
+                    target = senderObject.RpcTarget.Not(recipient, RpcTargetUse.Temp);
+                    break;
+                case AllocationType.List:
+                    target = senderObject.RpcTarget.Not(recipient.ToList(), RpcTargetUse.Temp);
+                    break;
+                case AllocationType.NativeArray:
+                    var arr = new NativeArray<ulong>(recipient, Allocator.Temp);
+                    target = senderObject.RpcTarget.Not(arr, RpcTargetUse.Temp);
+                    arr.Dispose();
+                    break;
+                case AllocationType.NativeList:
+                    // For some reason on 2020.3, calling list.AsArray() and passing that to the next function
+                    // causes Allocator.Temp allocations to become invalid somehow. This is not an issue on later
+                    // versions of Unity.
+                    var list = new NativeList<ulong>(recipient.Length, Allocator.TempJob);
+                    foreach (var id in recipient)
                     {
-                        for (ulong sender = 0u; sender <= 2u; ++sender)
-                        {
-                            yield return waitFor;
-
-                            foreach (var allocationType in Enum.GetValues(typeof(AllocationType)))
-                            {
-                                //if (++YieldCheck % YieldCycleCount == 0)
-                                //{
-                                //    yield return waitFor;
-                                //}
-
-                                OnInlineSetup();
-                                var sendMethodName = $"DefaultTo{defaultSendTo}AllowOverrideRpc";
-
-                                var senderObject = GetPlayerObject(objectOwner, sender);
-                                BaseRpcTarget target = null;
-                                switch (allocationType)
-                                {
-                                    case AllocationType.Array:
-                                        target = senderObject.RpcTarget.Not(recipient, RpcTargetUse.Temp);
-                                        break;
-                                    case AllocationType.List:
-                                        target = senderObject.RpcTarget.Not(recipient.ToList(), RpcTargetUse.Temp);
-                                        break;
-                                    case AllocationType.NativeArray:
-                                        var arr = new NativeArray<ulong>(recipient, Allocator.Temp);
-                                        target = senderObject.RpcTarget.Not(arr, RpcTargetUse.Temp);
-                                        arr.Dispose();
-                                        break;
-                                    case AllocationType.NativeList:
-                                        // For some reason on 2020.3, calling list.AsArray() and passing that to the next function
-                                        // causes Allocator.Temp allocations to become invalid somehow. This is not an issue on later
-                                        // versions of Unity.
-                                        var list = new NativeList<ulong>(recipient.Length, Allocator.TempJob);
-                                        foreach (var id in recipient)
-                                        {
-                                            list.Add(id);
-                                        }
-                                        target = senderObject.RpcTarget.Not(list, RpcTargetUse.Temp);
-                                        list.Dispose();
-                                        break;
-                                }
-                                var sendMethod = senderObject.GetType().GetMethod(sendMethodName);
-                                sendMethod.Invoke(senderObject, new object[] { (RpcParams)target });
-
-                                VerifyRemoteReceived(objectOwner, sender, sendMethodName, s_ClientIds.Where(c => !recipient.Contains(c)).ToArray(), false);
-                                VerifyNotReceived(objectOwner, s_ClientIds.Where(c => recipient.Contains(c)).ToArray());
-
-                                // Pass some time to make sure that no other client ever receives this
-                                TimeTravel(1f, 30);
-                                VerifyNotReceived(objectOwner, s_ClientIds.Where(c => recipient.Contains(c)).ToArray());
-                                OnInlineTearDown();
-                            }
-                        }
+                        list.Add(id);
                     }
-                }
+                    target = senderObject.RpcTarget.Not(list, RpcTargetUse.Temp);
+                    list.Dispose();
+                    break;
             }
+            var sendMethod = senderObject.GetType().GetMethod(sendMethodName);
+            sendMethod.Invoke(senderObject, new object[] { (RpcParams)target });
+
+            VerifyRemoteReceived(objectOwner, sender, sendMethodName, s_ClientIds.Where(c => !recipient.Contains(c)).ToArray(), false);
+            VerifyNotReceived(objectOwner, s_ClientIds.Where(c => recipient.Contains(c)).ToArray());
+
+            // Pass some time to make sure that no other client ever receives this
+            TimeTravel(1f, 30);
+            VerifyNotReceived(objectOwner, s_ClientIds.Where(c => recipient.Contains(c)).ToArray());
         }
 
     }
@@ -1472,6 +1546,7 @@ public UniversalRpcTestDefaultSendToSpecifiedInParamsSendingToServerAndOwner(Hos
         }
     }
 
+    [TestFixture(HostOrServer.DAHost)]
     [TestFixture(HostOrServer.Host)]
     [TestFixture(HostOrServer.Server)]
     internal class UniversalRpcTestDeferLocal : UniversalRpcTestsBase
@@ -1481,180 +1556,269 @@ public UniversalRpcTestDeferLocal(HostOrServer hostOrServer) : base(hostOrServer
 
         }
 
-        private struct TestData
+        [Test]
+        // All the test cases that involve sends that will be delivered locally
+        [TestCase(SendTo.Everyone, 0u, 0u)]
+        [TestCase(SendTo.Everyone, 0u, 1u)]
+        [TestCase(SendTo.Everyone, 0u, 2u)]
+        [TestCase(SendTo.Everyone, 1u, 0u)]
+        [TestCase(SendTo.Everyone, 1u, 1u)]
+        [TestCase(SendTo.Everyone, 1u, 2u)]
+        [TestCase(SendTo.Everyone, 2u, 0u)]
+        [TestCase(SendTo.Everyone, 2u, 1u)]
+        [TestCase(SendTo.Everyone, 2u, 2u)]
+        [TestCase(SendTo.Me, 0u, 0u)]
+        [TestCase(SendTo.Me, 0u, 1u)]
+        [TestCase(SendTo.Me, 0u, 2u)]
+        [TestCase(SendTo.Me, 1u, 0u)]
+        [TestCase(SendTo.Me, 1u, 1u)]
+        [TestCase(SendTo.Me, 1u, 2u)]
+        [TestCase(SendTo.Me, 2u, 0u)]
+        [TestCase(SendTo.Me, 2u, 1u)]
+        [TestCase(SendTo.Me, 2u, 2u)]
+        [TestCase(SendTo.Owner, 0u, 0u)]
+        [TestCase(SendTo.Owner, 1u, 1u)]
+        [TestCase(SendTo.Owner, 2u, 2u)]
+        [TestCase(SendTo.Server, 0u, 0u)]
+        [TestCase(SendTo.Server, 1u, 0u)]
+        [TestCase(SendTo.Server, 2u, 0u)]
+        [TestCase(SendTo.NotOwner, 0u, 1u)]
+        [TestCase(SendTo.NotOwner, 0u, 2u)]
+        [TestCase(SendTo.NotOwner, 1u, 0u)]
+        [TestCase(SendTo.NotOwner, 1u, 2u)]
+        [TestCase(SendTo.NotOwner, 2u, 0u)]
+        [TestCase(SendTo.NotOwner, 2u, 1u)]
+        [TestCase(SendTo.NotServer, 0u, 1u)]
+        [TestCase(SendTo.NotServer, 0u, 2u)]
+        [TestCase(SendTo.NotServer, 1u, 1u)]
+        [TestCase(SendTo.NotServer, 1u, 2u)]
+        [TestCase(SendTo.NotServer, 2u, 1u)]
+        [TestCase(SendTo.NotServer, 2u, 2u)]
+        [TestCase(SendTo.ClientsAndHost, 0u, 0u)]
+        [TestCase(SendTo.ClientsAndHost, 0u, 1u)]
+        [TestCase(SendTo.ClientsAndHost, 0u, 2u)]
+        [TestCase(SendTo.ClientsAndHost, 1u, 0u)]
+        [TestCase(SendTo.ClientsAndHost, 1u, 1u)]
+        [TestCase(SendTo.ClientsAndHost, 1u, 2u)]
+        [TestCase(SendTo.ClientsAndHost, 2u, 0u)]
+        [TestCase(SendTo.ClientsAndHost, 2u, 1u)]
+        [TestCase(SendTo.ClientsAndHost, 2u, 2u)]
+        [TestCase(SendTo.Authority, 0u, 0u)]
+        [TestCase(SendTo.Authority, 1u, 1u)]
+        [TestCase(SendTo.Authority, 2u, 2u)]
+        [TestCase(SendTo.NotAuthority, 0u, 1u)]
+        [TestCase(SendTo.NotAuthority, 0u, 2u)]
+        [TestCase(SendTo.NotAuthority, 1u, 0u)]
+        [TestCase(SendTo.NotAuthority, 1u, 2u)]
+        [TestCase(SendTo.NotAuthority, 2u, 0u)]
+        [TestCase(SendTo.NotAuthority, 2u, 1u)]
+        public void TestDeferLocal(
+            SendTo defaultSendTo,
+            ulong objectOwner,
+            ulong sender
+        )
         {
-            public SendTo SendTo;
-            public ulong ObjectOwner;
-            public ulong Sender;
-
-            public TestData(SendTo sendTo, ulong objectOwner, ulong sender)
+            if (defaultSendTo == SendTo.ClientsAndHost && sender == 0u && !m_ServerNetworkManager.IsHost)
             {
-                SendTo = sendTo;
-                ObjectOwner = objectOwner;
-                Sender = sender;
+                // Not calling Assert.Ignore() because Unity will mark the whole block of tests as ignored
+                // Just consider this case a success...
+                return;
             }
-        }
 
-        // All the test cases that involve sends that will be delivered locally
-        private static TestData[] s_LocalDeliveryTestCases =
-        {
-            new TestData(SendTo.Everyone, 0u, 0u),
-            new TestData(SendTo.Everyone, 0u, 1u),
-            new TestData(SendTo.Everyone, 0u, 2u),
-            new TestData(SendTo.Everyone, 1u, 0u),
-            new TestData(SendTo.Everyone, 1u, 1u),
-            new TestData(SendTo.Everyone, 1u, 2u),
-            new TestData(SendTo.Everyone, 2u, 0u),
-            new TestData(SendTo.Everyone, 2u, 1u),
-            new TestData(SendTo.Everyone, 2u, 2u),
-            new TestData(SendTo.Me, 0u, 0u),
-            new TestData(SendTo.Me, 0u, 1u),
-            new TestData(SendTo.Me, 0u, 2u),
-            new TestData(SendTo.Me, 1u, 0u),
-            new TestData(SendTo.Me, 1u, 1u),
-            new TestData(SendTo.Me, 1u, 2u),
-            new TestData(SendTo.Me, 2u, 0u),
-            new TestData(SendTo.Me, 2u, 1u),
-            new TestData(SendTo.Me, 2u, 2u),
-            new TestData(SendTo.Owner, 0u, 0u),
-            new TestData(SendTo.Owner, 1u, 1u),
-            new TestData(SendTo.Owner, 2u, 2u),
-            new TestData(SendTo.Server, 0u, 0u),
-            new TestData(SendTo.Server, 1u, 0u),
-            new TestData(SendTo.Server, 2u, 0u),
-            new TestData(SendTo.NotOwner, 0u, 1u),
-            new TestData(SendTo.NotOwner, 0u, 2u),
-            new TestData(SendTo.NotOwner, 1u, 0u),
-            new TestData(SendTo.NotOwner, 1u, 2u),
-            new TestData(SendTo.NotOwner, 2u, 0u),
-            new TestData(SendTo.NotOwner, 2u, 1u),
-            new TestData(SendTo.NotServer, 0u, 1u),
-            new TestData(SendTo.NotServer, 0u, 2u),
-            new TestData(SendTo.NotServer, 1u, 1u),
-            new TestData(SendTo.NotServer, 1u, 2u),
-            new TestData(SendTo.NotServer, 2u, 1u),
-            new TestData(SendTo.NotServer, 2u, 2u),
-            new TestData(SendTo.ClientsAndHost, 0u, 0u),
-            new TestData(SendTo.ClientsAndHost, 0u, 1u),
-            new TestData(SendTo.ClientsAndHost, 0u, 2u),
-            new TestData(SendTo.ClientsAndHost, 1u, 0u),
-            new TestData(SendTo.ClientsAndHost, 1u, 1u),
-            new TestData(SendTo.ClientsAndHost, 1u, 2u),
-            new TestData(SendTo.ClientsAndHost, 2u, 0u),
-            new TestData(SendTo.ClientsAndHost, 2u, 1u),
-            new TestData(SendTo.ClientsAndHost, 2u, 2u),
-        };
-
-
-        [UnityTest]
-        public IEnumerator TestDeferLocal()
-        {
-            foreach (var testCase in s_LocalDeliveryTestCases)
+            // Similar to above, since Server and NotServer are already tested we can consider this a success
+            if (!m_DistributedAuthority && defaultSendTo == SendTo.Authority || defaultSendTo == SendTo.NotAuthority)
             {
-                if (++YieldCheck % YieldCycleCount == 0)
-                {
-                    yield return null;
-                }
-                OnInlineSetup();
-                var defaultSendTo = testCase.SendTo;
-                var sender = testCase.Sender;
-                var objectOwner = testCase.ObjectOwner;
-
-                if (defaultSendTo == SendTo.ClientsAndHost && sender == 0u && !m_ServerNetworkManager.IsHost)
-                {
-                    // Not calling Assert.Ignore() because Unity will mark the whole block of tests as ignored
-                    // Just consider this case a success...
-                    yield break;
-                }
+                return;
+            }
 
-                var sendMethodName = $"DefaultTo{defaultSendTo}DeferLocalRpc";
-                var verifyMethodName = $"VerifySentTo{defaultSendTo}";
-                var senderObject = GetPlayerObject(objectOwner, sender);
-                var sendMethod = senderObject.GetType().GetMethod(sendMethodName);
-                sendMethod.Invoke(senderObject, new object[] { new RpcParams() });
+            var sendMethodName = $"DefaultTo{defaultSendTo}DeferLocalRpc";
+            var verifyMethodName = $"VerifySentTo{defaultSendTo}";
+            var senderObject = GetPlayerObject(objectOwner, sender);
+            var sendMethod = senderObject.GetType().GetMethod(sendMethodName);
+            sendMethod.Invoke(senderObject, new object[] { new RpcParams() });
 
-                VerifyNotReceived(objectOwner, new[] { sender });
-                // Should be received on the next frame
-                SimulateOneFrame();
-                VerifyLocalReceived(objectOwner, sender, sendMethodName, false);
+            VerifyNotReceived(objectOwner, new[] { sender });
+            // Should be received on the next frame
+            SimulateOneFrame();
+            VerifyLocalReceived(objectOwner, sender, sendMethodName, false);
 
-                var verifyMethod = GetType().GetMethod(verifyMethodName);
-                verifyMethod.Invoke(this, new object[] { objectOwner, sender, sendMethodName });
-                OnInlineTearDown();
-            }
+            var verifyMethod = GetType().GetMethod(verifyMethodName);
+            verifyMethod.Invoke(this, new object[] { objectOwner, sender, sendMethodName });
         }
 
-        [UnityTest]
-        public IEnumerator TestDeferLocalOverrideToTrue()
+        [Test]
+        // All the test cases that involve sends that will be delivered locally
+        [TestCase(SendTo.Everyone, 0u, 0u)]
+        [TestCase(SendTo.Everyone, 0u, 1u)]
+        [TestCase(SendTo.Everyone, 0u, 2u)]
+        [TestCase(SendTo.Everyone, 1u, 0u)]
+        [TestCase(SendTo.Everyone, 1u, 1u)]
+        [TestCase(SendTo.Everyone, 1u, 2u)]
+        [TestCase(SendTo.Everyone, 2u, 0u)]
+        [TestCase(SendTo.Everyone, 2u, 1u)]
+        [TestCase(SendTo.Everyone, 2u, 2u)]
+        [TestCase(SendTo.Me, 0u, 0u)]
+        [TestCase(SendTo.Me, 0u, 1u)]
+        [TestCase(SendTo.Me, 0u, 2u)]
+        [TestCase(SendTo.Me, 1u, 0u)]
+        [TestCase(SendTo.Me, 1u, 1u)]
+        [TestCase(SendTo.Me, 1u, 2u)]
+        [TestCase(SendTo.Me, 2u, 0u)]
+        [TestCase(SendTo.Me, 2u, 1u)]
+        [TestCase(SendTo.Me, 2u, 2u)]
+        [TestCase(SendTo.Owner, 0u, 0u)]
+        [TestCase(SendTo.Owner, 1u, 1u)]
+        [TestCase(SendTo.Owner, 2u, 2u)]
+        [TestCase(SendTo.Server, 0u, 0u)]
+        [TestCase(SendTo.Server, 1u, 0u)]
+        [TestCase(SendTo.Server, 2u, 0u)]
+        [TestCase(SendTo.NotOwner, 0u, 1u)]
+        [TestCase(SendTo.NotOwner, 0u, 2u)]
+        [TestCase(SendTo.NotOwner, 1u, 0u)]
+        [TestCase(SendTo.NotOwner, 1u, 2u)]
+        [TestCase(SendTo.NotOwner, 2u, 0u)]
+        [TestCase(SendTo.NotOwner, 2u, 1u)]
+        [TestCase(SendTo.NotServer, 0u, 1u)]
+        [TestCase(SendTo.NotServer, 0u, 2u)]
+        [TestCase(SendTo.NotServer, 1u, 1u)]
+        [TestCase(SendTo.NotServer, 1u, 2u)]
+        [TestCase(SendTo.NotServer, 2u, 1u)]
+        [TestCase(SendTo.NotServer, 2u, 2u)]
+        [TestCase(SendTo.ClientsAndHost, 0u, 0u)]
+        [TestCase(SendTo.ClientsAndHost, 0u, 1u)]
+        [TestCase(SendTo.ClientsAndHost, 0u, 2u)]
+        [TestCase(SendTo.ClientsAndHost, 1u, 0u)]
+        [TestCase(SendTo.ClientsAndHost, 1u, 1u)]
+        [TestCase(SendTo.ClientsAndHost, 1u, 2u)]
+        [TestCase(SendTo.ClientsAndHost, 2u, 0u)]
+        [TestCase(SendTo.ClientsAndHost, 2u, 1u)]
+        [TestCase(SendTo.ClientsAndHost, 2u, 2u)]
+        [TestCase(SendTo.Authority, 0u, 0u)]
+        [TestCase(SendTo.Authority, 1u, 1u)]
+        [TestCase(SendTo.Authority, 2u, 2u)]
+        [TestCase(SendTo.NotAuthority, 0u, 1u)]
+        [TestCase(SendTo.NotAuthority, 0u, 2u)]
+        [TestCase(SendTo.NotAuthority, 1u, 0u)]
+        [TestCase(SendTo.NotAuthority, 1u, 2u)]
+        [TestCase(SendTo.NotAuthority, 2u, 0u)]
+        [TestCase(SendTo.NotAuthority, 2u, 1u)]
+        public void TestDeferLocalOverrideToTrue(
+            SendTo defaultSendTo,
+            ulong objectOwner,
+            ulong sender
+        )
         {
-            foreach (var testCase in s_LocalDeliveryTestCases)
+            if (defaultSendTo == SendTo.ClientsAndHost && sender == 0u && !m_ServerNetworkManager.IsHost)
             {
-                if (++YieldCheck % YieldCycleCount == 0)
-                {
-                    yield return null;
-                }
-                OnInlineSetup();
-                var defaultSendTo = testCase.SendTo;
-                var sender = testCase.Sender;
-                var objectOwner = testCase.ObjectOwner;
-
-                if (defaultSendTo == SendTo.ClientsAndHost && sender == 0u && !m_ServerNetworkManager.IsHost)
-                {
-                    // Not calling Assert.Ignore() because Unity will mark the whole block of tests as ignored
-                    // Just consider this case a success...
-                    yield break;
-                }
+                // Not calling Assert.Ignore() because Unity will mark the whole block of tests as ignored
+                // Just consider this case a success...
+                return;
+            }
+            // Similar to above, since Server and NotServer are already tested we can consider this a success
+            if (!m_DistributedAuthority && defaultSendTo == SendTo.Authority || defaultSendTo == SendTo.NotAuthority)
+            {
+                return;
+            }
 
-                var sendMethodName = $"DefaultTo{defaultSendTo}WithRpcParamsRpc";
-                var verifyMethodName = $"VerifySentTo{defaultSendTo}";
-                var senderObject = GetPlayerObject(objectOwner, sender);
-                var sendMethod = senderObject.GetType().GetMethod(sendMethodName);
-                sendMethod.Invoke(senderObject, new object[] { (RpcParams)LocalDeferMode.Defer });
+            var sendMethodName = $"DefaultTo{defaultSendTo}WithRpcParamsRpc";
+            var verifyMethodName = $"VerifySentTo{defaultSendTo}";
+            var senderObject = GetPlayerObject(objectOwner, sender);
+            var sendMethod = senderObject.GetType().GetMethod(sendMethodName);
+            sendMethod.Invoke(senderObject, new object[] { (RpcParams)LocalDeferMode.Defer });
 
-                VerifyNotReceived(objectOwner, new[] { sender });
-                // Should be received on the next frame
-                SimulateOneFrame();
-                VerifyLocalReceived(objectOwner, sender, sendMethodName, false);
+            VerifyNotReceived(objectOwner, new[] { sender });
+            // Should be received on the next frame
+            SimulateOneFrame();
+            VerifyLocalReceived(objectOwner, sender, sendMethodName, false);
 
-                var verifyMethod = GetType().GetMethod(verifyMethodName);
-                verifyMethod.Invoke(this, new object[] { objectOwner, sender, sendMethodName });
-                OnInlineTearDown();
-            }
+            var verifyMethod = GetType().GetMethod(verifyMethodName);
+            verifyMethod.Invoke(this, new object[] { objectOwner, sender, sendMethodName });
         }
 
-        [UnityTest]
-        public IEnumerator TestDeferLocalOverrideToFalse()
+        [Test]
+        // All the test cases that involve sends that will be delivered locally
+        [TestCase(SendTo.Everyone, 0u, 0u)]
+        [TestCase(SendTo.Everyone, 0u, 1u)]
+        [TestCase(SendTo.Everyone, 0u, 2u)]
+        [TestCase(SendTo.Everyone, 1u, 0u)]
+        [TestCase(SendTo.Everyone, 1u, 1u)]
+        [TestCase(SendTo.Everyone, 1u, 2u)]
+        [TestCase(SendTo.Everyone, 2u, 0u)]
+        [TestCase(SendTo.Everyone, 2u, 1u)]
+        [TestCase(SendTo.Everyone, 2u, 2u)]
+        [TestCase(SendTo.Me, 0u, 0u)]
+        [TestCase(SendTo.Me, 0u, 1u)]
+        [TestCase(SendTo.Me, 0u, 2u)]
+        [TestCase(SendTo.Me, 1u, 0u)]
+        [TestCase(SendTo.Me, 1u, 1u)]
+        [TestCase(SendTo.Me, 1u, 2u)]
+        [TestCase(SendTo.Me, 2u, 0u)]
+        [TestCase(SendTo.Me, 2u, 1u)]
+        [TestCase(SendTo.Me, 2u, 2u)]
+        [TestCase(SendTo.Owner, 0u, 0u)]
+        [TestCase(SendTo.Owner, 1u, 1u)]
+        [TestCase(SendTo.Owner, 2u, 2u)]
+        [TestCase(SendTo.Server, 0u, 0u)]
+        [TestCase(SendTo.Server, 1u, 0u)]
+        [TestCase(SendTo.Server, 2u, 0u)]
+        [TestCase(SendTo.NotOwner, 0u, 1u)]
+        [TestCase(SendTo.NotOwner, 0u, 2u)]
+        [TestCase(SendTo.NotOwner, 1u, 0u)]
+        [TestCase(SendTo.NotOwner, 1u, 2u)]
+        [TestCase(SendTo.NotOwner, 2u, 0u)]
+        [TestCase(SendTo.NotOwner, 2u, 1u)]
+        [TestCase(SendTo.NotServer, 0u, 1u)]
+        [TestCase(SendTo.NotServer, 0u, 2u)]
+        [TestCase(SendTo.NotServer, 1u, 1u)]
+        [TestCase(SendTo.NotServer, 1u, 2u)]
+        [TestCase(SendTo.NotServer, 2u, 1u)]
+        [TestCase(SendTo.NotServer, 2u, 2u)]
+        [TestCase(SendTo.ClientsAndHost, 0u, 0u)]
+        [TestCase(SendTo.ClientsAndHost, 0u, 1u)]
+        [TestCase(SendTo.ClientsAndHost, 0u, 2u)]
+        [TestCase(SendTo.ClientsAndHost, 1u, 0u)]
+        [TestCase(SendTo.ClientsAndHost, 1u, 1u)]
+        [TestCase(SendTo.ClientsAndHost, 1u, 2u)]
+        [TestCase(SendTo.ClientsAndHost, 2u, 0u)]
+        [TestCase(SendTo.ClientsAndHost, 2u, 1u)]
+        [TestCase(SendTo.ClientsAndHost, 2u, 2u)]
+        [TestCase(SendTo.Authority, 0u, 0u)]
+        [TestCase(SendTo.Authority, 1u, 1u)]
+        [TestCase(SendTo.Authority, 2u, 2u)]
+        [TestCase(SendTo.NotAuthority, 0u, 1u)]
+        [TestCase(SendTo.NotAuthority, 0u, 2u)]
+        [TestCase(SendTo.NotAuthority, 1u, 0u)]
+        [TestCase(SendTo.NotAuthority, 1u, 2u)]
+        [TestCase(SendTo.NotAuthority, 2u, 0u)]
+        [TestCase(SendTo.NotAuthority, 2u, 1u)]
+        public void TestDeferLocalOverrideToFalse(
+            SendTo defaultSendTo,
+            ulong objectOwner,
+            ulong sender
+        )
         {
-            foreach (var testCase in s_LocalDeliveryTestCases)
+            if (defaultSendTo == SendTo.ClientsAndHost && sender == 0u && !m_ServerNetworkManager.IsHost)
             {
-                if (++YieldCheck % YieldCycleCount == 0)
-                {
-                    yield return null;
-                }
-                OnInlineSetup();
-                var defaultSendTo = testCase.SendTo;
-                var sender = testCase.Sender;
-                var objectOwner = testCase.ObjectOwner;
-
-                if (defaultSendTo == SendTo.ClientsAndHost && sender == 0u && !m_ServerNetworkManager.IsHost)
-                {
-                    // Not calling Assert.Ignore() because Unity will mark the whole block of tests as ignored
-                    // Just consider this case a success...
-                    yield break;
-                }
+                // Not calling Assert.Ignore() because Unity will mark the whole block of tests as ignored
+                // Just consider this case a success...
+                return;
+            }
+            // Similar to above, since Server and NotServer are already tested we can consider this a success
+            if (!m_DistributedAuthority && defaultSendTo == SendTo.Authority || defaultSendTo == SendTo.NotAuthority)
+            {
+                return;
+            }
 
-                var sendMethodName = $"DefaultTo{defaultSendTo}DeferLocalRpc";
-                var verifyMethodName = $"VerifySentTo{defaultSendTo}";
-                var senderObject = GetPlayerObject(objectOwner, sender);
-                var sendMethod = senderObject.GetType().GetMethod(sendMethodName);
-                sendMethod.Invoke(senderObject, new object[] { (RpcParams)LocalDeferMode.SendImmediate });
+            var sendMethodName = $"DefaultTo{defaultSendTo}DeferLocalRpc";
+            var verifyMethodName = $"VerifySentTo{defaultSendTo}";
+            var senderObject = GetPlayerObject(objectOwner, sender);
+            var sendMethod = senderObject.GetType().GetMethod(sendMethodName);
+            sendMethod.Invoke(senderObject, new object[] { (RpcParams)LocalDeferMode.SendImmediate });
 
-                VerifyLocalReceived(objectOwner, sender, sendMethodName, false);
+            VerifyLocalReceived(objectOwner, sender, sendMethodName, false);
 
-                var verifyMethod = GetType().GetMethod(verifyMethodName);
-                verifyMethod.Invoke(this, new object[] { objectOwner, sender, sendMethodName });
-                OnInlineTearDown();
-            }
+            var verifyMethod = GetType().GetMethod(verifyMethodName);
+            verifyMethod.Invoke(this, new object[] { objectOwner, sender, sendMethodName });
         }
 
     }
diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/com.unity.netcode.runtimetests.asmdef b/com.unity.netcode.gameobjects/Tests/Runtime/com.unity.netcode.runtimetests.asmdef
index 72d85ca4c5..ce8ab1c7eb 100644
--- a/com.unity.netcode.gameobjects/Tests/Runtime/com.unity.netcode.runtimetests.asmdef
+++ b/com.unity.netcode.gameobjects/Tests/Runtime/com.unity.netcode.runtimetests.asmdef
@@ -48,11 +48,6 @@
             "name": "com.unity.modules.physics",
             "expression": "",
             "define": "COM_UNITY_MODULES_PHYSICS"
-        },
-        {
-            "name": "com.unity.transport",
-            "expression": "2.0.0-exp",
-            "define": "UTP_TRANSPORT_2_0_ABOVE"
         }
     ],
     "noEngineReferences": false
diff --git a/com.unity.netcode.gameobjects/ValidationExceptions.json b/com.unity.netcode.gameobjects/ValidationExceptions.json
deleted file mode 100644
index 2d816124e2..0000000000
--- a/com.unity.netcode.gameobjects/ValidationExceptions.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "ErrorExceptions": [
-        {
-            "ValidationTest": "API Validation",
-            "ExceptionMessage": "Additions require a new minor or major version.",
-            "PackageVersion": "1.5.2"
-        }
-    ],
-    "WarningExceptions": []
-}
\ No newline at end of file
diff --git a/com.unity.netcode.gameobjects/package.json b/com.unity.netcode.gameobjects/package.json
index 28c031c44e..13044317ac 100644
--- a/com.unity.netcode.gameobjects/package.json
+++ b/com.unity.netcode.gameobjects/package.json
@@ -2,10 +2,17 @@
     "name": "com.unity.netcode.gameobjects",
     "displayName": "Netcode for GameObjects",
     "description": "Netcode for GameObjects is a high-level netcode SDK that provides networking capabilities to GameObject/MonoBehaviour workflows within Unity and sits on top of underlying transport layer.",
-    "version": "1.11.0",
-    "unity": "2021.3",
+    "version": "2.3.1",
+    "unity": "6000.0",
     "dependencies": {
-        "com.unity.nuget.mono-cecil": "1.10.1",
-        "com.unity.transport": "1.4.0"
+        "com.unity.nuget.mono-cecil": "1.11.4",
+        "com.unity.transport": "2.4.0"
+    },
+    "samples": [
+    {
+      "displayName": "Bootstrap",
+      "description": "A lightweight sample to get started",
+      "path": "Samples~/Bootstrap"
     }
+  ]
 }
diff --git a/minimalproject/Packages/manifest.json b/minimalproject/Packages/manifest.json
index 78757b1c50..c7c27fc5e9 100644
--- a/minimalproject/Packages/manifest.json
+++ b/minimalproject/Packages/manifest.json
@@ -1,8 +1,9 @@
 {
-    "dependencies": {
-        "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects"
-    },
-    "testables": [
-        "com.unity.netcode.gameobjects"
-    ]
-}
\ No newline at end of file
+  "dependencies": {
+    "com.unity.ide.rider": "3.0.34",
+    "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects"
+  },
+  "testables": [
+    "com.unity.netcode.gameobjects"
+  ]
+}
diff --git a/minimalproject/Packages/packages-lock.json b/minimalproject/Packages/packages-lock.json
index f0d0011699..d0ad6ca622 100644
--- a/minimalproject/Packages/packages-lock.json
+++ b/minimalproject/Packages/packages-lock.json
@@ -1,87 +1,152 @@
 {
   "dependencies": {
+    "com.unity.ai.navigation": {
+      "version": "2.0.5",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.modules.ai": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.burst": {
-      "version": "1.6.6",
+      "version": "1.8.19",
       "depth": 2,
       "source": "registry",
       "dependencies": {
-        "com.unity.mathematics": "1.2.1"
+        "com.unity.mathematics": "1.2.1",
+        "com.unity.modules.jsonserialize": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.collections": {
-      "version": "1.2.4",
+      "version": "2.5.1",
       "depth": 2,
       "source": "registry",
       "dependencies": {
-        "com.unity.burst": "1.6.6",
-        "com.unity.test-framework": "1.1.31"
+        "com.unity.burst": "1.8.17",
+        "com.unity.test-framework": "1.4.5",
+        "com.unity.nuget.mono-cecil": "1.11.4",
+        "com.unity.test-framework.performance": "3.0.3"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.ext.nunit": {
-      "version": "1.0.6",
+      "version": "2.0.5",
       "depth": 4,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.mathematics": {
-      "version": "1.2.6",
+      "version": "1.3.2",
       "depth": 2,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
+    "com.unity.multiplayer.center": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.uielements": "1.0.0"
+      }
+    },
     "com.unity.netcode.gameobjects": {
       "version": "file:../../com.unity.netcode.gameobjects",
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.unity.nuget.mono-cecil": "1.10.1",
-        "com.unity.transport": "1.4.0"
+        "com.unity.nuget.mono-cecil": "1.11.4",
+        "com.unity.transport": "2.4.0"
       }
     },
     "com.unity.nuget.mono-cecil": {
-      "version": "1.10.1",
+      "version": "1.11.4",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.33",
+      "version": "1.4.6",
       "depth": 3,
       "source": "registry",
       "dependencies": {
-        "com.unity.ext.nunit": "1.0.6",
+        "com.unity.ext.nunit": "2.0.3",
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.test-framework.performance": {
+      "version": "3.0.3",
+      "depth": 3,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.test-framework": "1.1.31",
+        "com.unity.modules.jsonserialize": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.transport": {
-      "version": "1.4.0",
+      "version": "2.4.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.collections": "1.2.4",
-        "com.unity.burst": "1.6.6",
-        "com.unity.mathematics": "1.2.6"
+        "com.unity.burst": "1.8.12",
+        "com.unity.collections": "2.2.1",
+        "com.unity.mathematics": "1.3.1"
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.modules.accessibility": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.ai": {
+      "version": "1.0.0",
+      "depth": 1,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.hierarchycore": {
+      "version": "1.0.0",
+      "depth": 2,
+      "source": "builtin",
+      "dependencies": {}
+    },
     "com.unity.modules.imgui": {
       "version": "1.0.0",
-      "depth": 4,
+      "depth": 2,
       "source": "builtin",
       "dependencies": {}
     },
     "com.unity.modules.jsonserialize": {
       "version": "1.0.0",
-      "depth": 4,
+      "depth": 2,
       "source": "builtin",
       "dependencies": {}
+    },
+    "com.unity.modules.ui": {
+      "version": "1.0.0",
+      "depth": 2,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.uielements": {
+      "version": "1.0.0",
+      "depth": 1,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.ui": "1.0.0",
+        "com.unity.modules.imgui": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.modules.hierarchycore": "1.0.0"
+      }
     }
   }
 }
diff --git a/minimalproject/ProjectSettings/ProjectSettings.asset b/minimalproject/ProjectSettings/ProjectSettings.asset
index 165c628ede..d110b4845a 100644
--- a/minimalproject/ProjectSettings/ProjectSettings.asset
+++ b/minimalproject/ProjectSettings/ProjectSettings.asset
@@ -3,7 +3,7 @@
 --- !u!129 &1
 PlayerSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 24
+  serializedVersion: 22
   productGUID: 53f9fd541540241529c78965266c29d6
   AndroidProfiler: 0
   AndroidFilterTouchesWhenObscured: 0
@@ -68,12 +68,6 @@ PlayerSettings:
   androidRenderOutsideSafeArea: 1
   androidUseSwappy: 1
   androidBlitType: 0
-  androidResizableWindow: 0
-  androidDefaultWindowWidth: 1920
-  androidDefaultWindowHeight: 1080
-  androidMinimumWindowWidth: 400
-  androidMinimumWindowHeight: 300
-  androidFullscreenMode: 1
   defaultIsNativeResolution: 1
   macRetinaSupport: 1
   runInBackground: 1
@@ -127,7 +121,6 @@ PlayerSettings:
   vulkanEnableSetSRGBWrite: 0
   vulkanEnablePreTransform: 0
   vulkanEnableLateAcquireNextImage: 0
-  vulkanEnableCommandBufferRecycling: 1
   m_SupportedAspectRatios:
     4:3: 1
     5:4: 1
@@ -145,24 +138,21 @@ PlayerSettings:
     enable360StereoCapture: 0
   isWsaHolographicRemotingEnabled: 0
   enableFrameTimingStats: 0
-  enableOpenGLProfilerGPURecorders: 1
   useHDRDisplay: 0
   D3DHDRBitDepth: 0
   m_ColorGamuts: 00000000
   targetPixelDensity: 30
   resolutionScalingMode: 0
-  resetResolutionOnWindowResize: 0
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
-  applicationIdentifier:
-    Standalone: com.DefaultCompany.minimalproject
+  applicationIdentifier: {}
   buildNumber:
     Standalone: 0
     iPhone: 0
     tvOS: 0
   overrideDefaultApplicationIdentifier: 0
   AndroidBundleVersionCode: 1
-  AndroidMinSdkVersion: 22
+  AndroidMinSdkVersion: 19
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1
   aotOptions: 
@@ -177,10 +167,10 @@ PlayerSettings:
   StripUnusedMeshComponents: 1
   VertexChannelCompressionMask: 4054
   iPhoneSdkVersion: 988
-  iOSTargetOSVersionString: 12.0
+  iOSTargetOSVersionString: 11.0
   tvOSSdkVersion: 0
   tvOSRequireExtendedGameController: 0
-  tvOSTargetOSVersionString: 12.0
+  tvOSTargetOSVersionString: 11.0
   uIPrerenderedIcon: 0
   uIRequiresPersistentWiFi: 0
   uIRequiresFullScreen: 1
@@ -218,7 +208,6 @@ PlayerSettings:
   iOSLaunchScreeniPadCustomStoryboardPath: 
   iOSDeviceRequirements: []
   iOSURLSchemes: []
-  macOSURLSchemes: []
   iOSBackgroundModes: 0
   iOSMetalForceHardShadows: 0
   metalEditorSupport: 1
@@ -246,7 +235,6 @@ PlayerSettings:
   useCustomGradlePropertiesTemplate: 0
   useCustomProguardFile: 0
   AndroidTargetArchitectures: 1
-  AndroidTargetDevices: 0
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
   AndroidKeystoreName: 
@@ -263,203 +251,13 @@ PlayerSettings:
     height: 180
     banner: {fileID: 0}
   androidGamepadSupportLevel: 0
-  chromeosInputEmulation: 1
   AndroidMinifyWithR8: 0
   AndroidMinifyRelease: 0
   AndroidMinifyDebug: 0
   AndroidValidateAppBundleSize: 1
   AndroidAppBundleSizeToValidate: 150
   m_BuildTargetIcons: []
-  m_BuildTargetPlatformIcons:
-  - m_BuildTarget: iPhone
-    m_Icons:
-    - m_Textures: []
-      m_Width: 180
-      m_Height: 180
-      m_Kind: 0
-      m_SubKind: iPhone
-    - m_Textures: []
-      m_Width: 120
-      m_Height: 120
-      m_Kind: 0
-      m_SubKind: iPhone
-    - m_Textures: []
-      m_Width: 167
-      m_Height: 167
-      m_Kind: 0
-      m_SubKind: iPad
-    - m_Textures: []
-      m_Width: 152
-      m_Height: 152
-      m_Kind: 0
-      m_SubKind: iPad
-    - m_Textures: []
-      m_Width: 76
-      m_Height: 76
-      m_Kind: 0
-      m_SubKind: iPad
-    - m_Textures: []
-      m_Width: 120
-      m_Height: 120
-      m_Kind: 3
-      m_SubKind: iPhone
-    - m_Textures: []
-      m_Width: 80
-      m_Height: 80
-      m_Kind: 3
-      m_SubKind: iPhone
-    - m_Textures: []
-      m_Width: 80
-      m_Height: 80
-      m_Kind: 3
-      m_SubKind: iPad
-    - m_Textures: []
-      m_Width: 40
-      m_Height: 40
-      m_Kind: 3
-      m_SubKind: iPad
-    - m_Textures: []
-      m_Width: 87
-      m_Height: 87
-      m_Kind: 1
-      m_SubKind: iPhone
-    - m_Textures: []
-      m_Width: 58
-      m_Height: 58
-      m_Kind: 1
-      m_SubKind: iPhone
-    - m_Textures: []
-      m_Width: 29
-      m_Height: 29
-      m_Kind: 1
-      m_SubKind: iPhone
-    - m_Textures: []
-      m_Width: 58
-      m_Height: 58
-      m_Kind: 1
-      m_SubKind: iPad
-    - m_Textures: []
-      m_Width: 29
-      m_Height: 29
-      m_Kind: 1
-      m_SubKind: iPad
-    - m_Textures: []
-      m_Width: 60
-      m_Height: 60
-      m_Kind: 2
-      m_SubKind: iPhone
-    - m_Textures: []
-      m_Width: 40
-      m_Height: 40
-      m_Kind: 2
-      m_SubKind: iPhone
-    - m_Textures: []
-      m_Width: 40
-      m_Height: 40
-      m_Kind: 2
-      m_SubKind: iPad
-    - m_Textures: []
-      m_Width: 20
-      m_Height: 20
-      m_Kind: 2
-      m_SubKind: iPad
-    - m_Textures: []
-      m_Width: 1024
-      m_Height: 1024
-      m_Kind: 4
-      m_SubKind: App Store
-  - m_BuildTarget: Android
-    m_Icons:
-    - m_Textures: []
-      m_Width: 432
-      m_Height: 432
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 324
-      m_Height: 324
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 216
-      m_Height: 216
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 162
-      m_Height: 162
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 108
-      m_Height: 108
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 81
-      m_Height: 81
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 192
-      m_Height: 192
-      m_Kind: 1
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 144
-      m_Height: 144
-      m_Kind: 1
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 96
-      m_Height: 96
-      m_Kind: 1
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 72
-      m_Height: 72
-      m_Kind: 1
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 48
-      m_Height: 48
-      m_Kind: 1
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 36
-      m_Height: 36
-      m_Kind: 1
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 192
-      m_Height: 192
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 144
-      m_Height: 144
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 96
-      m_Height: 96
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 72
-      m_Height: 72
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 48
-      m_Height: 48
-      m_Kind: 0
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 36
-      m_Height: 36
-      m_Kind: 0
-      m_SubKind: 
+  m_BuildTargetPlatformIcons: []
   m_BuildTargetBatching:
   - m_BuildTarget: Standalone
     m_StaticBatching: 1
@@ -476,7 +274,6 @@ PlayerSettings:
   - m_BuildTarget: WebGL
     m_StaticBatching: 0
     m_DynamicBatching: 0
-  m_BuildTargetShaderSettings: []
   m_BuildTargetGraphicsJobs:
   - m_BuildTarget: MacStandaloneSupport
     m_GraphicsJobs: 0
@@ -512,7 +309,7 @@ PlayerSettings:
   m_BuildTargetGraphicsAPIs:
   - m_BuildTarget: AndroidPlayer
     m_APIs: 150000000b000000
-    m_Automatic: 1
+    m_Automatic: 0
   - m_BuildTarget: iOSSupport
     m_APIs: 10000000
     m_Automatic: 1
@@ -528,8 +325,6 @@ PlayerSettings:
     m_Devices:
     - Oculus
     - OpenVR
-  m_DefaultShaderChunkSizeInMB: 16
-  m_DefaultShaderChunkCount: 0
   openGLRequireES31: 0
   openGLRequireES31AEP: 0
   openGLRequireES32: 0
@@ -541,7 +336,6 @@ PlayerSettings:
   m_BuildTargetGroupLightmapEncodingQuality: []
   m_BuildTargetGroupLightmapSettings: []
   m_BuildTargetNormalMapEncoding: []
-  m_BuildTargetDefaultTextureCompressionFormat: []
   playModeTestRunnerEnabled: 0
   runPlayModeTestAsEditModeTest: 0
   actionOnDotNetUnhandledException: 1
@@ -551,7 +345,6 @@ PlayerSettings:
   cameraUsageDescription: 
   locationUsageDescription: 
   microphoneUsageDescription: 
-  bluetoothUsageDescription: 
   switchNMETAOverride: 
   switchNetLibKey: 
   switchSocketMemoryPoolSize: 6144
@@ -560,7 +353,6 @@ PlayerSettings:
   switchScreenResolutionBehavior: 2
   switchUseCPUProfiler: 0
   switchUseGOLDLinker: 0
-  switchLTOSetting: 0
   switchApplicationID: 0x01004b9000490000
   switchNSODependencies: 
   switchTitleNames_0: 
@@ -636,6 +428,7 @@ PlayerSettings:
   switchReleaseVersion: 0
   switchDisplayVersion: 1.0.0
   switchStartupUserAccount: 0
+  switchTouchScreenUsage: 0
   switchSupportedLanguagesMask: 0
   switchLogoType: 0
   switchApplicationErrorCodeCategory: 
@@ -677,7 +470,6 @@ PlayerSettings:
   switchNativeFsCacheSize: 32
   switchIsHoldTypeHorizontal: 0
   switchSupportedNpadCount: 8
-  switchEnableTouchScreen: 1
   switchSocketConfigEnabled: 0
   switchTcpInitialSendBufferSize: 32
   switchTcpInitialReceiveBufferSize: 64
@@ -690,11 +482,8 @@ PlayerSettings:
   switchNetworkInterfaceManagerInitializeEnabled: 1
   switchPlayerConnectionEnabled: 1
   switchUseNewStyleFilepaths: 0
-  switchUseLegacyFmodPriorities: 1
   switchUseMicroSleepForYield: 1
-  switchEnableRamDiskSupport: 0
   switchMicroSleepForYieldTime: 25
-  switchRamDiskSpaceSize: 12
   ps4NPAgeRating: 12
   ps4NPTitleSecret: 
   ps4NPTrophyPackPath: 
@@ -765,7 +554,6 @@ PlayerSettings:
   ps4videoRecordingFeaturesUsed: 0
   ps4contentSearchFeaturesUsed: 0
   ps4CompatibilityPS5: 0
-  ps4AllowPS5Detection: 0
   ps4GPU800MHz: 1
   ps4attribEyeToEyeDistanceSettingVR: 0
   ps4IncludedModules: []
@@ -790,31 +578,18 @@ PlayerSettings:
   webGLLinkerTarget: 1
   webGLThreadsSupport: 0
   webGLDecompressionFallback: 0
-  webGLPowerPreference: 2
   scriptingDefineSymbols:
-    Standalone: NGO_MINIMALPROJECT
+    1: NGO_MINIMALPROJECT
   additionalCompilerArguments: {}
   platformArchitecture: {}
   scriptingBackend: {}
   il2cppCompilerConfiguration: {}
-  managedStrippingLevel:
-    EmbeddedLinux: 1
-    GameCoreScarlett: 1
-    GameCoreXboxOne: 1
-    Lumin: 1
-    Nintendo Switch: 1
-    PS4: 1
-    PS5: 1
-    Stadia: 1
-    WebGL: 1
-    Windows Store Apps: 1
-    XboxOne: 1
-    iPhone: 1
-    tvOS: 1
+  managedStrippingLevel: {}
   incrementalIl2cppBuild: {}
   suppressCommonWarnings: 1
   allowUnsafeCode: 0
   useDeterministicCompilation: 1
+  useReferenceAssemblies: 1
   enableRoslynAnalyzers: 1
   additionalIl2CppArgs: 
   scriptingRuntimeVersion: 1
@@ -850,7 +625,6 @@ PlayerSettings:
   metroFTAName: 
   metroFTAFileTypes: []
   metroProtocolName: 
-  vcxProjDefaultLanguage: 
   XboxOneProductId: 
   XboxOneUpdateKey: 
   XboxOneSandboxId: 
@@ -894,7 +668,6 @@ PlayerSettings:
     m_VersionName: 
   apiCompatibilityLevel: 6
   activeInputHandler: 0
-  windowsGamepadBackendHint: 0
   cloudProjectId: 
   framebufferDepthMemorylessMode: 0
   qualitySettingsNames: []
@@ -902,6 +675,4 @@ PlayerSettings:
   organizationId: 
   cloudEnabled: 0
   legacyClampBlendShapeWeights: 0
-  playerDataPath: 
-  forceSRGBBlit: 1
   virtualTexturingSupportEnabled: 0
diff --git a/minimalproject/ProjectSettings/ProjectVersion.txt b/minimalproject/ProjectSettings/ProjectVersion.txt
index 9cd738f3af..307f912404 100644
--- a/minimalproject/ProjectSettings/ProjectVersion.txt
+++ b/minimalproject/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.28f1
-m_EditorVersionWithRevision: 2021.3.28f1 (232e59c3f087)
+m_EditorVersion: 6000.0.38f1
+m_EditorVersionWithRevision: 6000.0.38f1 (82314a941f2d)
diff --git a/pvpExceptions.json b/pvpExceptions.json
new file mode 100644
index 0000000000..c004d0ed32
--- /dev/null
+++ b/pvpExceptions.json
@@ -0,0 +1,601 @@
+{
+    "exempts": {
+      "PVP-41-1": {
+        "errors": [
+          "CHANGELOG.md: line 9: Unreleased section is not allowed for public release"
+        ]
+      },
+      "PVP-151-1": {
+        "errors": [
+          "Unity.Netcode.TestHelpers.Runtime.ObjectNameIdentifier: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.ObjectNameIdentifier: void OnNetworkSpawn(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.ObjectNameIdentifier: void RegisterAndLabelNetworkObject(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.ObjectNameIdentifier: void DeRegisterNetworkObject(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.ObjectNameIdentifier: void OnLostOwnership(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.ObjectNameIdentifier: void OnGainedOwnership(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.ObjectNameIdentifier: void OnNetworkDespawn(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.ObjectNameIdentifier: void OnDestroy(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.ConditionalPredicateBase: TimedOut: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.ConditionalPredicateBase: bool OnHasConditionBeenReached(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.ConditionalPredicateBase: bool HasConditionBeenReached(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.ConditionalPredicateBase: void OnStarted(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.ConditionalPredicateBase: void Started(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.ConditionalPredicateBase: void OnFinished(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.ConditionalPredicateBase: void Finished(bool): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.IConditionalPredicate: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.IConditionalPredicate: bool HasConditionBeenReached(): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.IConditionalPredicate: void Finished(bool): missing <param name=\"timedOut\">",
+          "Unity.Netcode.TestHelpers.Runtime.IntegrationTestWithApproximation: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.IntegrationTestWithApproximation: string GetVector3Values(ref Vector3): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.IntegrationTestWithApproximation: string GetVector3Values(Vector3): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.IntegrationTestWithApproximation: float GetDeltaVarianceThreshold(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.IntegrationTestWithApproximation: float EulerDelta(float, float): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.IntegrationTestWithApproximation: Vector3 EulerDelta(Vector3, Vector3): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.IntegrationTestWithApproximation: bool ApproximatelyEuler(float, float): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.IntegrationTestWithApproximation: bool Approximately(float, float): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.IntegrationTestWithApproximation: bool Approximately(Vector2, Vector2): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.IntegrationTestWithApproximation: bool Approximately(Vector3, Vector3): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.IntegrationTestWithApproximation: bool Approximately(Quaternion, Quaternion): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.IntegrationTestWithApproximation: bool ApproximatelyEuler(Vector3, Vector3): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.IntegrationTestWithApproximation: Vector3 GetRandomVector3(float, float): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.IntegrationTestWithApproximation: .ctor(NetworkTopologyTypes, HostOrServer): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.IntegrationTestWithApproximation: .ctor(NetworkTopologyTypes): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.IntegrationTestWithApproximation: .ctor(HostOrServer): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.IntegrationTestWithApproximation: .ctor(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.MessageHooksConditional: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.MessageHooksConditional: AllMessagesReceived: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.MessageHooksConditional: NumberOfMessagesReceived: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.MessageHooksConditional: string GetHooksStillWaiting(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.MessageHooksConditional: bool OnHasConditionBeenReached(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.MessageHooksConditional: void OnFinished(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.MessageHooksConditional: void Reset(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.MessageHooksConditional: .ctor(List<MessageHookEntry>): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.ReceiptType: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.ReceiptType: Received: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.ReceiptType: Handled: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.MessageHookEntry: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.MessageHookEntry: m_NetworkManager: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.MessageHookEntry: void Initialize(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.MessageHookEntry: .ctor(NetworkManager, ReceiptType): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.Metrics.RpcTestComponent: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.Metrics.RpcTestComponent: OnServerRpcAction: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.Metrics.RpcTestComponent: OnClientRpcAction: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.Metrics.RpcTestComponent: void MyServerRpc(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.Metrics.RpcTestComponent: void MyClientRpc(ClientRpcParams): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.MockTimeProvider: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.MockTimeProvider: RealTimeSinceStartup: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.MockTimeProvider: UnscaledTime: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.MockTimeProvider: UnscaledDeltaTime: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.MockTimeProvider: DeltaTime: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.MockTimeProvider: FixedDeltaTime: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.MockTimeProvider: StaticRealTimeSinceStartup: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.MockTimeProvider: StaticUnscaledTime: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.MockTimeProvider: StaticUnscaledDeltaTime: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.MockTimeProvider: StaticDeltaTime: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.MockTimeProvider: void TimeTravel(double): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.MockTimeProvider: void Reset(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: k_TickFrequency: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: s_GlobalTimeoutHelper: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: s_DefaultWaitForTick: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: NetcodeLogAssert: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: void RegisterNetworkObject(NetworkObject): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: void DeregisterNetworkObject(NetworkObject): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: void DeregisterNetworkObject(ulong, ulong): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: TotalClients: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: k_DefaultTickRate: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: NumberOfClients: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: m_PlayerPrefab: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: m_ServerNetworkManager: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: m_ClientNetworkManagers: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: m_UseHost: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: m_DistributedAuthority: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: m_NetworkTopologyType: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: bool UseCMBService(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: NetworkTopologyTypes OnGetNetworkTopologyType(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: void SetDistributedAuthorityProperties(NetworkManager): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: m_TargetFrameRate: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: m_EnableVerboseDebug: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: bool OnSetVerboseDebug(): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: NetworkManagerInstatiationMode OnSetIntegrationTestMode(): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: void OnOneTimeSetup(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: void OneTimeSetup(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: IEnumerator OnSetup(): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: IEnumerator SetUp(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: IEnumerator StopOneClient(NetworkManager, bool): missing <param name=\"networkManager\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: IEnumerator StopOneClient(NetworkManager, bool): missing <param name=\"destroy\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: IEnumerator StopOneClient(NetworkManager, bool): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: void StopOneClientWithTimeTravel(NetworkManager, bool): missing <param name=\"networkManager\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: void StopOneClientWithTimeTravel(NetworkManager, bool): missing <param name=\"destroy\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: void SetTimeTravelSimulatedLatency(float): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: void SetTimeTravelSimulatedDropRate(float): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: void SetTimeTravelSimulatedLatencyJitter(float): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: bool CanStartServerAndClients(): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: IEnumerator OnStartedServerAndClients(): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: IEnumerator OnServerAndClientsConnected(): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: void ClientNetworkManagerPostStartInit(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: LogAllMessages: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: bool ShouldCheckForSpawnedPlayers(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: IEnumerator StartServerAndClients(): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: bool CanClientsLoad(): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: bool CanClientsUnload(): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: bool OnCanSceneCleanUpUnload(Scene): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: IEnumerator CoroutineShutdownAndCleanUp(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: IEnumerator OnTearDown(): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: void OnInlineTearDown(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: IEnumerator TearDown(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: void OneTimeTearDown(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: bool CanDestroyNetworkObject(NetworkObject): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: IEnumerator WaitForConditionOrTimeOut(Func<bool>, TimeoutHelper): missing <param name=\"checkForCondition\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: IEnumerator WaitForConditionOrTimeOut(Func<bool>, TimeoutHelper): missing <param name=\"timeOutHelper\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: IEnumerator WaitForConditionOrTimeOut(Func<bool>, TimeoutHelper): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: bool WaitForConditionOrTimeOutWithTimeTravel(Func<bool>, int): missing <param name=\"checkForCondition\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: bool WaitForConditionOrTimeOutWithTimeTravel(Func<bool>, int): missing <param name=\"maxTries\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: bool WaitForConditionOrTimeOutWithTimeTravel(Func<bool>, int): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: IEnumerator WaitForConditionOrTimeOut(IConditionalPredicate, TimeoutHelper): missing <param name=\"conditionalPredicate\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: IEnumerator WaitForConditionOrTimeOut(IConditionalPredicate, TimeoutHelper): missing <param name=\"timeOutHelper\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: IEnumerator WaitForConditionOrTimeOut(IConditionalPredicate, TimeoutHelper): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: bool WaitForConditionOrTimeOutWithTimeTravel(IConditionalPredicate, int): missing <param name=\"conditionalPredicate\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: bool WaitForConditionOrTimeOutWithTimeTravel(IConditionalPredicate, int): missing <param name=\"maxTries\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: bool WaitForConditionOrTimeOutWithTimeTravel(IConditionalPredicate, int): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: IEnumerator WaitForClientsConnectedOrTimeOut(NetworkManager[]): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: bool WaitForClientsConnectedOrTimeOutWithTimeTravel(NetworkManager[]): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: IEnumerator WaitForClientsConnectedOrTimeOut(): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: bool WaitForClientsConnectedOrTimeOutWithTimeTravel(): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: GameObject SpawnObject(GameObject, NetworkManager, bool): missing <param name=\"prefabGameObject\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: GameObject SpawnObject(GameObject, NetworkManager, bool): missing <param name=\"owner\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: GameObject SpawnObject(GameObject, NetworkManager, bool): missing <param name=\"destroyWithScene\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: GameObject SpawnObject(GameObject, NetworkManager, bool): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: GameObject SpawnPlayerObject(GameObject, NetworkManager, bool): missing <param name=\"prefabGameObject\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: GameObject SpawnPlayerObject(GameObject, NetworkManager, bool): missing <param name=\"owner\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: GameObject SpawnPlayerObject(GameObject, NetworkManager, bool): missing <param name=\"destroyWithScene\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: GameObject SpawnPlayerObject(GameObject, NetworkManager, bool): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: List<GameObject> SpawnObjects(GameObject, NetworkManager, int, bool): missing <param name=\"prefabGameObject\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: List<GameObject> SpawnObjects(GameObject, NetworkManager, int, bool): missing <param name=\"owner\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: List<GameObject> SpawnObjects(GameObject, NetworkManager, int, bool): missing <param name=\"count\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: List<GameObject> SpawnObjects(GameObject, NetworkManager, int, bool): missing <param name=\"destroyWithScene\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: List<GameObject> SpawnObjects(GameObject, NetworkManager, int, bool): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: .ctor(NetworkTopologyTypes): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: .ctor(NetworkTopologyTypes, HostOrServer): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: void AssertOnTimeout(string, TimeoutHelper): missing <param name=\"timeOutErrorMessage\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: void AssertOnTimeout(string, TimeoutHelper): missing <param name=\"assignedTimeoutHelper\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: IEnumerator WaitForTicks(NetworkManager, int): missing <param name=\"networkManager\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: IEnumerator WaitForTicks(NetworkManager, int): missing <param name=\"count\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: IEnumerator WaitForTicks(NetworkManager, int): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: uint GetTickRate(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest: int GetFrameRate(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest.SceneManagementState: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest.SceneManagementState: SceneManagementEnabled: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest.SceneManagementState: SceneManagementDisabled: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest.NetworkManagerInstatiationMode: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest.NetworkManagerInstatiationMode: PerTest: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest.NetworkManagerInstatiationMode: AllTests: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest.NetworkManagerInstatiationMode: DoNotCreate: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest.HostOrServer: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest.HostOrServer: Host: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest.HostOrServer: Server: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTest.HostOrServer: DAHost: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers: DefaultMinFrames: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers: DefaultTimeout: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers: NetworkManagerInstances: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers: void RegisterHandlers(NetworkManager, bool): missing <param name=\"networkManager\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers: void RegisterHandlers(NetworkManager, bool): missing <param name=\"serverSideSceneManager\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers: NetworkManager CreateServer(bool): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers: bool Create(int, out NetworkManager, out NetworkManager[], int, bool, bool): missing <param name=\"useMockTransport\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers: bool Create(int, out NetworkManager, out NetworkManager[], int, bool, bool): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers: bool CreateNewClients(int, out NetworkManager[], bool): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers: bool Start(bool, NetworkManager, NetworkManager[], BeforeClientStartCallback, bool): missing <param name=\"startServer\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers: uint GetNextGlobalIdHashValue(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers: IsNetcodeIntegrationTestRunning: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers: void RegisterNetcodeIntegrationTest(bool): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers: GameObject CreateNetworkObjectPrefab(string, NetworkManager, params NetworkManager[]): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers: void MarkAsSceneObjectRoot(GameObject, NetworkManager, NetworkManager[]): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers: IEnumerator WaitForClientConnected(NetworkManager, ResultWrapper<bool>, float): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers: IEnumerator WaitForClientsConnected(NetworkManager[], ResultWrapper<bool>, float): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers: IEnumerator WaitForClientConnectedToServer(NetworkManager, ResultWrapper<bool>, float): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers: IEnumerator WaitForClientsConnectedToServer(NetworkManager, int, ResultWrapper<bool>, float): missing <param name=\"clientCount\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers: IEnumerator WaitForClientsConnectedToServer(NetworkManager, int, ResultWrapper<bool>, float): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers: IEnumerator GetNetworkObjectByRepresentation(ulong, NetworkManager, ResultWrapper<NetworkObject>, bool, float): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers: IEnumerator GetNetworkObjectByRepresentation(Func<NetworkObject, bool>, NetworkManager, ResultWrapper<NetworkObject>, bool, float): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers: IEnumerator WaitForCondition(Func<bool>, ResultWrapper<bool>, float, int): missing <returns>",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers: uint GetGlobalObjectIdHash(NetworkObject): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers.MessageHandleCheck: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers.BeforeClientStartCallback: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers.ResultWrapper<T>: missing <typeparam name=\"T\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetcodeIntegrationTestHelpers.ResultWrapper<T>: Result: undocumented",
+          "Unity.Netcode.RuntimeTests.NetcodeLogAssert: undocumented",
+          "Unity.Netcode.RuntimeTests.NetcodeLogAssert: .ctor(bool, bool): undocumented",
+          "Unity.Netcode.RuntimeTests.NetcodeLogAssert: void AddLog(string, string, LogType): undocumented",
+          "Unity.Netcode.RuntimeTests.NetcodeLogAssert: void OnTearDown(): undocumented",
+          "Unity.Netcode.RuntimeTests.NetcodeLogAssert: void Dispose(): undocumented",
+          "Unity.Netcode.RuntimeTests.NetcodeLogAssert: void LogWasNotReceived(LogType, string): undocumented",
+          "Unity.Netcode.RuntimeTests.NetcodeLogAssert: void LogWasNotReceived(LogType, Regex): undocumented",
+          "Unity.Netcode.RuntimeTests.NetcodeLogAssert: void LogWasReceived(LogType, string): undocumented",
+          "Unity.Netcode.RuntimeTests.NetcodeLogAssert: void LogWasReceived(LogType, Regex): undocumented",
+          "Unity.Netcode.RuntimeTests.NetcodeLogAssert: bool HasLogBeenReceived(LogType, string): undocumented",
+          "Unity.Netcode.RuntimeTests.NetcodeLogAssert: void Reset(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetworkManagerHelper: NetworkManagerObject: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetworkManagerHelper: NetworkManagerGameObject: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetworkManagerHelper: InstantiatedGameObjects: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetworkManagerHelper: InstantiatedNetworkObjects: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetworkManagerHelper: CurrentNetworkManagerMode: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetworkManagerHelper: bool StartNetworkManager(out NetworkManager, NetworkManagerOperatingMode, NetworkConfig): missing <param name=\"networkManager\">",
+          "Unity.Netcode.TestHelpers.Runtime.NetworkManagerHelper: void ShutdownNetworkManager(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetworkManagerHelper: bool BuffersMatch(int, long, byte[], byte[]): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetworkManagerHelper.NetworkManagerOperatingMode: None: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetworkManagerHelper.NetworkManagerOperatingMode: Host: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetworkManagerHelper.NetworkManagerOperatingMode: Server: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetworkManagerHelper.NetworkManagerOperatingMode: Client: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetworkVariableHelper<T>: OnValueChanged: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetworkVariableHelper<T>: .ctor(NetworkVariableBase): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetworkVariableHelper<T>.OnMyValueChangedDelegateHandler: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.NetworkVariableBaseHelper: .ctor(NetworkVariableBase): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.TimeoutHelper: k_DefaultTimeOutWaitPeriod: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.TimeoutHelper: m_IsStarted: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.TimeoutHelper: TimedOut: undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.TimeoutHelper: float GetTimeElapsed(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.TimeoutHelper: void OnStart(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.TimeoutHelper: void Start(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.TimeoutHelper: void OnStop(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.TimeoutHelper: void Stop(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.TimeoutHelper: bool OnHasTimedOut(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.TimeoutHelper: bool HasTimedOut(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.TimeoutHelper: .ctor(float): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.TimeoutFrameCountHelper: int GetFrameCount(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.TimeoutFrameCountHelper: void OnStop(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.TimeoutFrameCountHelper: bool OnHasTimedOut(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.TimeoutFrameCountHelper: void OnStart(): undocumented",
+          "Unity.Netcode.TestHelpers.Runtime.TimeoutFrameCountHelper: .ctor(float, uint): undocumented",
+          "Unity.Netcode.RuntimeTests.ExtendedNetworkShowAndHideTests: undocumented",
+          "Unity.Netcode.RuntimeTests.ExtendedNetworkShowAndHideTests: NumberOfClients: undocumented",
+          "Unity.Netcode.RuntimeTests.ExtendedNetworkShowAndHideTests: .ctor(HostOrServer, bool): undocumented",
+          "Unity.Netcode.RuntimeTests.ExtendedNetworkShowAndHideTests: void OnServerAndClientsCreated(): undocumented",
+          "Unity.Netcode.RuntimeTests.ExtendedNetworkShowAndHideTests: void OnNewClientCreated(NetworkManager): undocumented",
+          "Unity.Netcode.RuntimeTests.ExtendedNetworkShowAndHideTests: IEnumerator HiddenObjectPromotedSessionOwnerNewClientSynchronizes(): missing <returns>",
+          "Unity.Netcode.RuntimeTests.RpcProxyMessageTesting: NumberOfClients: undocumented",
+          "Unity.Netcode.RuntimeTests.RpcProxyMessageTesting: .ctor(HostOrServer): undocumented",
+          "Unity.Netcode.RuntimeTests.RpcProxyMessageTesting: IEnumerator OnSetup(): undocumented",
+          "Unity.Netcode.RuntimeTests.RpcProxyMessageTesting: void OnCreatePlayerPrefab(): undocumented",
+          "Unity.Netcode.RuntimeTests.RpcProxyMessageTesting: IEnumerator ProxyDoesNotInvokeOnSender(): undocumented",
+          "Unity.Netcode.RuntimeTests.RpcProxyMessageTesting.RpcProxyText: undocumented",
+          "Unity.Netcode.RuntimeTests.RpcProxyMessageTesting.RpcProxyText: ReceivedRpc: undocumented",
+          "Unity.Netcode.RuntimeTests.RpcProxyMessageTesting.RpcProxyText: void SendToEveryOneButMe(): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted: undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted: NumberOfClients: undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted: .ctor(NetworkTopologyTypes, HostOrServer): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted: void OnOneTimeSetup(): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted: void OnServerAndClientsCreated(): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted: IEnumerator PrefabSessionIstantiationPass(int): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted: IEnumerator OnTearDown(): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted: void OnOneTimeTearDown(): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted.TestBehaviour: TestNetworkVariable: undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted.TestBehaviour: LastUpdateDelta: undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted.TestBehaviour: SpawnedCount: undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted.TestBehaviour: void OnNetworkSpawn(): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted.TestBehaviour: void OnNetworkPostSpawn(): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted.TestBehaviour: void OnDestroy(): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted.TestBehaviour: void OnNetworkDespawn(): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted.PrefabInstanceHandler: PrefabInstances: undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted.PrefabInstanceHandler: void OneTimeSetup(int, GameObject): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted.PrefabInstanceHandler: NetworkObject GetInstanceToSpawn(NetworkManager): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted.PrefabInstanceHandler: bool ValidatePersistedInstances(NetworkManager, int): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted.PrefabInstanceHandler: .ctor(GameObject): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted.PrefabInstanceHandler: void Initialize(NetworkManager): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted.PrefabInstanceHandler: bool ValidateInstanceSpawnCount(int): XML is not well-formed: Expected an end tag for element 'summary'",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted.PrefabInstanceHandler: void DeregisterHandler(): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted.PrefabInstanceHandler: NetworkObject GetInstance(): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted.PrefabInstanceHandler: NetworkObject Instantiate(ulong, Vector3, Quaternion): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted.PrefabInstanceHandler: void Destroy(NetworkObject): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableCollectionsTests: NumberOfClients: undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableCollectionsTests: .ctor(HostOrServer): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableCollectionsTests: bool OnSetVerboseDebug(): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableCollectionsTests: IEnumerator OnSetup(): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableCollectionsTests: void OnCreatePlayerPrefab(): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableCollectionsTests: IEnumerator TestListBuiltInTypeCollections(): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableCollectionsTests: IEnumerator TestListSerializableObjectCollections(): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableCollectionsTests: IEnumerator TestDictionaryCollections(): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableCollectionsTests: IEnumerator TestDictionaryNestedCollections(): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableCollectionsTests: IEnumerator TestHashSetBuiltInTypeCollections(): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableCollectionsChangingTests: undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableCollectionsChangingTests: NumberOfClients: undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableCollectionsChangingTests: .ctor(HostOrServer, CollectionTypes): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableCollectionsChangingTests: void OnServerAndClientsCreated(): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableCollectionsChangingTests: IEnumerator CollectionAndOwnershipChangingTest(): undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableCollectionsChangingTests.CollectionTypes: undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableCollectionsChangingTests.CollectionTypes: Dictionary: undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableCollectionsChangingTests.CollectionTypes: List: undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryCollectionUpdateHelper: bool OnValidateAgainst(BaseCollectionUpdateHelper): undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryCollectionUpdateHelper: void OnClear(): undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryCollectionUpdateHelper: void AddItem(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListCollectionUpdateHelper: bool OnValidateAgainst(BaseCollectionUpdateHelper): undocumented",
+          "Unity.Netcode.RuntimeTests.ListCollectionUpdateHelper: void OnClear(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListCollectionUpdateHelper: void AddItem(): undocumented",
+          "Unity.Netcode.RuntimeTests.BaseCollectionUpdateHelper: VerboseMode: undocumented",
+          "Unity.Netcode.RuntimeTests.BaseCollectionUpdateHelper: HelperState: undocumented",
+          "Unity.Netcode.RuntimeTests.BaseCollectionUpdateHelper: void SetState(HelperStates): undocumented",
+          "Unity.Netcode.RuntimeTests.BaseCollectionUpdateHelper: bool OnValidateAgainst(BaseCollectionUpdateHelper): undocumented",
+          "Unity.Netcode.RuntimeTests.BaseCollectionUpdateHelper: bool ValidateAgainst(BaseCollectionUpdateHelper): undocumented",
+          "Unity.Netcode.RuntimeTests.BaseCollectionUpdateHelper: void OnNetworkSpawn(): undocumented",
+          "Unity.Netcode.RuntimeTests.BaseCollectionUpdateHelper: void OnNetworkDespawn(): undocumented",
+          "Unity.Netcode.RuntimeTests.BaseCollectionUpdateHelper: void OnClear(): undocumented",
+          "Unity.Netcode.RuntimeTests.BaseCollectionUpdateHelper: void Clear(): undocumented",
+          "Unity.Netcode.RuntimeTests.BaseCollectionUpdateHelper: void AddItem(): undocumented",
+          "Unity.Netcode.RuntimeTests.BaseCollectionUpdateHelper: void OnOwnershipChanged(ulong, ulong): undocumented",
+          "Unity.Netcode.RuntimeTests.BaseCollectionUpdateHelper: void Log(string): undocumented",
+          "Unity.Netcode.RuntimeTests.BaseCollectionUpdateHelper.HelperStates: undocumented",
+          "Unity.Netcode.RuntimeTests.BaseCollectionUpdateHelper.HelperStates: Stop: undocumented",
+          "Unity.Netcode.RuntimeTests.BaseCollectionUpdateHelper.HelperStates: Start: undocumented",
+          "Unity.Netcode.RuntimeTests.BaseCollectionUpdateHelper.HelperStates: Pause: undocumented",
+          "Unity.Netcode.RuntimeTests.BaseCollectionUpdateHelper.HelperStates: ClearToChangeOwner: undocumented",
+          "Unity.Netcode.RuntimeTests.BaseCollectionUpdateHelper.HelperStates: ChangingOwner: undocumented",
+          "Unity.Netcode.RuntimeTests.HashSetBaseTypeTestHelper: undocumented",
+          "Unity.Netcode.RuntimeTests.HashSetBaseTypeTestHelper: Instances: undocumented",
+          "Unity.Netcode.RuntimeTests.HashSetBaseTypeTestHelper: void ResetState(): undocumented",
+          "Unity.Netcode.RuntimeTests.HashSetBaseTypeTestHelper: ListCollectionServer: undocumented",
+          "Unity.Netcode.RuntimeTests.HashSetBaseTypeTestHelper: ListCollectionOwner: undocumented",
+          "Unity.Netcode.RuntimeTests.HashSetBaseTypeTestHelper: NetworkVariableChanges: undocumented",
+          "Unity.Netcode.RuntimeTests.HashSetBaseTypeTestHelper: bool ValidateInstances(): undocumented",
+          "Unity.Netcode.RuntimeTests.HashSetBaseTypeTestHelper: bool CompareTrackedChanges(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.HashSetBaseTypeTestHelper: HashSet<int> GetHashSetValues(int): undocumented",
+          "Unity.Netcode.RuntimeTests.HashSetBaseTypeTestHelper: NetworkVariable<HashSet<int>> GetNetVar(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.HashSetBaseTypeTestHelper: HashSet<int> OnSetServerValues(): undocumented",
+          "Unity.Netcode.RuntimeTests.HashSetBaseTypeTestHelper: HashSet<int> OnSetOwnerValues(): undocumented",
+          "Unity.Netcode.RuntimeTests.HashSetBaseTypeTestHelper: void Add(int, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.HashSetBaseTypeTestHelper: void AddRange(HashSet<int>, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.HashSetBaseTypeTestHelper: void Remove(int, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.HashSetBaseTypeTestHelper: void FullSet(HashSet<int>, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.HashSetBaseTypeTestHelper: void Clear(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.HashSetBaseTypeTestHelper: void TrackChanges(Targets, HashSet<int>, HashSet<int>): undocumented",
+          "Unity.Netcode.RuntimeTests.HashSetBaseTypeTestHelper: void OnServerListValuesChanged(HashSet<int>, HashSet<int>): undocumented",
+          "Unity.Netcode.RuntimeTests.HashSetBaseTypeTestHelper: void OnOwnerListValuesChanged(HashSet<int>, HashSet<int>): undocumented",
+          "Unity.Netcode.RuntimeTests.HashSetBaseTypeTestHelper: void ResetTrackedChanges(): undocumented",
+          "Unity.Netcode.RuntimeTests.HashSetBaseTypeTestHelper: void OnNetworkPostSpawn(): undocumented",
+          "Unity.Netcode.RuntimeTests.HashSetBaseTypeTestHelper: void OnNetworkDespawn(): undocumented",
+          "Unity.Netcode.RuntimeTests.NestedDictionaryTestHelper: undocumented",
+          "Unity.Netcode.RuntimeTests.NestedDictionaryTestHelper: Instances: undocumented",
+          "Unity.Netcode.RuntimeTests.NestedDictionaryTestHelper: void ResetState(): undocumented",
+          "Unity.Netcode.RuntimeTests.NestedDictionaryTestHelper: ListCollectionServer: undocumented",
+          "Unity.Netcode.RuntimeTests.NestedDictionaryTestHelper: ListCollectionOwner: undocumented",
+          "Unity.Netcode.RuntimeTests.NestedDictionaryTestHelper: NetworkVariableChanges: undocumented",
+          "Unity.Netcode.RuntimeTests.NestedDictionaryTestHelper: bool ValidateInstances(): undocumented",
+          "Unity.Netcode.RuntimeTests.NestedDictionaryTestHelper: bool CompareTrackedChanges(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.NestedDictionaryTestHelper: Dictionary<int, SerializableObject> GetDictionaryValues(int): undocumented",
+          "Unity.Netcode.RuntimeTests.NestedDictionaryTestHelper: Dictionary<int, Dictionary<int, SerializableObject>> GetNestedDictionaryValues(int): undocumented",
+          "Unity.Netcode.RuntimeTests.NestedDictionaryTestHelper: NetworkVariable<Dictionary<int, Dictionary<int, SerializableObject>>> GetNetVar(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.NestedDictionaryTestHelper: Dictionary<int, Dictionary<int, SerializableObject>> OnSetServerValues(): undocumented",
+          "Unity.Netcode.RuntimeTests.NestedDictionaryTestHelper: Dictionary<int, Dictionary<int, SerializableObject>> OnSetOwnerValues(): undocumented",
+          "Unity.Netcode.RuntimeTests.NestedDictionaryTestHelper: bool UpdateValue((int, Dictionary<int, SerializableObject>), Targets, bool): undocumented",
+          "Unity.Netcode.RuntimeTests.NestedDictionaryTestHelper: void Add((int, Dictionary<int, SerializableObject>), Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.NestedDictionaryTestHelper: void Remove(int, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.NestedDictionaryTestHelper: void FullSet(Dictionary<int, Dictionary<int, SerializableObject>>, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.NestedDictionaryTestHelper: void Clear(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.NestedDictionaryTestHelper: void TrackChanges(Targets, Dictionary<int, Dictionary<int, SerializableObject>>, Dictionary<int, Dictionary<int, SerializableObject>>): undocumented",
+          "Unity.Netcode.RuntimeTests.NestedDictionaryTestHelper: void OnServerListValuesChanged(Dictionary<int, Dictionary<int, SerializableObject>>, Dictionary<int, Dictionary<int, SerializableObject>>): undocumented",
+          "Unity.Netcode.RuntimeTests.NestedDictionaryTestHelper: void OnOwnerListValuesChanged(Dictionary<int, Dictionary<int, SerializableObject>>, Dictionary<int, Dictionary<int, SerializableObject>>): undocumented",
+          "Unity.Netcode.RuntimeTests.NestedDictionaryTestHelper: void ResetTrackedChanges(): undocumented",
+          "Unity.Netcode.RuntimeTests.NestedDictionaryTestHelper: void OnNetworkPostSpawn(): undocumented",
+          "Unity.Netcode.RuntimeTests.NestedDictionaryTestHelper: void OnNetworkDespawn(): undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryTestHelper: undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryTestHelper: Instances: undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryTestHelper: void ResetState(): undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryTestHelper: ListCollectionServer: undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryTestHelper: ListCollectionOwner: undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryTestHelper: NetworkVariableChanges: undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryTestHelper: bool ValidateInstances(): undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryTestHelper: bool CompareTrackedChanges(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryTestHelper: Dictionary<int, SerializableObject> GetDictionaryValues(int): undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryTestHelper: NetworkVariable<Dictionary<int, SerializableObject>> GetNetVar(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryTestHelper: Dictionary<int, SerializableObject> OnSetServerValues(): undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryTestHelper: Dictionary<int, SerializableObject> OnSetOwnerValues(): undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryTestHelper: bool UpdateValue((int, SerializableObject), Targets, bool): undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryTestHelper: void Add((int, SerializableObject), Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryTestHelper: void Remove(int, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryTestHelper: void FullSet(Dictionary<int, SerializableObject>, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryTestHelper: void Clear(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryTestHelper: void TrackChanges(Targets, Dictionary<int, SerializableObject>, Dictionary<int, SerializableObject>): undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryTestHelper: void OnServerListValuesChanged(Dictionary<int, SerializableObject>, Dictionary<int, SerializableObject>): undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryTestHelper: void OnOwnerListValuesChanged(Dictionary<int, SerializableObject>, Dictionary<int, SerializableObject>): undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryTestHelper: void ResetTrackedChanges(): undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryTestHelper: void OnNetworkPostSpawn(): undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryTestHelper: void InitValues(): undocumented",
+          "Unity.Netcode.RuntimeTests.DictionaryTestHelper: void OnNetworkDespawn(): undocumented",
+          "Unity.Netcode.RuntimeTests.SerializableObject: undocumented",
+          "Unity.Netcode.RuntimeTests.SerializableObject: SerializableObject GetRandomObject(): undocumented",
+          "Unity.Netcode.RuntimeTests.SerializableObject: List<SerializableObject> GetListOfRandomObjects(int): undocumented",
+          "Unity.Netcode.RuntimeTests.SerializableObject: List<List<SerializableObject>> GetListOfListOfRandomObjects(int, int): undocumented",
+          "Unity.Netcode.RuntimeTests.SerializableObject: IntValue: undocumented",
+          "Unity.Netcode.RuntimeTests.SerializableObject: LongValue: undocumented",
+          "Unity.Netcode.RuntimeTests.SerializableObject: FloatValue: undocumented",
+          "Unity.Netcode.RuntimeTests.SerializableObject: string ToString(): undocumented",
+          "Unity.Netcode.RuntimeTests.SerializableObject: void NetworkSerialize(BufferSerializer<T>): undocumented",
+          "Unity.Netcode.RuntimeTests.SerializableObject: bool Equals(SerializableObject): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListSerializableObject: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListSerializableObject: Instances: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListSerializableObject: void ResetState(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListSerializableObject: ListCollectionServer: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListSerializableObject: ListCollectionOwner: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListSerializableObject: NetworkVariableChanges: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListSerializableObject: bool ValidateInstances(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListSerializableObject: bool CompareTrackedChanges(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListSerializableObject: NetworkVariable<List<List<SerializableObject>>> GetNetVar(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListSerializableObject: List<List<SerializableObject>> OnSetServerValues(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListSerializableObject: List<List<SerializableObject>> OnSetOwnerValues(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListSerializableObject: void UpdateValue(List<SerializableObject>, Targets, bool): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListSerializableObject: void Add(List<SerializableObject>, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListSerializableObject: void AddRange(List<List<SerializableObject>>, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListSerializableObject: void Insert(List<SerializableObject>, int, Targets, bool): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListSerializableObject: void Remove(List<SerializableObject>, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListSerializableObject: void FullSet(List<List<SerializableObject>>, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListSerializableObject: void Clear(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListSerializableObject: void TrackChanges(Targets, List<List<SerializableObject>>, List<List<SerializableObject>>): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListSerializableObject: void OnServerListValuesChanged(List<List<SerializableObject>>, List<List<SerializableObject>>): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListSerializableObject: void OnOwnerListValuesChanged(List<List<SerializableObject>>, List<List<SerializableObject>>): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListSerializableObject: void ResetTrackedChanges(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListSerializableObject: void OnNetworkPostSpawn(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListSerializableObject: void OnNetworkDespawn(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperSerializableObject: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperSerializableObject: Instances: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperSerializableObject: void ResetState(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperSerializableObject: ListCollectionServer: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperSerializableObject: ListCollectionOwner: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperSerializableObject: NetworkVariableChanges: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperSerializableObject: bool ValidateInstances(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperSerializableObject: bool CompareTrackedChanges(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperSerializableObject: NetworkVariable<List<SerializableObject>> GetNetVar(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperSerializableObject: List<SerializableObject> OnSetServerValues(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperSerializableObject: List<SerializableObject> OnSetOwnerValues(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperSerializableObject: void UpdateValue(SerializableObject, Targets, bool): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperSerializableObject: void Add(SerializableObject, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperSerializableObject: void AddRange(List<SerializableObject>, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperSerializableObject: void Insert(SerializableObject, int, Targets, bool): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperSerializableObject: void Remove(SerializableObject, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperSerializableObject: void FullSet(List<SerializableObject>, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperSerializableObject: void Clear(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperSerializableObject: void TrackChanges(Targets, List<SerializableObject>, List<SerializableObject>): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperSerializableObject: void OnServerListValuesChanged(List<SerializableObject>, List<SerializableObject>): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperSerializableObject: void OnOwnerListValuesChanged(List<SerializableObject>, List<SerializableObject>): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperSerializableObject: void ResetTrackedChanges(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperSerializableObject: void OnNetworkPostSpawn(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperSerializableObject: void OnNetworkDespawn(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListInt: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListInt: Instances: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListInt: void ResetState(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListInt: ListCollectionServer: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListInt: ListCollectionOwner: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListInt: NetworkVariableChanges: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListInt: bool ValidateInstances(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListInt: bool CompareTrackedChanges(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListInt: NetworkVariable<List<List<int>>> GetNetVar(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListInt: List<List<int>> OnSetServerValues(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListInt: List<List<int>> OnSetOwnerValues(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListInt: void UpdateValue(List<int>, Targets, bool): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListInt: void Add(List<int>, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListInt: void AddRange(List<List<int>>, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListInt: void Insert(List<int>, int, Targets, bool): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListInt: void Remove(List<int>, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListInt: void FullSet(List<List<int>>, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListInt: void Clear(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListInt: void TrackChanges(Targets, List<List<int>>, List<List<int>>): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListInt: void OnServerListValuesChanged(List<List<int>>, List<List<int>>): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListInt: void OnOwnerListValuesChanged(List<List<int>>, List<List<int>>): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListInt: void ResetTrackedChanges(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListInt: void OnNetworkPostSpawn(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperListInt: void OnNetworkDespawn(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperInt: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperInt: Instances: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperInt: void ResetState(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperInt: ListCollectionServer: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperInt: ListCollectionOwner: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperInt: NetworkVariableChanges: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperInt: bool ValidateInstances(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperInt: bool CompareTrackedChanges(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperInt: NetworkVariable<List<int>> GetNetVar(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperInt: List<int> OnSetServerValues(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperInt: List<int> OnSetOwnerValues(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperInt: void UpdateValue(int, Targets, bool): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperInt: void Add(int, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperInt: void AddRange(List<int>, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperInt: void Insert(int, int, Targets, bool): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperInt: void Remove(int, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperInt: void FullSet(List<int>, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperInt: void Clear(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperInt: void TrackChanges(Targets, List<int>, List<int>): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperInt: void OnServerListValuesChanged(List<int>, List<int>): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperInt: void OnOwnerListValuesChanged(List<int>, List<int>): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperInt: void ResetTrackedChanges(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperInt: void OnNetworkPostSpawn(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperInt: void OnNetworkDespawn(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperBase: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperBase: IsDebugMode: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperBase: string GetLog(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperBase: void LogMessage(string): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperBase: void LogStart(): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperBase: void SetDebugMode(bool): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperBase: bool CompareTrackedChanges(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperBase.Targets: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperBase.Targets: Server: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperBase.Targets: Owner: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperBase.DeltaTypes: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperBase.DeltaTypes: Added: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperBase.DeltaTypes: Removed: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperBase.DeltaTypes: Changed: undocumented",
+          "Unity.Netcode.RuntimeTests.ListTestHelperBase.DeltaTypes: UnChanged: undocumented",
+          "Unity.Netcode.RuntimeTests.IListTestHelperBase<T>: undocumented",
+          "Unity.Netcode.RuntimeTests.IListTestHelperBase<T>: bool ValidateInstances(): undocumented",
+          "Unity.Netcode.RuntimeTests.IListTestHelperBase<T>: NetworkVariable<List<T>> GetNetVar(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.IListTestHelperBase<T>: List<T> OnSetServerValues(): undocumented",
+          "Unity.Netcode.RuntimeTests.IListTestHelperBase<T>: List<T> OnSetOwnerValues(): undocumented",
+          "Unity.Netcode.RuntimeTests.IListTestHelperBase<T>: void UpdateValue(T, Targets, bool): undocumented",
+          "Unity.Netcode.RuntimeTests.IListTestHelperBase<T>: void Add(T, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.IListTestHelperBase<T>: void AddRange(List<T>, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.IListTestHelperBase<T>: void Insert(T, int, Targets, bool): undocumented",
+          "Unity.Netcode.RuntimeTests.IListTestHelperBase<T>: void Remove(T, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.IListTestHelperBase<T>: void FullSet(List<T>, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.IListTestHelperBase<T>: void Clear(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.IListTestHelperBase<T>: void TrackChanges(Targets, List<T>, List<T>): undocumented",
+          "Unity.Netcode.RuntimeTests.IListTestHelperBase<T>: void OnServerListValuesChanged(List<T>, List<T>): undocumented",
+          "Unity.Netcode.RuntimeTests.IListTestHelperBase<T>: void OnOwnerListValuesChanged(List<T>, List<T>): undocumented",
+          "Unity.Netcode.RuntimeTests.IListTestHelperBase<T>: void ResetTrackedChanges(): undocumented",
+          "Unity.Netcode.RuntimeTests.IDictionaryTestHelperBase<TKey, TValue>: undocumented",
+          "Unity.Netcode.RuntimeTests.IDictionaryTestHelperBase<TKey, TValue>: bool ValidateInstances(): undocumented",
+          "Unity.Netcode.RuntimeTests.IDictionaryTestHelperBase<TKey, TValue>: NetworkVariable<Dictionary<TKey, TValue>> GetNetVar(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.IDictionaryTestHelperBase<TKey, TValue>: Dictionary<TKey, TValue> OnSetServerValues(): undocumented",
+          "Unity.Netcode.RuntimeTests.IDictionaryTestHelperBase<TKey, TValue>: Dictionary<TKey, TValue> OnSetOwnerValues(): undocumented",
+          "Unity.Netcode.RuntimeTests.IDictionaryTestHelperBase<TKey, TValue>: bool UpdateValue((TKey, TValue), Targets, bool): undocumented",
+          "Unity.Netcode.RuntimeTests.IDictionaryTestHelperBase<TKey, TValue>: void Add((TKey, TValue), Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.IDictionaryTestHelperBase<TKey, TValue>: void Remove(TKey, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.IDictionaryTestHelperBase<TKey, TValue>: void FullSet(Dictionary<TKey, TValue>, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.IDictionaryTestHelperBase<TKey, TValue>: void Clear(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.IDictionaryTestHelperBase<TKey, TValue>: void TrackChanges(Targets, Dictionary<TKey, TValue>, Dictionary<TKey, TValue>): undocumented",
+          "Unity.Netcode.RuntimeTests.IDictionaryTestHelperBase<TKey, TValue>: void OnServerListValuesChanged(Dictionary<TKey, TValue>, Dictionary<TKey, TValue>): undocumented",
+          "Unity.Netcode.RuntimeTests.IDictionaryTestHelperBase<TKey, TValue>: void OnOwnerListValuesChanged(Dictionary<TKey, TValue>, Dictionary<TKey, TValue>): undocumented",
+          "Unity.Netcode.RuntimeTests.IDictionaryTestHelperBase<TKey, TValue>: void ResetTrackedChanges(): undocumented",
+          "Unity.Netcode.RuntimeTests.IHashSetTestHelperBase<T>: undocumented",
+          "Unity.Netcode.RuntimeTests.IHashSetTestHelperBase<T>: bool ValidateInstances(): undocumented",
+          "Unity.Netcode.RuntimeTests.IHashSetTestHelperBase<T>: NetworkVariable<HashSet<T>> GetNetVar(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.IHashSetTestHelperBase<T>: HashSet<T> OnSetServerValues(): undocumented",
+          "Unity.Netcode.RuntimeTests.IHashSetTestHelperBase<T>: HashSet<T> OnSetOwnerValues(): undocumented",
+          "Unity.Netcode.RuntimeTests.IHashSetTestHelperBase<T>: void Add(T, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.IHashSetTestHelperBase<T>: void Remove(T, Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.IHashSetTestHelperBase<T>: void Clear(Targets): undocumented",
+          "Unity.Netcode.RuntimeTests.IHashSetTestHelperBase<T>: void TrackChanges(Targets, HashSet<T>, HashSet<T>): undocumented",
+          "Unity.Netcode.RuntimeTests.IHashSetTestHelperBase<T>: void OnServerListValuesChanged(HashSet<T>, HashSet<T>): undocumented",
+          "Unity.Netcode.RuntimeTests.IHashSetTestHelperBase<T>: void OnOwnerListValuesChanged(HashSet<T>, HashSet<T>): undocumented",
+          "Unity.Netcode.RuntimeTests.IHashSetTestHelperBase<T>: void ResetTrackedChanges(): undocumented",
+          "Unity.Netcode.RuntimeTests.ByteEnum: undocumented",
+          "Unity.Netcode.RuntimeTests.ByteEnum: A: undocumented",
+          "Unity.Netcode.RuntimeTests.ByteEnum: B: undocumented",
+          "Unity.Netcode.RuntimeTests.ByteEnum: C: undocumented",
+          "Unity.Netcode.RuntimeTests.SByteEnum: undocumented",
+          "Unity.Netcode.RuntimeTests.SByteEnum: A: undocumented",
+          "Unity.Netcode.RuntimeTests.SByteEnum: B: undocumented",
+          "Unity.Netcode.RuntimeTests.SByteEnum: C: undocumented",
+          "Unity.Netcode.RuntimeTests.ShortEnum: undocumented",
+          "Unity.Netcode.RuntimeTests.ShortEnum: A: undocumented",
+          "Unity.Netcode.RuntimeTests.ShortEnum: B: undocumented",
+          "Unity.Netcode.RuntimeTests.ShortEnum: C: undocumented",
+          "Unity.Netcode.RuntimeTests.UShortEnum: undocumented",
+          "Unity.Netcode.RuntimeTests.UShortEnum: A: undocumented",
+          "Unity.Netcode.RuntimeTests.UShortEnum: B: undocumented",
+          "Unity.Netcode.RuntimeTests.UShortEnum: C: undocumented",
+          "Unity.Netcode.RuntimeTests.IntEnum: undocumented",
+          "Unity.Netcode.RuntimeTests.IntEnum: A: undocumented",
+          "Unity.Netcode.RuntimeTests.IntEnum: B: undocumented",
+          "Unity.Netcode.RuntimeTests.IntEnum: C: undocumented",
+          "Unity.Netcode.RuntimeTests.UIntEnum: undocumented",
+          "Unity.Netcode.RuntimeTests.UIntEnum: A: undocumented",
+          "Unity.Netcode.RuntimeTests.UIntEnum: B: undocumented",
+          "Unity.Netcode.RuntimeTests.UIntEnum: C: undocumented",
+          "Unity.Netcode.RuntimeTests.LongEnum: undocumented",
+          "Unity.Netcode.RuntimeTests.LongEnum: A: undocumented",
+          "Unity.Netcode.RuntimeTests.LongEnum: B: undocumented",
+          "Unity.Netcode.RuntimeTests.LongEnum: C: undocumented",
+          "Unity.Netcode.RuntimeTests.ULongEnum: undocumented",
+          "Unity.Netcode.RuntimeTests.ULongEnum: A: undocumented",
+          "Unity.Netcode.RuntimeTests.ULongEnum: B: undocumented",
+          "Unity.Netcode.RuntimeTests.ULongEnum: C: undocumented",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted.PrefabInstanceHandler: bool ValidateInstanceSpawnCount(int): missing <param name=\"minCount\">",
+          "Unity.Netcode.RuntimeTests.NetworkVariableBaseInitializesWhenPersisted.PrefabInstanceHandler: bool ValidateInstanceSpawnCount(int): missing <returns>"
+        ]
+      }
+    }
+}
diff --git a/pvpExceptions.json.meta b/pvpExceptions.json.meta
new file mode 100644
index 0000000000..897531988f
--- /dev/null
+++ b/pvpExceptions.json.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3460732dd46332e48acdf417ee62dbd4
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/testproject-tools-integration/Assets/Tests/Runtime/SceneEventTests.cs b/testproject-tools-integration/Assets/Tests/Runtime/SceneEventTests.cs
index c5d5a17812..eccaf57490 100644
--- a/testproject-tools-integration/Assets/Tests/Runtime/SceneEventTests.cs
+++ b/testproject-tools-integration/Assets/Tests/Runtime/SceneEventTests.cs
@@ -5,10 +5,10 @@
 using NUnit.Framework;
 using Unity.Multiplayer.Tools.MetricTypes;
 using Unity.Netcode;
+using Unity.Netcode.TestHelpers.Runtime;
 using Unity.Netcode.TestHelpers.Runtime.Metrics;
 using UnityEngine.SceneManagement;
 using UnityEngine.TestTools;
-using Unity.Netcode.TestHelpers.Runtime;
 using SceneEventType = Unity.Netcode.SceneEventType;
 
 namespace TestProject.ToolsIntegration.RuntimeTests
diff --git a/testproject-tools-integration/Packages/manifest.json b/testproject-tools-integration/Packages/manifest.json
index d1845d58f5..a3f60bc15a 100644
--- a/testproject-tools-integration/Packages/manifest.json
+++ b/testproject-tools-integration/Packages/manifest.json
@@ -1,44 +1,47 @@
 {
-    "registry": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates",
-    "dependencies": {
-        "com.unity.ide.rider": "3.0.7",
-        "com.unity.multiplayer.tools": "https://github.com/Unity-Technologies/com.unity.multiplayer.tools.git#release/1.1.0",
-        "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects",
-        "com.unity.test-framework": "1.1.31",
-        "com.unity.test-framework.performance": "2.8.0-preview",
-        "com.unity.modules.ai": "1.0.0",
-        "com.unity.modules.androidjni": "1.0.0",
-        "com.unity.modules.animation": "1.0.0",
-        "com.unity.modules.assetbundle": "1.0.0",
-        "com.unity.modules.audio": "1.0.0",
-        "com.unity.modules.cloth": "1.0.0",
-        "com.unity.modules.director": "1.0.0",
-        "com.unity.modules.imageconversion": "1.0.0",
-        "com.unity.modules.imgui": "1.0.0",
-        "com.unity.modules.jsonserialize": "1.0.0",
-        "com.unity.modules.particlesystem": "1.0.0",
-        "com.unity.modules.physics": "1.0.0",
-        "com.unity.modules.physics2d": "1.0.0",
-        "com.unity.modules.screencapture": "1.0.0",
-        "com.unity.modules.terrain": "1.0.0",
-        "com.unity.modules.terrainphysics": "1.0.0",
-        "com.unity.modules.tilemap": "1.0.0",
-        "com.unity.modules.ui": "1.0.0",
-        "com.unity.modules.uielements": "1.0.0",
-        "com.unity.modules.umbra": "1.0.0",
-        "com.unity.modules.unityanalytics": "1.0.0",
-        "com.unity.modules.unitywebrequest": "1.0.0",
-        "com.unity.modules.unitywebrequestassetbundle": "1.0.0",
-        "com.unity.modules.unitywebrequestaudio": "1.0.0",
-        "com.unity.modules.unitywebrequesttexture": "1.0.0",
-        "com.unity.modules.unitywebrequestwww": "1.0.0",
-        "com.unity.modules.vehicles": "1.0.0",
-        "com.unity.modules.video": "1.0.0",
-        "com.unity.modules.vr": "1.0.0",
-        "com.unity.modules.wind": "1.0.0",
-        "com.unity.modules.xr": "1.0.0"
-    },
-    "testables": [
-        "com.unity.netcode.gameobjects"
-    ]
+  "dependencies": {
+    "com.unity.ai.navigation": "2.0.5",
+    "com.unity.ide.rider": "3.0.34",
+    "com.unity.ide.visualstudio": "2.0.22",
+    "com.unity.multiplayer.center": "1.0.0",
+    "com.unity.multiplayer.tools": "2.2.3",
+    "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects",
+    "com.unity.test-framework": "1.4.6",
+    "com.unity.test-framework.performance": "3.0.3",
+    "com.unity.modules.accessibility": "1.0.0",
+    "com.unity.modules.ai": "1.0.0",
+    "com.unity.modules.androidjni": "1.0.0",
+    "com.unity.modules.animation": "1.0.0",
+    "com.unity.modules.assetbundle": "1.0.0",
+    "com.unity.modules.audio": "1.0.0",
+    "com.unity.modules.cloth": "1.0.0",
+    "com.unity.modules.director": "1.0.0",
+    "com.unity.modules.imageconversion": "1.0.0",
+    "com.unity.modules.imgui": "1.0.0",
+    "com.unity.modules.jsonserialize": "1.0.0",
+    "com.unity.modules.particlesystem": "1.0.0",
+    "com.unity.modules.physics": "1.0.0",
+    "com.unity.modules.physics2d": "1.0.0",
+    "com.unity.modules.screencapture": "1.0.0",
+    "com.unity.modules.terrain": "1.0.0",
+    "com.unity.modules.terrainphysics": "1.0.0",
+    "com.unity.modules.tilemap": "1.0.0",
+    "com.unity.modules.ui": "1.0.0",
+    "com.unity.modules.uielements": "1.0.0",
+    "com.unity.modules.umbra": "1.0.0",
+    "com.unity.modules.unityanalytics": "1.0.0",
+    "com.unity.modules.unitywebrequest": "1.0.0",
+    "com.unity.modules.unitywebrequestassetbundle": "1.0.0",
+    "com.unity.modules.unitywebrequestaudio": "1.0.0",
+    "com.unity.modules.unitywebrequesttexture": "1.0.0",
+    "com.unity.modules.unitywebrequestwww": "1.0.0",
+    "com.unity.modules.vehicles": "1.0.0",
+    "com.unity.modules.video": "1.0.0",
+    "com.unity.modules.vr": "1.0.0",
+    "com.unity.modules.wind": "1.0.0",
+    "com.unity.modules.xr": "1.0.0"
+  },
+  "testables": [
+    "com.unity.netcode.gameobjects"
+  ]
 }
diff --git a/testproject-tools-integration/Packages/packages-lock.json b/testproject-tools-integration/Packages/packages-lock.json
index 5e567caefa..76d63d3876 100644
--- a/testproject-tools-integration/Packages/packages-lock.json
+++ b/testproject-tools-integration/Packages/packages-lock.json
@@ -1,121 +1,158 @@
 {
   "dependencies": {
+    "com.unity.ai.navigation": {
+      "version": "2.0.5",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.modules.ai": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.burst": {
-      "version": "1.6.4",
-      "depth": 2,
+      "version": "1.8.18",
+      "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.mathematics": "1.2.1"
+        "com.unity.mathematics": "1.2.1",
+        "com.unity.modules.jsonserialize": "1.0.0"
       },
-      "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
+      "url": "https://packages.unity.com"
     },
     "com.unity.collections": {
-      "version": "1.2.3",
-      "depth": 2,
+      "version": "2.5.1",
+      "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.burst": "1.6.4",
-        "com.unity.test-framework": "1.1.31"
+        "com.unity.burst": "1.8.17",
+        "com.unity.test-framework": "1.4.5",
+        "com.unity.nuget.mono-cecil": "1.11.4",
+        "com.unity.test-framework.performance": "3.0.3"
       },
-      "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
+      "url": "https://packages.unity.com"
     },
     "com.unity.ext.nunit": {
-      "version": "1.0.6",
+      "version": "2.0.5",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
+      "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.7",
+      "version": "3.0.34",
       "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.ext.nunit": "1.0.6"
       },
-      "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.ide.visualstudio": {
+      "version": "2.0.22",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.test-framework": "1.1.9"
+      },
+      "url": "https://packages.unity.com"
     },
     "com.unity.mathematics": {
-      "version": "1.2.5",
-      "depth": 2,
+      "version": "1.3.2",
+      "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
+      "url": "https://packages.unity.com"
     },
-    "com.unity.multiplayer.tools": {
-      "version": "https://github.com/Unity-Technologies/com.unity.multiplayer.tools.git#f935904741c349dc41ba24fda6639041128e8f19",
+    "com.unity.multiplayer.center": {
+      "version": "1.0.0",
       "depth": 0,
-      "source": "git",
+      "source": "builtin",
       "dependencies": {
-        "com.unity.profiling.core": "1.0.0-pre.1",
-        "com.unity.nuget.newtonsoft-json": "2.0.0",
-        "com.unity.nuget.mono-cecil": "1.10.1",
-        "com.unity.collections": "1.1.0",
         "com.unity.modules.uielements": "1.0.0"
+      }
+    },
+    "com.unity.multiplayer.tools": {
+      "version": "2.2.3",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.burst": "1.8.18",
+        "com.unity.collections": "2.5.1",
+        "com.unity.mathematics": "1.3.2",
+        "com.unity.profiling.core": "1.0.2",
+        "com.unity.nuget.mono-cecil": "1.11.4",
+        "com.unity.modules.uielements": "1.0.0",
+        "com.unity.nuget.newtonsoft-json": "3.2.1"
       },
-      "hash": "f935904741c349dc41ba24fda6639041128e8f19"
+      "url": "https://packages.unity.com"
     },
     "com.unity.netcode.gameobjects": {
       "version": "file:../../com.unity.netcode.gameobjects",
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.unity.nuget.mono-cecil": "1.10.1",
-        "com.unity.transport": "1.3.1"
+        "com.unity.nuget.mono-cecil": "1.11.4",
+        "com.unity.transport": "2.4.0"
       }
     },
     "com.unity.nuget.mono-cecil": {
-      "version": "1.10.1",
+      "version": "1.11.4",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
+      "url": "https://packages.unity.com"
     },
     "com.unity.nuget.newtonsoft-json": {
-      "version": "2.0.0",
+      "version": "3.2.1",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
+      "url": "https://packages.unity.com"
     },
     "com.unity.profiling.core": {
-      "version": "1.0.0-pre.1",
+      "version": "1.0.2",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
+      "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.31",
+      "version": "1.4.6",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.ext.nunit": "1.0.6",
+        "com.unity.ext.nunit": "2.0.3",
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
-      "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
+      "url": "https://packages.unity.com"
     },
     "com.unity.test-framework.performance": {
-      "version": "2.8.0-preview",
+      "version": "3.0.3",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.test-framework": "1.1.0",
+        "com.unity.test-framework": "1.1.31",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
-      "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
+      "url": "https://packages.unity.com"
     },
     "com.unity.transport": {
-      "version": "1.3.1",
+      "version": "2.4.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.collections": "1.2.3",
-        "com.unity.burst": "1.6.4",
-        "com.unity.mathematics": "1.2.5"
+        "com.unity.burst": "1.8.12",
+        "com.unity.collections": "2.2.1",
+        "com.unity.mathematics": "1.3.1"
       },
-      "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.modules.accessibility": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
     },
     "com.unity.modules.ai": {
       "version": "1.0.0",
@@ -164,6 +201,12 @@
         "com.unity.modules.animation": "1.0.0"
       }
     },
+    "com.unity.modules.hierarchycore": {
+      "version": "1.0.0",
+      "depth": 1,
+      "source": "builtin",
+      "dependencies": {}
+    },
     "com.unity.modules.imageconversion": {
       "version": "1.0.0",
       "depth": 0,
@@ -253,17 +296,7 @@
         "com.unity.modules.ui": "1.0.0",
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0",
-        "com.unity.modules.uielementsnative": "1.0.0"
-      }
-    },
-    "com.unity.modules.uielementsnative": {
-      "version": "1.0.0",
-      "depth": 1,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.modules.ui": "1.0.0",
-        "com.unity.modules.imgui": "1.0.0",
-        "com.unity.modules.jsonserialize": "1.0.0"
+        "com.unity.modules.hierarchycore": "1.0.0"
       }
     },
     "com.unity.modules.umbra": {
diff --git a/testproject-tools-integration/ProjectSettings/ProjectVersion.txt b/testproject-tools-integration/ProjectSettings/ProjectVersion.txt
index dd7e0b04f1..307f912404 100644
--- a/testproject-tools-integration/ProjectSettings/ProjectVersion.txt
+++ b/testproject-tools-integration/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2020.3.40f1
-m_EditorVersionWithRevision: 2020.3.40f1 (ba48d4efcef1)
+m_EditorVersion: 6000.0.38f1
+m_EditorVersionWithRevision: 6000.0.38f1 (82314a941f2d)
diff --git a/testproject/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/testproject/Assets/AddressableAssetsData/AddressableAssetSettings.asset
index 87c46389ef..6a1c39a006 100644
--- a/testproject/Assets/AddressableAssetsData/AddressableAssetSettings.asset
+++ b/testproject/Assets/AddressableAssetsData/AddressableAssetSettings.asset
@@ -13,24 +13,39 @@ MonoBehaviour:
   m_Name: AddressableAssetSettings
   m_EditorClassIdentifier: 
   m_DefaultGroup: 93aa504d1b753cb41a8a779ae63f5795
-  m_CachedHash:
+  m_currentHash:
     serializedVersion: 2
-    Hash: 00000000000000000000000000000000
+    Hash: c105cac3e36a87a6dabc4f3755bc1fd9
   m_OptimizeCatalogSize: 0
   m_BuildRemoteCatalog: 0
-  m_BundleLocalCatalog: 0
   m_CatalogRequestsTimeout: 0
   m_DisableCatalogUpdateOnStart: 0
+  m_InternalIdNamingMode: 0
+  m_InternalBundleIdMode: 1
+  m_AssetLoadMode: 0
+  m_BundledAssetProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
+  m_AssetBundleProviderType:
+    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+    m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
   m_IgnoreUnsupportedFilesInBuild: 0
   m_UniqueBundleIds: 0
+  m_EnableJsonCatalog: 0
   m_NonRecursiveBuilding: 1
   m_CCDEnabled: 0
   m_maxConcurrentWebRequests: 500
+  m_UseUWRForLocalBundles: 0
+  m_BundleTimeout: 0
+  m_BundleRetryCount: 0
+  m_BundleRedirectLimit: -1
+  m_SharedBundleSettings: 0
+  m_SharedBundleSettingsCustomGroupIndex: 0
   m_ContiguousBundles: 0
   m_StripUnityVersionFromBundleBuild: 0
   m_DisableVisibleSubAssetRepresentations: 0
-  m_ShaderBundleNaming: 0
-  m_ShaderBundleCustomNaming: 
+  m_BuiltInBundleNaming: 0
+  mBuiltInBundleCustomNaming: 
   m_MonoScriptBundleNaming: 0
   m_CheckForContentUpdateRestrictionsOption: 0
   m_MonoScriptBundleCustomNaming: 
@@ -47,8 +62,6 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 783a7ba7cfd87084388760e6c08547b4, type: 2}
   - {fileID: 11400000, guid: cb34f2b4f49b0a64aa04c7c5bcb3e41e, type: 2}
   m_BuildSettings:
-    m_CompileScriptsInVirtualMode: 0
-    m_CleanupStreamingAssetsAfterBuilds: 1
     m_LogResourceManagerExceptions: 1
     m_BundleBuildPath: Temp/com.unity.addressables/AssetBundles
   m_ProfileSettings:
@@ -64,24 +77,24 @@ MonoBehaviour:
       - m_Id: 80085c797452bb94ca0bf0a4b2ec258c
         m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]'
       - m_Id: eaae5cc67c56cfe4299363a742a284b3
-        m_Value: ServerData/[BuildTarget]
+        m_Value: 'ServerData/[BuildTarget]'
       - m_Id: 2a3d80e942fdbfe49a979d4a22bbe893
-        m_Value: http://localhost/[BuildTarget]
+        m_Value: 'http://localhost/[BuildTarget]'
     m_ProfileEntryNames:
     - m_Id: a2553e7788fb43741926b3128a0aa641
       m_Name: BuildTarget
       m_InlineUsage: 0
     - m_Id: 8bc200e556c0a2f4daf1a4696958eaa6
-      m_Name: LocalBuildPath
+      m_Name: Local.BuildPath
       m_InlineUsage: 0
     - m_Id: 80085c797452bb94ca0bf0a4b2ec258c
-      m_Name: LocalLoadPath
+      m_Name: Local.LoadPath
       m_InlineUsage: 0
     - m_Id: eaae5cc67c56cfe4299363a742a284b3
-      m_Name: RemoteBuildPath
+      m_Name: Remote.BuildPath
       m_InlineUsage: 0
     - m_Id: 2a3d80e942fdbfe49a979d4a22bbe893
-      m_Name: RemoteLoadPath
+      m_Name: Remote.LoadPath
       m_InlineUsage: 0
     m_ProfileVersion: 1
   m_LabelTable:
@@ -94,15 +107,9 @@ MonoBehaviour:
   m_CertificateHandlerType:
     m_AssemblyName: 
     m_ClassName: 
-  m_ActivePlayerDataBuilderIndex: 3
+  m_ActivePlayerDataBuilderIndex: 2
   m_DataBuilders:
   - {fileID: 11400000, guid: 9f220b782e4e67d4787c06a5ca9f25cc, type: 2}
-  - {fileID: 11400000, guid: 34e64d32387bb4a4db2e4170f8100ace, type: 2}
   - {fileID: 11400000, guid: ae43701986fc59a44b2618f3bacabc0a, type: 2}
   - {fileID: 11400000, guid: d6f3a7ab824a4b04a970de0ba5011a93, type: 2}
   m_ActiveProfileId: b7ba5fc73af2a49449023b732cdf652d
-  m_HostingServicesManager:
-    m_HostingServiceInfos: []
-    m_Settings: {fileID: 11400000}
-    m_NextInstanceId: 0
-    m_RegisteredServiceTypeRefs: []
diff --git a/testproject/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset b/testproject/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset
index 0022b89409..0b67bb4c6d 100644
--- a/testproject/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset	
+++ b/testproject/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset	
@@ -13,24 +13,9 @@ MonoBehaviour:
   m_Name: Built In Data
   m_EditorClassIdentifier: 
   m_GroupName: Built In Data
-  m_Data:
-    m_SerializedData: []
   m_GUID: 42bcc811e41b9f54baba926c243b7608
-  m_SerializeEntries:
-  - m_GUID: Resources
-    m_Address: Resources
-    m_ReadOnly: 1
-    m_SerializedLabels: []
-    m_MainAsset: {fileID: 0}
-    m_TargetAsset: {fileID: 0}
-  - m_GUID: EditorSceneList
-    m_Address: EditorSceneList
-    m_ReadOnly: 1
-    m_SerializedLabels: []
-    m_MainAsset: {fileID: 0}
-    m_TargetAsset: {fileID: 0}
+  m_SerializeEntries: []
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: 75e5cd8b6bfca5d49a5818e70d71b64d, type: 2}
   m_SchemaSet:
-    m_Schemas:
-    - {fileID: 11400000, guid: 51fa2527519429944b6f26066c7050ff, type: 2}
+    m_Schemas: []
diff --git a/testproject/Assets/DefaultNetworkPrefabs.asset b/testproject/Assets/DefaultNetworkPrefabs.asset
index 88f490d092..a5e491547f 100644
--- a/testproject/Assets/DefaultNetworkPrefabs.asset
+++ b/testproject/Assets/DefaultNetworkPrefabs.asset
@@ -219,13 +219,7 @@ MonoBehaviour:
     SourceHashToOverride: 0
     OverridingTargetPrefab: {fileID: 0}
   - Override: 0
-    Prefab: {fileID: 8133991607019124060, guid: 421bcf732fe69486d8abecfa5eee63bb,
-      type: 3}
-    SourcePrefabToOverride: {fileID: 0}
-    SourceHashToOverride: 0
-    OverridingTargetPrefab: {fileID: 0}
-  - Override: 0
-    Prefab: {fileID: 3439633038736912633, guid: 398aad09d8b2a47eba664a076763cdcc,
+    Prefab: {fileID: 3830151999068797299, guid: 074ae41741b33f84ca886d5b8dc482d2,
       type: 3}
     SourcePrefabToOverride: {fileID: 0}
     SourceHashToOverride: 0
diff --git a/testproject/Assets/Scripts/ConnectionModeScript.cs b/testproject/Assets/Scripts/ConnectionModeScript.cs
index 70bc46a1d9..c7dc884113 100644
--- a/testproject/Assets/Scripts/ConnectionModeScript.cs
+++ b/testproject/Assets/Scripts/ConnectionModeScript.cs
@@ -1,13 +1,16 @@
+#if ENABLE_RELAY_SERVICE
+using System;
+#endif
 using System.Collections;
-using UnityEngine;
 using Unity.Netcode;
 using Unity.Netcode.Transports.UTP;
-using UnityEngine.SceneManagement;
 #if ENABLE_RELAY_SERVICE
-using System;
 using Unity.Services.Core;
 using Unity.Services.Authentication;
 #endif
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
 
 /// <summary>
 /// Used in tandem with the ConnectModeButtons prefab asset in test project
@@ -23,8 +26,10 @@ public class ConnectionModeScript : MonoBehaviour
     [SerializeField]
     private GameObject m_JoinCodeInput;
 
+#if ENABLE_RELAY_SERVICE
     [SerializeField]
     private int m_MaxConnections = 10;
+#endif
 
     [SerializeField]
     private LoadSceneMode m_ClientSynchronizationMode;
@@ -126,8 +131,10 @@ private void OnServicesInitialized()
         if (HasRelaySupport())
         {
             m_JoinCodeInput.SetActive(true);
+#if ENABLE_RELAY_SERVICE
             m_ConnectionModeButtons?.SetActive(false || AuthenticationService.Instance.IsSignedIn);
             m_AuthenticationButtons?.SetActive(NetworkManager.Singleton && !NetworkManager.Singleton.IsListening && !AuthenticationService.Instance.IsSignedIn);
+#endif
         }
     }
 
@@ -138,11 +145,13 @@ public void OnStartServerButton()
     {
         if (NetworkManager.Singleton && !NetworkManager.Singleton.IsListening && m_ConnectionModeButtons)
         {
+#if ENABLE_RELAY_SERVICE
             if (HasRelaySupport())
             {
                 StartCoroutine(StartRelayServer(StartServer));
             }
             else
+#endif
             {
                 StartServer();
             }
@@ -170,13 +179,13 @@ private void OnServerStopped(bool obj)
         }
     }
 
-
+#if ENABLE_RELAY_SERVICE
     /// <summary>
     /// Coroutine that handles starting MLAPI in server mode if Relay is enabled
     /// </summary>
     private IEnumerator StartRelayServer(Action postAllocationAction)
     {
-#if ENABLE_RELAY_SERVICE
+
         m_ConnectionModeButtons?.SetActive(false);
 
         var serverRelayUtilityTask = RelayUtility.AllocateRelayServerAndGetJoinCode(m_MaxConnections);
@@ -198,11 +207,8 @@ private IEnumerator StartRelayServer(Action postAllocationAction)
         NetworkManager.Singleton.GetComponent<UnityTransport>().SetRelayServerData(ipv4address, port, allocationIdBytes, key, connectionData);
 
         postAllocationAction();
-#else
-        yield return null;
-#endif
     }
-
+#endif
 
     /// <summary>
     /// Handles starting netcode in host mode
@@ -211,11 +217,13 @@ public void OnStartHostButton()
     {
         if (NetworkManager.Singleton && !NetworkManager.Singleton.IsListening && m_ConnectionModeButtons)
         {
+#if ENABLE_RELAY_SERVICE
             if (HasRelaySupport())
             {
                 StartCoroutine(StartRelayServer(StartHost));
             }
             else
+#endif
             {
                 StartHost();
             }
diff --git a/testproject/Assets/Scripts/RelayUtility.cs b/testproject/Assets/Scripts/RelayUtility.cs
index 4935a2fdf1..abd32efffd 100644
--- a/testproject/Assets/Scripts/RelayUtility.cs
+++ b/testproject/Assets/Scripts/RelayUtility.cs
@@ -1,3 +1,4 @@
+#if ENABLE_RELAY_SERVICE
 using System;
 using System.Threading.Tasks;
 using Unity.Services.Relay;
@@ -56,3 +57,4 @@ public class RelayUtility
         return (allocation.RelayServer.IpV4, (ushort)allocation.RelayServer.Port, allocation.AllocationIdBytes, allocation.ConnectionData, allocation.HostConnectionData, allocation.Key);
     }
 }
+#endif
diff --git a/testproject/Assets/Scripts/UIController.cs b/testproject/Assets/Scripts/UIController.cs
index 3cb27e09bb..f83d667bf9 100644
--- a/testproject/Assets/Scripts/UIController.cs
+++ b/testproject/Assets/Scripts/UIController.cs
@@ -1,10 +1,11 @@
-using UnityEngine;
 using Unity.Netcode;
 using Unity.Netcode.Transports.UTP;
 #if ENABLE_RELAY_SERVICE
 using Unity.Services.Core;
 using Unity.Services.Authentication;
 #endif
+using UnityEngine;
+
 
 public class UIController : MonoBehaviour
 {
@@ -49,10 +50,10 @@ private void HideButtons()
         ButtonsRoot.SetActive(false);
     }
 
-
+#if ENABLE_RELAY_SERVICE
     public async void OnSignIn()
     {
-#if ENABLE_RELAY_SERVICE
+
         await UnityServices.InitializeAsync();
         Debug.Log("OnSignIn");
         await AuthenticationService.Instance.SignInAnonymouslyAsync();
@@ -64,6 +65,7 @@ public async void OnSignIn()
             JoinCode.SetActive(true);
             AuthButton.SetActive(false);
         }
-#endif
+
     }
+#endif
 }
diff --git a/testproject/Assets/Tests/Manual/HybridScripts/SessionSynchronizedTest.cs b/testproject/Assets/Tests/Manual/HybridScripts/SessionSynchronizedTest.cs
index 962c5a035f..5d141c5d95 100644
--- a/testproject/Assets/Tests/Manual/HybridScripts/SessionSynchronizedTest.cs
+++ b/testproject/Assets/Tests/Manual/HybridScripts/SessionSynchronizedTest.cs
@@ -37,7 +37,7 @@ protected override void OnNetworkPreSpawn(ref NetworkManager networkManager)
 
         protected override void OnNetworkSessionSynchronized()
         {
-            if (!IsServer)
+            if (!HasAuthority)
             {
                 OtherObject.Value.TryGet(out ClientSideReferencedBehaviour, NetworkManager);
                 OtherValueObtained = ClientSideReferencedBehaviour.ValueToCheck;
@@ -51,7 +51,7 @@ protected override void OnNetworkSessionSynchronized()
         /// </summary>
         protected override void OnInSceneObjectsSpawned()
         {
-            if (IsServer)
+            if (HasAuthority)
             {
                 OtherObject.Value = new NetworkBehaviourReference(ObjectForServerToReference);
             }
diff --git a/testproject/Assets/Tests/Manual/InSceneObjectParentingTests/InSceneParentChildHandler.cs b/testproject/Assets/Tests/Manual/InSceneObjectParentingTests/InSceneParentChildHandler.cs
index 72f08fd45a..e11d1723f4 100644
--- a/testproject/Assets/Tests/Manual/InSceneObjectParentingTests/InSceneParentChildHandler.cs
+++ b/testproject/Assets/Tests/Manual/InSceneObjectParentingTests/InSceneParentChildHandler.cs
@@ -1,16 +1,15 @@
 using System;
 using System.Collections.Generic;
-using TestProject.ManualTests;
 using Unity.Netcode;
 using Unity.Netcode.Components;
 using UnityEngine;
 using Random = UnityEngine.Random;
 
-namespace TestProject.RuntimeTests
+namespace TestProject.ManualTests
 {
     public class InSceneParentChildHandler : NetworkBehaviour
     {
-        public static InSceneParentChildHandler ServerRootParent;
+        public static InSceneParentChildHandler AuthorityRootParent;
         public static bool EnableVerboseDebug = true;
         public static bool AddNetworkTransform;
         public static bool WorldPositionStays;
@@ -38,13 +37,13 @@ public class InSceneParentChildHandler : NetworkBehaviour
 
         private NetworkTransform m_NetworkTransform;
 
-        public static Dictionary<ulong, InSceneParentChildHandler> ServerRelativeInstances = new Dictionary<ulong, InSceneParentChildHandler>();
+        public static Dictionary<ulong, InSceneParentChildHandler> AuthorityRelativeInstances = new Dictionary<ulong, InSceneParentChildHandler>();
         public static Dictionary<ulong, Dictionary<ulong, InSceneParentChildHandler>> ClientRelativeInstances = new Dictionary<ulong, Dictionary<ulong, InSceneParentChildHandler>>();
 
         public static void ResetInstancesTracking(bool enableVerboseDebug)
         {
             EnableVerboseDebug = enableVerboseDebug;
-            ServerRelativeInstances.Clear();
+            AuthorityRelativeInstances.Clear();
             ClientRelativeInstances.Clear();
         }
 
@@ -121,9 +120,19 @@ private void RemoveParent(Transform child, bool worldPositionStays = true)
             }
         }
 
+        /// <summary>
+        /// DANGO-TODO: Run test where we remove the DAHost as the authority and see what breaks (if anything)
+        /// For now, handle checking authority outselves.
+        /// </summary>
+        /// <returns></returns>
+        private bool CheckForAuthority()
+        {
+            return NetworkObject.HasAuthority;
+        }
+
         public void DeparentAllChildren(bool worldPositionStays = true)
         {
-            if (IsRootParent && IsServer)
+            if (IsRootParent && HasAuthority)
             {
                 var lastChild = GetLastChild(transform);
                 if (lastChild != null)
@@ -154,7 +163,7 @@ private void ParentChild(InSceneParentChildHandler child, bool worldPositionStay
 
         public void ReParentAllChildren(bool worldPositionStays = true)
         {
-            if (IsRootParent && IsServer)
+            if (IsRootParent && HasAuthority)
             {
                 ParentChild(m_Child, worldPositionStays);
             }
@@ -162,7 +171,7 @@ public void ReParentAllChildren(bool worldPositionStays = true)
 
         public override void OnNetworkSpawn()
         {
-            if (IsServer)
+            if (HasAuthority)
             {
                 LogMessage($"[{NetworkObjectId}] Pos = ({m_TargetLocalPosition}) | Rotation ({m_TargetLocalRotation}) | Scale ({m_TargetLocalScale})");
                 if (AddNetworkTransform)
@@ -172,9 +181,13 @@ public override void OnNetworkSpawn()
                 }
                 if (IsRootParent)
                 {
-                    ServerRootParent = this;
+                    AuthorityRootParent = this;
+                }
+
+                if (!AuthorityRelativeInstances.ContainsKey(NetworkObjectId))
+                {
+                    AuthorityRelativeInstances.Add(NetworkObjectId, this);
                 }
-                ServerRelativeInstances.Add(NetworkObjectId, this);
             }
             else
             {
@@ -193,7 +206,7 @@ public override void OnNetworkSpawn()
 
         public void DeparentSetValuesAndReparent()
         {
-            if (IsServer && IsRootParent)
+            if (IsRootParent && HasAuthority)
             {
                 // Back to back de-parenting and re-parenting
                 s_GenerateRandomValues = true;
@@ -209,7 +222,7 @@ public void DeparentSetValuesAndReparent()
         /// </summary>
         public override void OnNetworkObjectParentChanged(NetworkObject parentNetworkObject)
         {
-            if (!IsServer || !IsSpawned || parentNetworkObject != null || !s_GenerateRandomValues)
+            if (!HasAuthority || !IsSpawned || parentNetworkObject != null || !s_GenerateRandomValues)
             {
                 return;
             }
@@ -225,10 +238,11 @@ public override void OnNetworkObjectParentChanged(NetworkObject parentNetworkObj
             base.OnNetworkObjectParentChanged(parentNetworkObject);
         }
 
+        private bool m_RequestSent;
 
         private void LateUpdate()
         {
-            if (!IsSpawned || !IsServer || NetworkManagerTestDisabler.IsIntegrationTest)
+            if (!IsSpawned || !HasAuthority || NetworkManagerTestDisabler.IsIntegrationTest)
             {
                 return;
             }
@@ -250,6 +264,249 @@ private void LateUpdate()
             {
                 RootParent.DeparentSetValuesAndReparent();
             }
+
+
+            if (Input.GetKeyDown(KeyCode.Space))
+            {
+                m_RequestSent = true;
+                RequestTransformInfoRpc();
+            }
+        }
+
+        public void CheckChildren()
+        {
+            if (!NetworkObject.HasAuthority || m_RequestSent || AuthorityRootParent != this)
+            {
+                return;
+            }
+
+            m_RequestSent = true;
+            RequestTransformInfoRpc();
+        }
+
+        [Rpc(SendTo.NotOwner)]
+        private void RequestTransformInfoRpc()
+        {
+            var nonAuthInstance = ClientRelativeInstances[NetworkManager.LocalClientId];
+            var childrenInfo = new ChildrenInfo()
+            {
+                Children = new List<ChildInfo>()
+            };
+
+            foreach (var instance in nonAuthInstance)
+            {
+                var childInfo = new ChildInfo()
+                {
+                    InfoType = ChildInfoType.AuthRelative,
+                    Id = instance.Key,
+                    Position = instance.Value.transform.position,
+                    Rotation = instance.Value.transform.eulerAngles,
+                    Scale = instance.Value.transform.localScale,
+                };
+                childrenInfo.Children.Add(childInfo);
+            }
+
+            var autoSync = ParentingAutoSyncManager.ClientInstances[NetworkManager.LocalClientId];
+            var count = 0;
+            foreach (var instance in autoSync.NetworkObjectAutoSyncOffTransforms)
+            {
+                var childInfo = new ChildInfo()
+                {
+                    InfoType = ChildInfoType.AutoSyncOff,
+                    Id = (ulong)count,
+                    Position = instance.position,
+                    Rotation = instance.eulerAngles,
+                    Scale = instance.localScale,
+                };
+                count++;
+                childrenInfo.Children.Add(childInfo);
+            }
+            count = 0;
+            foreach (var instance in autoSync.NetworkObjectAutoSyncOnTransforms)
+            {
+                var childInfo = new ChildInfo()
+                {
+                    InfoType = ChildInfoType.AutoSyncOn,
+                    Id = (ulong)count,
+                    Position = instance.position,
+                    Rotation = instance.eulerAngles,
+                    Scale = instance.localScale,
+                };
+                count++;
+                childrenInfo.Children.Add(childInfo);
+            }
+            count = 0;
+            foreach (var instance in autoSync.GameObjectAutoSyncOffTransforms)
+            {
+                var childInfo = new ChildInfo()
+                {
+                    InfoType = ChildInfoType.AutoSyncGameObjectOff,
+                    Id = (ulong)count,
+                    Position = instance.position,
+                    Rotation = instance.eulerAngles,
+                    Scale = instance.localScale,
+                };
+                count++;
+                childrenInfo.Children.Add(childInfo);
+            }
+            count = 0;
+            foreach (var instance in autoSync.GameObjectAutoSyncOnTransforms)
+            {
+                var childInfo = new ChildInfo()
+                {
+                    InfoType = ChildInfoType.AutoSyncGameObjectOn,
+                    Id = (ulong)count,
+                    Position = instance.position,
+                    Rotation = instance.eulerAngles,
+                    Scale = instance.localScale,
+                };
+                count++;
+                childrenInfo.Children.Add(childInfo);
+            }
+            SendTransformInfoRpc(childrenInfo);
+        }
+
+        [Rpc(SendTo.Owner)]
+        private void SendTransformInfoRpc(ChildrenInfo childrenInfo)
+        {
+            m_RequestSent = false;
+            var errorCount = 0;
+            var autoSync = ParentingAutoSyncManager.ServerInstance;
+            var position = Vector3.zero;
+            var rotation = Vector3.zero;
+            var scale = Vector3.zero;
+            var instanceName = "";
+            foreach (var childInfo in childrenInfo.Children)
+            {
+                switch (childInfo.InfoType)
+                {
+                    case ChildInfoType.AuthRelative:
+                        {
+                            var instance = AuthorityRelativeInstances[childInfo.Id];
+                            instanceName = instance.name;
+                            position = instance.transform.position;
+                            rotation = instance.transform.eulerAngles;
+                            scale = instance.transform.localScale;
+                            break;
+                        }
+                    case ChildInfoType.AutoSyncOff:
+                        {
+                            instanceName = autoSync.NetworkObjectAutoSyncOffTransforms[(int)childInfo.Id].name;
+                            position = autoSync.NetworkObjectAutoSyncOffTransforms[(int)childInfo.Id].position;
+                            rotation = autoSync.NetworkObjectAutoSyncOffTransforms[(int)childInfo.Id].eulerAngles;
+                            scale = autoSync.NetworkObjectAutoSyncOffTransforms[(int)childInfo.Id].localScale;
+                            break;
+                        }
+                    case ChildInfoType.AutoSyncOn:
+                        {
+                            instanceName = autoSync.NetworkObjectAutoSyncOnTransforms[(int)childInfo.Id].name;
+                            position = autoSync.NetworkObjectAutoSyncOnTransforms[(int)childInfo.Id].position;
+                            rotation = autoSync.NetworkObjectAutoSyncOnTransforms[(int)childInfo.Id].eulerAngles;
+                            scale = autoSync.NetworkObjectAutoSyncOnTransforms[(int)childInfo.Id].localScale;
+                            break;
+                        }
+                    case ChildInfoType.AutoSyncGameObjectOff:
+                        {
+                            instanceName = autoSync.GameObjectAutoSyncOffTransforms[(int)childInfo.Id].name;
+                            position = autoSync.GameObjectAutoSyncOffTransforms[(int)childInfo.Id].position;
+                            rotation = autoSync.GameObjectAutoSyncOffTransforms[(int)childInfo.Id].eulerAngles;
+                            scale = autoSync.GameObjectAutoSyncOffTransforms[(int)childInfo.Id].localScale;
+                            break;
+                        }
+                    case ChildInfoType.AutoSyncGameObjectOn:
+                        {
+                            instanceName = autoSync.GameObjectAutoSyncOnTransforms[(int)childInfo.Id].name;
+                            position = autoSync.GameObjectAutoSyncOnTransforms[(int)childInfo.Id].position;
+                            rotation = autoSync.GameObjectAutoSyncOnTransforms[(int)childInfo.Id].eulerAngles;
+                            scale = autoSync.GameObjectAutoSyncOnTransforms[(int)childInfo.Id].localScale;
+                            break;
+                        }
+                }
+
+                if (!Approximately(position, childInfo.Position))
+                {
+                    Debug.LogWarning($"[{childInfo.InfoType}][{instanceName}][Position Mismatch] Auth: {position} | NonAuth: {childInfo.Position}");
+                    errorCount++;
+                }
+                if (!Approximately(rotation, childInfo.Rotation))
+                {
+                    Debug.LogWarning($"[{childInfo.InfoType}][{instanceName}][Rotation Mismatch] Auth: {rotation} | NonAuth: {childInfo.Rotation}");
+                    errorCount++;
+                }
+                if (!Approximately(scale, childInfo.Scale))
+                {
+                    Debug.LogWarning($"[{childInfo.InfoType}][{instanceName}][Scale Mismatch] Auth: {scale} | NonAuth: {childInfo.Scale}");
+                    errorCount++;
+                }
+            }
+
+            Debug.Log($"Finished checking children with ({errorCount}) mismatch errors.");
+        }
+
+        protected bool Approximately(Vector3 a, Vector3 b)
+        {
+            var deltaVariance = 0.0125f;
+            return Math.Round(Mathf.Abs(a.x - b.x), 2) <= deltaVariance &&
+                Math.Round(Mathf.Abs(a.y - b.y), 2) <= deltaVariance &&
+                Math.Round(Mathf.Abs(a.z - b.z), 2) <= deltaVariance;
+        }
+    }
+
+    public struct ChildrenInfo : INetworkSerializable
+    {
+        public List<ChildInfo> Children;
+        public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReaderWriter
+        {
+            var count = 0;
+            if (serializer.IsWriter)
+            {
+                count = Children.Count;
+            }
+            serializer.SerializeValue(ref count);
+            if (serializer.IsReader)
+            {
+                Children = new List<ChildInfo>(count);
+            }
+
+            for (int i = 0; i < count; i++)
+            {
+                var childInfo = new ChildInfo();
+                if (serializer.IsWriter)
+                {
+                    childInfo = Children[i];
+                }
+                serializer.SerializeValue(ref childInfo);
+                if (serializer.IsReader)
+                {
+                    Children.Add(childInfo);
+                }
+            }
+        }
+    }
+
+    public enum ChildInfoType
+    {
+        AuthRelative,
+        AutoSyncOff,
+        AutoSyncOn,
+        AutoSyncGameObjectOff,
+        AutoSyncGameObjectOn,
+    }
+
+    public struct ChildInfo : INetworkSerializable
+    {
+        public ChildInfoType InfoType;
+        public ulong Id;
+        public Vector3 Position;
+        public Vector3 Rotation;
+        public Vector3 Scale;
+        public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReaderWriter
+        {
+            serializer.SerializeValue(ref InfoType);
+            serializer.SerializeValue(ref Id);
+            serializer.SerializeValue(ref Position);
+            serializer.SerializeValue(ref Rotation);
+            serializer.SerializeValue(ref Scale);
         }
     }
 }
diff --git a/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingAutoSyncManager.cs b/testproject/Assets/Tests/Manual/InSceneObjectParentingTests/ParentingAutoSyncManager.cs
similarity index 98%
rename from testproject/Assets/Tests/Runtime/ObjectParenting/ParentingAutoSyncManager.cs
rename to testproject/Assets/Tests/Manual/InSceneObjectParentingTests/ParentingAutoSyncManager.cs
index bd32c3f539..777c379c44 100644
--- a/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingAutoSyncManager.cs
+++ b/testproject/Assets/Tests/Manual/InSceneObjectParentingTests/ParentingAutoSyncManager.cs
@@ -3,7 +3,7 @@
 using UnityEngine;
 
 
-namespace TestProject.RuntimeTests
+namespace TestProject.ManualTests
 {
     /// <summary>
     /// Helper class that builds 4 transform lists based on parent-child hierarchy
diff --git a/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingAutoSyncManager.cs.meta b/testproject/Assets/Tests/Manual/InSceneObjectParentingTests/ParentingAutoSyncManager.cs.meta
similarity index 83%
rename from testproject/Assets/Tests/Runtime/ObjectParenting/ParentingAutoSyncManager.cs.meta
rename to testproject/Assets/Tests/Manual/InSceneObjectParentingTests/ParentingAutoSyncManager.cs.meta
index d147ac87ad..b8ed6304f2 100644
--- a/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingAutoSyncManager.cs.meta
+++ b/testproject/Assets/Tests/Manual/InSceneObjectParentingTests/ParentingAutoSyncManager.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3326399105afcf4459b51991aeeaacd2
+guid: 6cb9810cec78d7e4ca96c44f73bbbcf1
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/testproject/Assets/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs b/testproject/Assets/Tests/Manual/InSceneObjectParentingTests/ReparentingCubeNetBhv.cs
similarity index 100%
rename from testproject/Assets/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs
rename to testproject/Assets/Tests/Manual/InSceneObjectParentingTests/ReparentingCubeNetBhv.cs
diff --git a/testproject/Assets/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs.meta b/testproject/Assets/Tests/Manual/InSceneObjectParentingTests/ReparentingCubeNetBhv.cs.meta
similarity index 83%
rename from testproject/Assets/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs.meta
rename to testproject/Assets/Tests/Manual/InSceneObjectParentingTests/ReparentingCubeNetBhv.cs.meta
index 3d405245c3..a96bfea683 100644
--- a/testproject/Assets/Tests/Runtime/ObjectParenting/ReparentingCubeNetBhv.cs.meta
+++ b/testproject/Assets/Tests/Manual/InSceneObjectParentingTests/ReparentingCubeNetBhv.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9b9fb5b91091c4036bb4b0321b79f6c8
+guid: 0ca38a7c14d657e4fa7a2d73b4991ff6
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/testproject/Assets/Tests/Manual/IntegrationTestScenes/NetworkObjectSpawnerTest.unity b/testproject/Assets/Tests/Manual/IntegrationTestScenes/NetworkObjectSpawnerTest.unity
new file mode 100644
index 0000000000..ddc9c46f9f
--- /dev/null
+++ b/testproject/Assets/Tests/Manual/IntegrationTestScenes/NetworkObjectSpawnerTest.unity
@@ -0,0 +1,206 @@
+%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: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
+  m_LightingDataAsset: {fileID: 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 &1633685737
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1633685739}
+  - component: {fileID: 1633685738}
+  - component: {fileID: 1633685740}
+  - component: {fileID: 1633685741}
+  m_Layer: 0
+  m_Name: InSceneObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1633685738
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1633685737}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  GlobalObjectIdHash: 3975491472
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 1
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
+--- !u!4 &1633685739
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1633685737}
+  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 &1633685740
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1633685737}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 75c714dc47c5306488e8605e46dcd87a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &1633685741
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1633685737}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a915cfb2e4f748e4f9526a8bf5ee84f2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 1633685739}
diff --git a/testproject/Assets/Tests/Manual/IntegrationTestScenes/NetworkObjectSpawnerTest.unity.meta b/testproject/Assets/Tests/Manual/IntegrationTestScenes/NetworkObjectSpawnerTest.unity.meta
new file mode 100644
index 0000000000..9406cabace
--- /dev/null
+++ b/testproject/Assets/Tests/Manual/IntegrationTestScenes/NetworkObjectSpawnerTest.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 28ec9a0d98d9db64a9c57a79f38d6e0a
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/testproject/Assets/Tests/Manual/ManualTestsMenu.unity b/testproject/Assets/Tests/Manual/ManualTestsMenu.unity
index 0532fa5d5e..9870157bd7 100644
--- a/testproject/Assets/Tests/Manual/ManualTestsMenu.unity
+++ b/testproject/Assets/Tests/Manual/ManualTestsMenu.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
@@ -43,7 +43,6 @@ RenderSettings:
 LightmapSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 12
-  m_GIWorkflowMode: 1
   m_GISettings:
     serializedVersion: 2
     m_BounceScale: 1
@@ -66,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
@@ -923,7 +919,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_SceneMenus:
-  - {fileID: 11400000, guid: f2b30a19875731846a69d285dd4700ac, type: 2}
+  - {fileID: 11400000, guid: 703fb48fb1c457a40bd51de38e213798, type: 2}
   - {fileID: 11400000, guid: 2c0ff1138526d4041a875c84f7114513, type: 2}
   - {fileID: 11400000, guid: 5971e25d82220f448be7385f5d71ece9, type: 2}
   - {fileID: 11400000, guid: 17de05ff09d39df47a6bc85ab38dca2f, type: 2}
@@ -1101,9 +1097,8 @@ Light:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8786710035132639489}
   m_Enabled: 1
-  serializedVersion: 10
+  serializedVersion: 11
   m_Type: 1
-  m_Shape: 0
   m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
   m_Intensity: 1
   m_Range: 10
@@ -1153,8 +1148,12 @@ Light:
   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 &8786710035132639495
 Transform:
   m_ObjectHideFlags: 0
diff --git a/testproject/Assets/Tests/Manual/NestedNetworkTransforms/AutomatedPlayer-OA.prefab b/testproject/Assets/Tests/Manual/NestedNetworkTransforms/AutomatedPlayer-OA.prefab
index 00ed2f2f48..5b0f4ab7d9 100644
--- a/testproject/Assets/Tests/Manual/NestedNetworkTransforms/AutomatedPlayer-OA.prefab
+++ b/testproject/Assets/Tests/Manual/NestedNetworkTransforms/AutomatedPlayer-OA.prefab
@@ -51,6 +51,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:
@@ -96,6 +99,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0d8ad30fca3f9a240bdce16f0166033b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  AuthorityMode: 1
   UseUnreliableDeltas: 0
   SyncPositionX: 1
   SyncPositionY: 1
@@ -115,7 +119,6 @@ MonoBehaviour:
   InLocalSpace: 1
   Interpolate: 1
   SlerpPosition: 1
-  IsServerAuthority: 1
   DebugTransform: 0
   LastUpdatedPosition: {x: 0, y: 0, z: 0}
   LastUpdatedScale: {x: 0, y: 0, z: 0}
@@ -295,6 +298,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:
@@ -340,6 +346,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0d8ad30fca3f9a240bdce16f0166033b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  AuthorityMode: 1
   UseUnreliableDeltas: 0
   SyncPositionX: 1
   SyncPositionY: 1
@@ -359,7 +366,6 @@ MonoBehaviour:
   InLocalSpace: 1
   Interpolate: 1
   SlerpPosition: 1
-  IsServerAuthority: 1
   DebugTransform: 0
   LastUpdatedPosition: {x: 0, y: 0, z: 0}
   LastUpdatedScale: {x: 0, y: 0, z: 0}
@@ -388,7 +394,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 947981134, guid: 96e0a72e30d0c46c8a5c9a750e8f5807, type: 3}
       propertyPath: GlobalObjectIdHash
-      value: 503295152
+      value: 2714446911
       objectReference: {fileID: 0}
     - target: {fileID: 3809075828520557319, guid: 96e0a72e30d0c46c8a5c9a750e8f5807,
         type: 3}
@@ -557,6 +563,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: dfb1af1a9249278438d2daa2877ee2ad, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  AuthorityMode: 1
   UseUnreliableDeltas: 1
   SyncPositionX: 1
   SyncPositionY: 1
@@ -576,7 +583,6 @@ MonoBehaviour:
   InLocalSpace: 0
   Interpolate: 1
   SlerpPosition: 0
-  IsServerAuthority: 1
   DebugTransform: 0
   LastUpdatedPosition: {x: 0, y: 0, z: 0}
   LastUpdatedScale: {x: 0, y: 0, z: 0}
diff --git a/testproject/Assets/Tests/Manual/NestedNetworkTransforms/AutomatedPlayer-SA.prefab b/testproject/Assets/Tests/Manual/NestedNetworkTransforms/AutomatedPlayer-SA.prefab
index 3361d528e0..eb8da63629 100644
--- a/testproject/Assets/Tests/Manual/NestedNetworkTransforms/AutomatedPlayer-SA.prefab
+++ b/testproject/Assets/Tests/Manual/NestedNetworkTransforms/AutomatedPlayer-SA.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 772585991204072682}
+  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 4, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 296612175404815447}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!23 &6327137497379236391
 MeshRenderer:
@@ -51,6 +51,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:
@@ -96,6 +99,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0d8ad30fca3f9a240bdce16f0166033b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  AuthorityMode: 0
+  TickSyncChildren: 0
+  UseUnreliableDeltas: 0
   SyncPositionX: 1
   SyncPositionY: 1
   SyncPositionZ: 1
@@ -105,23 +111,27 @@ MonoBehaviour:
   SyncScaleX: 1
   SyncScaleY: 1
   SyncScaleZ: 1
-  SlerpPosition: 1
-  UseQuaternionSynchronization: 1
-  UseQuaternionCompression: 1
-  UseHalfFloatPrecision: 1
   PositionThreshold: 0.001
   RotAngleThreshold: 0.01
   ScaleThreshold: 0.01
+  UseQuaternionSynchronization: 1
+  UseQuaternionCompression: 1
+  UseHalfFloatPrecision: 1
   InLocalSpace: 1
   Interpolate: 1
+  SlerpPosition: 1
+  IsServerAuthority: 1
   DebugTransform: 0
-  IsServerAuthoritative: 1
   LastUpdatedPosition: {x: 0, y: 0, z: 0}
   LastUpdatedScale: {x: 0, y: 0, z: 0}
   LastUpdatedRotation: {x: 0, y: 0, z: 0, w: 0}
+  PushedPosition: {x: 0, y: 0, z: 0}
+  PushedScale: {x: 0, y: 0, z: 0}
+  PushedRotation: {x: 0, y: 0, z: 0, w: 0}
   PreviousUpdatedPosition: {x: 0, y: 0, z: 0}
   PreviousUpdatedScale: {x: 0, y: 0, z: 0}
   PreviousUpdatedRotation: {x: 0, y: 0, z: 0, w: 0}
+  m_StatesToLog: 80
   RotationSpeed: 7.4
   RotateBasedOnDirection: 0
 --- !u!1 &2771624607751045562
@@ -147,6 +157,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2771624607751045562}
+  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}
@@ -154,7 +165,6 @@ Transform:
   m_Children:
   - {fileID: 4974009855568796650}
   m_Father: {fileID: 296612175404815447}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4147667212972069939
 GameObject:
@@ -180,13 +190,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4147667212972069939}
+  serializedVersion: 2
   m_LocalRotation: {x: 0.17364816, y: -0, z: -0, w: 0.9848078}
   m_LocalPosition: {x: 0, y: 8, z: -10}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 296612175404815447}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 20, y: 0, z: 0}
 --- !u!20 &8372809022110481992
 Camera:
@@ -202,9 +212,17 @@ Camera:
   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_FocalLength: 50
   m_NormalizedViewPortRect:
     serializedVersion: 2
     x: 0
@@ -257,13 +275,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6292214655028195304}
+  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -4, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5485086383386216104}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!23 &3062926429781172158
 MeshRenderer:
@@ -282,6 +300,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:
@@ -327,6 +348,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0d8ad30fca3f9a240bdce16f0166033b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  AuthorityMode: 0
+  TickSyncChildren: 0
+  UseUnreliableDeltas: 0
   SyncPositionX: 1
   SyncPositionY: 1
   SyncPositionZ: 1
@@ -336,23 +360,27 @@ MonoBehaviour:
   SyncScaleX: 1
   SyncScaleY: 1
   SyncScaleZ: 1
-  SlerpPosition: 1
-  UseQuaternionSynchronization: 1
-  UseQuaternionCompression: 1
-  UseHalfFloatPrecision: 1
   PositionThreshold: 0.001
   RotAngleThreshold: 0.01
   ScaleThreshold: 0.01
+  UseQuaternionSynchronization: 1
+  UseQuaternionCompression: 1
+  UseHalfFloatPrecision: 1
   InLocalSpace: 1
   Interpolate: 1
+  SlerpPosition: 1
+  IsServerAuthority: 1
   DebugTransform: 0
-  IsServerAuthoritative: 1
   LastUpdatedPosition: {x: 0, y: 0, z: 0}
   LastUpdatedScale: {x: 0, y: 0, z: 0}
   LastUpdatedRotation: {x: 0, y: 0, z: 0, w: 0}
+  PushedPosition: {x: 0, y: 0, z: 0}
+  PushedScale: {x: 0, y: 0, z: 0}
+  PushedRotation: {x: 0, y: 0, z: 0, w: 0}
   PreviousUpdatedPosition: {x: 0, y: 0, z: 0}
   PreviousUpdatedScale: {x: 0, y: 0, z: 0}
   PreviousUpdatedRotation: {x: 0, y: 0, z: 0, w: 0}
+  m_StatesToLog: 80
   RotationSpeed: 7.4
   RotateBasedOnDirection: 0
 --- !u!1001 &8977898853425847701
@@ -360,6 +388,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: -745482209883575862, guid: 96e0a72e30d0c46c8a5c9a750e8f5807,
@@ -369,7 +398,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 947981134, guid: 96e0a72e30d0c46c8a5c9a750e8f5807, type: 3}
       propertyPath: GlobalObjectIdHash
-      value: 951099334
+      value: 2547197533
       objectReference: {fileID: 0}
     - target: {fileID: 3809075828520557319, guid: 96e0a72e30d0c46c8a5c9a750e8f5807,
         type: 3}
@@ -469,6 +498,33 @@ PrefabInstance:
     - {fileID: 8685790303553767877, guid: 96e0a72e30d0c46c8a5c9a750e8f5807, type: 3}
     - {fileID: -745482209883575862, guid: 96e0a72e30d0c46c8a5c9a750e8f5807, type: 3}
     - {fileID: 3809075828520557319, guid: 96e0a72e30d0c46c8a5c9a750e8f5807, type: 3}
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 8685790303553767874, guid: 96e0a72e30d0c46c8a5c9a750e8f5807,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1522619104359096714}
+    - targetCorrespondingSourceObject: {fileID: 8685790303553767874, guid: 96e0a72e30d0c46c8a5c9a750e8f5807,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 5485086383386216104}
+    - targetCorrespondingSourceObject: {fileID: 8685790303553767874, guid: 96e0a72e30d0c46c8a5c9a750e8f5807,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 7199215624742357828}
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 8685790303553767886, guid: 96e0a72e30d0c46c8a5c9a750e8f5807,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 4389916208190318681}
+    - targetCorrespondingSourceObject: {fileID: 8685790303553767886, guid: 96e0a72e30d0c46c8a5c9a750e8f5807,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 5376990732947334198}
+    - targetCorrespondingSourceObject: {fileID: 8685790303553767886, guid: 96e0a72e30d0c46c8a5c9a750e8f5807,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 7431853297519116304}
   m_SourcePrefab: {fileID: 100100000, guid: 96e0a72e30d0c46c8a5c9a750e8f5807, type: 3}
 --- !u!4 &296612175404815447 stripped
 Transform:
@@ -511,6 +567,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: dfb1af1a9249278438d2daa2877ee2ad, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  AuthorityMode: 0
+  TickSyncChildren: 1
+  UseUnreliableDeltas: 0
   SyncPositionX: 1
   SyncPositionY: 1
   SyncPositionZ: 1
@@ -520,23 +579,27 @@ MonoBehaviour:
   SyncScaleX: 1
   SyncScaleY: 1
   SyncScaleZ: 1
-  SlerpPosition: 0
-  UseQuaternionSynchronization: 1
-  UseQuaternionCompression: 0
-  UseHalfFloatPrecision: 1
   PositionThreshold: 0.001
   RotAngleThreshold: 0.001
   ScaleThreshold: 0.001
+  UseQuaternionSynchronization: 1
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 1
   InLocalSpace: 0
   Interpolate: 1
+  SlerpPosition: 0
+  IsServerAuthority: 1
   DebugTransform: 0
-  IsServerAuthoritative: 1
   LastUpdatedPosition: {x: 0, y: 0, z: 0}
   LastUpdatedScale: {x: 0, y: 0, z: 0}
   LastUpdatedRotation: {x: 0, y: 0, z: 0, w: 0}
+  PushedPosition: {x: 0, y: 0, z: 0}
+  PushedScale: {x: 0, y: 0, z: 0}
+  PushedRotation: {x: 0, y: 0, z: 0, w: 0}
   PreviousUpdatedPosition: {x: 0, y: 0, z: 0}
   PreviousUpdatedScale: {x: 0, y: 0, z: 0}
   PreviousUpdatedRotation: {x: 0, y: 0, z: 0, w: 0}
+  m_StatesToLog: 80
 --- !u!114 &7431853297519116304
 MonoBehaviour:
   m_ObjectHideFlags: 0
diff --git a/testproject/Assets/Tests/Manual/NestedNetworkTransforms/AutomatedPlayerMover.cs b/testproject/Assets/Tests/Manual/NestedNetworkTransforms/AutomatedPlayerMover.cs
index 051a3e3621..d4585ff802 100644
--- a/testproject/Assets/Tests/Manual/NestedNetworkTransforms/AutomatedPlayerMover.cs
+++ b/testproject/Assets/Tests/Manual/NestedNetworkTransforms/AutomatedPlayerMover.cs
@@ -36,16 +36,16 @@ private void UpdateDestination()
             }
         }
 
-        public override void OnNetworkSpawn()
+        protected override void OnNetworkPostSpawn()
         {
-            base.OnNetworkSpawn();
             if (CanCommitToTransform)
             {
                 UpdateDestination();
             }
+            base.OnNetworkPostSpawn();
         }
 
-        protected override void Update()
+        private void Update()
         {
             if (!IsSpawned)
             {
@@ -83,10 +83,6 @@ protected override void Update()
                     }
                 }
             }
-            else
-            {
-                base.Update();
-            }
         }
     }
 }
diff --git a/testproject/Assets/Tests/Manual/NestedNetworkTransforms/ChildMover.cs b/testproject/Assets/Tests/Manual/NestedNetworkTransforms/ChildMover.cs
index 61b7cee5e3..f731d6fe95 100644
--- a/testproject/Assets/Tests/Manual/NestedNetworkTransforms/ChildMover.cs
+++ b/testproject/Assets/Tests/Manual/NestedNetworkTransforms/ChildMover.cs
@@ -32,15 +32,16 @@ public bool IsAuthority()
             return CanCommitToTransform;
         }
 
-        private Vector3 m_LastPredictedPosition;
-
         public void PlayerIsMoving(float movementDirection)
         {
             if (IsSpawned && CanCommitToTransform)
             {
                 var rotateDirection = RotateBasedOnDirection ? movementDirection * RotationSpeed : RotationSpeed;
-
-                transform.RotateAround(m_RootParentTransform.position, transform.TransformDirection(Vector3.up), RotationSpeed);
+                // Just make sure we are set to local space for this test
+                if (InLocalSpace)
+                {
+                    transform.RotateAround(m_RootParentTransform.position, transform.TransformDirection(Vector3.up), RotationSpeed);
+                }
             }
         }
 
@@ -53,9 +54,9 @@ private Transform GetRootParentTransform(Transform transform)
             return transform;
         }
 
-        public override void OnNetworkSpawn()
+        protected override void OnNetworkPostSpawn()
         {
-            if ((OnIsServerAuthoritative() && IsServer) || (!OnIsServerAuthoritative() && IsOwner))
+            if (CanCommitToTransform)
             {
                 m_RootParentTransform = GetRootParentTransform(transform);
                 if (RandomizeScale)
@@ -63,7 +64,7 @@ public override void OnNetworkSpawn()
                     transform.localScale = transform.localScale * Random.Range(0.5f, 1.5f);
                 }
             }
-            base.OnNetworkSpawn();
+            base.OnNetworkPostSpawn();
         }
     }
 }
diff --git a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimatedCubeController.cs b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimatedCubeController.cs
index badeb189ff..7898adb47b 100644
--- a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimatedCubeController.cs
+++ b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimatedCubeController.cs
@@ -36,15 +36,6 @@ public override void OnNetworkSpawn()
             m_Rotate = m_Animator.GetBool("Rotate");
         }
 
-        private bool HasAuthority()
-        {
-            if (IsOwnerAuthority() || IsServerAuthority())
-            {
-                return true;
-            }
-            return false;
-        }
-
         private bool IsServerAuthority()
         {
             if (IsServer && m_IsServerAuthoritative)
diff --git a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers.meta b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers.meta
index d395b2042f..c5f625f3b3 100644
--- a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers.meta
+++ b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: eeb2bc472f117324ba142015c6b174fb
+guid: d162cdd54f6bdfe489cbae414c73ef5d
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/Cheer.anim.meta b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/Cheer.anim.meta
index b06d56a9a4..e0fad3ec09 100644
--- a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/Cheer.anim.meta
+++ b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/Cheer.anim.meta
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 79802e17d7973a548b0a042ad46e5628
+guid: 309a1768d8cd2ab429a7c0234b2e6ca8
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 7400000
+  mainObjectFileID: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/CubeAnimController.controller b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/CubeAnimController.controller
index 712b5b1b07..a52ac8de59 100644
--- a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/CubeAnimController.controller
+++ b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/CubeAnimController.controller
@@ -12,7 +12,9 @@ AnimatorState:
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: 8309520331244214419}
-  m_StateMachineBehaviours: []
+  m_StateMachineBehaviours:
+  - {fileID: 3444807930424531754}
+  - {fileID: 8115982846350031446}
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
   m_WriteDefaultValues: 1
@@ -21,7 +23,7 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 79802e17d7973a548b0a042ad46e5628, type: 2}
+  m_Motion: {fileID: 7400000, guid: 309a1768d8cd2ab429a7c0234b2e6ca8, type: 2}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
@@ -133,12 +135,36 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 0453bccc6b450d342adf2573f378fe58, type: 2}
+  m_Motion: {fileID: 7400000, guid: 95c52c0e06da2a640859b32d147fb032, type: 2}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!114 &3444807930424531754
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: beb3702bd4c8d274e9dffe0c6467eafb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &8115982846350031446
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: dec8cf4a19a8ef745ae0440ec04911ae, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1101 &8309520331244214419
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
diff --git a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/CubeAnimController.controller.meta b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/CubeAnimController.controller.meta
index d208cba06f..14e2f28a58 100644
--- a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/CubeAnimController.controller.meta
+++ b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/CubeAnimController.controller.meta
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: f7e23f629acb39741bf0fff41d87f5d2
+guid: 01c21f02e45c80f48895ff36143bc980
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 9100000
+  mainObjectFileID: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/DualTriggers.asset b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/DualTriggers.asset
index eaa5c5e6a1..da40a7a684 100644
--- a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/DualTriggers.asset
+++ b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/DualTriggers.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 39a16938ffb5cd846a9f6df7a686a9c4, type: 3}
   m_Name: DualTriggers
   m_EditorClassIdentifier: 
-  SceneToReference: {fileID: 102900000, guid: a2408927b1ca1c74bb359402d44b4c73, type: 3}
+  SceneToReference: {fileID: 102900000, guid: e12df855278120245a8a936a6a52b5bd, type: 3}
   m_IncludedScenes: []
   m_DisplayName: Dual Animation Triggers
   m_ReferencedScenes:
diff --git a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/DualTriggers.asset.meta b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/DualTriggers.asset.meta
index 797c79fc02..6597b68f91 100644
--- a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/DualTriggers.asset.meta
+++ b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/DualTriggers.asset.meta
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: f2b30a19875731846a69d285dd4700ac
+guid: 703fb48fb1c457a40bd51de38e213798
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 11400000
+  mainObjectFileID: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/Idle.anim.meta b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/Idle.anim.meta
index da19afd178..b911066c61 100644
--- a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/Idle.anim.meta
+++ b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/Idle.anim.meta
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 0453bccc6b450d342adf2573f378fe58
+guid: 95c52c0e06da2a640859b32d147fb032
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 7400000
+  mainObjectFileID: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/NetworkAnimatorDualTriggerCheer.unity b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/NetworkAnimatorDualTriggerCheer.unity
index da993d6440..d24b1355df 100644
--- a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/NetworkAnimatorDualTriggerCheer.unity
+++ b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/NetworkAnimatorDualTriggerCheer.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
@@ -43,7 +43,6 @@ RenderSettings:
 LightmapSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 12
-  m_GIWorkflowMode: 1
   m_GISettings:
     serializedVersion: 2
     m_BounceScale: 1
@@ -66,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
@@ -155,7 +151,7 @@ MonoBehaviour:
   NetworkConfig:
     ProtocolVersion: 0
     NetworkTransport: {fileID: 57527694}
-    PlayerPrefab: {fileID: 3830151999068797299, guid: 3a2af202b2ff8534994ecd7ad7eac25e,
+    PlayerPrefab: {fileID: 3830151999068797299, guid: 074ae41741b33f84ca886d5b8dc482d2,
       type: 3}
     Prefabs:
       NetworkPrefabsLists: []
@@ -174,6 +170,10 @@ MonoBehaviour:
     LoadSceneTimeOut: 120
     SpawnTimeout: 1
     EnableNetworkLogs: 1
+    NetworkTopology: 0
+    UseCMBService: 0
+    AutoSpawnPlayerPrefabClientSide: 1
+    NetworkProfilingMetrics: 1
     OldPrefabList:
     - Override: 0
       Prefab: {fileID: 3214090169675393154, guid: 978fc8cd63a1294438ebf3b352814970,
@@ -212,6 +212,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ProtocolType: 0
+  m_UseWebSockets: 0
+  m_UseEncryption: 0
   m_MaxPacketQueueSize: 128
   m_MaxPayloadSize: 80000
   m_HeartbeatTimeoutMS: 500
@@ -256,8 +258,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 4083883540
+  GlobalObjectIdHash: 1224819179
   InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 1
   AlwaysReplicateAsRoot: 0
   SynchronizeTransform: 1
   ActiveSceneSynchronization: 0
@@ -364,7 +368,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Press "C" and "Space" to make the cube play animations.
+  m_Text: Press "2" to play cheer and "1" to go back to idle.
 --- !u!222 &146283181
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -568,9 +572,8 @@ Light:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 825254415}
   m_Enabled: 1
-  serializedVersion: 10
+  serializedVersion: 11
   m_Type: 1
-  m_Shape: 0
   m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
   m_Intensity: 1
   m_Range: 10
@@ -620,8 +623,12 @@ Light:
   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 &825254417
 Transform:
   m_ObjectHideFlags: 0
diff --git a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/NetworkAnimatorDualTriggerCheer.unity.meta b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/NetworkAnimatorDualTriggerCheer.unity.meta
index 7727b44419..9da1646480 100644
--- a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/NetworkAnimatorDualTriggerCheer.unity.meta
+++ b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/NetworkAnimatorDualTriggerCheer.unity.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a2408927b1ca1c74bb359402d44b4c73
+guid: e12df855278120245a8a936a6a52b5bd
 DefaultImporter:
   externalObjects: {}
   userData: 
diff --git a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/PlayerCheer.prefab b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/PlayerCheer.prefab
index ff4119e153..28500f72e9 100644
--- a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/PlayerCheer.prefab
+++ b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/PlayerCheer.prefab
@@ -217,10 +217,13 @@ 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:
-  - {fileID: 2100000, guid: 52c34e1beacd44c9bb0f6375c891b4cf, type: 2}
+  - {fileID: 2100000, guid: 5d9678afcf333564dab383a5db660ae3, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -327,6 +330,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:
@@ -375,7 +381,7 @@ BoxCollider:
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!95 &1727324036711386622
 Animator:
-  serializedVersion: 5
+  serializedVersion: 7
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -383,12 +389,13 @@ Animator:
   m_GameObject: {fileID: 2830397513182166708}
   m_Enabled: 1
   m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: f7e23f629acb39741bf0fff41d87f5d2, type: 2}
+  m_Controller: {fileID: 9100000, guid: 01c21f02e45c80f48895ff36143bc980, type: 2}
   m_CullingMode: 0
   m_UpdateMode: 0
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
+  m_AnimatePhysics: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
@@ -431,7 +438,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 2830397513182166708}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a599d57c2665c3d46bc5a6a92915fdc6, type: 3}
+  m_Script: {fileID: 11500000, guid: 77114a4761fbbf04ebafd6a884d3d312, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
 --- !u!1 &3100330109001020412
@@ -498,6 +505,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:
@@ -546,7 +556,7 @@ BoxCollider:
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!95 &6695442631618495005
 Animator:
-  serializedVersion: 5
+  serializedVersion: 7
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -554,12 +564,13 @@ Animator:
   m_GameObject: {fileID: 3100330109001020412}
   m_Enabled: 1
   m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: f7e23f629acb39741bf0fff41d87f5d2, type: 2}
+  m_Controller: {fileID: 9100000, guid: 01c21f02e45c80f48895ff36143bc980, type: 2}
   m_CullingMode: 0
   m_UpdateMode: 0
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
+  m_AnimatePhysics: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
@@ -602,7 +613,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 3100330109001020412}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a599d57c2665c3d46bc5a6a92915fdc6, type: 3}
+  m_Script: {fileID: 11500000, guid: 77114a4761fbbf04ebafd6a884d3d312, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
 --- !u!1 &3734653738213143300
@@ -664,10 +675,13 @@ 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:
-  - {fileID: 2100000, guid: 52c34e1beacd44c9bb0f6375c891b4cf, type: 2}
+  - {fileID: 2100000, guid: 5d9678afcf333564dab383a5db660ae3, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -759,8 +773,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 0
+  GlobalObjectIdHash: 4075820365
   InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 1
   AlwaysReplicateAsRoot: 0
   SynchronizeTransform: 1
   ActiveSceneSynchronization: 0
@@ -794,6 +810,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  AuthorityMode: 0
   UseUnreliableDeltas: 0
   SyncPositionX: 1
   SyncPositionY: 1
@@ -872,10 +889,13 @@ 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:
-  - {fileID: 2100000, guid: d8e0487da5b3d4659909d18d138cff5a, type: 2}
+  - {fileID: 2100000, guid: 08e0c61b5a83bfb46a037cbecbebc671, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -1056,10 +1076,13 @@ 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:
-  - {fileID: 2100000, guid: d8e0487da5b3d4659909d18d138cff5a, type: 2}
+  - {fileID: 2100000, guid: 08e0c61b5a83bfb46a037cbecbebc671, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
diff --git a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/PlayerCheer.prefab.meta b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/PlayerCheer.prefab.meta
index 7975255c4a..5a12db0331 100644
--- a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/PlayerCheer.prefab.meta
+++ b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/PlayerCheer.prefab.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3a2af202b2ff8534994ecd7ad7eac25e
+guid: 074ae41741b33f84ca886d5b8dc482d2
 PrefabImporter:
   externalObjects: {}
   userData: 
diff --git a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/PlayerCheerBase.prefab b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/PlayerCheerBase.prefab
index 1323189415..637516cab3 100644
--- a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/PlayerCheerBase.prefab
+++ b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/PlayerCheerBase.prefab
@@ -65,6 +65,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:
@@ -123,8 +126,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 3743743769
+  GlobalObjectIdHash: 204130358
   InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 1
   AlwaysReplicateAsRoot: 0
   SynchronizeTransform: 1
   ActiveSceneSynchronization: 0
@@ -134,7 +139,7 @@ MonoBehaviour:
   AutoObjectParentSync: 1
 --- !u!95 &6956292178752767115
 Animator:
-  serializedVersion: 5
+  serializedVersion: 7
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -142,12 +147,13 @@ Animator:
   m_GameObject: {fileID: 1488386875393216933}
   m_Enabled: 1
   m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: f7e23f629acb39741bf0fff41d87f5d2, type: 2}
+  m_Controller: {fileID: 9100000, guid: 01c21f02e45c80f48895ff36143bc980, type: 2}
   m_CullingMode: 0
   m_UpdateMode: 0
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
+  m_AnimatePhysics: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
@@ -190,7 +196,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1488386875393216933}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a599d57c2665c3d46bc5a6a92915fdc6, type: 3}
+  m_Script: {fileID: 11500000, guid: 77114a4761fbbf04ebafd6a884d3d312, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
 --- !u!1 &4590500335814930323
@@ -252,10 +258,13 @@ 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:
-  - {fileID: 2100000, guid: d8e0487da5b3d4659909d18d138cff5a, type: 2}
+  - {fileID: 2100000, guid: 5d9678afcf333564dab383a5db660ae3, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -357,10 +366,13 @@ 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:
-  - {fileID: 2100000, guid: d8e0487da5b3d4659909d18d138cff5a, type: 2}
+  - {fileID: 2100000, guid: 5d9678afcf333564dab383a5db660ae3, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
diff --git a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/PlayerCheerBase.prefab.meta b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/PlayerCheerBase.prefab.meta
index 7ae32f0bf2..6e6b14d140 100644
--- a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/PlayerCheerBase.prefab.meta
+++ b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/PlayerCheerBase.prefab.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e4e9fd3d93a158244a79608314400ff9
+guid: 7752ac8c0bfaed64c8de839537204114
 PrefabImporter:
   externalObjects: {}
   userData: 
diff --git a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/PlayerCheerInput.cs.meta b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/PlayerCheerInput.cs.meta
index e0cef3bac8..3feb8e1dd3 100644
--- a/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/PlayerCheerInput.cs.meta
+++ b/testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/PlayerCheerInput.cs.meta
@@ -1,11 +1,2 @@
 fileFormatVersion: 2
-guid: a599d57c2665c3d46bc5a6a92915fdc6
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+guid: 77114a4761fbbf04ebafd6a884d3d312
\ No newline at end of file
diff --git a/testproject/Assets/Tests/Manual/PrefabTestAssets/InSceneDefined.prefab b/testproject/Assets/Tests/Manual/PrefabTestAssets/InSceneDefined.prefab
new file mode 100644
index 0000000000..38898ce5f7
--- /dev/null
+++ b/testproject/Assets/Tests/Manual/PrefabTestAssets/InSceneDefined.prefab
@@ -0,0 +1,84 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4575260563898367230
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8312435577503810917}
+  - component: {fileID: 2081691940845411492}
+  - component: {fileID: 6320789816902190951}
+  - component: {fileID: 8719147349821933225}
+  m_Layer: 0
+  m_Name: InSceneDefined
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8312435577503810917
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4575260563898367230}
+  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 &2081691940845411492
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4575260563898367230}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  GlobalObjectIdHash: 2100153195
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  DistributeOwnership: 0
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
+--- !u!114 &6320789816902190951
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4575260563898367230}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a915cfb2e4f748e4f9526a8bf5ee84f2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &8719147349821933225
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4575260563898367230}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 75dd2043257d8e049acf958cacdf1738, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  IsInSceneDefined: 1
diff --git a/testproject/Assets/Tests/Manual/PrefabTestAssets/InSceneDefined.prefab.meta b/testproject/Assets/Tests/Manual/PrefabTestAssets/InSceneDefined.prefab.meta
new file mode 100644
index 0000000000..86c4063206
--- /dev/null
+++ b/testproject/Assets/Tests/Manual/PrefabTestAssets/InSceneDefined.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4a05b9aab67281141953cf6878506d5c
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/testproject/Assets/Tests/Manual/PrefabTestAssets/PrefabListTestAsset.asset b/testproject/Assets/Tests/Manual/PrefabTestAssets/PrefabListTestAsset.asset
index 1fc372ba10..65c5b6cc7f 100644
--- a/testproject/Assets/Tests/Manual/PrefabTestAssets/PrefabListTestAsset.asset
+++ b/testproject/Assets/Tests/Manual/PrefabTestAssets/PrefabListTestAsset.asset
@@ -36,3 +36,11 @@ MonoBehaviour:
     SourceHashToOverride: 0
     OverridingTargetPrefab: {fileID: 5911443254905569495, guid: 1e7fa5aea121ba0459459b497c2f03e8,
       type: 3}
+  - Override: 0
+    Prefab: {fileID: 4575260563898367230, guid: 4a05b9aab67281141953cf6878506d5c,
+      type: 3}
+    SourcePrefabToOverride: {fileID: 6994329648695279756, guid: 5c4a10e01b6668147ba4ccda6a584181,
+      type: 3}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 5911443254905569495, guid: 1e7fa5aea121ba0459459b497c2f03e8,
+      type: 3}
diff --git a/testproject/Assets/Tests/Manual/PrefabTestAssets/PrefabTestScene.unity b/testproject/Assets/Tests/Manual/PrefabTestAssets/PrefabTestScene.unity
index 758e034f18..a6204f5469 100644
--- a/testproject/Assets/Tests/Manual/PrefabTestAssets/PrefabTestScene.unity
+++ b/testproject/Assets/Tests/Manual/PrefabTestAssets/PrefabTestScene.unity
@@ -459,86 +459,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
---- !u!1 &910084391
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 910084393}
-  - component: {fileID: 910084392}
-  - component: {fileID: 910084395}
-  - component: {fileID: 910084394}
-  m_Layer: 0
-  m_Name: InSceneDefined
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &910084392
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 910084391}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 3666358976
-  InScenePlacedSourceGlobalObjectIdHash: 0
-  AlwaysReplicateAsRoot: 0
-  SynchronizeTransform: 1
-  ActiveSceneSynchronization: 0
-  SceneMigrationSynchronization: 1
-  SpawnWithObservers: 1
-  DontDestroyWithOwner: 0
-  AutoObjectParentSync: 1
---- !u!4 &910084393
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 910084391}
-  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 &910084394
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 910084391}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 75dd2043257d8e049acf958cacdf1738, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  IsInSceneDefined: 1
---- !u!114 &910084395
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 910084391}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a915cfb2e4f748e4f9526a8bf5ee84f2, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &1713911584
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -743,6 +663,84 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 60, y: 0, z: 0}
+--- !u!1001 &909918602607054652
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 2081691940845411492, guid: 4a05b9aab67281141953cf6878506d5c,
+        type: 3}
+      propertyPath: GlobalObjectIdHash
+      value: 3537691690
+      objectReference: {fileID: 0}
+    - target: {fileID: 2081691940845411492, guid: 4a05b9aab67281141953cf6878506d5c,
+        type: 3}
+      propertyPath: InScenePlacedSourceGlobalObjectIdHash
+      value: 2100153195
+      objectReference: {fileID: 0}
+    - target: {fileID: 4575260563898367230, guid: 4a05b9aab67281141953cf6878506d5c,
+        type: 3}
+      propertyPath: m_Name
+      value: InSceneDefined
+      objectReference: {fileID: 0}
+    - target: {fileID: 8312435577503810917, guid: 4a05b9aab67281141953cf6878506d5c,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8312435577503810917, guid: 4a05b9aab67281141953cf6878506d5c,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8312435577503810917, guid: 4a05b9aab67281141953cf6878506d5c,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8312435577503810917, guid: 4a05b9aab67281141953cf6878506d5c,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8312435577503810917, guid: 4a05b9aab67281141953cf6878506d5c,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8312435577503810917, guid: 4a05b9aab67281141953cf6878506d5c,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8312435577503810917, guid: 4a05b9aab67281141953cf6878506d5c,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8312435577503810917, guid: 4a05b9aab67281141953cf6878506d5c,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8312435577503810917, guid: 4a05b9aab67281141953cf6878506d5c,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8312435577503810917, guid: 4a05b9aab67281141953cf6878506d5c,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 4a05b9aab67281141953cf6878506d5c, type: 3}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0
@@ -753,4 +751,4 @@ SceneRoots:
   - {fileID: 826833804}
   - {fileID: 1713911584}
   - {fileID: 557098469}
-  - {fileID: 910084393}
+  - {fileID: 909918602607054652}
diff --git a/testproject/Assets/Tests/Manual/SceneTransitioningAdditive/SceneTransitioningBase1.unity b/testproject/Assets/Tests/Manual/SceneTransitioningAdditive/SceneTransitioningBase1.unity
index b9af226321..bab567858b 100644
--- a/testproject/Assets/Tests/Manual/SceneTransitioningAdditive/SceneTransitioningBase1.unity
+++ b/testproject/Assets/Tests/Manual/SceneTransitioningAdditive/SceneTransitioningBase1.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,12 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 12
-  m_GIWorkflowMode: 1
+  serializedVersion: 13
+  m_BakeOnSceneLoad: 0
   m_GISettings:
     serializedVersion: 2
     m_BounceScale: 1
@@ -67,9 +66,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
@@ -104,7 +100,7 @@ NavMeshSettings:
   serializedVersion: 2
   m_ObjectHideFlags: 0
   m_BuildSettings:
-    serializedVersion: 2
+    serializedVersion: 3
     agentTypeID: 0
     agentRadius: 0.5
     agentHeight: 2
@@ -117,7 +113,7 @@ NavMeshSettings:
     cellSize: 0.16666667
     manualTileSize: 0
     tileSize: 256
-    accuratePlacement: 0
+    buildHeightMesh: 0
     maxJobWorkers: 0
     preserveTilesOutsideBounds: 0
     debug:
@@ -154,7 +150,6 @@ RectTransform:
   m_Children:
   - {fileID: 1351730454}
   m_Father: {fileID: 290861172}
-  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -173,6 +168,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 475de064003ff104fb88b1fbccd0f417, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  ShowTopMostFoldoutHeaderGroup: 1
   m_ActivateOnLoad: 0
   m_SceneToLoad: AdditiveSceneMultiInstance
   m_SceneAsset: {fileID: 102900000, guid: 0ae94f636016d3b40bfbecad57d99553, type: 3}
@@ -208,7 +204,6 @@ RectTransform:
   m_Children:
   - {fileID: 1347823142}
   m_Father: {fileID: 290861172}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
@@ -227,6 +222,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 244f0414ea8419b41ac51adb305d64b0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  ShowTopMostFoldoutHeaderGroup: 1
   m_SwitchSceneButtonObject: {fileID: 1347823141}
   m_SceneToSwitchTo: SceneTransitioningBase2
   m_EnableAutoSwitch: 0
@@ -245,10 +241,18 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   GlobalObjectIdHash: 412081913
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 1
   AlwaysReplicateAsRoot: 0
   SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
+  SyncOwnerTransformWhenParented: 1
+  AllowOwnerToParent: 0
 --- !u!1 &37242881
 GameObject:
   m_ObjectHideFlags: 0
@@ -274,9 +278,8 @@ Light:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 37242881}
   m_Enabled: 1
-  serializedVersion: 10
+  serializedVersion: 11
   m_Type: 1
-  m_Shape: 0
   m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
   m_Intensity: 1
   m_Range: 10
@@ -326,8 +329,12 @@ Light:
   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 &37242883
 Transform:
   m_ObjectHideFlags: 0
@@ -335,13 +342,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 37242881}
+  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_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
 --- !u!224 &42803802 stripped
 RectTransform:
@@ -381,7 +388,6 @@ RectTransform:
   m_Children:
   - {fileID: 1429502879}
   m_Father: {fileID: 362129048}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -457,7 +463,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 362129048}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -537,7 +542,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 212638130}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -609,9 +613,17 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 57392470}
   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
+  serializedVersion: 3
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!23 &57392472
@@ -631,6 +643,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:
@@ -671,13 +686,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 57392470}
+  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -30.5, y: 0.49999994, z: 0}
   m_LocalScale: {x: 1, y: 3, z: 62}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1332123092}
-  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &59926368
 GameObject:
@@ -710,7 +725,6 @@ RectTransform:
   m_Children:
   - {fileID: 1651938367}
   m_Father: {fileID: 290861172}
-  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -729,6 +743,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 475de064003ff104fb88b1fbccd0f417, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  ShowTopMostFoldoutHeaderGroup: 1
   m_ActivateOnLoad: 0
   m_SceneToLoad: AdditiveSceneMultiInstance
   m_SceneAsset: {fileID: 102900000, guid: 0ae94f636016d3b40bfbecad57d99553, type: 3}
@@ -764,7 +779,6 @@ RectTransform:
   m_Children:
   - {fileID: 615497064}
   m_Father: {fileID: 1351730454}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -840,7 +854,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1640896166}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -965,7 +978,9 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
@@ -983,7 +998,6 @@ RectTransform:
   m_Children:
   - {fileID: 1865409449}
   m_Father: {fileID: 0}
-  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1022,7 +1036,6 @@ RectTransform:
   m_Children:
   - {fileID: 57138324}
   m_Father: {fileID: 1783165220}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -1143,7 +1156,9 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
@@ -1175,7 +1190,6 @@ RectTransform:
   - {fileID: 1362072618}
   - {fileID: 1783165220}
   m_Father: {fileID: 0}
-  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1213,7 +1227,6 @@ RectTransform:
   m_Children:
   - {fileID: 362129048}
   m_Father: {fileID: 290861172}
-  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1232,6 +1245,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 475de064003ff104fb88b1fbccd0f417, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  ShowTopMostFoldoutHeaderGroup: 1
   m_ActivateOnLoad: 0
   m_SceneToLoad: AdditiveScene2
   m_SceneAsset: {fileID: 102900000, guid: c6a3d883c8253ee43bca4f2b03797d7b, type: 3}
@@ -1267,7 +1281,6 @@ RectTransform:
   - {fileID: 1689223598}
   - {fileID: 1638885888}
   m_Father: {fileID: 884557066}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1362,9 +1375,17 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 336568645}
   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
+  serializedVersion: 3
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!23 &336568647
@@ -1384,6 +1405,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:
@@ -1424,13 +1448,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 336568645}
+  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: -0.50000006, z: 0}
   m_LocalScale: {x: 60, y: 1, z: 60}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1332123092}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &348836178
 GameObject:
@@ -1463,7 +1487,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2084811628}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1540,7 +1563,6 @@ RectTransform:
   - {fileID: 44393280}
   - {fileID: 57065842}
   m_Father: {fileID: 291820796}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1640,7 +1662,6 @@ RectTransform:
   m_Children:
   - {fileID: 432733929}
   m_Father: {fileID: 1651938367}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -1716,7 +1737,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 418148061}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1792,7 +1812,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2079590080}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1868,7 +1887,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2058276876}
-  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1957,9 +1975,17 @@ Camera:
   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_FocalLength: 50
   m_NormalizedViewPortRect:
     serializedVersion: 2
     x: 0
@@ -1993,13 +2019,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 575203307}
+  serializedVersion: 2
   m_LocalRotation: {x: 0.41890106, y: -0, z: -0, w: 0.9080319}
   m_LocalPosition: {x: 0, y: 42, z: -46}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 49.530003, y: 0, z: 0}
 --- !u!1 &599972120
 GameObject:
@@ -2032,7 +2058,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1588117328}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -2112,7 +2137,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 125866603}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2188,7 +2212,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1362072618}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -2268,7 +2291,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1783165220}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -2348,7 +2370,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1290928583}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2424,7 +2445,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1398648428}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2500,7 +2520,6 @@ RectTransform:
   m_Children:
   - {fileID: 300124662}
   m_Father: {fileID: 290861172}
-  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2519,6 +2538,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 475de064003ff104fb88b1fbccd0f417, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  ShowTopMostFoldoutHeaderGroup: 1
   m_ActivateOnLoad: 0
   m_SceneToLoad: AdditiveScene1
   m_SceneAsset: {fileID: 102900000, guid: 41a0239b0c49e2047b7063c822f0df8a, type: 3}
@@ -2529,8 +2549,7 @@ LightingSettings:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: 
-  serializedVersion: 4
-  m_GIWorkflowMode: 1
+  serializedVersion: 9
   m_EnableBakedLightmaps: 1
   m_EnableRealtimeLightmaps: 0
   m_RealtimeEnvironmentLighting: 1
@@ -2540,6 +2559,8 @@ LightingSettings:
   m_UsingShadowmask: 1
   m_BakeBackend: 1
   m_LightmapMaxSize: 1024
+  m_LightmapSizeFixed: 0
+  m_UseMipmapLimits: 1
   m_BakeResolution: 40
   m_Padding: 2
   m_LightmapCompression: 3
@@ -2553,13 +2574,11 @@ LightingSettings:
   m_FilterMode: 1
   m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
   m_ExportTrainingData: 0
+  m_EnableWorkerProcessBaking: 1
   m_TrainingDataDestination: TrainingData
   m_RealtimeResolution: 2
   m_ForceWhiteAlbedo: 0
   m_ForceUpdates: 0
-  m_FinalGather: 0
-  m_FinalGatherRayCount: 256
-  m_FinalGatherFiltering: 1
   m_PVRCulling: 1
   m_PVRSampling: 1
   m_PVRDirectSampleCount: 32
@@ -2568,8 +2587,8 @@ LightingSettings:
   m_PVREnvironmentReferencePointCount: 2048
   m_LightProbeSampleCountMultiplier: 4
   m_PVRBounces: 2
-  m_PVRMinBounces: 1
-  m_PVREnvironmentMIS: 1
+  m_PVRMinBounces: 2
+  m_PVREnvironmentImportanceSampling: 1
   m_PVRFilteringMode: 1
   m_PVRDenoiserTypeDirect: 1
   m_PVRDenoiserTypeIndirect: 1
@@ -2583,7 +2602,7 @@ LightingSettings:
   m_PVRFilteringAtrousPositionSigmaDirect: 0.5
   m_PVRFilteringAtrousPositionSigmaIndirect: 2
   m_PVRFilteringAtrousPositionSigmaAO: 1
-  m_PVRTiledBaking: 0
+  m_RespectSceneVisibilityWhenBakingGI: 0
 --- !u!1 &906714043
 GameObject:
   m_ObjectHideFlags: 0
@@ -2615,7 +2634,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2019086800}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -2669,6 +2687,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: 4518755925279129984, guid: 3a854a190ab5b1b4fb00bec725fdda9e,
@@ -2731,6 +2750,11 @@ PrefabInstance:
       propertyPath: GlobalObjectIdHash
       value: 3537583461
       objectReference: {fileID: 0}
+    - target: {fileID: 4518755925279129985, guid: 3a854a190ab5b1b4fb00bec725fdda9e,
+        type: 3}
+      propertyPath: InScenePlacedSourceGlobalObjectIdHash
+      value: 225455949
+      objectReference: {fileID: 0}
     - target: {fileID: 4518755925279129986, guid: 3a854a190ab5b1b4fb00bec725fdda9e,
         type: 3}
       propertyPath: m_Name
@@ -2742,6 +2766,9 @@ PrefabInstance:
       value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 3a854a190ab5b1b4fb00bec725fdda9e, type: 3}
 --- !u!1 &1008611498
 GameObject:
@@ -2774,7 +2801,6 @@ RectTransform:
   m_Children:
   - {fileID: 1640896166}
   m_Father: {fileID: 290861172}
-  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2793,6 +2819,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 475de064003ff104fb88b1fbccd0f417, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  ShowTopMostFoldoutHeaderGroup: 1
   m_ActivateOnLoad: 0
   m_SceneToLoad: AdditiveSceneMultiInstance
   m_SceneAsset: {fileID: 102900000, guid: 0ae94f636016d3b40bfbecad57d99553, type: 3}
@@ -2828,8 +2855,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 593a2fe42fa9d37498c96f9a383b6521, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  RunInBackground: 1
-  LogLevel: 1
+  NetworkManagerExpanded: 0
   NetworkConfig:
     ProtocolVersion: 0
     NetworkTransport: {fileID: 1024114723}
@@ -2852,6 +2878,10 @@ MonoBehaviour:
     LoadSceneTimeOut: 120
     SpawnTimeout: 1
     EnableNetworkLogs: 1
+    NetworkTopology: 0
+    UseCMBService: 0
+    AutoSpawnPlayerPrefabClientSide: 1
+    NetworkProfilingMetrics: 1
     OldPrefabList:
     - Override: 0
       Prefab: {fileID: 771575417923360811, guid: c0a45bdb516f341498d933b7a7ed4fc1,
@@ -2903,6 +2933,8 @@ MonoBehaviour:
       SourcePrefabToOverride: {fileID: 0}
       SourceHashToOverride: 0
       OverridingTargetPrefab: {fileID: 0}
+  RunInBackground: 1
+  LogLevel: 1
 --- !u!4 &1024114720
 Transform:
   m_ObjectHideFlags: 0
@@ -2910,13 +2942,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1024114717}
+  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_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1024114721
 MonoBehaviour:
@@ -2957,6 +2989,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ProtocolType: 0
+  m_UseWebSockets: 0
+  m_UseEncryption: 0
   m_MaxPacketQueueSize: 128
   m_MaxPayloadSize: 512000
   m_HeartbeatTimeoutMS: 500
@@ -3001,6 +3035,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8c48ea35c67e64f7fac22a3f6831ca88, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  ShowTopMostFoldoutHeaderGroup: 1
   AutoSpawnEnable: 1
   InitialSpawnDelay: 0.2
   SpawnsPerSecond: 1
@@ -3027,13 +3062,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1113539278}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0.5, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1113539281
 MonoBehaviour:
@@ -3048,10 +3083,18 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   GlobalObjectIdHash: 1983031731
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 1
   AlwaysReplicateAsRoot: 0
   SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
+  SyncOwnerTransformWhenParented: 1
+  AllowOwnerToParent: 0
 --- !u!1 &1187680249
 GameObject:
   m_ObjectHideFlags: 0
@@ -3083,7 +3126,6 @@ RectTransform:
   m_Children:
   - {fileID: 2019086800}
   m_Father: {fileID: 290861172}
-  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -3102,6 +3144,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 475de064003ff104fb88b1fbccd0f417, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  ShowTopMostFoldoutHeaderGroup: 1
   m_ActivateOnLoad: 0
   m_SceneToLoad: AdditiveSceneMultiInstance
   m_SceneAsset: {fileID: 102900000, guid: 0ae94f636016d3b40bfbecad57d99553, type: 3}
@@ -3136,7 +3179,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1651938367}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -3217,7 +3259,6 @@ RectTransform:
   m_Children:
   - {fileID: 833301795}
   m_Father: {fileID: 1640896166}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -3285,6 +3326,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1332123091}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0.000000059604645, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -3296,7 +3338,6 @@ Transform:
   - {fileID: 57392474}
   - {fileID: 1336081255}
   m_Father: {fileID: 0}
-  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1336081251
 GameObject:
@@ -3325,9 +3366,17 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1336081251}
   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
+  serializedVersion: 3
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!23 &1336081253
@@ -3347,6 +3396,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:
@@ -3387,13 +3439,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1336081251}
+  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 30.5, y: 0.49999994, z: 0}
   m_LocalScale: {x: 1, y: 3, z: 62}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1332123092}
-  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1336892118
 GameObject:
@@ -3426,7 +3478,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1351730454}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -3508,7 +3559,6 @@ RectTransform:
   m_Children:
   - {fileID: 1846334315}
   m_Father: {fileID: 34066665}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
@@ -3641,7 +3691,6 @@ RectTransform:
   - {fileID: 125866603}
   - {fileID: 1336892119}
   m_Father: {fileID: 19371290}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -3741,7 +3790,6 @@ RectTransform:
   - {fileID: 2084811628}
   - {fileID: 703861692}
   m_Father: {fileID: 290861172}
-  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -3840,7 +3888,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 290861172}
-  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -3919,7 +3966,6 @@ RectTransform:
   m_Children:
   - {fileID: 1523424137}
   m_Father: {fileID: 2058276876}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -3958,7 +4004,6 @@ RectTransform:
   m_Children:
   - {fileID: 865202802}
   m_Father: {fileID: 2019086800}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -4034,7 +4079,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 44393280}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -4111,7 +4155,6 @@ RectTransform:
   - {fileID: 2079590080}
   - {fileID: 1489972349}
   m_Father: {fileID: 290861172}
-  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -4210,7 +4253,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1456950069}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -4290,7 +4332,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1387688805}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -4366,7 +4407,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1889006547}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -4444,7 +4484,6 @@ RectTransform:
   m_Children:
   - {fileID: 599972121}
   m_Father: {fileID: 290861172}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -4576,7 +4615,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 300124662}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -4657,7 +4695,6 @@ RectTransform:
   - {fileID: 1290928583}
   - {fileID: 163541782}
   m_Father: {fileID: 1008611499}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -4757,7 +4794,6 @@ RectTransform:
   - {fileID: 418148061}
   - {fileID: 1210784442}
   m_Father: {fileID: 59926369}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -4857,7 +4893,6 @@ RectTransform:
   m_Children:
   - {fileID: 1691305196}
   m_Father: {fileID: 300124662}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -4933,7 +4968,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1689223598}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -5010,7 +5044,6 @@ RectTransform:
   - {fileID: 212638130}
   - {fileID: 725420114}
   m_Father: {fileID: 290861172}
-  m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -5138,13 +5171,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1834318145}
+  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -431, y: -242.5, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 290861172}
-  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1846334314
 GameObject:
@@ -5177,7 +5210,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1347823142}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -5253,9 +5285,17 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1857685343}
   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
+  serializedVersion: 3
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!23 &1857685345
@@ -5275,6 +5315,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:
@@ -5315,19 +5358,20 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1857685343}
+  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0.49999994, z: -30.5}
   m_LocalScale: {x: 60, y: 3, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1332123092}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1865409448
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 167044834}
     m_Modifications:
     - target: {fileID: 6633621479308595792, guid: d725b5588e1b956458798319e6541d84,
@@ -5441,6 +5485,9 @@ PrefabInstance:
       value: ConnectionModeButtons
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d725b5588e1b956458798319e6541d84, type: 3}
 --- !u!224 &1865409449 stripped
 RectTransform:
@@ -5478,7 +5525,6 @@ RectTransform:
   m_Children:
   - {fileID: 1549858059}
   m_Father: {fileID: 2058276876}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.25}
   m_AnchorMax: {x: 1, y: 0.75}
@@ -5517,7 +5563,6 @@ RectTransform:
   - {fileID: 1398648428}
   - {fileID: 906714044}
   m_Father: {fileID: 1187680250}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -5616,7 +5661,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2058276876}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.25}
   m_AnchorMax: {x: 1, y: 0.75}
@@ -5688,9 +5732,17 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2028091268}
   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
+  serializedVersion: 3
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!23 &2028091270
@@ -5710,6 +5762,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:
@@ -5750,13 +5805,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2028091268}
+  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0.49999994, z: 30.5}
   m_LocalScale: {x: 60, y: 3, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1332123092}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2058276875
 GameObject:
@@ -5792,7 +5847,6 @@ RectTransform:
   - {fileID: 1387688805}
   - {fileID: 562991979}
   m_Father: {fileID: 290861172}
-  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -5894,7 +5948,6 @@ RectTransform:
   m_Children:
   - {fileID: 441263735}
   m_Father: {fileID: 1456950069}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -5971,7 +6024,6 @@ RectTransform:
   m_Children:
   - {fileID: 348836179}
   m_Father: {fileID: 1362072618}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -6041,13 +6093,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2107482020}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 318.45444, y: 110.697815, z: 216.79077}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2107482022
 MonoBehaviour:
@@ -6061,6 +6113,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: cb5f3e55f5dd247129d8a4979b80ebbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  ShowTopMostFoldoutHeaderGroup: 1
   m_ClientServerToggle: {fileID: 1588117327}
   m_TrackSceneEvents: 1
 --- !u!114 &2107482023
@@ -6076,15 +6129,24 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   GlobalObjectIdHash: 3197939627
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 1
   AlwaysReplicateAsRoot: 0
   SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
+  SyncOwnerTransformWhenParented: 1
+  AllowOwnerToParent: 0
 --- !u!1001 &2848221156282925290
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 290861172}
     m_Modifications:
     - target: {fileID: 2848221156307247792, guid: 3200770c16e3b2b4ebe7f604154faac7,
@@ -6244,4 +6306,20 @@ PrefabInstance:
       objectReference: {fileID: 11400000, guid: c10d995498e0c514a853c3506031d3fb,
         type: 2}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 3200770c16e3b2b4ebe7f604154faac7, type: 3}
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 575203310}
+  - {fileID: 37242883}
+  - {fileID: 1024114720}
+  - {fileID: 167044834}
+  - {fileID: 290861172}
+  - {fileID: 1113539280}
+  - {fileID: 1332123092}
+  - {fileID: 2107482021}
+  - {fileID: 960545998}
diff --git a/testproject/Assets/Tests/Manual/Scripts/IntegrationNetworkTransform.cs b/testproject/Assets/Tests/Manual/Scripts/IntegrationNetworkTransform.cs
index 1146c1969e..feeec569f4 100644
--- a/testproject/Assets/Tests/Manual/Scripts/IntegrationNetworkTransform.cs
+++ b/testproject/Assets/Tests/Manual/Scripts/IntegrationNetworkTransform.cs
@@ -19,9 +19,6 @@ namespace TestProject.ManualTests
 {
     public class IntegrationNetworkTransform : NetworkTransform
     {
-
-        public bool IsServerAuthority = true;
-
         public bool DebugTransform;
 
         public Vector3 LastUpdatedPosition;
@@ -54,11 +51,6 @@ protected override void Awake()
 #endif
         }
 
-        protected override bool OnIsServerAuthoritative()
-        {
-            return IsServerAuthority;
-        }
-
         protected override void OnAuthorityPushTransformState(ref NetworkTransformState networkTransformState)
         {
             base.OnAuthorityPushTransformState(ref networkTransformState);
@@ -176,7 +168,9 @@ public void NetworkSerialize<T>(BufferSerializer<T> serializer) where T : IReade
             }
         }
         private const int k_StatesToLog = 80;
-        private bool m_StopLoggingStates = false;
+#if DEBUG_NETWORKTRANSFORM || UNITY_INCLUDE_TESTS
+        private bool m_StopLoggingStates;
+#endif
         private Dictionary<ulong, Dictionary<ulong, List<HalfPosDebugStates>>> m_FirstInitialStateUpdates = new Dictionary<ulong, Dictionary<ulong, List<HalfPosDebugStates>>>();
 
         private void InternalAddLogEntry(ref NetworkTransformState networkTransformState, ulong targetClient, bool preUpdate = false)
@@ -219,7 +213,11 @@ private void InternalAddLogEntry(ref NetworkTransformState networkTransformState
             ownerTable[localClientId].Add(state);
             if (ownerTable[localClientId].Count >= m_StatesToLog)
             {
-                m_StopLoggingStates = true;
+                if (DebugTransform && !m_StopLoggingStates)
+                {
+                    m_StopLoggingStates = true;
+                }
+
                 if (IsServer)
                 {
                     LogInitialTransformStates(localClientId, ownerId);
diff --git a/testproject/Assets/Tests/Manual/Scripts/ParentPlayerToInSceneNetworkObject.cs b/testproject/Assets/Tests/Manual/Scripts/ParentPlayerToInSceneNetworkObject.cs
index 699f0ed47e..6aa6985962 100644
--- a/testproject/Assets/Tests/Manual/Scripts/ParentPlayerToInSceneNetworkObject.cs
+++ b/testproject/Assets/Tests/Manual/Scripts/ParentPlayerToInSceneNetworkObject.cs
@@ -7,32 +7,37 @@ public class ParentPlayerToInSceneNetworkObject : NetworkBehaviour
     {
         public override void OnNetworkSpawn()
         {
-            if (IsServer && NetworkManager.IsServer)
+            if (IsServer && IsOwner)
             {
-                // Server subscribes to the NetworkSceneManager.OnSceneEvent event
-                NetworkManager.SceneManager.OnSceneEvent += SceneManager_OnSceneEvent;
-
+                // Client-Server mode, the server handles parenting the players
+                if (!NetworkManager.DistributedAuthorityMode)
+                {
+                    NetworkManager.OnClientConnectedCallback += NetworkManager_OnClientConnectedCallback;
+                }
                 // Server player is parented under this NetworkObject
                 SetPlayerParent(NetworkManager.LocalClientId);
             }
         }
 
+        private void NetworkManager_OnClientConnectedCallback(ulong clientId)
+        {
+            if (clientId != NetworkManager.LocalClientId)
+            {
+                // Set the newly joined and synchronized client-player as a child of this in-scene placed NetworkObject
+                SetPlayerParent(clientId);
+            }
+        }
+
         private void SetPlayerParent(ulong clientId)
         {
-            if (IsSpawned && IsServer)
+            if (IsSpawned)
             {
-                // As long as the client (player) is in the connected clients list
-                if (NetworkManager.ConnectedClients.ContainsKey(clientId))
+                var playerObject = NetworkManager.SpawnManager.GetPlayerNetworkObject(clientId);
+                if (playerObject.gameObject.scene != gameObject.scene)
                 {
-                    var playerObject = NetworkManager.ConnectedClients[clientId].PlayerObject;
-                    if (playerObject.gameObject.scene != gameObject.scene)
-                    {
-                        SceneManager.MoveGameObjectToScene(playerObject.gameObject, gameObject.scene);
-                    }
-                    // Set the player as a child of this in-scene placed NetworkObject
-                    // We parent in local space by setting the WorldPositionStays value to false
-                    NetworkManager.ConnectedClients[clientId].PlayerObject.TrySetParent(NetworkObject, false);
+                    SceneManager.MoveGameObjectToScene(playerObject.gameObject, gameObject.scene);
                 }
+                playerObject.TrySetParent(NetworkObject, false);
             }
         }
 
diff --git a/testproject/Assets/Tests/Manual/Scripts/PlayerMovementManager.cs b/testproject/Assets/Tests/Manual/Scripts/PlayerMovementManager.cs
index c5099e6a25..5811e6aeac 100644
--- a/testproject/Assets/Tests/Manual/Scripts/PlayerMovementManager.cs
+++ b/testproject/Assets/Tests/Manual/Scripts/PlayerMovementManager.cs
@@ -25,7 +25,7 @@ private void Update()
                 return;
             }
 
-            if (m_RandomMovement.HasAuthority())
+            if (m_RandomMovement.IsAuthority())
             {
                 if (Input.GetKeyDown(KeyCode.Space) && IsOwner)
                 {
diff --git a/testproject/Assets/Tests/Manual/Scripts/RandomMovement.cs b/testproject/Assets/Tests/Manual/Scripts/RandomMovement.cs
index 9b6eaaf71c..c54e908458 100644
--- a/testproject/Assets/Tests/Manual/Scripts/RandomMovement.cs
+++ b/testproject/Assets/Tests/Manual/Scripts/RandomMovement.cs
@@ -16,7 +16,7 @@ public class RandomMovement : NetworkBehaviour, IPlayerMovement
         private NetworkTransform m_NetworkTransform;
         private ClientNetworkTransform m_ClientNetworkTransform;
 
-        public bool HasAuthority()
+        public bool IsAuthority()
         {
             if (m_NetworkTransform != null)
             {
@@ -38,7 +38,7 @@ public override void OnNetworkSpawn()
             m_NetworkTransform = GetComponent<NetworkTransform>();
             if (NetworkObject != null && m_Rigidbody != null)
             {
-                if (HasAuthority())
+                if (IsAuthority())
                 {
                     ChangeDirection(true, true);
                 }
@@ -61,7 +61,7 @@ private void FixedUpdate()
             {
                 return;
             }
-            if (HasAuthority())
+            if (IsAuthority())
             {
                 if (m_Rigidbody == null)
                 {
@@ -81,7 +81,7 @@ private void FixedUpdate()
 
         private void OnCollisionStay(Collision collision)
         {
-            if (HasAuthority())
+            if (IsAuthority())
             {
                 if (collision.gameObject.CompareTag("Floor") || collision.gameObject.CompareTag("GenericObject"))
                 {
diff --git a/testproject/Assets/Tests/Runtime/AddressablesTests.cs b/testproject/Assets/Tests/Runtime/AddressablesTests.cs
index 7fa0782437..8af531b0b2 100644
--- a/testproject/Assets/Tests/Runtime/AddressablesTests.cs
+++ b/testproject/Assets/Tests/Runtime/AddressablesTests.cs
@@ -12,8 +12,9 @@
 
 namespace TestProject.RuntimeTests
 {
-    [TestFixture(HostOrServer.Server)]
+    [TestFixture(HostOrServer.DAHost)]
     [TestFixture(HostOrServer.Host)]
+    [TestFixture(HostOrServer.Server)]
     public class AddressablesTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 2;
@@ -33,7 +34,6 @@ protected override NetworkManagerInstatiationMode OnSetIntegrationTestMode()
             return NetworkManagerInstatiationMode.DoNotCreate;
         }
 
-
         protected override void OnInlineTearDown()
         {
             ShutdownAndCleanUp();
diff --git a/testproject/Assets/Tests/Runtime/AnalyticsTests.cs b/testproject/Assets/Tests/Runtime/AnalyticsTests.cs
new file mode 100644
index 0000000000..3db6bc103f
--- /dev/null
+++ b/testproject/Assets/Tests/Runtime/AnalyticsTests.cs
@@ -0,0 +1,202 @@
+#if UNITY_EDITOR
+using System.Collections;
+using NUnit.Framework;
+using Unity.Netcode;
+using Unity.Netcode.Editor;
+using Unity.Netcode.TestHelpers.Runtime;
+using UnityEngine.TestTools;
+
+namespace TestProject.RuntimeTests
+{
+    /// <summary>
+    /// In-Editor only test<br />
+    /// Validates the analytics event data collection process.<br />
+    /// <see cref="ValidateCollectionProcess"/>
+    /// </summary>
+    internal class AnalyticsTests : NetcodeIntegrationTest
+    {
+        protected override int NumberOfClients => 0;
+
+        private NetcodeAnalytics m_NetcodeAnalytics;
+
+        protected override IEnumerator OnSetup()
+        {
+            NetcodeAnalytics.IsIntegrationTest = true;
+            m_NetcodeAnalytics = Unity.Netcode.Editor.NetworkManagerHelper.Singleton.NetcodeAnalytics;
+            yield return base.OnSetup();
+        }
+
+        protected override IEnumerator OnTearDown()
+        {
+            NetcodeAnalytics.IsIntegrationTest = false;
+            yield return base.OnTearDown();
+        }
+
+        private bool m_NetworkManagerStarted;
+        private bool m_NetworkManagerStopped;
+        private IEnumerator StartAndStopSession(int expectedCount, bool isHost, bool isDistributedAuthority)
+        {
+            m_NetworkManagerStarted = false;
+            m_NetworkManagerStopped = false;
+
+            m_ServerNetworkManager.NetworkConfig.NetworkTopology = isDistributedAuthority ? NetworkTopologyTypes.DistributedAuthority : NetworkTopologyTypes.ClientServer;
+
+            if (!isHost)
+            {
+                m_ServerNetworkManager.StartServer();
+            }
+            else
+            {
+                m_ServerNetworkManager.StartHost();
+            }
+            yield return WaitForConditionOrTimeOut(() => m_NetworkManagerStarted);
+            var serverOrHost = isHost ? "Host" : "Server";
+            AssertOnTimeout($"Failed to start {nameof(NetworkManager)} as a {serverOrHost} using a {m_ServerNetworkManager.NetworkConfig.NetworkTopology} {nameof(NetworkConfig.NetworkTopology)}!");
+
+            yield return StopNetworkManager();
+        }
+
+        private IEnumerator StopNetworkManager()
+        {
+            var serverOrHost = m_ServerNetworkManager.IsHost ? "Host" : "Server";
+
+            m_ServerNetworkManager.Shutdown();
+            yield return WaitForConditionOrTimeOut(() => m_NetworkManagerStopped);
+            AssertOnTimeout($"Failed to stop {nameof(NetworkManager)} as a {serverOrHost} using a {m_ServerNetworkManager.NetworkConfig.NetworkTopology} {nameof(NetworkConfig.NetworkTopology)}!");
+        }
+
+        private void OnServerStarted()
+        {
+            m_NetworkManagerStarted = true;
+        }
+
+        private void OnServerStopped(bool wasHost)
+        {
+            m_NetworkManagerStopped = true;
+        }
+
+        /// <summary>
+        /// Validates the NGO analytics gathering process: <br />
+        /// - When entering play mode any previous analytics events should be cleared.<br />
+        /// - Each session while in play mode should be tracked (minimal processing).<br />
+        /// - When exiting play mode the sessions should be processed and cleared.<br />
+        /// - There should only be one unique analytic data event per unique session configuration.<br />
+        /// </summary>
+        [UnityTest]
+        public IEnumerator ValidateCollectionProcess()
+        {
+            var expectedCount = 0;
+            var currentCount = 0;
+            m_ServerNetworkManager.OnServerStarted += OnServerStarted;
+            m_ServerNetworkManager.OnServerStopped += OnServerStopped;
+            m_PlayerPrefab.SetActive(false);
+            m_ServerNetworkManager.NetworkConfig.PlayerPrefab = null;
+            yield return StopNetworkManager();
+            Assert.True(m_NetcodeAnalytics.RecentSessions.Count == 1, $"Expected 1 session but found: {m_NetcodeAnalytics.RecentSessions.Count}!");
+            Assert.True(m_NetcodeAnalytics.AnalyticsTestResults.Count == 0, $"Expected 0 analytics events but found: {m_NetcodeAnalytics.AnalyticsTestResults.Count}!");
+
+            // Simulate exiting play mode
+            m_NetcodeAnalytics.ModeChanged(UnityEditor.PlayModeStateChange.ExitingPlayMode, m_ServerNetworkManager);
+            Assert.True(m_NetcodeAnalytics.AnalyticsTestResults.Count == 1, $"Expected 1 analytics event but found: {m_NetcodeAnalytics.AnalyticsTestResults.Count}!");
+
+            // Simulate entering play mode
+            m_NetcodeAnalytics.ModeChanged(UnityEditor.PlayModeStateChange.EnteredPlayMode, m_ServerNetworkManager);
+
+            Assert.IsFalse(m_ServerNetworkManager.IsListening, $"Networkmanager should be stopped but is still listening!");
+            // Client-Server
+            // Start as a Server and then shutdown
+            yield return StartAndStopSession(expectedCount, false, false);
+            expectedCount++;
+            Assert.True(m_NetcodeAnalytics.RecentSessions.Count == expectedCount, $"Expected {expectedCount} session but found: {m_NetcodeAnalytics.RecentSessions.Count}!");
+
+            // Start as a server again with the same settings and then shutdown
+            // (this should be excluded in the final analytics event data)
+            yield return StartAndStopSession(expectedCount, false, false);
+            expectedCount++;
+            Assert.True(m_NetcodeAnalytics.RecentSessions.Count == expectedCount, $"Expected {expectedCount} session but found: {m_NetcodeAnalytics.RecentSessions.Count}!");
+
+            // Start as a Host and then shutdown
+            yield return StartAndStopSession(expectedCount, true, false);
+            expectedCount++;
+            Assert.True(m_NetcodeAnalytics.RecentSessions.Count == expectedCount, $"Expected {expectedCount} session but found: {m_NetcodeAnalytics.RecentSessions.Count}!");
+
+            // Start as a DAHost and then shutdown
+            yield return StartAndStopSession(expectedCount, true, true);
+            expectedCount++;
+            Assert.True(m_NetcodeAnalytics.RecentSessions.Count == expectedCount, $"Expected {expectedCount} session but found: {m_NetcodeAnalytics.RecentSessions.Count}!");
+
+            // Start as a Host again and then shutdown
+            // (this should be excluded in the final analytics event data)
+            yield return StartAndStopSession(expectedCount, true, false);
+            expectedCount++;
+            Assert.True(m_NetcodeAnalytics.RecentSessions.Count == expectedCount, $"Expected {expectedCount} session but found: {m_NetcodeAnalytics.RecentSessions.Count}!");
+            Assert.True(m_NetcodeAnalytics.AnalyticsTestResults.Count == 0, $"Expected 0 analytics events but found: {m_NetcodeAnalytics.AnalyticsTestResults.Count}!");
+
+            //////////////////////////////////////////////////
+            // Validating that each session's configuration is tracked for generating the analytics data events.
+            // Verify session 1
+            var session = m_NetcodeAnalytics.RecentSessions[currentCount];
+            Assert.True(session.WasServer && !session.WasClient, $"Expected session to be started as a server session but it was not! Server: {session.WasServer} Client: {session.WasClient}");
+            Assert.True(session.NetworkConfig.NetworkTopology == NetworkTopologyTypes.ClientServer, $"Expected session to be a {NetworkTopologyTypes.ClientServer} session but it was {session.NetworkConfig.NetworkTopology}!");
+
+            // Verify session 2
+            currentCount++;
+            session = m_NetcodeAnalytics.RecentSessions[currentCount];
+            Assert.True(session.WasServer && !session.WasClient, $"Expected session to be started as a server session but it was not! Server: {session.WasServer} Client: {session.WasClient}");
+            Assert.True(session.NetworkConfig.NetworkTopology == NetworkTopologyTypes.ClientServer, $"Expected session to be a {NetworkTopologyTypes.ClientServer} session but it was {session.NetworkConfig.NetworkTopology}!");
+
+            // Verify session 3
+            currentCount++;
+            session = m_NetcodeAnalytics.RecentSessions[currentCount];
+            Assert.True(session.WasServer && session.WasClient, $"Expected session to be started as a host session but it was not! Server: {session.WasServer}Client: {session.WasClient}");
+            Assert.True(session.NetworkConfig.NetworkTopology == NetworkTopologyTypes.ClientServer, $"Expected session to be a {NetworkTopologyTypes.ClientServer} session but it was {session.NetworkConfig.NetworkTopology}!");
+
+            // Verify session 4
+            currentCount++;
+            session = m_NetcodeAnalytics.RecentSessions[currentCount];
+            Assert.True(session.WasServer && session.WasClient, $"Expected session to be started as a host session but it was not! Server: {session.WasServer}Client: {session.WasClient}");
+            Assert.True(session.NetworkConfig.NetworkTopology == NetworkTopologyTypes.DistributedAuthority, $"Expected session to be a {NetworkTopologyTypes.DistributedAuthority} session but it was {session.NetworkConfig.NetworkTopology}!");
+
+            // Verify session 5
+            currentCount++;
+            session = m_NetcodeAnalytics.RecentSessions[currentCount];
+            Assert.True(session.WasServer == true && session.WasClient, $"Expected session to be started as a host session but it was not! Server: {session.WasServer}Client: {session.WasClient}");
+            Assert.True(session.NetworkConfig.NetworkTopology == NetworkTopologyTypes.ClientServer, $"Expected session to be a {NetworkTopologyTypes.ClientServer} session but it was {session.NetworkConfig.NetworkTopology}!");
+
+            //////////////////////////////////////////////////
+            // Validating that the analytics event data that would be sent should only contain information on the 3 unique session configurations
+            // Client-Server as a Server
+            // Client-Server as a Host
+            // Distributed Authority as a DAHost
+            m_NetcodeAnalytics.ModeChanged(UnityEditor.PlayModeStateChange.ExitingPlayMode, m_ServerNetworkManager);
+
+            // Verify that we cleared out the NetcodeAnalytics.RecentSessions when we exited play mode
+            Assert.True(m_NetcodeAnalytics.RecentSessions.Count == 0, $"After exiting play mode we expected 0 RecentSessions but had {m_NetcodeAnalytics.RecentSessions.Count}");
+
+            // Adjust our expected count to be 2 less than the RecentSessions since we intentionally included two identical sessions.
+            // (There should only be unique session configurations included in the final analytics event data entries)
+            expectedCount -= 2;
+
+            Assert.True(m_NetcodeAnalytics.AnalyticsTestResults.Count == expectedCount, $"Expected {expectedCount} analytics event but found: {m_NetcodeAnalytics.AnalyticsTestResults.Count}!");
+            currentCount = 0;
+            // Verify event data 1
+            var eventData = m_NetcodeAnalytics.AnalyticsTestResults[currentCount].Data;
+            Assert.True(eventData.WasServer && !eventData.WasClient, $"Expected session to be started as a server session but it was not! WasServer: {eventData.WasServer} WasClient: {eventData.WasClient}");
+            Assert.True(!eventData.IsDistributedAuthority, $"Expected IsDistributedAuthority to be false but it was true!");
+
+            // Verify event data 2
+            currentCount++;
+            eventData = m_NetcodeAnalytics.AnalyticsTestResults[currentCount].Data;
+            Assert.True(eventData.WasServer && eventData.WasClient, $"Expected session to be started as a Host session but it was not! WasServer: {eventData.WasServer} WasClient: {eventData.WasClient}");
+            Assert.True(!eventData.IsDistributedAuthority, $"Expected IsDistributedAuthority to be false but it was true!");
+
+            // Verify event data 3
+            currentCount++;
+            eventData = m_NetcodeAnalytics.AnalyticsTestResults[currentCount].Data;
+            Assert.True(eventData.WasServer && eventData.WasClient, $"Expected session to be started as a host session but it was not! WasServer: {eventData.WasServer} WasClient: {eventData.WasClient}");
+            Assert.True(eventData.IsDistributedAuthority, $"Expected IsDistributedAuthority to be true but it was false!");
+            yield return null;
+        }
+    }
+}
+#endif
diff --git a/testproject/Assets/Tests/Runtime/AnalyticsTests.cs.meta b/testproject/Assets/Tests/Runtime/AnalyticsTests.cs.meta
new file mode 100644
index 0000000000..0075e04b38
--- /dev/null
+++ b/testproject/Assets/Tests/Runtime/AnalyticsTests.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 095c486606a56464ab25cccb457df562
\ No newline at end of file
diff --git a/testproject/Assets/Tests/Runtime/Animation/NetworkAnimatorTests.cs b/testproject/Assets/Tests/Runtime/Animation/NetworkAnimatorTests.cs
index c9d47c8237..7befcfab22 100644
--- a/testproject/Assets/Tests/Runtime/Animation/NetworkAnimatorTests.cs
+++ b/testproject/Assets/Tests/Runtime/Animation/NetworkAnimatorTests.cs
@@ -19,8 +19,15 @@ namespace TestProject.RuntimeTests
     /// Possibly we could build this at runtime, but for now it uses the same animator controller as the manual
     /// test does.
     /// </summary>
-    [TestFixture(HostOrServer.Host)]
-    [TestFixture(HostOrServer.Server)]
+    [TestFixture(HostOrServer.DAHost, OwnerShipMode.ClientOwner, AuthoritativeMode.OwnerAuth)]
+    [TestFixture(HostOrServer.Host, OwnerShipMode.ServerOwner, AuthoritativeMode.OwnerAuth)]
+    [TestFixture(HostOrServer.Host, OwnerShipMode.ServerOwner, AuthoritativeMode.ServerAuth)]
+    [TestFixture(HostOrServer.Host, OwnerShipMode.ClientOwner, AuthoritativeMode.OwnerAuth)]
+    [TestFixture(HostOrServer.Host, OwnerShipMode.ClientOwner, AuthoritativeMode.ServerAuth)]
+    [TestFixture(HostOrServer.Server, OwnerShipMode.ServerOwner, AuthoritativeMode.OwnerAuth)]
+    [TestFixture(HostOrServer.Server, OwnerShipMode.ServerOwner, AuthoritativeMode.ServerAuth)]
+    [TestFixture(HostOrServer.Server, OwnerShipMode.ClientOwner, AuthoritativeMode.OwnerAuth)]
+    [TestFixture(HostOrServer.Server, OwnerShipMode.ClientOwner, AuthoritativeMode.ServerAuth)]
     public class NetworkAnimatorTests : NetcodeIntegrationTest
     {
         private const string k_AnimatorObjectName = "AnimatorObject";
@@ -35,20 +42,23 @@ public class NetworkAnimatorTests : NetcodeIntegrationTest
         protected override int NumberOfClients => 3;
         private GameObject m_AnimationTestPrefab => m_AnimatorObjectPrefab ? m_AnimatorObjectPrefab as GameObject : null;
         private GameObject m_AnimationOwnerTestPrefab => m_OwnerAnimatorObjectPrefab ? m_OwnerAnimatorObjectPrefab as GameObject : null;
-
         private GameObject m_AnimationCheerTestPrefab => m_PlayerCheerPrefab ? m_PlayerCheerPrefab as GameObject : null;
         private GameObject m_AnimationCheerOwnerTestPrefab => m_OwnerPlayerCheerPrefab ? m_OwnerPlayerCheerPrefab as GameObject : null;
 
         private AnimatorTestHelper.ParameterValues m_ParameterValues;
         private Object m_AnimatorObjectPrefab;
         private Object m_OwnerAnimatorObjectPrefab;
-
         private Object m_PlayerCheerPrefab;
         private Object m_OwnerPlayerCheerPrefab;
+        private OwnerShipMode m_OwnerShipMode;
+        private AuthoritativeMode m_AuthoritativeMode;
 
-        public NetworkAnimatorTests(HostOrServer hostOrServer)
+
+        public NetworkAnimatorTests(HostOrServer hostOrServer, OwnerShipMode ownerShipMode, AuthoritativeMode authoritative)
         {
             m_UseHost = hostOrServer == HostOrServer.Host;
+            m_OwnerShipMode = ownerShipMode;
+            m_AuthoritativeMode = authoritative;
         }
 
         protected override void OnOneTimeSetup()
@@ -64,7 +74,6 @@ protected override void OnOneTimeSetup()
 
             m_PlayerCheerPrefab = Resources.Load(k_PlayerCheerName);
             Assert.NotNull(m_PlayerCheerPrefab, $"Failed to load resource {k_PlayerCheerName}!");
-
             base.OnOneTimeSetup();
         }
 
@@ -94,11 +103,10 @@ protected override void OnServerAndClientsCreated()
             // Owner authority prefab
             var networkObjectOwner = (m_OwnerAnimatorObjectPrefab as GameObject).GetComponent<NetworkObject>();
             networkObjectOwner.NetworkManagerOwner = m_ServerNetworkManager;
-            networkObjectOwner.name = "OwnerAuthority";
+            networkObjectOwner.name = "OwnerAuth";
             NetcodeIntegrationTestHelpers.MakeNetworkObjectTestPrefab(networkObjectOwner);
             var networkAnimatorOwnerAuthPrefab = new NetworkPrefab() { Prefab = networkObjectOwner.gameObject };
             m_ServerNetworkManager.NetworkConfig.Prefabs.Add(networkAnimatorOwnerAuthPrefab);
-
             // Server authority player cheer prefab
             var networkObjectPlayerCheerServer = (m_PlayerCheerPrefab as GameObject).GetComponent<NetworkObject>();
             networkObjectPlayerCheerServer.NetworkManagerOwner = m_ServerNetworkManager;
@@ -154,11 +162,9 @@ public enum AuthoritativeMode
         {
             ServerAuth,
             OwnerAuth,
-            PCServerAuth,
-            PCOwnerAuth
         }
 
-        private GameObject SpawnPrefab(bool isClientOwner, AuthoritativeMode authoritativeMode)
+        private GameObject SpawnPrefab(bool isClientOwner, AuthoritativeMode authoritativeMode, bool useDualTrigger = false)
         {
             var networkManager = isClientOwner ? m_ClientNetworkManagers[0] : m_ServerNetworkManager;
             var gameObject = (GameObject)null;
@@ -166,55 +172,49 @@ private GameObject SpawnPrefab(bool isClientOwner, AuthoritativeMode authoritati
             {
                 case AuthoritativeMode.ServerAuth:
                     {
-                        Assert.NotNull(m_AnimatorObjectPrefab);
-                        gameObject = SpawnObject(m_AnimatorObjectPrefab as GameObject, networkManager);
+                        if (!useDualTrigger)
+                        {
+                            Assert.NotNull(m_AnimatorObjectPrefab);
+                            gameObject = SpawnObject(m_AnimatorObjectPrefab as GameObject, networkManager);
+                        }
+                        else
+                        {
+                            Assert.NotNull(m_PlayerCheerPrefab);
+                            gameObject = SpawnObject(m_PlayerCheerPrefab as GameObject, networkManager);
+                        }
                         break;
                     }
                 case AuthoritativeMode.OwnerAuth:
                     {
-                        Assert.NotNull(m_OwnerAnimatorObjectPrefab);
-                        gameObject = SpawnObject(m_OwnerAnimatorObjectPrefab as GameObject, networkManager);
-                        break;
-                    }
-                case AuthoritativeMode.PCServerAuth:
-                    {
-                        Assert.NotNull(m_PlayerCheerPrefab);
-                        gameObject = SpawnObject(m_PlayerCheerPrefab as GameObject, networkManager);
-                        break;
-                    }
-                case AuthoritativeMode.PCOwnerAuth:
-                    {
-                        Assert.NotNull(m_OwnerPlayerCheerPrefab);
-                        gameObject = SpawnObject(m_OwnerPlayerCheerPrefab as GameObject, networkManager);
+                        if (!useDualTrigger)
+                        {
+                            Assert.NotNull(m_OwnerAnimatorObjectPrefab);
+                            gameObject = SpawnObject(m_OwnerAnimatorObjectPrefab as GameObject, networkManager);
+                        }
+                        else
+                        {
+                            Assert.NotNull(m_OwnerPlayerCheerPrefab);
+                            gameObject = SpawnObject(m_OwnerPlayerCheerPrefab as GameObject, networkManager);
+                        }
                         break;
                     }
             }
             return gameObject;
         }
 
-        private string GetNetworkAnimatorName(AuthoritativeMode authoritativeMode)
+        private string GetNetworkAnimatorName(AuthoritativeMode authoritativeMode, bool useDualTrigger = false)
         {
             var name = string.Empty;
             switch (authoritativeMode)
             {
                 case AuthoritativeMode.ServerAuth:
                     {
-                        name = m_AnimationTestPrefab.name;
+                        name = !useDualTrigger ? m_AnimationTestPrefab.name : m_PlayerCheerPrefab.name;
                         break;
                     }
                 case AuthoritativeMode.OwnerAuth:
                     {
-                        name = m_AnimationOwnerTestPrefab.name;
-                        break;
-                    }
-                case AuthoritativeMode.PCServerAuth:
-                    {
-                        name = m_PlayerCheerPrefab.name;
-                        break;
-                    }
-                case AuthoritativeMode.PCOwnerAuth:
-                    {
-                        name = m_OwnerPlayerCheerPrefab.name;
+                        name = !useDualTrigger ? m_AnimationOwnerTestPrefab.name : m_OwnerPlayerCheerPrefab.name;
                         break;
                     }
             }
@@ -227,27 +227,27 @@ private string GetNetworkAnimatorName(AuthoritativeMode authoritativeMode)
         /// </summary>
         /// <param name="authoritativeMode">Server or Owner authoritative</param>
         [Test]
-        public void ParameterUpdateTests([Values] OwnerShipMode ownerShipMode, [Values(AuthoritativeMode.ServerAuth, AuthoritativeMode.OwnerAuth)] AuthoritativeMode authoritativeMode)
+        public void ParameterUpdateTests()
         {
-            VerboseDebug($" ++++++++++++++++++ Parameter Test [{ownerShipMode}] Starting ++++++++++++++++++ ");
+            VerboseDebug($" ++++++++++++++++++ Parameter Test [{m_OwnerShipMode}] Starting ++++++++++++++++++ ");
 
             // Spawn our test animator object
-            var objectInstance = SpawnPrefab(ownerShipMode == OwnerShipMode.ClientOwner, authoritativeMode);
+            var objectInstance = SpawnPrefab(m_OwnerShipMode == OwnerShipMode.ClientOwner, m_AuthoritativeMode);
 
             // Wait for it to spawn server-side
             var success = WaitForConditionOrTimeOutWithTimeTravel(() => AnimatorTestHelper.ServerSideInstance != null);
-            Assert.True(success, $"Timed out waiting for the server-side instance of {GetNetworkAnimatorName(authoritativeMode)} to be spawned!");
+            Assert.True(success, $"Timed out waiting for the server-side instance of {GetNetworkAnimatorName(m_AuthoritativeMode)} to be spawned!");
 
             // Wait for it to spawn client-side
             success = WaitForConditionOrTimeOutWithTimeTravel(() => AnimatorTestHelper.ClientSideInstances.ContainsKey(m_ClientNetworkManagers[0].LocalClientId));
-            Assert.True(success, $"Timed out waiting for the client-side instance of {GetNetworkAnimatorName(authoritativeMode)} to be spawned!");
+            Assert.True(success, $"Timed out waiting for the client-side instance of {GetNetworkAnimatorName(m_AuthoritativeMode)} to be spawned!");
 
             // Create new parameter values
             m_ParameterValues = new AnimatorTestHelper.ParameterValues() { FloatValue = 1.0f, IntValue = 5, BoolValue = true };
 
-            if (authoritativeMode == AuthoritativeMode.OwnerAuth)
+            if (m_AuthoritativeMode == AuthoritativeMode.OwnerAuth)
             {
-                var objectToUpdate = ownerShipMode == OwnerShipMode.ClientOwner ? AnimatorTestHelper.ClientSideInstances[m_ClientNetworkManagers[0].LocalClientId] : AnimatorTestHelper.ServerSideInstance;
+                var objectToUpdate = m_OwnerShipMode == OwnerShipMode.ClientOwner ? AnimatorTestHelper.ClientSideInstances[m_ClientNetworkManagers[0].LocalClientId] : AnimatorTestHelper.ServerSideInstance;
                 // Set the new parameter values via the owner
                 objectToUpdate.UpdateParameters(m_ParameterValues);
             }
@@ -258,9 +258,9 @@ public void ParameterUpdateTests([Values] OwnerShipMode ownerShipMode, [Values(A
             }
 
             // Wait for the client side to update to the new parameter values
-            success = WaitForConditionOrTimeOutWithTimeTravel(() => ParameterValuesMatch(ownerShipMode, authoritativeMode, m_EnableVerboseDebug));
+            success = WaitForConditionOrTimeOutWithTimeTravel(() => ParameterValuesMatch(m_OwnerShipMode, m_AuthoritativeMode, m_EnableVerboseDebug));
             Assert.True(success, $"Timed out waiting for the client-side parameters to match {m_ParameterValues}!");
-            VerboseDebug($" ------------------ Parameter Test [{ownerShipMode}] Stopping ------------------ ");
+            VerboseDebug($" ------------------ Parameter Test [{m_OwnerShipMode}] Stopping ------------------ ");
         }
 
 
@@ -359,30 +359,30 @@ private bool AllClientsTransitioningAnyState()
         /// Verifies that cross fading is synchronized with currently connected clients
         /// </summary>
         [UnityTest]
-        public IEnumerator CrossFadeTransitionTests([Values] OwnerShipMode ownerShipMode, [Values(AuthoritativeMode.ServerAuth, AuthoritativeMode.OwnerAuth)] AuthoritativeMode authoritativeMode)
+        public IEnumerator CrossFadeTransitionTests()
         {
             CrossFadeTransitionDetect.ResetTest();
             CrossFadeTransitionDetect.SetTargetAnimationState(AnimatorTestHelper.TargetCrossFadeState);
-            VerboseDebug($" ++++++++++++++++++ Cross Fade Transition Test [{ownerShipMode}] Starting ++++++++++++++++++ ");
+            VerboseDebug($" ++++++++++++++++++ Cross Fade Transition Test [{m_OwnerShipMode}] Starting ++++++++++++++++++ ");
             CrossFadeTransitionDetect.IsVerboseDebug = m_EnableVerboseDebug;
 
             // Spawn our test animator object
-            var objectInstance = SpawnPrefab(ownerShipMode == OwnerShipMode.ClientOwner, authoritativeMode);
+            var objectInstance = SpawnPrefab(m_OwnerShipMode == OwnerShipMode.ClientOwner, m_AuthoritativeMode);
 
             // Wait for it to spawn server-side
             var success = WaitForConditionOrTimeOutWithTimeTravel(() => AnimatorTestHelper.ServerSideInstance != null);
-            Assert.True(success, $"Timed out waiting for the server-side instance of {GetNetworkAnimatorName(authoritativeMode)} to be spawned!");
+            Assert.True(success, $"Timed out waiting for the server-side instance of {GetNetworkAnimatorName(m_AuthoritativeMode)} to be spawned!");
 
             // Wait for it to spawn client-side
             success = WaitForConditionOrTimeOutWithTimeTravel(WaitForClientsToInitialize);
-            Assert.True(success, $"Timed out waiting for the client-side instance of {GetNetworkAnimatorName(authoritativeMode)} to be spawned!");
-            var animatorTestHelper = ownerShipMode == OwnerShipMode.ClientOwner ? AnimatorTestHelper.ClientSideInstances[m_ClientNetworkManagers[0].LocalClientId] : AnimatorTestHelper.ServerSideInstance;
+            Assert.True(success, $"Timed out waiting for the client-side instance of {GetNetworkAnimatorName(m_AuthoritativeMode)} to be spawned!");
+            var animatorTestHelper = m_OwnerShipMode == OwnerShipMode.ClientOwner ? AnimatorTestHelper.ClientSideInstances[m_ClientNetworkManagers[0].LocalClientId] : AnimatorTestHelper.ServerSideInstance;
             var layerCount = animatorTestHelper.GetAnimator().layerCount;
 
             var animationStateCount = animatorTestHelper.GetAnimatorStateCount();
             Assert.True(layerCount == animationStateCount, $"AnimationState count {animationStateCount} does not equal the layer count {layerCount}!");
 
-            if (authoritativeMode == AuthoritativeMode.ServerAuth)
+            if (m_AuthoritativeMode == AuthoritativeMode.ServerAuth)
             {
                 animatorTestHelper = AnimatorTestHelper.ServerSideInstance;
             }
@@ -463,38 +463,38 @@ private bool AllObserversSameLayerWeight(OwnerShipMode ownerShipMode, int layer,
         }
 
         [UnityTest]
-        public IEnumerator OnlyObserversAnimateTest([Values] OwnerShipMode ownerShipMode, [Values(AuthoritativeMode.ServerAuth, AuthoritativeMode.OwnerAuth)] AuthoritativeMode authoritativeMode)
+        public IEnumerator OnlyObserversAnimateTest()
         {
             // Spawn our test animator object
-            var objectInstance = SpawnPrefab(ownerShipMode == OwnerShipMode.ClientOwner, authoritativeMode);
+            var objectInstance = SpawnPrefab(m_OwnerShipMode == OwnerShipMode.ClientOwner, m_AuthoritativeMode);
             var networkObject = objectInstance.GetComponent<NetworkObject>();
             // Wait for it to spawn server-side
             var success = WaitForConditionOrTimeOutWithTimeTravel(() => AnimatorTestHelper.ServerSideInstance != null);
-            Assert.True(success, $"Timed out waiting for the server-side instance of {GetNetworkAnimatorName(authoritativeMode)} to be spawned!");
+            Assert.True(success, $"Timed out waiting for the server-side instance of {GetNetworkAnimatorName(m_AuthoritativeMode)} to be spawned!");
 
             // Wait for it to spawn client-side
             success = WaitForConditionOrTimeOutWithTimeTravel(WaitForClientsToInitialize);
-            Assert.True(success, $"Timed out waiting for the server-side instance of {GetNetworkAnimatorName(authoritativeMode)} to be spawned!");
+            Assert.True(success, $"Timed out waiting for the server-side instance of {GetNetworkAnimatorName(m_AuthoritativeMode)} to be spawned!");
 
-            var animatorTestHelper = ownerShipMode == OwnerShipMode.ClientOwner ? AnimatorTestHelper.ClientSideInstances[m_ClientNetworkManagers[0].LocalClientId] : AnimatorTestHelper.ServerSideInstance;
+            var animatorTestHelper = m_OwnerShipMode == OwnerShipMode.ClientOwner ? AnimatorTestHelper.ClientSideInstances[m_ClientNetworkManagers[0].LocalClientId] : AnimatorTestHelper.ServerSideInstance;
 
             networkObject.NetworkHide(m_ClientNetworkManagers[1].LocalClientId);
 
             yield return WaitForConditionOrTimeOut(() => !m_ClientNetworkManagers[1].SpawnManager.SpawnedObjects.ContainsKey(networkObject.NetworkObjectId));
             AssertOnTimeout($"Client-{m_ClientNetworkManagers[1].LocalClientId} timed out waiting to hide {networkObject.name}!");
 
-            if (authoritativeMode == AuthoritativeMode.ServerAuth)
+            if (m_AuthoritativeMode == AuthoritativeMode.ServerAuth)
             {
                 animatorTestHelper = AnimatorTestHelper.ServerSideInstance;
             }
             animatorTestHelper.SetTrigger();
             // Wait for all triggers to fire
-            yield return WaitForConditionOrTimeOut(() => AllTriggersDetectedOnObserversOnly(ownerShipMode, m_ClientNetworkManagers[1].LocalClientId));
+            yield return WaitForConditionOrTimeOut(() => AllTriggersDetectedOnObserversOnly(m_OwnerShipMode, m_ClientNetworkManagers[1].LocalClientId));
             AssertOnTimeout($"Timed out waiting for all triggers to match!");
 
             animatorTestHelper.SetLayerWeight(1, 0.75f);
             // Wait for all instances to update their weight value for layer 1
-            success = WaitForConditionOrTimeOutWithTimeTravel(() => AllObserversSameLayerWeight(ownerShipMode, 1, 0.75f, m_ClientNetworkManagers[1].LocalClientId));
+            success = WaitForConditionOrTimeOutWithTimeTravel(() => AllObserversSameLayerWeight(m_OwnerShipMode, 1, 0.75f, m_ClientNetworkManagers[1].LocalClientId));
             Assert.True(success, $"Timed out waiting for all instances to match weight 0.75 on layer 1!");
         }
 
@@ -503,33 +503,31 @@ public IEnumerator OnlyObserversAnimateTest([Values] OwnerShipMode ownerShipMode
         /// </summary>
         /// <param name="authoritativeMode">Server or Owner authoritative</param>
         [UnityTest]
-        public IEnumerator TriggerUpdateTests([Values] OwnerShipMode ownerShipMode, [Values(AuthoritativeMode.ServerAuth, AuthoritativeMode.OwnerAuth)] AuthoritativeMode authoritativeMode)
+        public IEnumerator TriggerUpdateTests()
         {
             CheckStateEnterCount.ResetTest();
 
-            VerboseDebug($" ++++++++++++++++++ Trigger Test [{TriggerTest.Iteration}][{ownerShipMode}] Starting ++++++++++++++++++ ");
+            VerboseDebug($" ++++++++++++++++++ Trigger Test [{TriggerTest.Iteration}][{m_OwnerShipMode}] Starting ++++++++++++++++++ ");
             TriggerTest.IsVerboseDebug = m_EnableVerboseDebug;
             AnimatorTestHelper.IsTriggerTest = m_EnableVerboseDebug;
 
             // Spawn our test animator object
-            var objectInstance = SpawnPrefab(ownerShipMode == OwnerShipMode.ClientOwner, authoritativeMode);
+            var objectInstance = SpawnPrefab(m_OwnerShipMode == OwnerShipMode.ClientOwner, m_AuthoritativeMode);
 
             // Wait for it to spawn server-side
             var success = WaitForConditionOrTimeOutWithTimeTravel(() => AnimatorTestHelper.ServerSideInstance != null);
-            Assert.True(success, $"Timed out waiting for the server-side instance of {GetNetworkAnimatorName(authoritativeMode)} to be spawned!");
+            Assert.True(success, $"Timed out waiting for the server-side instance of {GetNetworkAnimatorName(m_AuthoritativeMode)} to be spawned!");
 
             // Wait for it to spawn client-side
             success = WaitForConditionOrTimeOutWithTimeTravel(WaitForClientsToInitialize);
-            Assert.True(success, $"Timed out waiting for the client-side instance of {GetNetworkAnimatorName(authoritativeMode)} to be spawned!");
-            var animatorTestHelper = ownerShipMode == OwnerShipMode.ClientOwner ? AnimatorTestHelper.ClientSideInstances[m_ClientNetworkManagers[0].LocalClientId] : AnimatorTestHelper.ServerSideInstance;
+            Assert.True(success, $"Timed out waiting for the client-side instance of {GetNetworkAnimatorName(m_AuthoritativeMode)} to be spawned!");
+            var animatorTestHelper = m_OwnerShipMode == OwnerShipMode.ClientOwner ? AnimatorTestHelper.ClientSideInstances[m_ClientNetworkManagers[0].LocalClientId] : AnimatorTestHelper.ServerSideInstance;
             var layerCount = animatorTestHelper.GetAnimator().layerCount;
 
             var animationStateCount = animatorTestHelper.GetAnimatorStateCount();
             Assert.True(layerCount == animationStateCount, $"AnimationState count {animationStateCount} does not equal the layer count {layerCount}!");
 
-
-
-            if (authoritativeMode == AuthoritativeMode.ServerAuth)
+            if (m_AuthoritativeMode == AuthoritativeMode.ServerAuth)
             {
                 animatorTestHelper = AnimatorTestHelper.ServerSideInstance;
             }
@@ -546,12 +544,12 @@ public IEnumerator TriggerUpdateTests([Values] OwnerShipMode ownerShipMode, [Val
                     animatorTestHelper.SetTrigger();
                     VerboseDebug($"New Trigger State: {animatorTestHelper.GetCurrentTriggerState()}");
                     // Wait for all triggers to fire
-                    yield return WaitForConditionOrTimeOut(() => AllTriggersDetected(ownerShipMode), timeOutHelper);
+                    yield return WaitForConditionOrTimeOut(() => AllTriggersDetected(m_OwnerShipMode), timeOutHelper);
                     retryTrigger = timeOutHelper.TimedOut;
                     if (retryTrigger)
                     {
                         count++;
-                        Debug.LogWarning($"[{ownerShipMode}][{count}] Resending trigger!");
+                        Debug.LogWarning($"[{m_OwnerShipMode}][{count}] Resending trigger!");
                     }
                 }
             }
@@ -559,7 +557,7 @@ public IEnumerator TriggerUpdateTests([Values] OwnerShipMode ownerShipMode, [Val
             {
                 animatorTestHelper.SetTrigger();
                 // Wait for all triggers to fire
-                yield return WaitForConditionOrTimeOut(() => AllTriggersDetected(ownerShipMode));
+                yield return WaitForConditionOrTimeOut(() => AllTriggersDetected(m_OwnerShipMode));
                 AssertOnTimeout($"Timed out waiting for all triggers to match!");
             }
 
@@ -603,12 +601,12 @@ public IEnumerator TriggerUpdateTests([Values] OwnerShipMode ownerShipMode, [Val
                     animatorTestHelper.SetTrigger("Attack");
                     VerboseDebug($"New Trigger State: {animatorTestHelper.GetCurrentTriggerState()}");
                     // Wait for all triggers to fire
-                    yield return WaitForConditionOrTimeOut(() => AllTriggersDetected(ownerShipMode), timeOutHelper);
+                    yield return WaitForConditionOrTimeOut(() => AllTriggersDetected(m_OwnerShipMode), timeOutHelper);
                     retryTrigger = timeOutHelper.TimedOut;
                     if (retryTrigger)
                     {
                         count++;
-                        Debug.LogWarning($"[{ownerShipMode}][{count}] Resending trigger!");
+                        Debug.LogWarning($"[{m_OwnerShipMode}][{count}] Resending trigger!");
                     }
                 }
             }
@@ -618,25 +616,12 @@ public IEnumerator TriggerUpdateTests([Values] OwnerShipMode ownerShipMode, [Val
                 animator.SetInteger("WeaponType", 1);
                 animatorTestHelper.SetTrigger("Attack");
                 // Wait for all triggers to fire
-                yield return WaitForConditionOrTimeOut(() => AllTriggersDetected(ownerShipMode));
+                yield return WaitForConditionOrTimeOut(() => AllTriggersDetected(m_OwnerShipMode));
                 AssertOnTimeout($"Timed out waiting for all triggers to match!");
             }
 
             AnimatorTestHelper.IsTriggerTest = false;
-            VerboseDebug($" ------------------ Trigger Test [{TriggerTest.Iteration}][{ownerShipMode}] Stopping ------------------ ");
-        }
-
-        protected override void OnNewClientCreated(NetworkManager networkManager)
-        {
-            var networkPrefab = new NetworkPrefab() { Prefab = m_AnimationTestPrefab };
-            networkManager.NetworkConfig.Prefabs.Add(networkPrefab);
-            networkPrefab = new NetworkPrefab() { Prefab = m_AnimationOwnerTestPrefab };
-            networkManager.NetworkConfig.Prefabs.Add(networkPrefab);
-
-            networkPrefab = new NetworkPrefab() { Prefab = m_AnimationCheerTestPrefab };
-            networkManager.NetworkConfig.Prefabs.Add(networkPrefab);
-            networkPrefab = new NetworkPrefab() { Prefab = m_AnimationCheerOwnerTestPrefab };
-            networkManager.NetworkConfig.Prefabs.Add(networkPrefab);
+            VerboseDebug($" ------------------ Trigger Test [{TriggerTest.Iteration}][{m_OwnerShipMode}] Stopping ------------------ ");
         }
 
         /// <summary>
@@ -644,31 +629,31 @@ protected override void OnNewClientCreated(NetworkManager networkManager)
         /// </summary>
         /// <param name="authoritativeMode">Server or Owner authoritative</param>
         [Test]
-        public void WeightUpdateTests([Values] OwnerShipMode ownerShipMode, [Values(AuthoritativeMode.ServerAuth, AuthoritativeMode.OwnerAuth)] AuthoritativeMode authoritativeMode)
+        public void WeightUpdateTests()
         {
             CheckStateEnterCount.ResetTest();
             TriggerTest.ResetTest();
-            VerboseDebug($" ++++++++++++++++++ Weight Test [{ownerShipMode}] Starting ++++++++++++++++++ ");
+            VerboseDebug($" ++++++++++++++++++ Weight Test [{m_OwnerShipMode}] Starting ++++++++++++++++++ ");
             TriggerTest.IsVerboseDebug = m_EnableVerboseDebug;
             AnimatorTestHelper.IsTriggerTest = m_EnableVerboseDebug;
 
             // Spawn our test animator object
-            var objectInstance = SpawnPrefab(ownerShipMode == OwnerShipMode.ClientOwner, authoritativeMode);
+            var objectInstance = SpawnPrefab(m_OwnerShipMode == OwnerShipMode.ClientOwner, m_AuthoritativeMode);
 
             // Wait for it to spawn server-side
             var success = WaitForConditionOrTimeOutWithTimeTravel(() => AnimatorTestHelper.ServerSideInstance != null);
-            Assert.True(success, $"Timed out waiting for the server-side instance of {GetNetworkAnimatorName(authoritativeMode)} to be spawned!");
+            Assert.True(success, $"Timed out waiting for the server-side instance of {GetNetworkAnimatorName(m_AuthoritativeMode)} to be spawned!");
 
             // Wait for it to spawn client-side
             success = WaitForConditionOrTimeOutWithTimeTravel(WaitForClientsToInitialize);
-            Assert.True(success, $"Timed out waiting for the client-side instance of {GetNetworkAnimatorName(authoritativeMode)} to be spawned!");
-            var animatorTestHelper = ownerShipMode == OwnerShipMode.ClientOwner ? AnimatorTestHelper.ClientSideInstances[m_ClientNetworkManagers[0].LocalClientId] : AnimatorTestHelper.ServerSideInstance;
+            Assert.True(success, $"Timed out waiting for the client-side instance of {GetNetworkAnimatorName(m_AuthoritativeMode)} to be spawned!");
+            var animatorTestHelper = m_OwnerShipMode == OwnerShipMode.ClientOwner ? AnimatorTestHelper.ClientSideInstances[m_ClientNetworkManagers[0].LocalClientId] : AnimatorTestHelper.ServerSideInstance;
             var layerCount = animatorTestHelper.GetAnimator().layerCount;
 
             var animationStateCount = animatorTestHelper.GetAnimatorStateCount();
             Assert.True(layerCount == animationStateCount, $"AnimationState count {animationStateCount} does not equal the layer count {layerCount}!");
 
-            if (authoritativeMode == AuthoritativeMode.ServerAuth)
+            if (m_AuthoritativeMode == AuthoritativeMode.ServerAuth)
             {
                 animatorTestHelper = AnimatorTestHelper.ServerSideInstance;
             }
@@ -677,12 +662,12 @@ public void WeightUpdateTests([Values] OwnerShipMode ownerShipMode, [Values(Auth
 
             animatorTestHelper.SetLayerWeight(1, 0.75f);
             // Wait for all instances to update their weight value for layer 1
-            success = WaitForConditionOrTimeOutWithTimeTravel(() => AllInstancesSameLayerWeight(ownerShipMode, 1, 0.75f));
+            success = WaitForConditionOrTimeOutWithTimeTravel(() => AllInstancesSameLayerWeight(m_OwnerShipMode, 1, 0.75f));
             Assert.True(success, $"Timed out waiting for all instances to match weight 0.75 on layer 1!");
 
             animatorTestHelper.SetLayerWeight(1, originalWeight);
             // Wait for all instances to update their weight value for layer 1
-            success = WaitForConditionOrTimeOutWithTimeTravel(() => AllInstancesSameLayerWeight(ownerShipMode, 1, originalWeight));
+            success = WaitForConditionOrTimeOutWithTimeTravel(() => AllInstancesSameLayerWeight(m_OwnerShipMode, 1, originalWeight));
             Assert.True(success, $"Timed out waiting for all instances to match weight {originalWeight} on layer 1!");
 
             // Now set the layer weight to 0
@@ -692,16 +677,16 @@ public void WeightUpdateTests([Values] OwnerShipMode ownerShipMode, [Values(Auth
             CreateAndStartNewClientWithTimeTravel();
 
             // Verify the late joined client is synchronized to the changed weight
-            success = WaitForConditionOrTimeOutWithTimeTravel(() => AllInstancesSameLayerWeight(ownerShipMode, 1, 0.0f));
+            success = WaitForConditionOrTimeOutWithTimeTravel(() => AllInstancesSameLayerWeight(m_OwnerShipMode, 1, 0.0f));
             Assert.True(success, $"[Late-Join] Timed out waiting for all instances to match weight 0 on layer 1!");
 
             animatorTestHelper.SetLayerWeight(1, originalWeight);
             // Wait for all instances to update their weight value for layer 1
-            success = WaitForConditionOrTimeOutWithTimeTravel(() => AllInstancesSameLayerWeight(ownerShipMode, 1, originalWeight));
+            success = WaitForConditionOrTimeOutWithTimeTravel(() => AllInstancesSameLayerWeight(m_OwnerShipMode, 1, originalWeight));
             Assert.True(success, $"Timed out waiting for all instances to match weight {originalWeight} on layer 1!");
 
             AnimatorTestHelper.IsTriggerTest = false;
-            VerboseDebug($" ------------------ Weight Test [{ownerShipMode}] Stopping ------------------ ");
+            VerboseDebug($" ------------------ Weight Test [{m_OwnerShipMode}] Stopping ------------------ ");
         }
 
         /// <summary>
@@ -710,30 +695,31 @@ public void WeightUpdateTests([Values] OwnerShipMode ownerShipMode, [Values(Auth
         /// </summary>
         /// <param name="authoritativeMode">Server or Owner authoritative</param>
         [UnityTest]
-        public IEnumerator LateJoinTriggerSynchronizationTest([Values] OwnerShipMode ownerShipMode, [Values] AuthoritativeMode authoritativeMode)
+        public IEnumerator LateJoinTriggerSynchronizationTest([Values] bool testDualTrigger)
         {
-            VerboseDebug($" ++++++++++++++++++ Late Join Trigger Test [{TriggerTest.Iteration}][{ownerShipMode}] Starting ++++++++++++++++++ ");
+            VerboseDebug($" ++++++++++++++++++ Late Join Trigger Test [{TriggerTest.Iteration}][{m_OwnerShipMode}] Starting ++++++++++++++++++ ");
             TriggerTest.IsVerboseDebug = m_EnableVerboseDebug;
             CheckStateEnterCount.IsVerboseDebug = m_EnableVerboseDebug;
             AnimatorTestHelper.IsTriggerTest = m_EnableVerboseDebug;
-            bool isClientOwner = ownerShipMode == OwnerShipMode.ClientOwner;
+            bool isClientOwner = m_OwnerShipMode == OwnerShipMode.ClientOwner;
 
             // Spawn our test animator object
-            var objectInstance = SpawnPrefab(ownerShipMode == OwnerShipMode.ClientOwner, authoritativeMode);
+            var objectInstance = SpawnPrefab(m_OwnerShipMode == OwnerShipMode.ClientOwner, m_AuthoritativeMode, testDualTrigger);
 
             // Wait for it to spawn server-side
             var success = WaitForConditionOrTimeOutWithTimeTravel(() => AnimatorTestHelper.ServerSideInstance != null);
-            Assert.True(success, $"Timed out waiting for the server-side instance of {GetNetworkAnimatorName(authoritativeMode)} to be spawned!");
+            Assert.True(success, $"Timed out waiting for the server-side instance of {GetNetworkAnimatorName(m_AuthoritativeMode)} to be spawned!");
 
             // Wait for it to spawn client-side
             success = WaitForConditionOrTimeOutWithTimeTravel(WaitForClientsToInitialize);
-            Assert.True(success, $"Timed out waiting for the client-side instance of {GetNetworkAnimatorName(authoritativeMode)} to be spawned!");
+            Assert.True(success, $"Timed out waiting for the client-side instance of {GetNetworkAnimatorName(m_AuthoritativeMode)} to be spawned!");
+
+            var triggerName = !testDualTrigger ? "TestTrigger" : "Cheer";
 
-            var triggerName = authoritativeMode == AuthoritativeMode.OwnerAuth || authoritativeMode == AuthoritativeMode.ServerAuth ? "TestTrigger" : "Cheer";
             // Set the trigger based on the type of test
-            if (authoritativeMode == AuthoritativeMode.OwnerAuth)
+            if (m_AuthoritativeMode == AuthoritativeMode.OwnerAuth)
             {
-                var objectToUpdate = ownerShipMode == OwnerShipMode.ClientOwner ? AnimatorTestHelper.ClientSideInstances[m_ClientNetworkManagers[0].LocalClientId] : AnimatorTestHelper.ServerSideInstance;
+                var objectToUpdate = m_OwnerShipMode == OwnerShipMode.ClientOwner ? AnimatorTestHelper.ClientSideInstances[m_ClientNetworkManagers[0].LocalClientId] : AnimatorTestHelper.ServerSideInstance;
                 // Set the animation trigger via the owner
                 objectToUpdate.SetTrigger(triggerName);
             }
@@ -744,17 +730,17 @@ public IEnumerator LateJoinTriggerSynchronizationTest([Values] OwnerShipMode own
             }
 
             // Wait for all triggers to fire
-            yield return WaitForConditionOrTimeOut(() => AllTriggersDetected(ownerShipMode));
+            yield return WaitForConditionOrTimeOut(() => AllTriggersDetected(m_OwnerShipMode));
             AssertOnTimeout($"Timed out waiting for all triggers to match!");
 
-            if (authoritativeMode == AuthoritativeMode.OwnerAuth || authoritativeMode == AuthoritativeMode.ServerAuth)
+            if (!testDualTrigger)
             {
                 // Create new parameter values
                 m_ParameterValues = new AnimatorTestHelper.ParameterValues() { FloatValue = 1.0f, IntValue = 5, BoolValue = true };
 
-                if (authoritativeMode == AuthoritativeMode.OwnerAuth)
+                if (m_AuthoritativeMode == AuthoritativeMode.OwnerAuth)
                 {
-                    var objectToUpdate = ownerShipMode == OwnerShipMode.ClientOwner ? AnimatorTestHelper.ClientSideInstances[m_ClientNetworkManagers[0].LocalClientId] : AnimatorTestHelper.ServerSideInstance;
+                    var objectToUpdate = m_OwnerShipMode == OwnerShipMode.ClientOwner ? AnimatorTestHelper.ClientSideInstances[m_ClientNetworkManagers[0].LocalClientId] : AnimatorTestHelper.ServerSideInstance;
                     // Set the new parameter values
                     objectToUpdate.UpdateParameters(m_ParameterValues);
                 }
@@ -765,7 +751,7 @@ public IEnumerator LateJoinTriggerSynchronizationTest([Values] OwnerShipMode own
                 }
 
                 // Wait for the client side to update to the new parameter values
-                success = WaitForConditionOrTimeOutWithTimeTravel(() => ParameterValuesMatch(ownerShipMode, authoritativeMode, m_EnableVerboseDebug));
+                success = WaitForConditionOrTimeOutWithTimeTravel(() => ParameterValuesMatch(m_OwnerShipMode, m_AuthoritativeMode, m_EnableVerboseDebug));
                 Assert.True(success, $"Timed out waiting for the client-side parameters to match {m_ParameterValues.ValuesToString()}!");
             }
 
@@ -775,14 +761,14 @@ public IEnumerator LateJoinTriggerSynchronizationTest([Values] OwnerShipMode own
 
             // Wait for it to spawn client-side
             success = WaitForConditionOrTimeOutWithTimeTravel(WaitForClientsToInitialize);
-            Assert.True(success, $"Timed out waiting for the late joining client-side instance of {GetNetworkAnimatorName(authoritativeMode)} to be spawned!");
+            Assert.True(success, $"Timed out waiting for the late joining client-side instance of {GetNetworkAnimatorName(m_AuthoritativeMode)} to be spawned!");
 
             // Make sure the AnimatorTestHelper client side instances is the same as the TotalClients
             var calculatedClients = (AnimatorTestHelper.ClientSideInstances.Count + (m_UseHost ? 1 : 0));
             Assert.True(calculatedClients == TotalClients, $"Number of client");
 
             // Now check that the late joining client and all other clients are synchronized to the trigger
-            yield return WaitForConditionOrTimeOut(() => AllTriggersDetected(ownerShipMode));
+            yield return WaitForConditionOrTimeOut(() => AllTriggersDetected(m_OwnerShipMode));
 
             var message = string.Empty;
             if (s_GlobalTimeoutHelper.TimedOut)
@@ -794,15 +780,17 @@ public IEnumerator LateJoinTriggerSynchronizationTest([Values] OwnerShipMode own
                 }
             }
             AssertOnTimeout($"Timed out waiting for the late joining client's triggers to match!{message}", s_GlobalTimeoutHelper);
-            // Now check that the late joining client and all other clients are synchronized to the updated parameter values
-            if (authoritativeMode == AuthoritativeMode.OwnerAuth || authoritativeMode == AuthoritativeMode.ServerAuth)
+
+            if (!testDualTrigger)
             {
-                success = WaitForConditionOrTimeOutWithTimeTravel(() => ParameterValuesMatch(ownerShipMode, authoritativeMode, m_EnableVerboseDebug));
+                // Now check that the late joining client and all other clients are synchronized to the updated parameter values
+                success = WaitForConditionOrTimeOutWithTimeTravel(() => ParameterValuesMatch(m_OwnerShipMode, m_AuthoritativeMode, m_EnableVerboseDebug));
                 Assert.True(success, $"Timed out waiting for the client-side parameters to match {m_ParameterValues.ValuesToString()}!");
             }
+
             var newlyJoinedClient = m_ClientNetworkManagers[NumberOfClients];
             StopOneClientWithTimeTravel(newlyJoinedClient);
-            VerboseDebug($" ------------------ Late Join Trigger Test [{TriggerTest.Iteration}][{ownerShipMode}] Stopping ------------------ ");
+            VerboseDebug($" ------------------ Late Join Trigger Test [{TriggerTest.Iteration}][{m_OwnerShipMode}] Stopping ------------------ ");
         }
 
         /// <summary>
@@ -811,30 +799,30 @@ public IEnumerator LateJoinTriggerSynchronizationTest([Values] OwnerShipMode own
         /// </summary>
         /// <param name="authoritativeMode">Server or Owner authoritative</param>
         [UnityTest]
-        public IEnumerator LateJoinSynchronizationTest([Values] OwnerShipMode ownerShipMode, [Values(AuthoritativeMode.ServerAuth, AuthoritativeMode.OwnerAuth)] AuthoritativeMode authoritativeMode)
+        public IEnumerator LateJoinSynchronizationTest()
         {
-            VerboseDebug($" ++++++++++++++++++ Late Join Synchronization Test [{TriggerTest.Iteration}][{ownerShipMode}] Starting ++++++++++++++++++ ");
+            VerboseDebug($" ++++++++++++++++++ Late Join Synchronization Test [{TriggerTest.Iteration}][{m_OwnerShipMode}] Starting ++++++++++++++++++ ");
 
             StateSyncTest.IsVerboseDebug = m_EnableVerboseDebug;
             TriggerTest.IsVerboseDebug = m_EnableVerboseDebug;
             AnimatorTestHelper.IsTriggerTest = m_EnableVerboseDebug;
-            bool isClientOwner = ownerShipMode == OwnerShipMode.ClientOwner;
+            bool isClientOwner = m_OwnerShipMode == OwnerShipMode.ClientOwner;
 
             // Spawn our test animator object
-            var objectInstance = SpawnPrefab(ownerShipMode == OwnerShipMode.ClientOwner, authoritativeMode);
+            var objectInstance = SpawnPrefab(m_OwnerShipMode == OwnerShipMode.ClientOwner, m_AuthoritativeMode);
 
             // Wait for it to spawn server-side
             var success = WaitForConditionOrTimeOutWithTimeTravel(() => AnimatorTestHelper.ServerSideInstance != null);
-            Assert.True(success, $"Timed out waiting for the server-side instance of {GetNetworkAnimatorName(authoritativeMode)} to be spawned!");
+            Assert.True(success, $"Timed out waiting for the server-side instance of {GetNetworkAnimatorName(m_AuthoritativeMode)} to be spawned!");
 
             // Wait for it to spawn client-side
             success = WaitForConditionOrTimeOutWithTimeTravel(WaitForClientsToInitialize);
-            Assert.True(success, $"Timed out waiting for the client-side instance of {GetNetworkAnimatorName(authoritativeMode)} to be spawned!");
+            Assert.True(success, $"Timed out waiting for the client-side instance of {GetNetworkAnimatorName(m_AuthoritativeMode)} to be spawned!");
 
             // Set the late join parameter based on the type of test
-            if (authoritativeMode == AuthoritativeMode.OwnerAuth)
+            if (m_AuthoritativeMode == AuthoritativeMode.OwnerAuth)
             {
-                var objectToUpdate = ownerShipMode == OwnerShipMode.ClientOwner ? AnimatorTestHelper.ClientSideInstances[m_ClientNetworkManagers[0].LocalClientId] : AnimatorTestHelper.ServerSideInstance;
+                var objectToUpdate = m_OwnerShipMode == OwnerShipMode.ClientOwner ? AnimatorTestHelper.ClientSideInstances[m_ClientNetworkManagers[0].LocalClientId] : AnimatorTestHelper.ServerSideInstance;
                 // Set the late join parameter via the owner
                 objectToUpdate.SetLateJoinParam(true);
             }
@@ -859,7 +847,7 @@ public IEnumerator LateJoinSynchronizationTest([Values] OwnerShipMode ownerShipM
 
             // Wait for the client to have spawned and the spawned prefab to be instantiated
             success = WaitForConditionOrTimeOutWithTimeTravel(WaitForClientsToInitialize);
-            Assert.True(success, $"Timed out waiting for the late joining client-side instance of {GetNetworkAnimatorName(authoritativeMode)} to be spawned!");
+            Assert.True(success, $"Timed out waiting for the late joining client-side instance of {GetNetworkAnimatorName(m_AuthoritativeMode)} to be spawned!");
 
             // Make sure the AnimatorTestHelper client side instances is the same as the TotalClients
             var calculatedClients = (AnimatorTestHelper.ClientSideInstances.Count + (m_UseHost ? 1 : 0));
@@ -875,7 +863,7 @@ public IEnumerator LateJoinSynchronizationTest([Values] OwnerShipMode ownerShipM
 
             var newlyJoinedClient = m_ClientNetworkManagers[NumberOfClients];
             StopOneClientWithTimeTravel(newlyJoinedClient);
-            VerboseDebug($" ------------------ Late Join Synchronization Test [{TriggerTest.Iteration}][{ownerShipMode}] Stopping ------------------ ");
+            VerboseDebug($" ------------------ Late Join Synchronization Test [{TriggerTest.Iteration}][{m_OwnerShipMode}] Stopping ------------------ ");
         }
 
         /// <summary>
diff --git a/testproject/Assets/Tests/Runtime/Animation/Resources/AnimatorObject.prefab b/testproject/Assets/Tests/Runtime/Animation/Resources/AnimatorObject.prefab
index b0eadd2de1..9ef650701f 100644
--- a/testproject/Assets/Tests/Runtime/Animation/Resources/AnimatorObject.prefab
+++ b/testproject/Assets/Tests/Runtime/Animation/Resources/AnimatorObject.prefab
@@ -61,6 +61,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:
@@ -166,6 +169,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:
@@ -271,6 +277,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:
@@ -368,6 +377,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   GlobalObjectIdHash: 1958757820
   InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 1
   AlwaysReplicateAsRoot: 0
   SynchronizeTransform: 1
   ActiveSceneSynchronization: 0
@@ -377,7 +388,7 @@ MonoBehaviour:
   AutoObjectParentSync: 1
 --- !u!95 &6515743261518512780
 Animator:
-  serializedVersion: 5
+  serializedVersion: 7
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -391,6 +402,7 @@ Animator:
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
+  m_AnimatePhysics: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
diff --git a/testproject/Assets/Tests/Runtime/Animation/Resources/OwnerAnimatorObject.prefab b/testproject/Assets/Tests/Runtime/Animation/Resources/OwnerAnimatorObject.prefab
index f55b57542d..56b679ebb2 100644
--- a/testproject/Assets/Tests/Runtime/Animation/Resources/OwnerAnimatorObject.prefab
+++ b/testproject/Assets/Tests/Runtime/Animation/Resources/OwnerAnimatorObject.prefab
@@ -61,6 +61,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:
@@ -166,6 +169,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:
@@ -271,6 +277,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:
@@ -368,6 +377,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   GlobalObjectIdHash: 3978410502
   InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 1
   AlwaysReplicateAsRoot: 0
   SynchronizeTransform: 1
   ActiveSceneSynchronization: 0
@@ -377,7 +388,7 @@ MonoBehaviour:
   AutoObjectParentSync: 1
 --- !u!95 &6515743261518512780
 Animator:
-  serializedVersion: 5
+  serializedVersion: 7
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -391,6 +402,7 @@ Animator:
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
+  m_AnimatePhysics: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
diff --git a/testproject/Assets/Tests/Runtime/Animation/Resources/PlayerCheerOwnerAuth.prefab b/testproject/Assets/Tests/Runtime/Animation/Resources/PlayerCheerOwnerAuth.prefab
index 6d2e605763..c243ddc5b4 100644
--- a/testproject/Assets/Tests/Runtime/Animation/Resources/PlayerCheerOwnerAuth.prefab
+++ b/testproject/Assets/Tests/Runtime/Animation/Resources/PlayerCheerOwnerAuth.prefab
@@ -59,6 +59,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:
@@ -164,6 +167,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:
@@ -277,6 +283,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:
@@ -325,7 +334,7 @@ BoxCollider:
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!95 &4217478864398958195
 Animator:
-  serializedVersion: 5
+  serializedVersion: 7
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -333,12 +342,13 @@ Animator:
   m_GameObject: {fileID: 6958138586392507362}
   m_Enabled: 1
   m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: f7e23f629acb39741bf0fff41d87f5d2, type: 2}
+  m_Controller: {fileID: 9100000, guid: 01c21f02e45c80f48895ff36143bc980, type: 2}
   m_CullingMode: 0
   m_UpdateMode: 0
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
+  m_AnimatePhysics: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
@@ -356,8 +366,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 1062837899
+  GlobalObjectIdHash: 1665052760
   InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 1
   AlwaysReplicateAsRoot: 0
   SynchronizeTransform: 1
   ActiveSceneSynchronization: 0
@@ -402,7 +414,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 6958138586392507362}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a599d57c2665c3d46bc5a6a92915fdc6, type: 3}
+  m_Script: {fileID: 11500000, guid: 77114a4761fbbf04ebafd6a884d3d312, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
 --- !u!114 &-126005763244726388
diff --git a/testproject/Assets/Tests/Runtime/Animation/Resources/PlayerCheerOwnerAuth.prefab.meta b/testproject/Assets/Tests/Runtime/Animation/Resources/PlayerCheerOwnerAuth.prefab.meta
index 47ffd8be3f..d38e6ae893 100644
--- a/testproject/Assets/Tests/Runtime/Animation/Resources/PlayerCheerOwnerAuth.prefab.meta
+++ b/testproject/Assets/Tests/Runtime/Animation/Resources/PlayerCheerOwnerAuth.prefab.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: dfba1c6e3f2aa7344ac8a0626301deb0
+guid: 4b31f769283d3c24ca2a5d6baf28a806
 PrefabImporter:
   externalObjects: {}
   userData: 
diff --git a/testproject/Assets/Tests/Runtime/Animation/Resources/PlayerCheerServerAuth.prefab b/testproject/Assets/Tests/Runtime/Animation/Resources/PlayerCheerServerAuth.prefab
index 476227c3fb..3b8fc9dd68 100644
--- a/testproject/Assets/Tests/Runtime/Animation/Resources/PlayerCheerServerAuth.prefab
+++ b/testproject/Assets/Tests/Runtime/Animation/Resources/PlayerCheerServerAuth.prefab
@@ -59,6 +59,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:
@@ -172,6 +175,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:
@@ -220,7 +226,7 @@ BoxCollider:
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!95 &7612458143371274009
 Animator:
-  serializedVersion: 5
+  serializedVersion: 7
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -228,12 +234,13 @@ Animator:
   m_GameObject: {fileID: 8188135024827620138}
   m_Enabled: 1
   m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: f7e23f629acb39741bf0fff41d87f5d2, type: 2}
+  m_Controller: {fileID: 9100000, guid: 01c21f02e45c80f48895ff36143bc980, type: 2}
   m_CullingMode: 0
   m_UpdateMode: 0
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
+  m_AnimatePhysics: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
@@ -251,8 +258,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 3563891718
+  GlobalObjectIdHash: 3281146135
   InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 1
   AlwaysReplicateAsRoot: 0
   SynchronizeTransform: 1
   ActiveSceneSynchronization: 0
@@ -297,7 +306,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 8188135024827620138}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a599d57c2665c3d46bc5a6a92915fdc6, type: 3}
+  m_Script: {fileID: 11500000, guid: 77114a4761fbbf04ebafd6a884d3d312, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
 --- !u!114 &-967079540368916851
@@ -383,6 +392,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:
diff --git a/testproject/Assets/Tests/Runtime/Animation/Resources/PlayerCheerServerAuth.prefab.meta b/testproject/Assets/Tests/Runtime/Animation/Resources/PlayerCheerServerAuth.prefab.meta
index b49a6eff8f..aaa068d35e 100644
--- a/testproject/Assets/Tests/Runtime/Animation/Resources/PlayerCheerServerAuth.prefab.meta
+++ b/testproject/Assets/Tests/Runtime/Animation/Resources/PlayerCheerServerAuth.prefab.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 15696ae0708d1394e921578ccf65dcf9
+guid: c000e98bc12da2941a59ec61c260dd6a
 PrefabImporter:
   externalObjects: {}
   userData: 
diff --git a/testproject/Assets/Tests/Runtime/DontDestroyOnLoadTests.cs b/testproject/Assets/Tests/Runtime/DontDestroyOnLoadTests.cs
index f3794d46b5..dcea70efdd 100644
--- a/testproject/Assets/Tests/Runtime/DontDestroyOnLoadTests.cs
+++ b/testproject/Assets/Tests/Runtime/DontDestroyOnLoadTests.cs
@@ -22,12 +22,6 @@ protected override void OnServerAndClientsCreated()
             base.OnServerAndClientsCreated();
         }
 
-        protected override void OnNewClientCreated(NetworkManager networkManager)
-        {
-            networkManager.NetworkConfig.Prefabs = m_ServerNetworkManager.NetworkConfig.Prefabs;
-            base.OnNewClientCreated(networkManager);
-        }
-
         private ulong m_SpawnedNetworkObjectId;
         private StringBuilder m_ErrorLog = new StringBuilder();
 
diff --git a/testproject/Assets/Tests/Runtime/NetworkBehaviourSessionSynchronized.cs b/testproject/Assets/Tests/Runtime/NetworkBehaviourSessionSynchronized.cs
index 3af76fe696..714b87b88b 100644
--- a/testproject/Assets/Tests/Runtime/NetworkBehaviourSessionSynchronized.cs
+++ b/testproject/Assets/Tests/Runtime/NetworkBehaviourSessionSynchronized.cs
@@ -7,6 +7,8 @@
 
 namespace TestProject.RuntimeTests
 {
+    [TestFixture(HostOrServer.Host)]
+    [TestFixture(HostOrServer.DAHost)]
     public class NetworkBehaviourSessionSynchronized : NetcodeIntegrationTest
     {
         private const string k_SceneToLoad = "SessionSynchronize";
@@ -14,6 +16,8 @@ public class NetworkBehaviourSessionSynchronized : NetcodeIntegrationTest
 
         private bool m_SceneLoaded;
 
+        public NetworkBehaviourSessionSynchronized(HostOrServer hostOrServer) : base(hostOrServer) { }
+
         [UnityTest]
         public IEnumerator InScenePlacedSessionSynchronized()
         {
diff --git a/testproject/Assets/Tests/Runtime/NetworkManagerTests.cs b/testproject/Assets/Tests/Runtime/NetworkManagerTests.cs
index 277e8f8836..5756f81b85 100644
--- a/testproject/Assets/Tests/Runtime/NetworkManagerTests.cs
+++ b/testproject/Assets/Tests/Runtime/NetworkManagerTests.cs
@@ -22,7 +22,6 @@ public enum UseSceneManagement
             SceneManagementDisabled
         }
 
-        private bool m_EnableSceneManagement;
         private NetworkObject m_NetworkObject;
         private bool m_NetworkObjectWasSpawned;
         private bool m_NetworkBehaviourIsHostWasSet;
@@ -85,7 +84,7 @@ protected override IEnumerator OnTearDown()
 
         protected override void OnServerAndClientsCreated()
         {
-            m_ServerNetworkManager.NetworkConfig.EnableSceneManagement = m_EnableSceneManagement;
+            m_ServerNetworkManager.NetworkConfig.EnableSceneManagement = m_UseSceneManagement;
             m_NetworkObjectTestComponent.ConfigureClientConnected(m_ServerNetworkManager, OnClientConnectedCallback);
         }
 
@@ -108,17 +107,13 @@ public enum ShutdownChecks
 
         protected override void OnNewClientCreated(NetworkManager networkManager)
         {
-            networkManager.NetworkConfig.EnableSceneManagement = m_EnableSceneManagement;
-            foreach (var prefab in m_ServerNetworkManager.NetworkConfig.Prefabs.Prefabs)
-            {
-                networkManager.NetworkConfig.Prefabs.Add(prefab);
-            }
+            networkManager.NetworkConfig.EnableSceneManagement = m_UseSceneManagement;
             base.OnNewClientCreated(networkManager);
         }
 
         /// <summary>
         /// Validate shutting down a second time does not cause an exception.
-        /// </summary>        
+        /// </summary>
         [UnityTest]
         public IEnumerator ValidateShutdown([Values] ShutdownChecks shutdownCheck)
         {
@@ -133,7 +128,7 @@ public IEnumerator ValidateShutdown([Values] ShutdownChecks shutdownCheck)
             }
             else
             {
-                // For this test (simplify the complexity) with a late joining client, just remove the 
+                // For this test (simplify the complexity) with a late joining client, just remove the
                 // in-scene placed NetworkObject prior to the client connecting
                 // (We are testing the shutdown sequence)
                 var spawnedObjects = m_ServerNetworkManager.SpawnManager.SpawnedObjectsList.ToList();
diff --git a/testproject/Assets/Tests/Runtime/NetworkObjectSpawning.cs b/testproject/Assets/Tests/Runtime/NetworkObjectSpawning.cs
new file mode 100644
index 0000000000..dbf2120411
--- /dev/null
+++ b/testproject/Assets/Tests/Runtime/NetworkObjectSpawning.cs
@@ -0,0 +1,217 @@
+using System.Collections;
+using System.Text.RegularExpressions;
+using NUnit.Framework;
+using Unity.Netcode;
+using Unity.Netcode.TestHelpers.Runtime;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+using UnityEngine.TestTools;
+
+namespace TestProject.RuntimeTests
+{
+    [TestFixture(NetworkTopologyTypes.ClientServer)]
+    [TestFixture(NetworkTopologyTypes.DistributedAuthority)]
+    internal class NetworkObjectSpawning : NetcodeIntegrationTest
+    {
+        private const string k_SceneToLoad = "NetworkObjectSpawnerTest";
+
+        private GameObject m_ObjectToSpawn;
+
+        private bool m_CanStartServerAndClients;
+
+        protected override int NumberOfClients => 1;
+
+        public NetworkObjectSpawning(NetworkTopologyTypes networkTopology) : base(networkTopology) { }
+
+
+        protected override IEnumerator OnSetup()
+        {
+            NetworkObjectSpawnerForTests.Reset();
+            m_CanStartServerAndClients = false;
+            return base.OnSetup();
+        }
+
+        protected override IEnumerator OnTearDown()
+        {
+            Object.DestroyImmediate(m_ObjectToSpawn);
+            m_ObjectToSpawn = null;
+            return base.OnTearDown();
+        }
+
+        protected override bool CanStartServerAndClients()
+        {
+            return m_CanStartServerAndClients;
+        }
+
+        protected override void OnServerAndClientsCreated()
+        {
+            m_ObjectToSpawn = NetworkObjectSpawnerForTests.ObjectToSpawn = CreateNetworkObjectPrefab("TestObject");
+            base.OnServerAndClientsCreated();
+        }
+
+        private void OnClientStarted()
+        {
+            if (m_NetworkTopologyType == NetworkTopologyTypes.DistributedAuthority)
+            {
+                LogAssert.Expect(LogType.Error, new Regex($"Cannot spawn {m_ObjectToSpawn.name} until the client is fully connected to the session!"));
+                var networkObject = m_ObjectToSpawn.GetComponent<NetworkObject>();
+                networkObject.NetworkManagerOwner = m_ClientNetworkManagers[0];
+                networkObject.Spawn();
+                m_ClientNetworkManagers[0].OnClientStarted -= OnClientStarted;
+            }
+        }
+
+        /// <summary>
+        /// Validates that a NetworkObject cannot be spawned before being approved when
+        /// using a distributed authority network topology.
+        /// </summary>
+        [UnityTest]
+        public IEnumerator CannotSpawnBeforeApproved()
+        {
+            m_CanStartServerAndClients = true;
+            m_ClientNetworkManagers[0].OnClientStarted += OnClientStarted;
+            yield return StartServerAndClients();
+        }
+
+        private Scene m_SceneLoaded;
+        private bool m_SceneLoadCompleted;
+        private NetworkSceneManager.VerifySceneBeforeLoadingDelegateHandler m_ServerVerificationAction;
+
+        public enum SynchronizeNotificationTypes
+        {
+            InSceneObjects,
+            Synchronized,
+            Both
+        }
+
+        /// <summary>
+        /// Validates that you can spawn during <see cref="NetworkBehaviour.OnInSceneObjectsSpawned"/> and <see cref="NetworkBehaviour.OnNetworkSessionSynchronized"/> (or spawn during both)
+        /// </summary>
+        [UnityTest]
+        public IEnumerator SpawnOnSynchronizedNotification([Values] SynchronizeNotificationTypes synchronizeNotificationTypes)
+        {
+            m_SceneLoadCompleted = false;
+            m_CanStartServerAndClients = true;
+            NetworkObjectSpawnerForTests.SpawnAfterInSceneSynchronized = synchronizeNotificationTypes == SynchronizeNotificationTypes.InSceneObjects || synchronizeNotificationTypes == SynchronizeNotificationTypes.Both;
+            NetworkObjectSpawnerForTests.SpawnAfterSynchronized = synchronizeNotificationTypes == SynchronizeNotificationTypes.Synchronized || synchronizeNotificationTypes == SynchronizeNotificationTypes.Both;
+            NetworkObjectSpawnerForTests.OnlyAuthoritySpawns = !m_DistributedAuthority;
+
+            if (synchronizeNotificationTypes == SynchronizeNotificationTypes.Both)
+            {
+                SceneManager.sceneLoaded += SceneLoaded;
+                var asyncTask = SceneManager.LoadSceneAsync(k_SceneToLoad, LoadSceneMode.Additive);
+                yield return WaitForConditionOrTimeOut(() => asyncTask.isDone);
+                AssertOnTimeout($"Failed to load scene {k_SceneToLoad}!");
+            }
+
+            yield return StartServerAndClients();
+
+            if (synchronizeNotificationTypes != SynchronizeNotificationTypes.Both)
+            {
+                m_ServerNetworkManager.SceneManager.OnSceneEvent += OnSceneEvent;
+                m_ServerNetworkManager.SceneManager.LoadScene(k_SceneToLoad, LoadSceneMode.Additive);
+
+                yield return WaitForConditionOrTimeOut(() => m_SceneLoaded.name == k_SceneToLoad && m_SceneLoaded.IsValid() && m_SceneLoaded.isLoaded && m_SceneLoadCompleted);
+                AssertOnTimeout($"Failed to load scene {k_SceneToLoad}!");
+
+                m_ServerNetworkManager.SceneManager.OnSceneEvent -= OnSceneEvent;
+            }
+
+            yield return s_DefaultWaitForTick;
+            var hostOrSessionOwner = m_DistributedAuthority ? "Session Owner" : "Host";
+
+            Assert.IsTrue(NetworkObjectSpawnerForTests.SpawnedInstances.ContainsKey(NetworkManager.ServerClientId), $"[{m_NetworkTopologyType}] {hostOrSessionOwner} did not spawn any objects during notification for in-scene objects synchronized!");
+            var expectedSpawnCount = synchronizeNotificationTypes == SynchronizeNotificationTypes.Both ? 2 : 1;
+            var authorityCount = NetworkObjectSpawnerForTests.SpawnedInstances[NetworkManager.ServerClientId].Count;
+            Assert.IsTrue(authorityCount == expectedSpawnCount, $"[{m_NetworkTopologyType}] {hostOrSessionOwner} only spawned {authorityCount} but was expected to spawn {expectedSpawnCount}!");
+
+            if (m_DistributedAuthority)
+            {
+                Assert.IsTrue(NetworkObjectSpawnerForTests.SpawnedInstances.ContainsKey(m_ClientNetworkManagers[0].LocalClientId), $"[{m_NetworkTopologyType}] Client did not spawn any objects during notification for in-scene objects synchronized!");
+                var clientCount = NetworkObjectSpawnerForTests.SpawnedInstances[m_ClientNetworkManagers[0].LocalClientId].Count;
+                Assert.IsTrue(clientCount == expectedSpawnCount, $"[{m_NetworkTopologyType}] Client-{m_ClientNetworkManagers[0].LocalClientId} only spawned {clientCount} but was expected to spawn {expectedSpawnCount}!");
+            }
+
+            if (synchronizeNotificationTypes == SynchronizeNotificationTypes.Both)
+            {
+                SceneManager.UnloadSceneAsync(m_SceneLoaded);
+            }
+        }
+
+
+        public enum InstantiateAndSpawnTypes
+        {
+            NetworkSpawnManager,
+            NetworkObject,
+        }
+
+        public enum InstantiateAndSpawnContexts
+        {
+            Host,
+            Client,
+        }
+
+        [UnityTest]
+        public IEnumerator InstantiateAndSpawn([Values] InstantiateAndSpawnTypes instantiateAndSpawnTypes, [Values] InstantiateAndSpawnContexts instantiateAndSpawnContexts)
+        {
+            m_CanStartServerAndClients = true;
+            Object.DontDestroyOnLoad(m_ObjectToSpawn);
+            yield return StartServerAndClients();
+            var instanceNetworkObject = (NetworkObject)null;
+            // Setup the test relative to parameters driven context
+            var ownerId = instantiateAndSpawnContexts == InstantiateAndSpawnContexts.Host ? m_ServerNetworkManager.LocalClientId : m_ClientNetworkManagers[0].LocalClientId;
+            var spawnManager = m_ServerNetworkManager.SpawnManager;
+            if (m_DistributedAuthority && instantiateAndSpawnContexts == InstantiateAndSpawnContexts.Client)
+            {
+                spawnManager = m_ClientNetworkManagers[0].SpawnManager;
+            }
+
+            // Spawn the NetworkObject
+            if (instantiateAndSpawnTypes == InstantiateAndSpawnTypes.NetworkSpawnManager)
+            {
+                Debug.Log($"Spawning {m_ObjectToSpawn.name}");
+                instanceNetworkObject = spawnManager.InstantiateAndSpawn(m_ObjectToSpawn.GetComponent<NetworkObject>(), ownerId);
+            }
+            else
+            {
+                instanceNetworkObject = NetworkObject.InstantiateAndSpawn(m_ObjectToSpawn, spawnManager.NetworkManager, ownerId);
+            }
+            Assert.IsNotNull(instanceNetworkObject, $"Failed to instantiate {m_ObjectToSpawn.name}!");
+            Assert.IsTrue(instanceNetworkObject.IsSpawned, $"Failed to spawn {m_ObjectToSpawn.name}!");
+            Assert.IsTrue(instanceNetworkObject.OwnerClientId == ownerId, $"Invalid owner ({instanceNetworkObject.OwnerClientId} vs {ownerId})!");
+            yield return WaitForConditionOrTimeOut(() => s_GlobalNetworkObjects.ContainsKey(m_ClientNetworkManagers[0].LocalClientId) && s_GlobalNetworkObjects.ContainsKey(m_ServerNetworkManager.LocalClientId));
+            AssertOnTimeout($"Timed out waiting for all instances to spawn!");
+            yield return WaitForConditionOrTimeOut(() => s_GlobalNetworkObjects[m_ClientNetworkManagers[0].LocalClientId].ContainsKey(instanceNetworkObject.NetworkObjectId) && s_GlobalNetworkObjects[m_ServerNetworkManager.LocalClientId].ContainsKey(instanceNetworkObject.NetworkObjectId));
+            AssertOnTimeout($"Timed out waiting for all instances to spawn!");
+
+            if (instantiateAndSpawnContexts == InstantiateAndSpawnContexts.Host)
+            {
+                Assert.IsTrue(s_GlobalNetworkObjects[m_ClientNetworkManagers[0].LocalClientId].ContainsKey(instanceNetworkObject.NetworkObjectId), $"Client-{m_ClientNetworkManagers[0].LocalClientId} failed to spawn {instanceNetworkObject.name}!");
+            }
+            else
+            {
+                Assert.IsTrue(s_GlobalNetworkObjects[m_ServerNetworkManager.LocalClientId].ContainsKey(instanceNetworkObject.NetworkObjectId), $"Client-{m_ServerNetworkManager.LocalClientId} failed to spawn {instanceNetworkObject.name}!");
+            }
+        }
+
+        private void SceneLoaded(Scene scene, LoadSceneMode arg1)
+        {
+            if (scene.name == k_SceneToLoad)
+            {
+                m_SceneLoaded = scene;
+            }
+        }
+
+        private void OnSceneEvent(SceneEvent sceneEvent)
+        {
+            if (sceneEvent.SceneEventType == SceneEventType.LoadComplete && sceneEvent.ClientId == m_ServerNetworkManager.LocalClientId && sceneEvent.Scene.name == k_SceneToLoad)
+            {
+                m_SceneLoaded = sceneEvent.Scene;
+            }
+            else if (sceneEvent.SceneEventType == SceneEventType.LoadEventCompleted && sceneEvent.SceneName == k_SceneToLoad)
+            {
+                m_SceneLoadCompleted = true;
+            }
+        }
+    }
+}
diff --git a/testproject/Assets/Tests/Runtime/NetworkObjectSpawning.cs.meta b/testproject/Assets/Tests/Runtime/NetworkObjectSpawning.cs.meta
new file mode 100644
index 0000000000..e1d0c1b5f2
--- /dev/null
+++ b/testproject/Assets/Tests/Runtime/NetworkObjectSpawning.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: d287f6fbe5791cf4782fb4bc75fc85e0
\ No newline at end of file
diff --git a/testproject/Assets/Tests/Runtime/NetworkSceneManager/ClientSynchronizationValidationTest.cs b/testproject/Assets/Tests/Runtime/NetworkSceneManager/ClientSynchronizationValidationTest.cs
index 7ee9a4ecef..99781be873 100644
--- a/testproject/Assets/Tests/Runtime/NetworkSceneManager/ClientSynchronizationValidationTest.cs
+++ b/testproject/Assets/Tests/Runtime/NetworkSceneManager/ClientSynchronizationValidationTest.cs
@@ -9,6 +9,9 @@
 
 namespace TestProject.RuntimeTests
 {
+    [TestFixture(NetworkTopologyTypes.DistributedAuthority, HostOrServer.DAHost)]
+    [TestFixture(NetworkTopologyTypes.ClientServer, HostOrServer.Host)]
+    [TestFixture(NetworkTopologyTypes.ClientServer, HostOrServer.Server)]
     public class ClientSynchronizationValidationTest : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 0;
@@ -20,6 +23,7 @@ public class ClientSynchronizationValidationTest : NetcodeIntegrationTest
         private bool m_RuntimeSceneWasExcludedFromSynch;
 
         private List<ClientSceneVerificationHandler> m_ClientSceneVerifiers = new List<ClientSceneVerificationHandler>();
+        public ClientSynchronizationValidationTest(NetworkTopologyTypes networkTopologyType, HostOrServer hostOrServer) : base(networkTopologyType, hostOrServer) { }
 
         protected override void OnNewClientStarted(NetworkManager networkManager)
         {
@@ -75,11 +79,17 @@ public IEnumerator ClientSynchWithServerSideRuntimeGeneratedScene()
         /// Validates that connecting clients will exclude scenes using <see cref="NetworkSceneManager.VerifySceneBeforeLoading"/>
         /// </summary>
         [UnityTest]
-        public IEnumerator ClientVerifySceneBeforeLoading()
+        public IEnumerator ClientVerifySceneBeforeLoading([Values] bool startClientBefore)
         {
             m_IncludeSceneVerificationHandler = true;
             var scenesToLoad = new List<string>() { k_FirstSceneToLoad, k_SecondSceneToLoad, k_ThirdSceneToSkip };
             m_ServerNetworkManager.SceneManager.OnLoadComplete += OnLoadComplete;
+
+            if (startClientBefore)
+            {
+                yield return CreateAndStartNewClient();
+            }
+
             foreach (var sceneToLoad in scenesToLoad)
             {
                 m_SceneBeingLoadedIsLoaded = false;
@@ -88,9 +98,25 @@ public IEnumerator ClientVerifySceneBeforeLoading()
 
                 yield return WaitForConditionOrTimeOut(() => m_SceneBeingLoadedIsLoaded);
                 AssertOnTimeout($"Timed out waiting for scene {m_SceneBeingLoaded} to finish loading!");
+
+                var serverId = m_ServerNetworkManager.LocalClientId;
+                var serverOrHost = m_ServerNetworkManager.IsHost ? "Host" : "Server";
+                foreach (var spawnedObjectEntry in m_ServerNetworkManager.SpawnManager.SpawnedObjects)
+                {
+                    var networkObject = spawnedObjectEntry.Value;
+                    if (!networkObject.IsSceneObject.Value)
+                    {
+                        continue;
+                    }
+
+                    Assert.True(networkObject.Observers.Contains(serverId), $"The {serverOrHost} is not an observer of in-scene placed {nameof(NetworkObject)} {networkObject.name}!");
+                }
             }
 
-            yield return CreateAndStartNewClient();
+            if (!startClientBefore)
+            {
+                yield return CreateAndStartNewClient();
+            }
 
             yield return WaitForConditionOrTimeOut(m_ClientSceneVerifiers[0].HasLoadedExpectedScenes);
             AssertOnTimeout($"Timed out waiting for the client to have loaded the expected scenes");
@@ -101,6 +127,18 @@ public IEnumerator ClientVerifySceneBeforeLoading()
             {
                 clientSceneVerifier.ValidateScenesLoaded();
             }
+
+            // Finally, validate that all in-scene placed NetworkObjects were properly synchronized/spawned on the client side
+            foreach (var spawnedObjectEntry in m_ServerNetworkManager.SpawnManager.SpawnedObjects)
+            {
+                var networkObject = spawnedObjectEntry.Value;
+                if (!networkObject.IsSceneObject.Value)
+                {
+                    continue;
+                }
+                Assert.True(m_ClientNetworkManagers[0].SpawnManager.SpawnedObjects.ContainsKey(networkObject.NetworkObjectId), $"{nameof(NetworkObject)}-{networkObject.NetworkObjectId} " +
+                    $"did not synchronize on Client-{m_ClientNetworkManagers[0].LocalClientId}!");
+            }
         }
 
         private string m_SceneBeingLoaded;
diff --git a/testproject/Assets/Tests/Runtime/NetworkSceneManager/InScenePlacedNetworkObjectTests.cs b/testproject/Assets/Tests/Runtime/NetworkSceneManager/InScenePlacedNetworkObjectTests.cs
index 8dd4d69cf8..32eb3be776 100644
--- a/testproject/Assets/Tests/Runtime/NetworkSceneManager/InScenePlacedNetworkObjectTests.cs
+++ b/testproject/Assets/Tests/Runtime/NetworkSceneManager/InScenePlacedNetworkObjectTests.cs
@@ -13,9 +13,12 @@
 
 namespace TestProject.RuntimeTests
 {
+    [TestFixture(NetworkTopologyTypes.DistributedAuthority, HostOrServer.DAHost)]
+    [TestFixture(NetworkTopologyTypes.ClientServer, HostOrServer.Host)]
+    [TestFixture(NetworkTopologyTypes.ClientServer, HostOrServer.Server)]
     public class InScenePlacedNetworkObjectTests : IntegrationTestWithApproximation
     {
-        protected override int NumberOfClients => 2;
+        protected override int NumberOfClients => 3;
 
         private const string k_SceneToLoad = "InSceneNetworkObject";
         private const string k_InSceneUnder = "InSceneUnderGameObject";
@@ -24,6 +27,8 @@ public class InScenePlacedNetworkObjectTests : IntegrationTestWithApproximation
         private bool m_CanStartServerAndClients;
         private string m_SceneLoading = k_SceneToLoad;
 
+        public InScenePlacedNetworkObjectTests(NetworkTopologyTypes networkTopologyType, HostOrServer hostOrServer) : base(networkTopologyType, hostOrServer) { }
+
         protected override IEnumerator OnSetup()
         {
             NetworkObjectTestComponent.Reset();
@@ -48,6 +53,12 @@ protected override bool CanStartServerAndClients()
             return m_CanStartServerAndClients;
         }
 
+        public enum DespawnMode
+        {
+            Despawn,
+            DeferDespawn,
+        }
+
         /// <summary>
         /// This verifies that in-scene placed NetworkObjects will be properly
         /// synchronized if:
@@ -56,8 +67,14 @@ protected override bool CanStartServerAndClients()
         /// NetworkObject as a NetworkPrefab
         /// </summary>
         [UnityTest]
-        public IEnumerator InSceneNetworkObjectSynchAndSpawn()
+        public IEnumerator InSceneNetworkObjectSynchAndSpawn([Values] DespawnMode despawnMode)
         {
+            if (!m_DistributedAuthority && despawnMode == DespawnMode.DeferDespawn)
+            {
+                Assert.Ignore($"Test ignored as DeferDespawn is only valid with Distributed Authority mode.");
+            }
+
+            NetworkObjectTestComponent.VerboseDebug = false;
             // Because despawning a client will cause it to shutdown and clean everything in the
             // scene hierarchy, we have to prevent one of the clients from spawning initially before
             // we test synchronizing late joining clients with despawned in-scene placed NetworkObjects.
@@ -65,23 +82,25 @@ public IEnumerator InSceneNetworkObjectSynchAndSpawn()
             // will be targeting to join late from the m_ClientNetworkManagers array, start the server
             // and the remaining client, despawn the in-scene NetworkObject, and then start and synchronize
             // the clientToTest.
-            var clientToTest = m_ClientNetworkManagers[1];
+            var clientToTest = m_ClientNetworkManagers[2];
             var clients = m_ClientNetworkManagers.ToList();
             clients.Remove(clientToTest);
             m_ClientNetworkManagers = clients.ToArray();
             m_CanStartServerAndClients = true;
+            NetworkObjectTestComponent.Reset();
             yield return StartServerAndClients();
             clients.Add(clientToTest);
             m_ClientNetworkManagers = clients.ToArray();
 
-            NetworkObjectTestComponent.ServerNetworkObjectInstance = null;
+
             m_ServerNetworkManager.SceneManager.OnSceneEvent += Server_OnSceneEvent;
             var status = m_ServerNetworkManager.SceneManager.LoadScene(k_SceneToLoad, LoadSceneMode.Additive);
             Assert.IsTrue(status == SceneEventProgressStatus.Started, $"When attempting to load scene {k_SceneToLoad} was returned the following progress status: {status}");
-
+            // We removed a client from the initial spawn and server should spawn too
+            var clientCount = TotalClients - (m_UseHost ? 1 : 0);
             // This verifies the scene loaded and the in-scene placed NetworkObjects spawned.
-            yield return WaitForConditionOrTimeOut(() => NetworkObjectTestComponent.SpawnedInstances.Count == TotalClients - 1);
-            AssertOnTimeout($"Timed out waiting for total spawned in-scene placed NetworkObjects to reach a count of {TotalClients - 1} and is currently {NetworkObjectTestComponent.SpawnedInstances.Count}");
+            yield return WaitForConditionOrTimeOut(() => NetworkObjectTestComponent.SpawnedInstances.Count == clientCount);
+            AssertOnTimeout($"Timed out waiting for total spawned in-scene placed NetworkObjects to reach a count of {clientCount} and is currently {NetworkObjectTestComponent.SpawnedInstances.Count}");
 
             // Get the server-side instance of the in-scene NetworkObject
             Assert.True(s_GlobalNetworkObjects.ContainsKey(m_ServerNetworkManager.LocalClientId), $"Could not find server instance of the test in-scene NetworkObject!");
@@ -91,13 +110,25 @@ public IEnumerator InSceneNetworkObjectSynchAndSpawn()
 
             // Despawn the in-scene placed NetworkObject
             Debug.Log("Despawning In-Scene placed NetworkObject");
-            serverObject.Despawn(false);
+
+            if (despawnMode == DespawnMode.Despawn)
+            {
+                serverObject.Despawn(false);
+            }
+            else
+            {
+                serverObject.DeferDespawn(1, false);
+            }
+
             yield return WaitForConditionOrTimeOut(() => NetworkObjectTestComponent.SpawnedInstances.Count == 0);
             AssertOnTimeout($"Timed out waiting for all in-scene instances to be despawned!  Current spawned count: {NetworkObjectTestComponent.SpawnedInstances.Count()}");
 
             // Now late join a client
             NetworkObjectTestComponent.OnInSceneObjectDespawned += OnInSceneObjectDespawned;
             NetcodeIntegrationTestHelpers.StartOneClient(clientToTest);
+            // Spawned another client
+            clientCount++;
+
             yield return WaitForConditionOrTimeOut(() => (clientToTest.IsConnectedClient && clientToTest.IsListening));
             AssertOnTimeout($"Timed out waiting for {clientToTest.name} to reconnect!");
 
@@ -116,21 +147,24 @@ public IEnumerator InSceneNetworkObjectSynchAndSpawn()
             // Now test that the despawned in-scene placed NetworkObject can be re-spawned (without having been registered as a NetworkPrefab)
             serverObject.Spawn();
 
-            yield return WaitForConditionOrTimeOut(() => NetworkObjectTestComponent.SpawnedInstances.Count == TotalClients);
-            AssertOnTimeout($"Timed out waiting for all in-scene instances to be spawned!  Current spawned count: {NetworkObjectTestComponent.SpawnedInstances.Count()} | Expected spawn count: {TotalClients}");
+            yield return WaitForConditionOrTimeOut(() => NetworkObjectTestComponent.SpawnedInstances.Count == clientCount);
+            AssertOnTimeout($"Timed out waiting for all in-scene instances to be spawned!  Current spawned count: {NetworkObjectTestComponent.SpawnedInstances.Count()} | Expected spawn count: {clientCount}");
 
             // Test NetworkHide on the first client
             var firstClientId = m_ClientNetworkManagers[0].LocalClientId;
 
             serverObject.NetworkHide(firstClientId);
+            clientCount--;
 
-            yield return WaitForConditionOrTimeOut(() => NetworkObjectTestComponent.SpawnedInstances.Count == TotalClients - 1);
-            AssertOnTimeout($"[NetworkHide] Timed out waiting for Client-{firstClientId} to despawn the in-scene placed NetworkObject! Current spawned count: {NetworkObjectTestComponent.SpawnedInstances.Count()} | Expected spawn count: {TotalClients - 1}");
+            yield return WaitForConditionOrTimeOut(() => NetworkObjectTestComponent.SpawnedInstances.Count == clientCount);
+            AssertOnTimeout($"[NetworkHide] Timed out waiting for Client-{firstClientId} to despawn the in-scene placed NetworkObject! Current spawned count: {NetworkObjectTestComponent.SpawnedInstances.Count()} | Expected spawn count: {clientCount}");
 
             // Validate that the first client can spawn the "netcode hidden" in-scene placed NetworkObject
             serverObject.NetworkShow(firstClientId);
-            yield return WaitForConditionOrTimeOut(() => NetworkObjectTestComponent.SpawnedInstances.Count == TotalClients);
-            AssertOnTimeout($"[NetworkShow] Timed out waiting for Client-{firstClientId} to spawn the in-scene placed NetworkObject! Current spawned count: {NetworkObjectTestComponent.SpawnedInstances.Count()} | Expected spawn count: {TotalClients}");
+            clientCount++;
+
+            yield return WaitForConditionOrTimeOut(() => NetworkObjectTestComponent.SpawnedInstances.Count == clientCount);
+            AssertOnTimeout($"[NetworkShow] Timed out waiting for Client-{firstClientId} to spawn the in-scene placed NetworkObject! Current spawned count: {NetworkObjectTestComponent.SpawnedInstances.Count()} | Expected spawn count: {clientCount}");
 
             CleanUpLoadedScene();
         }
@@ -147,7 +181,7 @@ public IEnumerator ParentedInSceneObjectLateJoiningClient()
             // will be targeting to join late from the m_ClientNetworkManagers array, start the server
             // and the remaining client, despawn the in-scene NetworkObject, and then start and synchronize
             // the clientToTest.
-            var clientToTest = m_ClientNetworkManagers[1];
+            var clientToTest = m_ClientNetworkManagers[2];
             var clients = m_ClientNetworkManagers.ToList();
             clients.Remove(clientToTest);
             m_ClientNetworkManagers = clients.ToArray();
@@ -169,12 +203,22 @@ public IEnumerator ParentedInSceneObjectLateJoiningClient()
             Assert.IsNotNull(firstClientInSceneObjectInstance, $"Could not get the client-side registration of {nameof(NetworkObjectTestComponent)}!");
             Assert.IsTrue(firstClientInSceneObjectInstance.NetworkManager == m_ClientNetworkManagers[0]);
 
-            // Parent the object
-            serverInSceneObjectInstance.transform.parent = m_ServerNetworkManager.LocalClient.PlayerObject.transform;
+            var playerObjectToParent = m_UseHost ? m_ServerNetworkManager.LocalClient.PlayerObject : m_PlayerNetworkObjects[m_ServerNetworkManager.LocalClientId][m_ClientNetworkManagers[1].LocalClientId];
+            var clientSidePlayer = (NetworkObject)null;
+            if (!m_UseHost)
+            {
+                playerObjectToParent = m_PlayerNetworkObjects[m_ServerNetworkManager.LocalClientId][m_ClientNetworkManagers[1].LocalClientId];
+                clientSidePlayer = m_PlayerNetworkObjects[m_ClientNetworkManagers[0].LocalClientId][m_ClientNetworkManagers[1].LocalClientId];
+            }
+            else
+            {
+                clientSidePlayer = m_PlayerNetworkObjects[m_ClientNetworkManagers[0].LocalClientId][NetworkManager.ServerClientId];
+            }
 
-            var clientSideServerPlayer = m_PlayerNetworkObjects[m_ClientNetworkManagers[0].LocalClientId][NetworkManager.ServerClientId];
+            // Parent the object
+            serverInSceneObjectInstance.transform.parent = playerObjectToParent.transform;
 
-            yield return WaitForConditionOrTimeOut(() => firstClientInSceneObjectInstance.transform.parent != null && firstClientInSceneObjectInstance.transform.parent == clientSideServerPlayer.transform);
+            yield return WaitForConditionOrTimeOut(() => firstClientInSceneObjectInstance.transform.parent != null && firstClientInSceneObjectInstance.transform.parent == clientSidePlayer.transform);
             AssertOnTimeout($"Timed out waiting for the client-side id ({m_ClientNetworkManagers[0].LocalClientId}) server player transform to be set on the client-side in-scene object!");
             // Now late join a client
             NetcodeIntegrationTestHelpers.StartOneClient(clientToTest);
@@ -186,15 +230,15 @@ public IEnumerator ParentedInSceneObjectLateJoiningClient()
             // Update the newly joined client information
             ClientNetworkManagerPostStartInit();
 
-            var lateJoinClientInSceneObjectInstance = NetworkObjectTestComponent.SpawnedInstances.Where((c) => c.NetworkManager == m_ClientNetworkManagers[1]).FirstOrDefault();
+            var lateJoinClientInSceneObjectInstance = NetworkObjectTestComponent.SpawnedInstances.Where((c) => c.NetworkManager == m_ClientNetworkManagers[2]).FirstOrDefault();
             Assert.IsNotNull(lateJoinClientInSceneObjectInstance, $"Could not get the client-side registration of {nameof(NetworkObjectTestComponent)} for the late joining client!");
 
             // Now get the late-joining client's instance for the server player
-            clientSideServerPlayer = m_PlayerNetworkObjects[clientToTest.LocalClientId][NetworkManager.ServerClientId];
+            clientSidePlayer = m_PlayerNetworkObjects[clientToTest.LocalClientId][clientSidePlayer.OwnerClientId];
 
             // Validate the late joined client's in-scene NetworkObject is parented to the server-side player
-            yield return WaitForConditionOrTimeOut(() => lateJoinClientInSceneObjectInstance.transform.parent != null && lateJoinClientInSceneObjectInstance.transform.parent == clientSideServerPlayer.transform);
-            AssertOnTimeout($"Timed out waiting for the client-side id ({m_ClientNetworkManagers[0].LocalClientId}) server player transform to be set on the client-side in-scene object!");
+            yield return WaitForConditionOrTimeOut(() => lateJoinClientInSceneObjectInstance.transform.parent != null && lateJoinClientInSceneObjectInstance.transform.parent == clientSidePlayer.transform);
+            AssertOnTimeout($"Timed out waiting for the client-side id ({m_ClientNetworkManagers[0].LocalClientId}) player transform to be set on the client-side in-scene object!");
         }
 
         private void OnSceneEvent(SceneEvent sceneEvent)
@@ -480,9 +524,6 @@ public IEnumerator ParentedInSceneObjectUnderGameObject([Values(k_InSceneUnder,
             Assert.IsNotNull(firstClientInSceneObjectInstance, $"Could not get the client-side registration of {nameof(NetworkObjectTestComponent)}!");
             Assert.IsTrue(firstClientInSceneObjectInstance.NetworkManager == m_ClientNetworkManagers[0]);
 
-            // Parent the object
-            var clientSideServerPlayer = m_PlayerNetworkObjects[m_ClientNetworkManagers[0].LocalClientId][NetworkManager.ServerClientId];
-
             serverInSceneObjectInstance.AutoObjectParentSync = parentSyncSettings == ParentSyncSettings.ParentSync;
             serverInSceneObjectInstance.SynchronizeTransform = transformSyncSettings == TransformSyncSettings.TransformSync;
 
@@ -508,7 +549,7 @@ public IEnumerator ParentedInSceneObjectUnderGameObject([Values(k_InSceneUnder,
             // Now make sure the server and newly joined client transform values match.
             RotationsMatch(serverInSceneObjectInstance.transform, lateJoinClientInSceneObjectInstance.transform, transformSpace == TransformSpace.Local);
             PositionsMatch(serverInSceneObjectInstance.transform, lateJoinClientInSceneObjectInstance.transform, transformSpace == TransformSpace.Local);
-            // When tesing local space we also do a sanity check and validate the world space values too.
+            // When testing local space we also do a sanity check and validate the world space values too.
             if (transformSpace == TransformSpace.Local)
             {
                 RotationsMatch(serverInSceneObjectInstance.transform, lateJoinClientInSceneObjectInstance.transform);
@@ -620,6 +661,5 @@ public IEnumerator DespawnAndDestroyNetworkObjects()
             var insceneObject = GameObject.Find("InSceneObject");
             Assert.IsNotNull(insceneObject, $"Could not find the in-scene placed {nameof(NetworkObject)}: InSceneObject!");
         }
-
     }
 }
diff --git a/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkObjectSceneMigrationTests.cs b/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkObjectSceneMigrationTests.cs
index ccfbf25b05..d5eb5f427c 100644
--- a/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkObjectSceneMigrationTests.cs
+++ b/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkObjectSceneMigrationTests.cs
@@ -59,19 +59,6 @@ protected override void OnServerAndClientsCreated()
             base.OnServerAndClientsCreated();
         }
 
-        protected override void OnNewClientCreated(NetworkManager networkManager)
-        {
-            foreach (var networkPrfab in m_ServerNetworkManager.NetworkConfig.Prefabs.Prefabs)
-            {
-                if (networkPrfab.Prefab == null)
-                {
-                    continue;
-                }
-                networkManager.NetworkConfig.Prefabs.Add(networkPrfab);
-            }
-            base.OnNewClientCreated(networkManager);
-        }
-
         private bool DidClientsSpawnInstance(NetworkObject serverObject, bool checkDestroyWithScene = false)
         {
             foreach (var networkManager in m_ClientNetworkManagers)
diff --git a/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerEventCallbacks.cs b/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerEventCallbacks.cs
index f46292d90e..505088dd8e 100644
--- a/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerEventCallbacks.cs
+++ b/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerEventCallbacks.cs
@@ -10,6 +10,7 @@
 
 namespace TestProject.RuntimeTests
 {
+    [TestFixture(HostOrServer.DAHost)]
     [TestFixture(HostOrServer.Host)]
     [TestFixture(HostOrServer.Server)]
     public class NetworkSceneManagerEventCallbacks : NetcodeIntegrationTest
diff --git a/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerEventDataPoolTest.cs b/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerEventDataPoolTest.cs
index 90d5a34934..73349a49a1 100644
--- a/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerEventDataPoolTest.cs
+++ b/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerEventDataPoolTest.cs
@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using NUnit.Framework;
 using Unity.Netcode;
 using Unity.Netcode.TestHelpers.Runtime;
@@ -10,6 +11,8 @@
 
 namespace TestProject.RuntimeTests
 {
+    [TestFixture(HostOrServer.DAHost, LoadSceneMode.Single)]
+    [TestFixture(HostOrServer.DAHost, LoadSceneMode.Additive)]
     [TestFixture(HostOrServer.Host, LoadSceneMode.Single)]
     [TestFixture(HostOrServer.Host, LoadSceneMode.Additive)]
     [TestFixture(HostOrServer.Server, LoadSceneMode.Single)]
@@ -307,6 +310,8 @@ private bool DataPoolVerifySceneClient(int sceneIndex, string sceneName, LoadSce
             return true;
         }
 
+
+        private StringBuilder m_ErrorMsg = new StringBuilder();
         /// <summary>
         /// Small to heavy scene loading scenario to test the dynamically generated SceneEventData objects under a load.
         /// Will load from 1 to 32 scenes in both single and additive ClientSynchronizationMode
@@ -356,11 +361,30 @@ public IEnumerator SceneEventDataPoolSceneLoadingTest([Values(1, 2, 4, 6)] int n
             }
 
             yield return UnloadAllScenes(true);
+            Assert.IsTrue(CheckNetworkObjectsToSynchronizeSceneChanges(m_ServerNetworkManager), $"{nameof(NetworkSpawnManager.NetworkObjectsToSynchronizeSceneChanges)} validation check failure!\n {m_ErrorMsg}");
+            m_ServerNetworkManager.SceneManager.OnSceneEvent -= ServerSceneManager_OnSceneEvent;
+            // Validate that the NetworkObjectsToSynchronizeSceneChanges does not persist entries when scenes are unloaded.
             foreach (var client in m_ClientNetworkManagers)
             {
+                Assert.IsTrue(CheckNetworkObjectsToSynchronizeSceneChanges(client), $"{nameof(NetworkSpawnManager.NetworkObjectsToSynchronizeSceneChanges)} validation check failure!\n {m_ErrorMsg}");
                 client.SceneManager.OnUnloadComplete -= SceneManager_OnUnloadComplete;
             }
-            m_ServerNetworkManager.SceneManager.OnSceneEvent -= ServerSceneManager_OnSceneEvent;
+        }
+
+        private bool CheckNetworkObjectsToSynchronizeSceneChanges(NetworkManager networkManager)
+        {
+            m_ErrorMsg.Clear();
+            if (networkManager.SpawnManager.NetworkObjectsToSynchronizeSceneChanges.Count > 0)
+            {
+                foreach (var entry in networkManager.SpawnManager.NetworkObjectsToSynchronizeSceneChanges)
+                {
+                    if (entry.Value.IsSceneObject.HasValue && entry.Value.IsSceneObject.Value)
+                    {
+                        m_ErrorMsg.AppendLine($"{entry.Value.name} still exists within {nameof(NetworkSpawnManager.NetworkObjectsToSynchronizeSceneChanges)}!");
+                    }
+                }
+            }
+            return m_ErrorMsg.Length == 0;
         }
 
         private string m_SceneBeingUnloaded;
diff --git a/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerEventNotifications.cs b/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerEventNotifications.cs
index 2c29c981bb..34a2078499 100644
--- a/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerEventNotifications.cs
+++ b/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerEventNotifications.cs
@@ -10,6 +10,7 @@
 
 namespace TestProject.RuntimeTests
 {
+    [TestFixture(HostOrServer.DAHost)]
     [TestFixture(HostOrServer.Host)]
     [TestFixture(HostOrServer.Server)]
     public class NetworkSceneManagerEventNotifications : NetcodeIntegrationTest
@@ -262,7 +263,7 @@ public IEnumerator SceneLoadingAndNotifications([Values] LoadSceneMode loadScene
                 AssertOnTimeout($"Timed out waiting for all clients to switch to scene {m_CurrentSceneName}!");
 
 
-                // Now single mode load a a new scene (i.e. "scene switch")
+                // Now single mode load a new scene (i.e. "scene switch")
                 m_CurrentSceneName = k_BaseUnitTestSceneName;
                 ResetWait();
                 Assert.AreEqual(m_ServerNetworkManager.SceneManager.LoadScene(m_CurrentSceneName, loadSceneMode), SceneEventProgressStatus.Started);
@@ -280,6 +281,7 @@ public IEnumerator SceneLoadingAndNotifications([Values] LoadSceneMode loadScene
                     {
                         additionalInfo += $"{sceneName},";
                     }
+                    Debug.Break();
                 }
                 AssertOnTimeout($"{nameof(m_ScenesLoaded)} still contains some of the scenes that were expected to be unloaded!\n {additionalInfo}");
             }
diff --git a/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerFixValidationTests.cs b/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerFixValidationTests.cs
deleted file mode 100644
index 1da238adec..0000000000
--- a/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerFixValidationTests.cs
+++ /dev/null
@@ -1,326 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using NUnit.Framework;
-using Unity.Netcode;
-using Unity.Netcode.TestHelpers.Runtime;
-using Unity.Netcode.Transports.UTP;
-using UnityEngine;
-using UnityEngine.SceneManagement;
-using UnityEngine.TestTools;
-using Object = UnityEngine.Object;
-
-// TODO: Rewrite test to use the tools package. Debug simulator not available in UTP 2.X.
-#if !UTP_TRANSPORT_2_0_ABOVE
-
-namespace TestProject.RuntimeTests
-{
-    /// <summary>
-    /// Use this test group for validating NetworkSceneManager fixes.
-    /// </summary>
-    public class NetworkSceneManagerFixValidationTests : NetcodeIntegrationTest
-    {
-
-        private const string k_SceneToLoad = "UnitTestBaseScene";
-        private const string k_AdditiveScene1 = "InSceneNetworkObject";
-        private const string k_AdditiveScene2 = "AdditiveSceneMultiInstance";
-
-        protected override int NumberOfClients => 2;
-
-        private bool m_CanStart;
-        private bool m_NoLatency;
-
-        private Scene m_OriginalActiveScene;
-
-        protected override IEnumerator OnSetup()
-        {
-            m_OriginalActiveScene = SceneManager.GetActiveScene();
-            return base.OnSetup();
-        }
-
-        protected override bool CanStartServerAndClients()
-        {
-            return m_CanStart;
-        }
-
-        /// <summary>
-        /// This validation test verifies that the NetworkSceneManager will not crash if
-        /// the SpawnManager.SpawnedObjectsList contains destroyed and invalid NetworkObjects.
-        /// </summary>
-        [Test]
-        public void DDOLPopulateWithNullNetworkObjectsValidation([Values] bool useHost)
-        {
-            var gameObject = new GameObject();
-            var networkObject = gameObject.AddComponent<NetworkObject>();
-            NetcodeIntegrationTestHelpers.MakeNetworkObjectTestPrefab(networkObject);
-
-            m_ServerNetworkManager.NetworkConfig.Prefabs.Add(new NetworkPrefab() { Prefab = gameObject });
-
-            foreach (var clientNetworkManager in m_ClientNetworkManagers)
-            {
-                clientNetworkManager.NetworkConfig.Prefabs.Add(new NetworkPrefab() { Prefab = gameObject });
-            }
-
-            // Start the host and clients
-            if (!NetcodeIntegrationTestHelpers.Start(useHost, m_ServerNetworkManager, new NetworkManager[] { }))
-            {
-                Debug.LogError("Failed to start instances");
-                Assert.Fail("Failed to start instances");
-            }
-
-            // Spawn some NetworkObjects
-            var spawnedNetworkObjects = new List<GameObject>();
-            for (int i = 0; i < 10; i++)
-            {
-                var instance = Object.Instantiate(gameObject);
-                var instanceNetworkObject = instance.GetComponent<NetworkObject>();
-                instanceNetworkObject.NetworkManagerOwner = m_ServerNetworkManager;
-                instanceNetworkObject.Spawn();
-                spawnedNetworkObjects.Add(instance);
-            }
-
-            // Add a bogus entry to the SpawnManager
-            m_ServerNetworkManager.SpawnManager.SpawnedObjectsList.Add(null);
-
-            // Verify moving all NetworkObjects into the DDOL when some might be invalid will not crash
-            m_ServerNetworkManager.SceneManager.MoveObjectsToDontDestroyOnLoad();
-
-            // Verify moving all NetworkObjects from DDOL back into the active scene will not crash even if some are invalid
-            m_ServerNetworkManager.SceneManager.MoveObjectsFromDontDestroyOnLoadToScene(SceneManager.GetActiveScene());
-
-            // Now remove the invalid object
-            m_ServerNetworkManager.SpawnManager.SpawnedObjectsList.Remove(null);
-
-            // As long as there are no exceptions this test passes
-        }
-
-        protected override void OnServerAndClientsCreated()
-        {
-            if (m_NoLatency)
-            {
-                return;
-            }
-
-            // Apply a 500ms latency on packets (primarily for ClientDisconnectsDuringSeneLoadingValidation)
-            var serverTransport = m_ServerNetworkManager.GetComponent<UnityTransport>();
-            serverTransport.SetDebugSimulatorParameters(500, 0, 0);
-
-            foreach (var clientNetworkManager in m_ClientNetworkManagers)
-            {
-                var clientTransport = m_ServerNetworkManager.GetComponent<UnityTransport>();
-                clientTransport.SetDebugSimulatorParameters(500, 0, 0);
-            }
-        }
-
-        protected override IEnumerator OnServerAndClientsConnected()
-        {
-            m_ServerNetworkManager.SceneManager.OnLoadEventCompleted += SceneManager_OnLoadEventCompleted;
-            return base.OnServerAndClientsConnected();
-        }
-
-        private void SceneManager_OnLoadEventCompleted(string sceneName, LoadSceneMode loadSceneMode, List<ulong> clientsCompleted, List<ulong> clientsTimedOut)
-        {
-            if (sceneName == k_SceneToLoad)
-            {
-                m_ServerNetworkManager.SceneManager.OnLoadEventCompleted -= SceneManager_OnLoadEventCompleted;
-                m_SceneLoadEventCompleted = true;
-
-                // Verify that the disconnected client is in the clients that timed out list
-                Assert.IsTrue(clientsTimedOut.Contains(m_FirstClientId), $"Client-id({m_FirstClientId}) was not found in the clients that timed out list that has a count of ({clientsTimedOut.Count}) entries!");
-            }
-        }
-
-        private bool m_SceneLoadEventCompleted;
-        private bool m_ClientDisconnectedOnLoad;
-        private ulong m_FirstClientId;
-
-        [UnityTest]
-        public IEnumerator ClientDisconnectsDuringSeneLoadingValidation()
-        {
-            m_CanStart = true;
-            yield return StartServerAndClients();
-
-            // Do some preparation for the client we will be disconnecting.
-            m_FirstClientId = m_ClientNetworkManagers[0].LocalClientId;
-            if (m_ClientNetworkManagers[0].SceneManager.VerifySceneBeforeLoading != null)
-            {
-                m_OriginalVerifyScene = m_ClientNetworkManagers[0].SceneManager.VerifySceneBeforeLoading;
-            }
-            m_ClientNetworkManagers[0].SceneManager.VerifySceneBeforeLoading = VerifySceneBeforeLoading;
-
-            // We use this to verify that the loading scene event doesn't take NetworkConfig.LoadSceneTimeOut to complete
-            var timeEventStarted = Time.realtimeSinceStartup;
-            var disconnectedClientName = m_ClientNetworkManagers[0].name;
-
-            // Start to load the scene
-            m_ServerNetworkManager.SceneManager.LoadScene(k_SceneToLoad, LoadSceneMode.Additive);
-            yield return WaitForConditionOrTimeOut(() => m_SceneLoadEventCompleted);
-            AssertOnTimeout("Timed out waiting for the load scene event to be completed!");
-
-            // Verify the client disconnected when it was just about to start the load event
-            Assert.True(m_ClientDisconnectedOnLoad, $"{disconnectedClientName} did not disconnect!");
-
-            // Verify it didn't take as long as the NetworkConfig.LoadSceneTimeOut period to complete the event
-            var timeToComplete = Time.realtimeSinceStartup - timeEventStarted;
-            Assert.True(timeToComplete < m_ServerNetworkManager.NetworkConfig.LoadSceneTimeOut, "Server scene loading event timed out!");
-
-            // Verification that the disconnected client was in the timeout list is done in SceneManager_OnLoadEventCompleted
-        }
-
-        private NetworkSceneManager.VerifySceneBeforeLoadingDelegateHandler m_OriginalVerifyScene;
-
-        /// <summary>
-        /// The client that disconnects during the scene event will have this override that will:
-        /// - Set m_ClientDisconnectedOnLoad
-        /// - Stop/Disconnect the client
-        /// - Return false (i.e. don't load this scene) as we are simulating the client disconnected
-        /// right as the scene event started
-        /// </summary>
-        private bool VerifySceneBeforeLoading(int sceneIndex, string sceneName, LoadSceneMode loadSceneMode)
-        {
-            if (sceneName == k_SceneToLoad)
-            {
-                m_ClientDisconnectedOnLoad = true;
-                NetcodeIntegrationTestHelpers.StopOneClient(m_ClientNetworkManagers[0]);
-                IntegrationTestSceneHandler.NetworkManagers.Remove(m_ClientNetworkManagers[0]);
-                return false;
-            }
-            if (m_OriginalVerifyScene != null)
-            {
-                return m_OriginalVerifyScene.Invoke(sceneIndex, sceneName, loadSceneMode);
-            }
-            return true;
-        }
-
-
-        private Scene m_FirstScene;
-        private Scene m_SecondScene;
-        private Scene m_ThirdScene;
-
-        private bool m_SceneUnloadedEventCompleted;
-
-
-        [UnityTest]
-        public IEnumerator InitialActiveSceneUnload()
-        {
-            SceneManager.sceneLoaded += SceneManager_sceneLoaded;
-            SceneManager.LoadScene(k_SceneToLoad, LoadSceneMode.Additive);
-
-            yield return WaitForConditionOrTimeOut(FirstSceneIsLoaded);
-            AssertOnTimeout($"Failed to load scene {k_SceneToLoad}!");
-
-            // Now set the "first scene" as the active scene prior to starting the server and clients
-            SceneManager.SetActiveScene(m_FirstScene);
-            m_NoLatency = true;
-            m_CanStart = true;
-
-            yield return StartServerAndClients();
-
-            var serverSceneManager = m_ServerNetworkManager.SceneManager;
-            serverSceneManager.OnSceneEvent += ServerSceneManager_OnSceneEvent;
-            m_SceneLoadEventCompleted = false;
-            serverSceneManager.LoadScene(k_AdditiveScene1, LoadSceneMode.Additive);
-
-            yield return WaitForConditionOrTimeOut(SecondSceneIsLoaded);
-            AssertOnTimeout($"[Load Event] Failure in loading scene {k_AdditiveScene1} (locally or on client side)!");
-
-            // Since we have to keep the test running scene active, we mimic the "auto assignment" of
-            // the active scene prior to unloading the first scene in order to validate this test scenario.
-            SceneManager.SetActiveScene(m_SecondScene);
-
-            yield return s_DefaultWaitForTick;
-
-            // Now unload the "first" scene which, if this was the only scene loaded prior to loading the second scene,
-            // would automatically make the second scene the currently active scene
-            m_SceneUnloadedEventCompleted = false;
-            serverSceneManager.UnloadScene(m_FirstScene);
-            yield return WaitForConditionOrTimeOut(SceneUnloadEventCompleted);
-            AssertOnTimeout($"[Unload Event] Failure in unloading scene {m_FirstScene} (locally or on client side)!");
-
-            // Now load the third scene, and if no time out occurs then we have validated this test!
-            m_SceneLoadEventCompleted = false;
-            serverSceneManager.LoadScene(k_AdditiveScene2, LoadSceneMode.Additive);
-            yield return WaitForConditionOrTimeOut(ThirdSceneIsLoaded);
-            AssertOnTimeout($"[Load Event] Failure in loading scene {k_AdditiveScene2} (locally or on client side)!");
-            serverSceneManager.OnSceneEvent -= ServerSceneManager_OnSceneEvent;
-        }
-
-        private void ServerSceneManager_OnSceneEvent(SceneEvent sceneEvent)
-        {
-            if (sceneEvent.ClientId != m_ServerNetworkManager.LocalClientId)
-            {
-                return;
-            }
-
-            if (sceneEvent.SceneEventType == SceneEventType.LoadComplete)
-            {
-                if (sceneEvent.Scene.name == k_AdditiveScene1)
-                {
-                    m_SecondScene = sceneEvent.Scene;
-                }
-                else if (sceneEvent.Scene.name == k_AdditiveScene2)
-                {
-                    m_ThirdScene = sceneEvent.Scene;
-                }
-            }
-
-            if (sceneEvent.SceneEventType == SceneEventType.LoadEventCompleted)
-            {
-                if (sceneEvent.SceneName == k_AdditiveScene1 || sceneEvent.SceneName == k_AdditiveScene2)
-                {
-                    m_SceneLoadEventCompleted = true;
-                }
-            }
-
-            if (sceneEvent.SceneEventType == SceneEventType.UnloadEventCompleted)
-            {
-                if (sceneEvent.SceneName == k_SceneToLoad || sceneEvent.SceneName == k_AdditiveScene1 || sceneEvent.SceneName == k_AdditiveScene2)
-                {
-                    m_SceneUnloadedEventCompleted = true;
-                }
-            }
-        }
-
-        private bool SceneUnloadEventCompleted()
-        {
-            return m_SceneUnloadedEventCompleted;
-        }
-
-        private bool FirstSceneIsLoaded()
-        {
-            return m_FirstScene.IsValid() && m_FirstScene.isLoaded;
-        }
-
-        private bool SecondSceneIsLoaded()
-        {
-            return m_SecondScene.IsValid() && m_SecondScene.isLoaded && m_SceneLoadEventCompleted;
-        }
-
-        private bool ThirdSceneIsLoaded()
-        {
-            return m_ThirdScene.IsValid() && m_ThirdScene.isLoaded && m_SceneLoadEventCompleted;
-        }
-
-        private void SceneManager_sceneLoaded(Scene scene, LoadSceneMode mode)
-        {
-            if (scene.name == k_SceneToLoad && mode == LoadSceneMode.Additive)
-            {
-                m_FirstScene = scene;
-                SceneManager.sceneLoaded -= SceneManager_sceneLoaded;
-            }
-        }
-
-        protected override IEnumerator OnTearDown()
-        {
-            m_CanStart = false;
-            m_NoLatency = false;
-
-            if (m_OriginalActiveScene != SceneManager.GetActiveScene())
-            {
-                SceneManager.SetActiveScene(m_OriginalActiveScene);
-            }
-
-            return base.OnTearDown();
-        }
-    }
-}
-#endif
diff --git a/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerPopulateInSceneTests.cs b/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerPopulateInSceneTests.cs
index f48f869e9a..4af8737c44 100644
--- a/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerPopulateInSceneTests.cs
+++ b/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerPopulateInSceneTests.cs
@@ -10,6 +10,10 @@
 
 namespace TestProject.RuntimeTests
 {
+
+    [TestFixture(NetworkTopologyTypes.DistributedAuthority, HostOrServer.DAHost)]
+    [TestFixture(NetworkTopologyTypes.ClientServer, HostOrServer.Host)]
+    [TestFixture(NetworkTopologyTypes.ClientServer, HostOrServer.Server)]
     public class NetworkSceneManagerPopulateInSceneTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 0;
@@ -17,6 +21,8 @@ public class NetworkSceneManagerPopulateInSceneTests : NetcodeIntegrationTest
 
         protected Dictionary<uint, GameObject> m_InSceneObjectList = new Dictionary<uint, GameObject>();
 
+        public NetworkSceneManagerPopulateInSceneTests(NetworkTopologyTypes networkTopologyType, HostOrServer hostOrServer) : base(networkTopologyType, hostOrServer) { }
+
         protected override IEnumerator OnSetup()
         {
             m_InSceneObjectList.Clear();
diff --git a/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerSeneVerification.cs b/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerSeneVerification.cs
index 99c8c514ef..9f92f4bd28 100644
--- a/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerSeneVerification.cs
+++ b/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerSeneVerification.cs
@@ -9,6 +9,8 @@
 
 namespace TestProject.RuntimeTests
 {
+    [TestFixture(HostOrServer.DAHost, LoadSceneMode.Single)]
+    [TestFixture(HostOrServer.DAHost, LoadSceneMode.Additive)]
     [TestFixture(HostOrServer.Host, LoadSceneMode.Single)]
     [TestFixture(HostOrServer.Host, LoadSceneMode.Additive)]
     [TestFixture(HostOrServer.Server, LoadSceneMode.Single)]
@@ -359,25 +361,26 @@ public IEnumerator SceneVerifyBeforeLoadTest()
             }
 
             m_IsTestingVerifyScene = false;
-            Assert.AreEqual(m_ServerNetworkManager.SceneManager.UnloadScene(m_CurrentScene), SceneEventProgressStatus.Started);
             var currentSceneName = m_CurrentScene;
+            Assert.AreEqual(m_ServerNetworkManager.SceneManager.UnloadScene(m_CurrentScene), SceneEventProgressStatus.Started);
+
             // Now wait for scenes to unload
             yield return WaitForConditionOrTimeOut(ConditionPassed);
             AssertOnTimeout($"Timed out waiting for all clients to unload {m_CurrentSceneName}!\n{PrintFailedCondition()}");
 
             // Verify that all NetworkSceneManager instances reflect the change in scenes synchronized
-            var scenesSynchronized = m_ServerNetworkManager.SceneManager.ScenesLoaded;
+            var scenesSynchronized = m_ServerNetworkManager.SceneManager.GetSynchronizedScenes();
             foreach (var scene in scenesSynchronized)
             {
-                Assert.False(scene.Value.name.Equals(currentSceneName), $"Host still thinks scene {currentSceneName} is loaded and synchronized!");
+                Assert.False(scene.name.Equals(currentSceneName), $"Host still thinks scene {currentSceneName} is loaded and synchronized!");
             }
 
             foreach (var client in m_ClientNetworkManagers)
             {
-                scenesSynchronized = client.SceneManager.ScenesLoaded;
+                scenesSynchronized = client.SceneManager.GetSynchronizedScenes();
                 foreach (var scene in scenesSynchronized)
                 {
-                    Assert.False(scene.Value.name.Equals(currentSceneName), $"Client-{client.LocalClientId} still thinks scene {currentSceneName} is loaded and synchronized!");
+                    Assert.False(scene.name.Equals(currentSceneName), $"Client-{client.LocalClientId} still thinks scene {currentSceneName} is loaded and synchronized!");
                 }
             }
         }
diff --git a/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerUsageTests.cs b/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerUsageTests.cs
index 138fa9b4cb..e05d292c36 100644
--- a/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerUsageTests.cs
+++ b/testproject/Assets/Tests/Runtime/NetworkSceneManager/NetworkSceneManagerUsageTests.cs
@@ -7,6 +7,7 @@
 
 namespace TestProject.RuntimeTests
 {
+    [TestFixture(HostOrServer.DAHost)]
     [TestFixture(HostOrServer.Host)]
     [TestFixture(HostOrServer.Server)]
     public class NetworkSceneManagerUsageTests : NetcodeIntegrationTest
@@ -38,7 +39,14 @@ public void SceneManagementDisabled([Values(LoadSceneMode.Single, LoadSceneMode.
         [Test]
         public void ClientSetClientSynchronizationMode()
         {
-            LogAssert.Expect(UnityEngine.LogType.Warning, "[Netcode] Clients should not set this value as it is automatically synchronized with the server's setting!");
+            if (!m_DistributedAuthority)
+            {
+                LogAssert.Expect(UnityEngine.LogType.Warning, "[Netcode] Clients should not set this value as it is automatically synchronized with the server's setting!");
+            }
+            else
+            {
+                LogAssert.NoUnexpectedReceived();
+            }
             m_ClientNetworkManagers[0].SceneManager.SetClientSynchronizationMode(LoadSceneMode.Single);
         }
 
@@ -48,11 +56,21 @@ public void ClientSetClientSynchronizationMode()
         [UnityTest]
         public IEnumerator ServerSetClientSynchronizationModeAfterClientsConnected()
         {
-            // Verify that changing this setting when additional clients are connect will generate the warning
-            LogAssert.Expect(UnityEngine.LogType.Warning, "[Netcode] Server is changing client synchronization mode after clients have been synchronized! It is recommended to do this before clients are connected!");
+            if (!m_DistributedAuthority)
+            {
+                // Verify that changing this setting when additional clients are connect will generate the warning
+                LogAssert.Expect(UnityEngine.LogType.Warning, "[Netcode] Server is changing client synchronization mode after clients have been synchronized! It is recommended to do this before clients are connected!");
+            }
+            else
+            {
+                LogAssert.NoUnexpectedReceived();
+            }
+
             m_ServerNetworkManager.SceneManager.SetClientSynchronizationMode(LoadSceneMode.Additive);
+
             // Verify that changing this setting when no additional clients are connected will not generate a warning
             yield return StopOneClient(m_ClientNetworkManagers[0]);
+
             m_ServerNetworkManager.SceneManager.SetClientSynchronizationMode(LoadSceneMode.Additive);
             LogAssert.NoUnexpectedReceived();
         }
@@ -65,7 +83,13 @@ public IEnumerator ClientCannotUseException([Values(LoadSceneMode.Single, LoadSc
         {
             m_CurrentSceneName = k_AdditiveScene1;
             var statusResult = m_ClientNetworkManagers[0].SceneManager.LoadScene(m_CurrentSceneName, loadSceneMode);
-            Assert.True(statusResult == SceneEventProgressStatus.ServerOnlyAction, $"[Client][Load][{loadSceneMode}] Failed to receive a {nameof(SceneEventProgressStatus.ServerOnlyAction)} response!");
+            var expectedResult = SceneEventProgressStatus.ServerOnlyAction;
+            if (m_DistributedAuthority)
+            {
+                expectedResult = SceneEventProgressStatus.SessionOwnerOnlyAction;
+            }
+
+            Assert.True(statusResult == expectedResult, $"[Client][Load][{loadSceneMode}] Failed to receive a {nameof(expectedResult)} response!");
 
             // Check that a client cannot call UnloadScene
             m_ServerNetworkManager.SceneManager.OnSceneEvent += ServerSceneManager_OnSceneEvent;
@@ -82,7 +106,9 @@ public IEnumerator ClientCannotUseException([Values(LoadSceneMode.Single, LoadSc
 
             // Now try to unload the scene as a client
             statusResult = m_ClientNetworkManagers[0].SceneManager.UnloadScene(m_CurrentScene);
-            Assert.True(statusResult == SceneEventProgressStatus.ServerOnlyAction, $"[Client][Unload] Failed to receive a {nameof(SceneEventProgressStatus.ServerOnlyAction)} response!");
+
+
+            Assert.True(statusResult == expectedResult, $"[Client][Unload] Failed to receive a {nameof(expectedResult)} response!");
 
             foreach (var clientNetworkManager in m_ClientNetworkManagers)
             {
diff --git a/testproject/Assets/Tests/Runtime/NetworkSceneManager/SceneEventProgressTests.cs b/testproject/Assets/Tests/Runtime/NetworkSceneManager/SceneEventProgressTests.cs
index ac9a78514e..7d61f2c7dc 100644
--- a/testproject/Assets/Tests/Runtime/NetworkSceneManager/SceneEventProgressTests.cs
+++ b/testproject/Assets/Tests/Runtime/NetworkSceneManager/SceneEventProgressTests.cs
@@ -10,6 +10,8 @@
 
 namespace TestProject.RuntimeTests
 {
+    [TestFixture(NetworkTopologyTypes.DistributedAuthority)]
+    [TestFixture(NetworkTopologyTypes.ClientServer)]
     public class SceneEventProgressTests : NetcodeIntegrationTest
     {
         private const string k_SceneUsedToGetAsyncOperation = "EmptyScene";
@@ -23,6 +25,8 @@ public class SceneEventProgressTests : NetcodeIntegrationTest
         private List<ulong> m_ClientThatShouldNotHaveCompleted = new List<ulong>();
         private List<ulong> m_ClientThatShouldHaveCompleted = new List<ulong>();
 
+        public SceneEventProgressTests(NetworkTopologyTypes networkTopologyType) : base(networkTopologyType) { }
+
         private bool SceneEventProgressComplete(SceneEventProgress sceneEventProgress)
         {
             m_SceneEventProgressCompleted = true;
diff --git a/testproject/Assets/Tests/Runtime/NetworkTransform/NestedNetworkTransformTests.cs b/testproject/Assets/Tests/Runtime/NetworkTransform/NestedNetworkTransformTests.cs
index 77d8403d57..dc5b2b4e9d 100644
--- a/testproject/Assets/Tests/Runtime/NetworkTransform/NestedNetworkTransformTests.cs
+++ b/testproject/Assets/Tests/Runtime/NetworkTransform/NestedNetworkTransformTests.cs
@@ -2,24 +2,66 @@
 using System.Text;
 using NUnit.Framework;
 using TestProject.ManualTests;
+using Unity.Netcode.Components;
 using Unity.Netcode.TestHelpers.Runtime;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
 namespace TestProject.RuntimeTests
 {
-    [TestFixture(Interpolation.Interpolation, Precision.Full, AuthoritativeModel.Server)]
-    [TestFixture(Interpolation.Interpolation, Precision.Full, AuthoritativeModel.Owner)]
-    [TestFixture(Interpolation.Interpolation, Precision.Half, AuthoritativeModel.Server)]
-    [TestFixture(Interpolation.Interpolation, Precision.Half, AuthoritativeModel.Owner)]
-    [TestFixture(Interpolation.Interpolation, Precision.Compressed, AuthoritativeModel.Server)]
-    [TestFixture(Interpolation.Interpolation, Precision.Compressed, AuthoritativeModel.Owner)]
-    [TestFixture(Interpolation.NoInterpolation, Precision.Full, AuthoritativeModel.Server)]
-    [TestFixture(Interpolation.NoInterpolation, Precision.Full, AuthoritativeModel.Owner)]
-    [TestFixture(Interpolation.NoInterpolation, Precision.Half, AuthoritativeModel.Server)]
-    [TestFixture(Interpolation.NoInterpolation, Precision.Half, AuthoritativeModel.Owner)]
-    [TestFixture(Interpolation.NoInterpolation, Precision.Compressed, AuthoritativeModel.Server)]
-    [TestFixture(Interpolation.NoInterpolation, Precision.Compressed, AuthoritativeModel.Owner)]
+    [TestFixture(Interpolation.Interpolation, Precision.Full, NetworkTransform.AuthorityModes.Server, NestedTickSynchronization.TickSynchronized)]
+    [TestFixture(Interpolation.Interpolation, Precision.Full, NetworkTransform.AuthorityModes.Owner, NestedTickSynchronization.TickSynchronized)]
+    [TestFixture(Interpolation.Interpolation, Precision.Half, NetworkTransform.AuthorityModes.Server, NestedTickSynchronization.TickSynchronized)]
+    [TestFixture(Interpolation.Interpolation, Precision.Half, NetworkTransform.AuthorityModes.Owner, NestedTickSynchronization.TickSynchronized)]
+    [TestFixture(Interpolation.Interpolation, Precision.Compressed, NetworkTransform.AuthorityModes.Server, NestedTickSynchronization.TickSynchronized)]
+    [TestFixture(Interpolation.Interpolation, Precision.Compressed, NetworkTransform.AuthorityModes.Owner, NestedTickSynchronization.TickSynchronized)]
+    [TestFixture(Interpolation.NoInterpolation, Precision.Full, NetworkTransform.AuthorityModes.Server, NestedTickSynchronization.TickSynchronized)]
+    [TestFixture(Interpolation.NoInterpolation, Precision.Full, NetworkTransform.AuthorityModes.Owner, NestedTickSynchronization.TickSynchronized)]
+    [TestFixture(Interpolation.NoInterpolation, Precision.Half, NetworkTransform.AuthorityModes.Server, NestedTickSynchronization.TickSynchronized)]
+    [TestFixture(Interpolation.NoInterpolation, Precision.Half, NetworkTransform.AuthorityModes.Owner, NestedTickSynchronization.TickSynchronized)]
+    [TestFixture(Interpolation.NoInterpolation, Precision.Compressed, NetworkTransform.AuthorityModes.Server, NestedTickSynchronization.TickSynchronized)]
+    [TestFixture(Interpolation.NoInterpolation, Precision.Compressed, NetworkTransform.AuthorityModes.Owner, NestedTickSynchronization.TickSynchronized)]
+
+    [TestFixture(Interpolation.Interpolation, Precision.Full, NetworkTransform.AuthorityModes.Server, NestedTickSynchronization.NormalSynchronize)]
+    [TestFixture(Interpolation.Interpolation, Precision.Full, NetworkTransform.AuthorityModes.Owner, NestedTickSynchronization.NormalSynchronize)]
+    [TestFixture(Interpolation.Interpolation, Precision.Half, NetworkTransform.AuthorityModes.Server, NestedTickSynchronization.NormalSynchronize)]
+    [TestFixture(Interpolation.Interpolation, Precision.Half, NetworkTransform.AuthorityModes.Owner, NestedTickSynchronization.NormalSynchronize)]
+    [TestFixture(Interpolation.Interpolation, Precision.Compressed, NetworkTransform.AuthorityModes.Server, NestedTickSynchronization.NormalSynchronize)]
+    [TestFixture(Interpolation.Interpolation, Precision.Compressed, NetworkTransform.AuthorityModes.Owner, NestedTickSynchronization.NormalSynchronize)]
+    [TestFixture(Interpolation.NoInterpolation, Precision.Full, NetworkTransform.AuthorityModes.Server, NestedTickSynchronization.NormalSynchronize)]
+    [TestFixture(Interpolation.NoInterpolation, Precision.Full, NetworkTransform.AuthorityModes.Owner, NestedTickSynchronization.NormalSynchronize)]
+    [TestFixture(Interpolation.NoInterpolation, Precision.Half, NetworkTransform.AuthorityModes.Server, NestedTickSynchronization.NormalSynchronize)]
+    [TestFixture(Interpolation.NoInterpolation, Precision.Half, NetworkTransform.AuthorityModes.Owner, NestedTickSynchronization.NormalSynchronize)]
+    [TestFixture(Interpolation.NoInterpolation, Precision.Compressed, NetworkTransform.AuthorityModes.Server, NestedTickSynchronization.NormalSynchronize)]
+    [TestFixture(Interpolation.NoInterpolation, Precision.Compressed, NetworkTransform.AuthorityModes.Owner, NestedTickSynchronization.NormalSynchronize)]
+
+    // Lerp, extrapolate, and blend pass
+    [TestFixture(NetworkTransform.InterpolationTypes.Lerp, Interpolation.Interpolation, Precision.Full, NetworkTransform.AuthorityModes.Server, NestedTickSynchronization.TickSynchronized)]
+    [TestFixture(NetworkTransform.InterpolationTypes.Lerp, Interpolation.Interpolation, Precision.Full, NetworkTransform.AuthorityModes.Owner, NestedTickSynchronization.TickSynchronized)]
+    [TestFixture(NetworkTransform.InterpolationTypes.Lerp, Interpolation.Interpolation, Precision.Half, NetworkTransform.AuthorityModes.Server, NestedTickSynchronization.TickSynchronized)]
+    [TestFixture(NetworkTransform.InterpolationTypes.Lerp, Interpolation.Interpolation, Precision.Half, NetworkTransform.AuthorityModes.Owner, NestedTickSynchronization.TickSynchronized)]
+    [TestFixture(NetworkTransform.InterpolationTypes.Lerp, Interpolation.Interpolation, Precision.Compressed, NetworkTransform.AuthorityModes.Server, NestedTickSynchronization.TickSynchronized)]
+    [TestFixture(NetworkTransform.InterpolationTypes.Lerp, Interpolation.Interpolation, Precision.Compressed, NetworkTransform.AuthorityModes.Owner, NestedTickSynchronization.TickSynchronized)]
+    [TestFixture(NetworkTransform.InterpolationTypes.Lerp, Interpolation.Interpolation, Precision.Full, NetworkTransform.AuthorityModes.Server, NestedTickSynchronization.NormalSynchronize)]
+    [TestFixture(NetworkTransform.InterpolationTypes.Lerp, Interpolation.Interpolation, Precision.Full, NetworkTransform.AuthorityModes.Owner, NestedTickSynchronization.NormalSynchronize)]
+    [TestFixture(NetworkTransform.InterpolationTypes.Lerp, Interpolation.Interpolation, Precision.Half, NetworkTransform.AuthorityModes.Server, NestedTickSynchronization.NormalSynchronize)]
+    [TestFixture(NetworkTransform.InterpolationTypes.Lerp, Interpolation.Interpolation, Precision.Half, NetworkTransform.AuthorityModes.Owner, NestedTickSynchronization.NormalSynchronize)]
+    [TestFixture(NetworkTransform.InterpolationTypes.Lerp, Interpolation.Interpolation, Precision.Compressed, NetworkTransform.AuthorityModes.Server, NestedTickSynchronization.NormalSynchronize)]
+    [TestFixture(NetworkTransform.InterpolationTypes.Lerp, Interpolation.Interpolation, Precision.Compressed, NetworkTransform.AuthorityModes.Owner, NestedTickSynchronization.NormalSynchronize)]
+
+    // Smooth dampening interpolation pass
+    [TestFixture(NetworkTransform.InterpolationTypes.SmoothDampening, Interpolation.Interpolation, Precision.Full, NetworkTransform.AuthorityModes.Server, NestedTickSynchronization.TickSynchronized)]
+    [TestFixture(NetworkTransform.InterpolationTypes.SmoothDampening, Interpolation.Interpolation, Precision.Full, NetworkTransform.AuthorityModes.Owner, NestedTickSynchronization.TickSynchronized)]
+    [TestFixture(NetworkTransform.InterpolationTypes.SmoothDampening, Interpolation.Interpolation, Precision.Half, NetworkTransform.AuthorityModes.Server, NestedTickSynchronization.TickSynchronized)]
+    [TestFixture(NetworkTransform.InterpolationTypes.SmoothDampening, Interpolation.Interpolation, Precision.Half, NetworkTransform.AuthorityModes.Owner, NestedTickSynchronization.TickSynchronized)]
+    [TestFixture(NetworkTransform.InterpolationTypes.SmoothDampening, Interpolation.Interpolation, Precision.Compressed, NetworkTransform.AuthorityModes.Server, NestedTickSynchronization.TickSynchronized)]
+    [TestFixture(NetworkTransform.InterpolationTypes.SmoothDampening, Interpolation.Interpolation, Precision.Compressed, NetworkTransform.AuthorityModes.Owner, NestedTickSynchronization.TickSynchronized)]
+    [TestFixture(NetworkTransform.InterpolationTypes.SmoothDampening, Interpolation.Interpolation, Precision.Full, NetworkTransform.AuthorityModes.Server, NestedTickSynchronization.NormalSynchronize)]
+    [TestFixture(NetworkTransform.InterpolationTypes.SmoothDampening, Interpolation.Interpolation, Precision.Full, NetworkTransform.AuthorityModes.Owner, NestedTickSynchronization.NormalSynchronize)]
+    [TestFixture(NetworkTransform.InterpolationTypes.SmoothDampening, Interpolation.Interpolation, Precision.Half, NetworkTransform.AuthorityModes.Server, NestedTickSynchronization.NormalSynchronize)]
+    [TestFixture(NetworkTransform.InterpolationTypes.SmoothDampening, Interpolation.Interpolation, Precision.Half, NetworkTransform.AuthorityModes.Owner, NestedTickSynchronization.NormalSynchronize)]
+    [TestFixture(NetworkTransform.InterpolationTypes.SmoothDampening, Interpolation.Interpolation, Precision.Compressed, NetworkTransform.AuthorityModes.Server, NestedTickSynchronization.NormalSynchronize)]
+    [TestFixture(NetworkTransform.InterpolationTypes.SmoothDampening, Interpolation.Interpolation, Precision.Compressed, NetworkTransform.AuthorityModes.Owner, NestedTickSynchronization.NormalSynchronize)]
     public class NestedNetworkTransformTests : IntegrationTestWithApproximation
     {
         private const string k_TestScene = "NestedNetworkTransformTestScene";
@@ -39,7 +81,9 @@ public class NestedNetworkTransformTests : IntegrationTestWithApproximation
         private Object m_PlayerPrefabResource;
         private Interpolation m_Interpolation;
         private Precision m_Precision;
-        private AuthoritativeModel m_Authority;
+        private NetworkTransform.AuthorityModes m_Authority;
+        private NestedTickSynchronization m_NestedTickSynchronization;
+        private NetworkTransform.InterpolationTypes m_InterpolationType;
 
         public enum Interpolation
         {
@@ -60,14 +104,26 @@ public enum AuthoritativeModel
             Owner
         }
 
+        public enum NestedTickSynchronization
+        {
+            NormalSynchronize,
+            TickSynchronized,
+        }
+
 
-        public NestedNetworkTransformTests(Interpolation interpolation, Precision precision, AuthoritativeModel authoritativeModel)
+        public NestedNetworkTransformTests(NetworkTransform.InterpolationTypes interpolationType, Interpolation interpolation, Precision precision, NetworkTransform.AuthorityModes authoritativeModel, NestedTickSynchronization nestedTickSynchronization)
         {
+            m_InterpolationType = interpolationType;
             m_Interpolation = interpolation;
             m_Precision = precision;
             m_Authority = authoritativeModel;
+            m_NestedTickSynchronization = nestedTickSynchronization;
         }
 
+        public NestedNetworkTransformTests(Interpolation interpolation, Precision precision, NetworkTransform.AuthorityModes authoritativeModel, NestedTickSynchronization nestedTickSynchronization) :
+            this(NetworkTransform.InterpolationTypes.LegacyLerp, interpolation, precision, authoritativeModel, nestedTickSynchronization)
+        { }
+
         public NestedNetworkTransformTests()
         {
 
@@ -108,6 +164,8 @@ protected override void OnOneTimeTearDown()
 
         protected override IEnumerator OnSetup()
         {
+            NetworkTransform.AssignDefaultInterpolationType = true;
+            NetworkTransform.DefaultInterpolationType = m_InterpolationType;
             yield return WaitForConditionOrTimeOut(() => m_BaseSceneLoaded.IsValid() && m_BaseSceneLoaded.isLoaded);
             AssertOnTimeout($"Timed out waiting for scene {k_TestScene} to load!");
         }
@@ -126,6 +184,8 @@ protected override void OnInlineTearDown()
         {
             // This prevents us from trying to destroy the resource loaded
             m_PlayerPrefab = null;
+            NetworkTransform.AssignDefaultInterpolationType = false;
+            NetworkTransform.DefaultInterpolationType = NetworkTransform.InterpolationTypes.Lerp;
         }
 
         private void ConfigureNetworkTransform(IntegrationNetworkTransform networkTransform)
@@ -134,7 +194,8 @@ private void ConfigureNetworkTransform(IntegrationNetworkTransform networkTransf
             networkTransform.UseQuaternionSynchronization = true;
             networkTransform.UseHalfFloatPrecision = m_Precision == Precision.Half || m_Precision == Precision.Compressed;
             networkTransform.UseQuaternionCompression = m_Precision == Precision.Compressed;
-            networkTransform.IsServerAuthority = m_Authority == AuthoritativeModel.Server;
+            networkTransform.AuthorityMode = m_Authority;
+            networkTransform.TickSyncChildren = m_NestedTickSynchronization == NestedTickSynchronization.TickSynchronized;
         }
 
 
@@ -151,6 +212,12 @@ protected override void OnCreatePlayerPrefab()
             foreach (var networkTransform in networkTransforms)
             {
                 ConfigureNetworkTransform(networkTransform);
+                if (networkTransform.TickSyncChildren && networkTransform.gameObject != m_PlayerPrefab)
+                {
+                    // Skew the thresholds of the children
+                    networkTransform.PositionThreshold *= Random.Range(0.75f, 0.90f);
+                    networkTransform.RotAngleThreshold *= Random.Range(0.75f, 0.90f);
+                }
             }
 
             base.OnCreatePlayerPrefab();
@@ -181,11 +248,6 @@ protected override float GetDeltaVarianceThreshold()
 
         private StringBuilder m_ValidationErrors;
 
-        private string GetVector3Values(ref Vector3 vector3)
-        {
-            return $"({vector3.x:F6},{vector3.y:F6},{vector3.z:F6})";
-        }
-
         /// <summary>
         /// Validates all transform instance values match the authority's
         /// </summary>
@@ -194,7 +256,7 @@ private bool ValidateNetworkTransforms()
             m_ValidationErrors.Clear();
             foreach (var connectedClient in m_ServerNetworkManager.ConnectedClientsIds)
             {
-                var authorityId = m_Authority == AuthoritativeModel.Server ? m_ServerNetworkManager.LocalClientId : connectedClient;
+                var authorityId = m_Authority == NetworkTransform.AuthorityModes.Server ? m_ServerNetworkManager.LocalClientId : connectedClient;
                 var playerToValidate = m_PlayerNetworkObjects[authorityId][connectedClient];
                 var playerNetworkTransforms = playerToValidate.GetComponentsInChildren<IntegrationNetworkTransform>();
                 foreach (var playerRelative in m_PlayerNetworkObjects)
diff --git a/testproject/Assets/Tests/Runtime/NetworkTransform/Resources/PlayerNestedTransforms.prefab b/testproject/Assets/Tests/Runtime/NetworkTransform/Resources/PlayerNestedTransforms.prefab
index 27a9413d20..5e95b16431 100644
--- a/testproject/Assets/Tests/Runtime/NetworkTransform/Resources/PlayerNestedTransforms.prefab
+++ b/testproject/Assets/Tests/Runtime/NetworkTransform/Resources/PlayerNestedTransforms.prefab
@@ -26,13 +26,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 344161399033526463}
+  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -2, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2272675266166542847}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!23 &8724994478026131689
 MeshRenderer:
@@ -51,6 +51,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:
@@ -96,6 +99,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0d8ad30fca3f9a240bdce16f0166033b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  AuthorityMode: 0
+  UseUnreliableDeltas: 0
   SyncPositionX: 1
   SyncPositionY: 1
   SyncPositionZ: 1
@@ -105,20 +110,22 @@ MonoBehaviour:
   SyncScaleX: 1
   SyncScaleY: 1
   SyncScaleZ: 1
-  UseQuaternionSynchronization: 1
-  UseQuaternionCompression: 1
-  UseHalfFloatPrecision: 1
   PositionThreshold: 0.001
   RotAngleThreshold: 0.001
   ScaleThreshold: 0.001
+  UseQuaternionSynchronization: 1
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 1
   InLocalSpace: 1
-  Interpolate: 1
+  Interpolate: 0
   SlerpPosition: 1
-  IsServerAuthority: 0
   DebugTransform: 0
   LastUpdatedPosition: {x: 0, y: 0, z: 0}
   LastUpdatedScale: {x: 0, y: 0, z: 0}
   LastUpdatedRotation: {x: 0, y: 0, z: 0, w: 0}
+  PushedPosition: {x: 0, y: 0, z: 0}
+  PushedScale: {x: 0, y: 0, z: 0}
+  PushedRotation: {x: 0, y: 0, z: 0, w: 0}
   PreviousUpdatedPosition: {x: 0, y: 0, z: 0}
   PreviousUpdatedScale: {x: 0, y: 0, z: 0}
   PreviousUpdatedRotation: {x: 0, y: 0, z: 0, w: 0}
@@ -155,6 +162,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6307603743893504780}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0.5, z: 0}
   m_LocalScale: {x: 2, y: 2, z: 2}
@@ -163,7 +171,6 @@ Transform:
   - {fileID: 5095177694802425565}
   - {fileID: 2272675266166542847}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &6307603743893504769
 MeshFilter:
@@ -190,6 +197,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:
@@ -227,9 +237,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 951099334
+  GlobalObjectIdHash: 441869080
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 1
   AlwaysReplicateAsRoot: 0
   SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
 --- !u!114 &3387617782067200397
@@ -274,6 +290,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: dfb1af1a9249278438d2daa2877ee2ad, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  AuthorityMode: 0
+  UseUnreliableDeltas: 0
   SyncPositionX: 1
   SyncPositionY: 1
   SyncPositionZ: 1
@@ -283,20 +301,22 @@ MonoBehaviour:
   SyncScaleX: 1
   SyncScaleY: 1
   SyncScaleZ: 1
-  UseQuaternionSynchronization: 1
-  UseQuaternionCompression: 1
-  UseHalfFloatPrecision: 1
   PositionThreshold: 0.001
   RotAngleThreshold: 0.001
   ScaleThreshold: 0.001
+  UseQuaternionSynchronization: 1
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 1
   InLocalSpace: 0
-  Interpolate: 1
+  Interpolate: 0
   SlerpPosition: 0
-  IsServerAuthority: 0
   DebugTransform: 0
   LastUpdatedPosition: {x: 0, y: 0, z: 0}
   LastUpdatedScale: {x: 0, y: 0, z: 0}
   LastUpdatedRotation: {x: 0, y: 0, z: 0, w: 0}
+  PushedPosition: {x: 0, y: 0, z: 0}
+  PushedScale: {x: 0, y: 0, z: 0}
+  PushedRotation: {x: 0, y: 0, z: 0, w: 0}
   PreviousUpdatedPosition: {x: 0, y: 0, z: 0}
   PreviousUpdatedScale: {x: 0, y: 0, z: 0}
   PreviousUpdatedRotation: {x: 0, y: 0, z: 0, w: 0}
@@ -339,13 +359,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6425543486096047037}
+  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 2, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6307603743893504768}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!23 &313661067260263792
 MeshRenderer:
@@ -364,6 +384,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:
@@ -409,6 +432,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0d8ad30fca3f9a240bdce16f0166033b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  AuthorityMode: 0
+  UseUnreliableDeltas: 0
   SyncPositionX: 1
   SyncPositionY: 1
   SyncPositionZ: 1
@@ -418,20 +443,22 @@ MonoBehaviour:
   SyncScaleX: 1
   SyncScaleY: 1
   SyncScaleZ: 1
-  UseQuaternionSynchronization: 1
-  UseQuaternionCompression: 1
-  UseHalfFloatPrecision: 1
   PositionThreshold: 0.001
   RotAngleThreshold: 0.001
   ScaleThreshold: 0.001
+  UseQuaternionSynchronization: 1
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 1
   InLocalSpace: 1
-  Interpolate: 1
+  Interpolate: 0
   SlerpPosition: 1
-  IsServerAuthority: 0
   DebugTransform: 0
   LastUpdatedPosition: {x: 0, y: 0, z: 0}
   LastUpdatedScale: {x: 0, y: 0, z: 0}
   LastUpdatedRotation: {x: 0, y: 0, z: 0, w: 0}
+  PushedPosition: {x: 0, y: 0, z: 0}
+  PushedScale: {x: 0, y: 0, z: 0}
+  PushedRotation: {x: 0, y: 0, z: 0, w: 0}
   PreviousUpdatedPosition: {x: 0, y: 0, z: 0}
   PreviousUpdatedScale: {x: 0, y: 0, z: 0}
   PreviousUpdatedRotation: {x: 0, y: 0, z: 0, w: 0}
@@ -461,6 +488,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8494372709139388141}
+  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}
@@ -468,5 +496,4 @@ Transform:
   m_Children:
   - {fileID: 1626890731237231805}
   m_Father: {fileID: 6307603743893504768}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/testproject/Assets/Tests/Runtime/ObjectParenting.meta b/testproject/Assets/Tests/Runtime/ObjectParenting.meta
index 63a52b767a..9d1e1001b8 100644
--- a/testproject/Assets/Tests/Runtime/ObjectParenting.meta
+++ b/testproject/Assets/Tests/Runtime/ObjectParenting.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4b0e72312f6c8404891c5cb3f2a3f36d
+guid: f81ead0033298b049a68c12c6d68659c
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/testproject/Assets/Tests/Runtime/ObjectParenting/BlueColMat.mat.meta b/testproject/Assets/Tests/Runtime/ObjectParenting/BlueColMat.mat.meta
index 6df17a3b9b..802349a9df 100644
--- a/testproject/Assets/Tests/Runtime/ObjectParenting/BlueColMat.mat.meta
+++ b/testproject/Assets/Tests/Runtime/ObjectParenting/BlueColMat.mat.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 52c34e1beacd44c9bb0f6375c891b4cf
+guid: cb2191cfdbf1c9548b6d2705cd1598b3
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
diff --git a/testproject/Assets/Tests/Runtime/ObjectParenting/GrayColMat.mat.meta b/testproject/Assets/Tests/Runtime/ObjectParenting/GrayColMat.mat.meta
index 35533b8924..9406e30bdc 100644
--- a/testproject/Assets/Tests/Runtime/ObjectParenting/GrayColMat.mat.meta
+++ b/testproject/Assets/Tests/Runtime/ObjectParenting/GrayColMat.mat.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 03e094ab168544996a7d1d6dcdc60058
+guid: 0e597626cbe10b140ab0de9400e6bcaa
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
diff --git a/testproject/Assets/Tests/Runtime/ObjectParenting/GreenColMat.mat.meta b/testproject/Assets/Tests/Runtime/ObjectParenting/GreenColMat.mat.meta
index 6cc05ba8f0..bef9108007 100644
--- a/testproject/Assets/Tests/Runtime/ObjectParenting/GreenColMat.mat.meta
+++ b/testproject/Assets/Tests/Runtime/ObjectParenting/GreenColMat.mat.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d8e0487da5b3d4659909d18d138cff5a
+guid: 08e0c61b5a83bfb46a037cbecbebc671
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
diff --git a/testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs b/testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs
index 1b1257a6c3..c148a05d2c 100644
--- a/testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs
+++ b/testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs
@@ -10,6 +10,8 @@
 
 namespace TestProject.RuntimeTests
 {
+    [TestFixture(NetworkTopologyTypes.DistributedAuthority)]
+    [TestFixture(NetworkTopologyTypes.ClientServer)]
     public class NetworkObjectParentingTests
     {
         private const int k_ClientInstanceCount = 1;
@@ -30,6 +32,12 @@ public class NetworkObjectParentingTests
         private Scene m_InitScene;
         private Scene m_TestScene;
 
+        private NetworkTopologyTypes m_NetworkTopologyType;
+        public NetworkObjectParentingTests(NetworkTopologyTypes networkTopologyType)
+        {
+            m_NetworkTopologyType = networkTopologyType;
+        }
+
         private void OnSceneLoaded(Scene scene, LoadSceneMode mode)
         {
             if (scene.name == nameof(NetworkObjectParentingTests))
@@ -63,6 +71,15 @@ public IEnumerator Setup()
             Assert.That(m_ClientNetworkManagers, Is.Not.Null);
             Assert.That(m_ClientNetworkManagers.Length, Is.EqualTo(k_ClientInstanceCount));
 
+            m_ServerNetworkManager.NetworkConfig.NetworkTopology = m_NetworkTopologyType;
+            m_ServerNetworkManager.NetworkConfig.AutoSpawnPlayerPrefabClientSide = m_NetworkTopologyType == NetworkTopologyTypes.DistributedAuthority;
+
+            foreach (var client in m_ClientNetworkManagers)
+            {
+                client.NetworkConfig.NetworkTopology = m_NetworkTopologyType;
+                client.NetworkConfig.AutoSpawnPlayerPrefabClientSide = m_NetworkTopologyType == NetworkTopologyTypes.DistributedAuthority;
+            }
+
             m_Dude_NetObjs = new Transform[setCount];
             m_Dude_LeftArm_NetObjs = new Transform[setCount];
             m_Dude_RightArm_NetObjs = new Transform[setCount];
diff --git a/testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs.meta b/testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs.meta
index bcd376301e..7e280235f5 100644
--- a/testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs.meta
+++ b/testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ee0fd7f2f6c544c59849f815c90128b5
+guid: cbe29dfc87668c24c9c29dd354e6751e
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity b/testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity
index 7640744d8d..35444ab962 100644
--- a/testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity
+++ b/testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641275, b: 0.5748172, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -104,7 +104,7 @@ NavMeshSettings:
   serializedVersion: 2
   m_ObjectHideFlags: 0
   m_BuildSettings:
-    serializedVersion: 2
+    serializedVersion: 3
     agentTypeID: 0
     agentRadius: 0.5
     agentHeight: 2
@@ -117,7 +117,7 @@ NavMeshSettings:
     cellSize: 0.16666667
     manualTileSize: 0
     tileSize: 256
-    accuratePlacement: 0
+    buildHeightMesh: 0
     maxJobWorkers: 0
     preserveTilesOutsideBounds: 0
     debug:
@@ -150,9 +150,17 @@ MeshCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 126426935}
   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: 4
+  serializedVersion: 5
   m_Convex: 0
   m_CookingOptions: 30
   m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
@@ -176,7 +184,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 03e094ab168544996a7d1d6dcdc60058, type: 2}
+  - {fileID: 2100000, guid: 0e597626cbe10b140ab0de9400e6bcaa, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -213,12 +221,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 126426935}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 10, y: 1, z: 10}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &136229882
 GameObject:
@@ -247,12 +256,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 136229882}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0.13052616, w: 0.9914449}
   m_LocalPosition: {x: 0.6, y: 0.2, z: 0}
   m_LocalScale: {x: 0.3, y: 0.8, z: 0.3}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1233633000}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 15}
 --- !u!136 &136229884
 CapsuleCollider:
@@ -262,8 +272,17 @@ CapsuleCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 136229882}
   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.5
   m_Height: 2
   m_Direction: 1
@@ -330,8 +349,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 1291518364
+  GlobalObjectIdHash: 3378737312
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 0
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
 --- !u!1 &223562595
@@ -357,14 +383,15 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 223562595}
+  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:
   - {fileID: 877191011}
   - {fileID: 1646178338}
   m_Father: {fileID: 753527895}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &249733529
 GameObject:
@@ -392,12 +419,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 249733529}
+  serializedVersion: 2
   m_LocalRotation: {x: -0.42261827, y: 0, z: 0, w: 0.9063079}
   m_LocalPosition: {x: 0, y: 1.25, z: 2.5}
   m_LocalScale: {x: 4, y: 2.3, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1904043517}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: -50, y: 0, z: 0}
 --- !u!65 &249733531
 BoxCollider:
@@ -407,9 +435,17 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 249733529}
   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
+  serializedVersion: 3
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!23 &249733532
@@ -432,7 +468,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 52c34e1beacd44c9bb0f6375c891b4cf, type: 2}
+  - {fileID: 2100000, guid: cb2191cfdbf1c9548b6d2705cd1598b3, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -488,12 +524,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 305396494}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2027339602}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!135 &305396496
 SphereCollider:
@@ -503,9 +540,17 @@ SphereCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 305396494}
   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
+  serializedVersion: 3
   m_Radius: 0.5
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!23 &305396497
@@ -585,12 +630,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 453914372}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: -0.13052624, w: 0.9914449}
   m_LocalPosition: {x: -0.6, y: 0.2, z: 0}
   m_LocalScale: {x: 0.3, y: 0.8, z: 0.3}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1233633000}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15}
 --- !u!136 &453914374
 CapsuleCollider:
@@ -600,8 +646,17 @@ CapsuleCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 453914372}
   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.5
   m_Height: 2
   m_Direction: 1
@@ -668,8 +723,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 2501551336
+  GlobalObjectIdHash: 3875094526
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 0
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
 --- !u!1 &534941258
@@ -698,12 +760,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 534941258}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
   m_LocalPosition: {x: 2.5, y: -1, z: 3.5}
   m_LocalScale: {x: 2, y: 0.5, z: 2}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1095337960}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
 --- !u!136 &534941260
 CapsuleCollider:
@@ -713,8 +776,17 @@ CapsuleCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 534941258}
   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
@@ -795,12 +867,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 590215650}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
   m_LocalPosition: {x: 2.5, y: -1, z: -3.5}
   m_LocalScale: {x: 2, y: 0.5, z: 2}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1095337960}
-  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
 --- !u!136 &590215652
 CapsuleCollider:
@@ -810,8 +883,17 @@ CapsuleCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 590215650}
   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
@@ -952,12 +1034,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 598123439}
+  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_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
 --- !u!1 &753527891
 GameObject:
@@ -987,8 +1070,17 @@ CapsuleCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 753527891}
   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.5
   m_Height: 2
   m_Direction: 1
@@ -1050,15 +1142,16 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 753527891}
+  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 3, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 779041968}
   - {fileID: 1233633000}
   - {fileID: 223562596}
   m_Father: {fileID: 1618484849}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &753527896
 MonoBehaviour:
@@ -1072,8 +1165,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 3039817976
+  GlobalObjectIdHash: 404955689
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 0
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
 --- !u!1 &779041967
@@ -1102,12 +1202,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 779041967}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 1.4, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 753527895}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!135 &779041969
 SphereCollider:
@@ -1117,9 +1218,17 @@ SphereCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 779041967}
   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
+  serializedVersion: 3
   m_Radius: 0.5
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!23 &779041970
@@ -1199,12 +1308,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 877191010}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0.3, y: -1.4, z: 0}
   m_LocalScale: {x: 0.30000004, y: 0.8, z: 0.3}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 223562596}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &877191012
 MonoBehaviour:
@@ -1218,8 +1328,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 4012496145
+  GlobalObjectIdHash: 1943698069
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 0
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
 --- !u!136 &877191013
@@ -1230,8 +1347,17 @@ CapsuleCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 877191010}
   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.5
   m_Height: 2
   m_Direction: 1
@@ -1312,12 +1438,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1042922634}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
   m_LocalPosition: {x: -2.5, y: -1, z: -3.5}
   m_LocalScale: {x: 2, y: 0.5, z: 2}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1095337960}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
 --- !u!136 &1042922636
 CapsuleCollider:
@@ -1327,8 +1454,17 @@ CapsuleCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1042922634}
   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
@@ -1406,16 +1542,17 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1095337959}
+  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:
   - {fileID: 2102441317}
   - {fileID: 534941259}
   - {fileID: 1042922635}
   - {fileID: 590215651}
   m_Father: {fileID: 1907713851}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1139821555
 GameObject:
@@ -1443,12 +1580,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1139821555}
+  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 5, y: 2, z: 10}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1904043517}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &1139821557
 BoxCollider:
@@ -1458,9 +1596,17 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1139821555}
   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
+  serializedVersion: 3
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!23 &1139821558
@@ -1483,7 +1629,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 52c34e1beacd44c9bb0f6375c891b4cf, type: 2}
+  - {fileID: 2100000, guid: cb2191cfdbf1c9548b6d2705cd1598b3, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -1536,14 +1682,15 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1233632999}
+  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:
   - {fileID: 136229883}
   - {fileID: 453914373}
   m_Father: {fileID: 753527895}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1346726830
 GameObject:
@@ -1578,8 +1725,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 4270594269
+  GlobalObjectIdHash: 472884780
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 0
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
 --- !u!65 &1346726832
@@ -1590,9 +1744,17 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1346726830}
   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
+  serializedVersion: 3
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!23 &1346726833
@@ -1615,7 +1777,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: d8e0487da5b3d4659909d18d138cff5a, type: 2}
+  - {fileID: 2100000, guid: 08e0c61b5a83bfb46a037cbecbebc671, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -1652,12 +1814,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1346726830}
+  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 3, y: 0.5, z: 3}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1618484849}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1346726836
 MonoBehaviour:
@@ -1668,7 +1831,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1346726830}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9b9fb5b91091c4036bb4b0321b79f6c8, type: 3}
+  m_Script: {fileID: 11500000, guid: 0ca38a7c14d657e4fa7a2d73b4991ff6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
 --- !u!1 &1463134322
@@ -1711,9 +1874,17 @@ Camera:
   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_FocalLength: 50
   m_NormalizedViewPortRect:
     serializedVersion: 2
     x: 0
@@ -1747,12 +1918,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1463134322}
+  serializedVersion: 2
   m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258}
   m_LocalPosition: {x: 0, y: 10, z: -10}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0}
 --- !u!1 &1522146278
 GameObject:
@@ -1780,12 +1952,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1522146278}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 1.75, z: 1}
   m_LocalScale: {x: 4.5, y: 1.5, z: 2}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1904043517}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &1522146280
 BoxCollider:
@@ -1795,9 +1968,17 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1522146278}
   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
+  serializedVersion: 3
   m_Size: {x: 1, y: 1, z: 1}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!23 &1522146281
@@ -1820,7 +2001,7 @@ MeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 52c34e1beacd44c9bb0f6375c891b4cf, type: 2}
+  - {fileID: 2100000, guid: cb2191cfdbf1c9548b6d2705cd1598b3, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -1873,15 +2054,16 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1618484848}
+  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:
   - {fileID: 753527895}
   - {fileID: 1346726835}
   - {fileID: 1907713851}
   m_Father: {fileID: 0}
-  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1646178337
 GameObject:
@@ -1910,12 +2092,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1646178337}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -0.3, y: -1.4, z: 0}
   m_LocalScale: {x: 0.30000004, y: 0.8, z: 0.3}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 223562596}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1646178339
 MonoBehaviour:
@@ -1929,8 +2112,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 1239503228
+  GlobalObjectIdHash: 1041897422
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 0
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
 --- !u!136 &1646178340
@@ -1941,8 +2131,17 @@ CapsuleCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1646178337}
   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.5
   m_Height: 2
   m_Direction: 1
@@ -2020,16 +2219,17 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1904043516}
+  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:
   - {fileID: 1139821556}
   - {fileID: 1522146279}
   - {fileID: 249733530}
   - {fileID: 2027339602}
   m_Father: {fileID: 1907713851}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1907713849
 GameObject:
@@ -2060,8 +2260,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 2387167595
+  GlobalObjectIdHash: 1504619025
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 0
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
 --- !u!4 &1907713851
@@ -2071,14 +2278,15 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1907713849}
+  serializedVersion: 2
   m_LocalRotation: {x: -0, y: 0.5, z: -0, w: 0.8660254}
   m_LocalPosition: {x: 0, y: 2, z: 10}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1904043517}
   - {fileID: 1095337960}
   m_Father: {fileID: 1618484849}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 60, z: 0}
 --- !u!1 &2027339601
 GameObject:
@@ -2104,13 +2312,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2027339601}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 1, z: -2}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 305396495}
   m_Father: {fileID: 1904043517}
-  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2027339603
 MonoBehaviour:
@@ -2124,8 +2333,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 805918072
+  GlobalObjectIdHash: 333240446
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 0
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
 --- !u!1 &2102441316
@@ -2154,12 +2370,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2102441316}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
   m_LocalPosition: {x: -2.5, y: -1, z: 3.5}
   m_LocalScale: {x: 2, y: 0.5, z: 2}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1095337960}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
 --- !u!136 &2102441318
 CapsuleCollider:
@@ -2169,8 +2386,17 @@ CapsuleCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2102441316}
   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
@@ -2225,3 +2451,11 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2102441316}
   m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 1463134325}
+  - {fileID: 598123441}
+  - {fileID: 126426939}
+  - {fileID: 1618484849}
diff --git a/testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity.meta b/testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity.meta
index 73144b7868..f850e33601 100644
--- a/testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity.meta
+++ b/testproject/Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7522f8723c5674939a3c24acfd83a688
+guid: abe92ece17d830e41a66dff7edc9245d
 DefaultImporter:
   externalObjects: {}
   userData: 
diff --git a/testproject/Assets/Tests/Runtime/ObjectParenting/ParentDynamicUnderInScenePlaced.cs b/testproject/Assets/Tests/Runtime/ObjectParenting/ParentDynamicUnderInScenePlaced.cs
index 153dc285c9..5acf256de1 100644
--- a/testproject/Assets/Tests/Runtime/ObjectParenting/ParentDynamicUnderInScenePlaced.cs
+++ b/testproject/Assets/Tests/Runtime/ObjectParenting/ParentDynamicUnderInScenePlaced.cs
@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using NUnit.Framework;
 using Unity.Netcode;
 using Unity.Netcode.TestHelpers.Runtime;
 using UnityEngine;
@@ -26,6 +27,8 @@ public override void OnNetworkSpawn()
         }
     }
 
+    [TestFixture(NetworkTopologyTypes.DistributedAuthority)]
+    [TestFixture(NetworkTopologyTypes.ClientServer)]
     public class ParentDynamicUnderInScenePlaced : NetcodeIntegrationTest
     {
         private const string k_SceneToLoad = "GenericInScenePlacedObject";
@@ -33,6 +36,14 @@ public class ParentDynamicUnderInScenePlaced : NetcodeIntegrationTest
         private GameObject m_DynamicallySpawned;
         private bool m_SceneIsLoaded;
 
+        public ParentDynamicUnderInScenePlaced(NetworkTopologyTypes networkTopologyType) : base(networkTopologyType) { }
+
+        protected override IEnumerator OnSetup()
+        {
+            ParentDynamicUnderInScenePlacedHelper.Instances.Clear();
+            return base.OnSetup();
+        }
+
         protected override void OnServerAndClientsCreated()
         {
             m_DynamicallySpawned = CreateNetworkObjectPrefab("DynamicObj");
@@ -46,15 +57,6 @@ protected override IEnumerator OnStartedServerAndClients()
             return base.OnStartedServerAndClients();
         }
 
-        protected override void OnNewClientCreated(NetworkManager networkManager)
-        {
-            foreach (var networkPrefab in m_ServerNetworkManager.NetworkConfig.Prefabs.Prefabs)
-            {
-                networkManager.NetworkConfig.Prefabs.Add(networkPrefab);
-            }
-            base.OnNewClientCreated(networkManager);
-        }
-
         protected override void OnNewClientStarted(NetworkManager networkManager)
         {
             m_ServerNetworkManager.SceneManager.SetClientSynchronizationMode(LoadSceneMode.Additive);
@@ -94,6 +96,7 @@ private bool TestParentedAndNotInScenePlaced()
             return true;
         }
 
+        private ulong m_TargetScenePlacedId;
         /// <summary>
         /// Integration test that validates parenting dynamically spawned NetworkObjects
         /// under an in-scene placed NetworkObject works properly.
@@ -116,6 +119,7 @@ public IEnumerator ParentUnderInSceneplaced()
             // Wait for the host-server's player to be parented under the in-scene placed NetworkObject
             yield return WaitForConditionOrTimeOut(TestParentedAndNotInScenePlaced);
             AssertOnTimeout($"[{m_FailedValidation.name}] Failed validation! InScenePlaced ({m_FailedValidation.IsSceneObject.Value}) | Was Parented ({m_FailedValidation.transform.position != null})");
+            m_TargetScenePlacedId = m_ServerNetworkManager.LocalClient.PlayerObject.transform.parent.GetComponent<NetworkObject>().NetworkObjectId;
 
             // Now dynamically spawn a NetworkObject to also test dynamically spawned NetworkObjects being parented
             // under in-scene placed NetworkObjects
@@ -125,11 +129,44 @@ public IEnumerator ParentUnderInSceneplaced()
             for (int i = 0; i < 5; i++)
             {
                 yield return CreateAndStartNewClient();
+                if (m_DistributedAuthority)
+                {
+                    yield return WaitForConditionOrTimeOut(() => ParentPlayerToInSceneNetworkObjectFound(i));
+                    AssertOnTimeout($"[Client-{i + 1}] Failed to find in-scene placed NetworkObject or failed to parent under it!");
+                }
                 yield return WaitForConditionOrTimeOut(TestParentedAndNotInScenePlaced);
                 AssertOnTimeout($"[{m_FailedValidation.name}] Failed validation! InScenePlaced ({m_FailedValidation.IsSceneObject.Value}) | Was Parented ({m_FailedValidation.transform.position != null})");
             }
         }
 
+        /// <summary>
+        /// For distributed authority mode, we have to find the in-scene placed object to parent the newly spawned player under
+        /// </summary>
+        private bool ParentPlayerToInSceneNetworkObjectFound(int index)
+        {
+            if (m_ClientNetworkManagers.Length - 1 != index)
+            {
+                return false;
+            }
+            var clientId = m_ClientNetworkManagers[index].LocalClientId;
+            if (!s_GlobalNetworkObjects.ContainsKey(clientId))
+            {
+                return false;
+            }
+
+            if (!s_GlobalNetworkObjects[clientId].ContainsKey(m_TargetScenePlacedId))
+            {
+                return false;
+            }
+
+            if (!m_ClientNetworkManagers[index].LocalClient.PlayerObject.TrySetParent(s_GlobalNetworkObjects[clientId][m_TargetScenePlacedId], false))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
         private void SceneManager_OnLoadComplete(ulong clientId, string sceneName, LoadSceneMode loadSceneMode)
         {
             if (clientId == m_ServerNetworkManager.LocalClientId && sceneName == k_SceneToLoad)
diff --git a/testproject/Assets/Tests/Runtime/ObjectParenting/ParentDynamicUnderInScenePlaced.cs.meta b/testproject/Assets/Tests/Runtime/ObjectParenting/ParentDynamicUnderInScenePlaced.cs.meta
index 475de27504..acf51ab560 100644
--- a/testproject/Assets/Tests/Runtime/ObjectParenting/ParentDynamicUnderInScenePlaced.cs.meta
+++ b/testproject/Assets/Tests/Runtime/ObjectParenting/ParentDynamicUnderInScenePlaced.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4afe0bcb2a387094bb99b8cb6da1d0e0
+guid: 3e1743594c30a284f9dd355e6754bb1a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingInSceneObjects.unity b/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingInSceneObjects.unity
index 4b846072ec..89076e29f4 100644
--- a/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingInSceneObjects.unity
+++ b/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingInSceneObjects.unity
@@ -104,7 +104,7 @@ NavMeshSettings:
   serializedVersion: 2
   m_ObjectHideFlags: 0
   m_BuildSettings:
-    serializedVersion: 2
+    serializedVersion: 3
     agentTypeID: 0
     agentRadius: 0.5
     agentHeight: 2
@@ -117,7 +117,7 @@ NavMeshSettings:
     cellSize: 0.16666667
     manualTileSize: 0
     tileSize: 256
-    accuratePlacement: 0
+    buildHeightMesh: 0
     maxJobWorkers: 0
     preserveTilesOutsideBounds: 0
     debug:
@@ -152,8 +152,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 2988556371
+  GlobalObjectIdHash: 879667119
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 0
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
 --- !u!4 &69934939
@@ -163,6 +170,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 69934937}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0.53729963, z: 0, w: 0.8433915}
   m_LocalPosition: {x: 10, y: 10, z: 10}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -170,7 +178,6 @@ Transform:
   m_Children:
   - {fileID: 1353280373}
   m_Father: {fileID: 0}
-  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 65, z: 0}
 --- !u!1 &118026864
 GameObject:
@@ -230,13 +237,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 593a2fe42fa9d37498c96f9a383b6521, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  RunInBackground: 1
-  LogLevel: 1
+  DistributedAuthorityReset: 0
   NetworkConfig:
     ProtocolVersion: 0
     NetworkTransport: {fileID: 118026865}
     PlayerPrefab: {fileID: 0}
-    NetworkPrefabs: []
+    Prefabs:
+      NetworkPrefabsLists: []
     TickRate: 30
     ClientConnectionBufferTimeout: 10
     ConnectionApproval: 0
@@ -252,6 +259,13 @@ MonoBehaviour:
     LoadSceneTimeOut: 120
     SpawnTimeout: 1
     EnableNetworkLogs: 1
+    SessionMode: 1
+    UseCMBService: 0
+    ClientSidePlayerSpawning: 0
+    InterestManagementCellSize: 512
+    OldPrefabList: []
+  RunInBackground: 1
+  LogLevel: 1
 --- !u!4 &118026867
 Transform:
   m_ObjectHideFlags: 0
@@ -259,13 +273,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 118026864}
+  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0.5, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &118026868
 MonoBehaviour:
@@ -302,6 +316,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 153482222}
+  serializedVersion: 2
   m_LocalRotation: {x: 0.18730325, y: -0.036408048, z: 0.18730325, w: 0.963592}
   m_LocalPosition: {x: 2, y: 0, z: 2}
   m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
@@ -309,7 +324,6 @@ Transform:
   m_Children:
   - {fileID: 1934730583}
   m_Father: {fileID: 1351092234}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 22, y: 0, z: 22}
 --- !u!1 &295758851
 GameObject:
@@ -387,7 +401,9 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
@@ -406,7 +422,6 @@ RectTransform:
   - {fileID: 844324455}
   - {fileID: 605493857}
   m_Father: {fileID: 1392712516}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -437,13 +452,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 321630914}
+  serializedVersion: 2
   m_LocalRotation: {x: -0.011012609, y: -0, z: -0, w: 0.99993944}
   m_LocalPosition: {x: 0, y: 5, z: -15}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1392712516}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: -1.262, y: 0, z: 0}
 --- !u!20 &321630917
 Camera:
@@ -459,9 +474,17 @@ Camera:
   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_FocalLength: 50
   m_NormalizedViewPortRect:
     serializedVersion: 2
     x: 0
@@ -511,6 +534,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 364512791}
+  serializedVersion: 2
   m_LocalRotation: {x: 0.18730325, y: -0.036408048, z: 0.18730325, w: 0.963592}
   m_LocalPosition: {x: 2, y: 0, z: 2}
   m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
@@ -518,7 +542,6 @@ Transform:
   m_Children:
   - {fileID: 700085893}
   m_Father: {fileID: 366400900}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 22, y: 0, z: 22}
 --- !u!1 &366400899
 GameObject:
@@ -543,6 +566,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 366400899}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0.53729963, z: 0, w: 0.8433915}
   m_LocalPosition: {x: 10, y: 10, z: 10}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -550,7 +574,6 @@ Transform:
   m_Children:
   - {fileID: 364512792}
   m_Father: {fileID: 0}
-  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 65, z: 0}
 --- !u!1 &505911173
 GameObject:
@@ -629,6 +652,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 505911173}
+  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}
@@ -636,7 +660,6 @@ Transform:
   m_Children:
   - {fileID: 1601792191}
   m_Father: {fileID: 733348968}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &505911177
 MonoBehaviour:
@@ -650,8 +673,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 1818541129
+  GlobalObjectIdHash: 953362924
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 0
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
 --- !u!114 &505911178
@@ -700,13 +730,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 518555745}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 10, y: 10, z: 10}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1353280373}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &518555747
 MonoBehaviour:
@@ -720,8 +750,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 4284572620
+  GlobalObjectIdHash: 3696641308
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 0
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
 --- !u!1 &582431330
@@ -748,6 +785,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 582431330}
+  serializedVersion: 2
   m_LocalRotation: {x: 0.18730325, y: -0.036408048, z: 0.18730325, w: 0.963592}
   m_LocalPosition: {x: 2, y: 0, z: 2}
   m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
@@ -755,7 +793,6 @@ Transform:
   m_Children:
   - {fileID: 1546803112}
   m_Father: {fileID: 1282066021}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 22, y: 0, z: 22}
 --- !u!114 &582431332
 MonoBehaviour:
@@ -769,8 +806,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 3027368638
+  GlobalObjectIdHash: 2064500905
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 0
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 0
 --- !u!1 &605493856
@@ -798,13 +842,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 605493856}
+  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: 295758855}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &605493858
 MonoBehaviour:
@@ -918,13 +962,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 631269575}
+  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: 1601792191}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &631269579
 MonoBehaviour:
@@ -938,8 +982,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 1688266703
+  GlobalObjectIdHash: 670951037
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 0
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
 --- !u!114 &631269580
@@ -973,8 +1024,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 694186464}
-  - component: {fileID: 694186463}
   - component: {fileID: 694186462}
+  - component: {fileID: 694186465}
   m_Layer: 0
   m_Name: AutoSyncManager
   m_TagString: Untagged
@@ -994,11 +1045,33 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 2343724113
+  GlobalObjectIdHash: 1826507586
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 0
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
---- !u!114 &694186463
+--- !u!4 &694186464
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 694186461}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 561, y: 144.52359, 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 &694186465
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1007,7 +1080,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 694186461}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3326399105afcf4459b51991aeeaacd2, type: 3}
+  m_Script: {fileID: 11500000, guid: 6cb9810cec78d7e4ca96c44f73bbbcf1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   WithNetworkObjectAutoSyncOn: {fileID: 69934937}
@@ -1018,21 +1091,6 @@ MonoBehaviour:
   NetworkObjectAutoSyncOffTransforms: []
   GameObjectAutoSyncOnTransforms: []
   GameObjectAutoSyncOffTransforms: []
---- !u!4 &694186464
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 694186461}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 561, y: 144.52359, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 8
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &700085892
 GameObject:
   m_ObjectHideFlags: 0
@@ -1057,13 +1115,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 700085892}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 10, y: 10, z: 10}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 364512792}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &700085894
 MonoBehaviour:
@@ -1077,8 +1135,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 1482043520
+  GlobalObjectIdHash: 3183342136
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 0
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 0
 --- !u!1 &733348965
@@ -1158,6 +1223,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 733348965}
+  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}
@@ -1165,7 +1231,6 @@ Transform:
   m_Children:
   - {fileID: 505911176}
   m_Father: {fileID: 945457593}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &733348969
 MonoBehaviour:
@@ -1179,8 +1244,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 1181626381
+  GlobalObjectIdHash: 892840195
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 0
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
 --- !u!114 &733348970
@@ -1210,6 +1282,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 295758855}
     m_Modifications:
     - target: {fileID: 6633621479308595792, guid: d725b5588e1b956458798319e6541d84,
@@ -1323,6 +1396,9 @@ PrefabInstance:
       value: ConnectionModeButtons
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d725b5588e1b956458798319e6541d84, type: 3}
 --- !u!224 &844324455 stripped
 RectTransform:
@@ -1357,6 +1433,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 945457592}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 1, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -1364,7 +1441,6 @@ Transform:
   m_Children:
   - {fileID: 733348968}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!23 &945457594
 MeshRenderer:
@@ -1428,8 +1504,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 3960212516
+  GlobalObjectIdHash: 2706935065
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 0
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
 --- !u!114 &945457597
@@ -1483,8 +1566,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 3624362024
+  GlobalObjectIdHash: 2900709904
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 0
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 0
 --- !u!4 &1282066021
@@ -1494,6 +1584,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1282066019}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0.53729963, z: 0, w: 0.8433915}
   m_LocalPosition: {x: 10, y: 10, z: 10}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -1501,7 +1592,6 @@ Transform:
   m_Children:
   - {fileID: 582431331}
   m_Father: {fileID: 0}
-  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 65, z: 0}
 --- !u!1 &1343771061
 GameObject:
@@ -1527,13 +1617,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1343771061}
+  serializedVersion: 2
   m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
   m_LocalPosition: {x: 0, y: 2.5, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1392712516}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
 --- !u!108 &1343771063
 Light:
@@ -1620,6 +1710,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1351092233}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0.53729963, z: 0, w: 0.8433915}
   m_LocalPosition: {x: 10, y: 10, z: 10}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -1627,7 +1718,6 @@ Transform:
   m_Children:
   - {fileID: 153482223}
   m_Father: {fileID: 0}
-  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 65, z: 0}
 --- !u!1 &1353280372
 GameObject:
@@ -1653,6 +1743,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1353280372}
+  serializedVersion: 2
   m_LocalRotation: {x: 0.18730325, y: -0.036408048, z: 0.18730325, w: 0.963592}
   m_LocalPosition: {x: 2, y: 0, z: 2}
   m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
@@ -1660,7 +1751,6 @@ Transform:
   m_Children:
   - {fileID: 518555746}
   m_Father: {fileID: 69934939}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 22, y: 0, z: 22}
 --- !u!114 &1353280374
 MonoBehaviour:
@@ -1674,8 +1764,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 2685148660
+  GlobalObjectIdHash: 1172264353
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 0
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
 --- !u!1 &1392712513
@@ -1703,6 +1800,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1392712513}
+  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}
@@ -1712,7 +1810,6 @@ Transform:
   - {fileID: 321630915}
   - {fileID: 1343771062}
   m_Father: {fileID: 0}
-  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1392712517
 MonoBehaviour:
@@ -1738,8 +1835,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 2701768183
+  GlobalObjectIdHash: 1990214503
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 0
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
 --- !u!1 &1546803111
@@ -1766,13 +1870,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1546803111}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 10, y: 10, z: 10}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 582431331}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1546803113
 MonoBehaviour:
@@ -1786,8 +1890,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 136657534
+  GlobalObjectIdHash: 4223257018
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 0
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 0
 --- !u!1 &1601792188
@@ -1867,6 +1978,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1601792188}
+  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}
@@ -1874,7 +1986,6 @@ Transform:
   m_Children:
   - {fileID: 631269578}
   m_Father: {fileID: 505911176}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1601792192
 MonoBehaviour:
@@ -1888,8 +1999,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 65702661
+  GlobalObjectIdHash: 616258735
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 0
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
 --- !u!114 &1601792193
@@ -1937,6 +2055,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1839922012}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0.5, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -1944,7 +2063,6 @@ Transform:
   m_Children:
   - {fileID: 2062433907}
   m_Father: {fileID: 0}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1934730582
 GameObject:
@@ -1970,13 +2088,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1934730582}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 10, y: 10, z: 10}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 153482223}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1934730584
 MonoBehaviour:
@@ -1990,8 +2108,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 638354969
+  GlobalObjectIdHash: 2656819585
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 0
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 0
 --- !u!1 &2062433906
@@ -2019,13 +2144,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2062433906}
+  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: 1839922013}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2062433908
 MonoBehaviour:
@@ -2039,8 +2164,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 136663336
+  GlobalObjectIdHash: 1341406513
+  InScenePlacedSourceGlobalObjectIdHash: 0
+  DeferredDespawnTick: 0
+  Ownership: 0
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
 --- !u!114 &2062433909
@@ -2055,3 +2187,16 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8384b01f654da304ebe165da1624cf56, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 945457593}
+  - {fileID: 118026867}
+  - {fileID: 1839922013}
+  - {fileID: 1392712516}
+  - {fileID: 69934939}
+  - {fileID: 1282066021}
+  - {fileID: 1351092234}
+  - {fileID: 366400900}
+  - {fileID: 694186464}
diff --git a/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingInSceneObjects.unity.meta b/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingInSceneObjects.unity.meta
index b8b7ca5ac5..87847a92f4 100644
--- a/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingInSceneObjects.unity.meta
+++ b/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingInSceneObjects.unity.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 49fd14bff1eceda4f9299721a9029750
+guid: d04d395e163705441935990f702c782f
 DefaultImporter:
   externalObjects: {}
   userData: 
diff --git a/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingInSceneObjectsTests.cs b/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingInSceneObjectsTests.cs
index c275ad45d4..5b5458e17b 100644
--- a/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingInSceneObjectsTests.cs
+++ b/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingInSceneObjectsTests.cs
@@ -4,11 +4,14 @@
 using TestProject.ManualTests;
 using Unity.Netcode;
 using Unity.Netcode.TestHelpers.Runtime;
+using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityEngine.TestTools;
 
 namespace TestProject.RuntimeTests
 {
+    [TestFixture(NetworkTopologyTypes.DistributedAuthority)]
+    [TestFixture(NetworkTopologyTypes.ClientServer)]
     public class ParentingInSceneObjectsTests : IntegrationTestWithApproximation
     {
         private const string k_BaseSceneToLoad = "UnitTestBaseScene";
@@ -21,6 +24,8 @@ public class ParentingInSceneObjectsTests : IntegrationTestWithApproximation
 
         protected override int NumberOfClients => 2;
 
+        public ParentingInSceneObjectsTests(NetworkTopologyTypes networkTopologyType) : base(networkTopologyType) { }
+
         protected override void OnOneTimeSetup()
         {
             NetworkManagerTestDisabler.IsIntegrationTest = true;
@@ -56,6 +61,8 @@ private void SceneManager_sceneLoaded(Scene scene, LoadSceneMode mode)
 
         protected override IEnumerator OnTearDown()
         {
+            ParentingAutoSyncManager.Reset();
+
             if (m_BaseSceneLoaded.IsValid() && m_BaseSceneLoaded.isLoaded)
             {
                 SceneManager.UnloadSceneAsync(m_BaseSceneLoaded);
@@ -66,17 +73,20 @@ protected override IEnumerator OnTearDown()
 
         private void GeneratePositionDoesNotMatch(InSceneParentChildHandler serverHandler, InSceneParentChildHandler clientHandler)
         {
-            m_ErrorValidationLog.AppendLine($"[Client-{clientHandler.NetworkManager.LocalClientId}] {nameof(NetworkObject)}-{clientHandler.NetworkObjectId}'s position {clientHandler.transform.position} does not equal the server-side position {serverHandler.transform.position}");
+            m_ErrorValidationLog.AppendLine($"[Client-{clientHandler.NetworkManager.LocalClientId}] {nameof(NetworkObject)}-{clientHandler.NetworkObjectId}'s " +
+                $"position {GetVector3Values(clientHandler.transform.position)} does not equal the server-side position {GetVector3Values(serverHandler.transform.position)}");
         }
 
         private void GenerateRotationDoesNotMatch(InSceneParentChildHandler serverHandler, InSceneParentChildHandler clientHandler)
         {
-            m_ErrorValidationLog.Append($"[Client-{clientHandler.NetworkManager.LocalClientId}] {nameof(NetworkObject)}-{clientHandler.NetworkObjectId}'s rotation {clientHandler.transform.eulerAngles} does not equal the server-side rotation {serverHandler.transform.eulerAngles}");
+            m_ErrorValidationLog.AppendLine($"[Client-{clientHandler.NetworkManager.LocalClientId}] {nameof(NetworkObject)}-{clientHandler.NetworkObjectId}'s " +
+                $"rotation {GetVector3Values(clientHandler.transform.eulerAngles)} does not equal the server-side rotation {GetVector3Values(serverHandler.transform.eulerAngles)}");
         }
 
         private void GenerateScaleDoesNotMatch(InSceneParentChildHandler serverHandler, InSceneParentChildHandler clientHandler)
         {
-            m_ErrorValidationLog.AppendLine($"[Client-{clientHandler.NetworkManager.LocalClientId}] {nameof(NetworkObject)}-{clientHandler.NetworkObjectId}'s scale {clientHandler.transform.localScale} does not equal the server-side scale {serverHandler.transform.localScale}");
+            m_ErrorValidationLog.AppendLine($"[Client-{clientHandler.NetworkManager.LocalClientId}] {nameof(NetworkObject)}-{clientHandler.NetworkObjectId}'s " +
+                $"scale {GetVector3Values(clientHandler.transform.localScale)} does not equal the server-side scale {GetVector3Values(serverHandler.transform.localScale)}");
         }
 
         private void GenerateParentIsNotCorrect(InSceneParentChildHandler handler, bool shouldHaveParent, bool isStillSpawnedCheck = false)
@@ -114,13 +124,13 @@ private void GenerateTransformInfo(InSceneParentChildHandler serverHandler, InSc
             }
         }
 
-        private bool ValidateClientAgainstServerTransformValues()
+        private bool ValidateClientsAgainstAuthorityTransformValues()
         {
             // We reset this each time because we are only interested in the last time it checked and failed
             m_ErrorValidationLog.Clear();
             var passed = true;
             var failingClient = (ulong)0;
-            foreach (var instance in InSceneParentChildHandler.ServerRelativeInstances)
+            foreach (var instance in InSceneParentChildHandler.AuthorityRelativeInstances)
             {
                 var serverInstanceTransform = instance.Value.transform;
                 foreach (var clientInstances in InSceneParentChildHandler.ClientRelativeInstances)
@@ -163,7 +173,7 @@ private bool ValidateClientAgainstServerTransformValues()
         private bool ValidateAllChildrenParentingStatus(bool checkForParent)
         {
             m_ErrorValidationLog.Clear();
-            foreach (var instance in InSceneParentChildHandler.ServerRelativeInstances)
+            foreach (var instance in InSceneParentChildHandler.AuthorityRelativeInstances)
             {
                 if (!instance.Value.IsRootParent)
                 {
@@ -238,22 +248,40 @@ public IEnumerator InSceneParentingTest([Values] ParentingSpace parentingSpace)
             yield return WaitForConditionOrTimeOut(() => m_InitialClientsLoadedScene);
             AssertOnTimeout($"Timed out waiting for all clients to load scene {k_TestSceneToLoad}!");
 
+            var debugWait = new WaitForSeconds(2);
             // [Currently Connected Clients]
             // remove the parents, change all transform values, and re-parent
-            InSceneParentChildHandler.ServerRootParent.DeparentSetValuesAndReparent();
-            yield return WaitForConditionOrTimeOut(ValidateClientAgainstServerTransformValues);
-            AssertOnTimeout($"Timed out waiting for all clients transform values to match the server transform values!\n {m_ErrorValidationLog}");
+            InSceneParentChildHandler.AuthorityRootParent.DeparentSetValuesAndReparent();
+            yield return WaitForConditionOrTimeOut(ValidateClientsAgainstAuthorityTransformValues);
+
+
+            if (s_GlobalTimeoutHelper.TimedOut)
+            {
+                InSceneParentChildHandler.AuthorityRootParent.CheckChildren();
+                yield return debugWait;
+            }
+            AssertOnTimeout($"Timed out waiting for all clients transform values to match the authority transform values!\n {m_ErrorValidationLog}");
 
             // [Late Join Client #1]
             // Make sure the late joining client synchronizes properly
             yield return CreateAndStartNewClient();
-            yield return WaitForConditionOrTimeOut(ValidateClientAgainstServerTransformValues);
-            AssertOnTimeout($"[Late Join 1] Timed out waiting for the late joining client's transform values to match the server transform values!\n {m_ErrorValidationLog}");
+            yield return WaitForConditionOrTimeOut(ValidateClientsAgainstAuthorityTransformValues);
+            if (s_GlobalTimeoutHelper.TimedOut)
+            {
+                InSceneParentChildHandler.AuthorityRootParent.CheckChildren();
+                yield return debugWait;
+            }
+            AssertOnTimeout($"[Late Join 1] Timed out waiting for the late joining client's transform values to match the authority transform values!\n {m_ErrorValidationLog}");
 
             // Remove the parents from all of the children
-            InSceneParentChildHandler.ServerRootParent.DeparentAllChildren();
-            yield return WaitForConditionOrTimeOut(ValidateClientAgainstServerTransformValues);
-            AssertOnTimeout($"[Late Join 1] Timed out waiting for all clients transform values to match the server transform values!\n {m_ErrorValidationLog}");
+            InSceneParentChildHandler.AuthorityRootParent.DeparentAllChildren();
+            yield return WaitForConditionOrTimeOut(ValidateClientsAgainstAuthorityTransformValues);
+            if (s_GlobalTimeoutHelper.TimedOut)
+            {
+                InSceneParentChildHandler.AuthorityRootParent.CheckChildren();
+                yield return debugWait;
+            }
+            AssertOnTimeout($"[Late Join 1] Timed out waiting for all clients transform values to match the authority transform values!\n {m_ErrorValidationLog}");
 
             yield return WaitForConditionOrTimeOut(() => ValidateAllChildrenParentingStatus(false));
             AssertOnTimeout($"[Late Join 1] Timed out waiting for all children to be removed from their parent!\n {m_ErrorValidationLog}");
@@ -261,48 +289,78 @@ public IEnumerator InSceneParentingTest([Values] ParentingSpace parentingSpace)
             // [Late Join Client #2]
             // Make sure the late joining client synchronizes properly with all children having their parent removed
             yield return CreateAndStartNewClient();
-            yield return WaitForConditionOrTimeOut(ValidateClientAgainstServerTransformValues);
-            AssertOnTimeout($"[Late Join 2] Timed out waiting for the late joining client's transform values to match the server transform values!\n {m_ErrorValidationLog}");
+            yield return WaitForConditionOrTimeOut(ValidateClientsAgainstAuthorityTransformValues);
+            if (s_GlobalTimeoutHelper.TimedOut)
+            {
+                InSceneParentChildHandler.AuthorityRootParent.CheckChildren();
+                yield return debugWait;
+            }
+            AssertOnTimeout($"[Late Join 2] Timed out waiting for the late joining client's transform values to match the authority transform values!\n {m_ErrorValidationLog}");
 
             // Just a sanity check that late joining client #2 has no child parented
             yield return WaitForConditionOrTimeOut(() => ValidateAllChildrenParentingStatus(false));
-            AssertOnTimeout($"[Late Join 2] Timed out waiting for late joined client's children objects to have no parent!\n {m_ErrorValidationLog}");
+            if (s_GlobalTimeoutHelper.TimedOut)
+            {
+                InSceneParentChildHandler.AuthorityRootParent.CheckChildren();
+                yield return debugWait;
+            }
+            AssertOnTimeout($"[Late Join 2] Timed out verifying late joined client's children objects to have no parent!\n {m_ErrorValidationLog}");
 
             // Finally, re-parent all of the children to make sure late joining client #2 synchronizes properly
-            InSceneParentChildHandler.ServerRootParent.ReParentAllChildren();
-            yield return WaitForConditionOrTimeOut(ValidateClientAgainstServerTransformValues);
-            AssertOnTimeout($"[Late Join 2] Timed out waiting for all clients transform values to match the server transform values!\n {m_ErrorValidationLog}");
+            InSceneParentChildHandler.AuthorityRootParent.ReParentAllChildren();
+            yield return WaitForConditionOrTimeOut(ValidateClientsAgainstAuthorityTransformValues);
+            if (s_GlobalTimeoutHelper.TimedOut)
+            {
+                InSceneParentChildHandler.AuthorityRootParent.CheckChildren();
+                yield return debugWait;
+            }
+            AssertOnTimeout($"[Late Join 2] Timed out waiting for all clients' transform values to match the authority transform values!\n {m_ErrorValidationLog}");
             yield return WaitForConditionOrTimeOut(() => ValidateAllChildrenParentingStatus(true));
-            AssertOnTimeout($"[Late Join 2] Timed out waiting for all children to be removed from their parent!\n {m_ErrorValidationLog}");
+            if (s_GlobalTimeoutHelper.TimedOut)
+            {
+                InSceneParentChildHandler.AuthorityRootParent.CheckChildren();
+                yield return debugWait;
+            }
+            AssertOnTimeout($"[Late Join 2] Timed out waiting for all clients' to re-parent all targeted child objects!\n {m_ErrorValidationLog}");
 
             // Now run through many iterations where we remove the parents, set the parents, and while
             // the parents are being set the InSceneParentChildHandler assigns new position, rotation, and scale values
             // in the OnNetworkObjectParentChanged overridden method on the server side only
             for (int i = 0; i < k_NumIterationsDeparentReparent; i++)
             {
-                InSceneParentChildHandler.ServerRootParent.DeparentSetValuesAndReparent();
+                InSceneParentChildHandler.AuthorityRootParent.DeparentSetValuesAndReparent();
 
-                yield return WaitForConditionOrTimeOut(ValidateClientAgainstServerTransformValues);
-                AssertOnTimeout($"[Final Pass] Timed out waiting for all clients transform values to match the server transform values!\n {m_ErrorValidationLog}");
+                yield return WaitForConditionOrTimeOut(ValidateClientsAgainstAuthorityTransformValues);
+                if (s_GlobalTimeoutHelper.TimedOut)
+                {
+                    InSceneParentChildHandler.AuthorityRootParent.CheckChildren();
+                    yield return debugWait;
+                }
+                AssertOnTimeout($"[Final Pass][Deparent-Reparent-{i}] Timed out waiting for all clients transform values to match the server transform values!\n {m_ErrorValidationLog}");
 
                 yield return WaitForConditionOrTimeOut(() => ValidateAllChildrenParentingStatus(true));
-                AssertOnTimeout($"[Final Pass] Timed out waiting for all children to be removed from their parent!\n {m_ErrorValidationLog}");
+                if (s_GlobalTimeoutHelper.TimedOut)
+                {
+                    InSceneParentChildHandler.AuthorityRootParent.CheckChildren();
+                    yield return debugWait;
+                }
+                AssertOnTimeout($"[Final Pass][Deparent-Reparent-{i}] Timed out waiting for all children to be removed from their parent!\n {m_ErrorValidationLog}");
             }
 
             // In the final pass, we remove the second generation nested child
-            var firstGenChild = InSceneParentChildHandler.ServerRootParent.transform.GetChild(0);
+            var firstGenChild = InSceneParentChildHandler.AuthorityRootParent.transform.GetChild(0);
             var secondGenChild = firstGenChild.GetChild(0);
             var secondGenChildNetworkObject = secondGenChild.GetComponent<NetworkObject>();
             Assert.True(secondGenChildNetworkObject.TrySetParent((NetworkObject)null, false), $"[Final Pass] Failed to remove the parent from the second generation child!");
 
             // Validate all transform values match
-            yield return WaitForConditionOrTimeOut(ValidateClientAgainstServerTransformValues);
+            yield return WaitForConditionOrTimeOut(ValidateClientsAgainstAuthorityTransformValues);
             AssertOnTimeout($"[Final Pass] Timed out waiting for all clients transform values to match the server transform values after the second generation child's parent was removed!\n {m_ErrorValidationLog}");
 
             // Now run through one last de-parent, re-parent, and set new values pass to make sure everything still synchronizes
-            InSceneParentChildHandler.ServerRootParent.DeparentSetValuesAndReparent();
+            InSceneParentChildHandler.AuthorityRootParent.DeparentSetValuesAndReparent();
 
-            yield return WaitForConditionOrTimeOut(ValidateClientAgainstServerTransformValues);
+            yield return WaitForConditionOrTimeOut(ValidateClientsAgainstAuthorityTransformValues);
             AssertOnTimeout($"[Final Pass - Last Test] Timed out waiting for all clients transform values to match the server transform values!\n {m_ErrorValidationLog}");
 
             yield return WaitForConditionOrTimeOut(() => ValidateAllChildrenParentingStatus(true));
@@ -316,11 +374,11 @@ private bool ValidateRootParentDespawnedAndChildAtRoot()
         {
             m_ErrorValidationLog.Clear();
 
-            var childOfRoot_ServerSide = InSceneParentChildHandler.ServerRootParent.GetChild();
-            if (InSceneParentChildHandler.ServerRootParent.IsSpawned)
+            var childOfRoot_ServerSide = InSceneParentChildHandler.AuthorityRootParent.GetChild();
+            if (InSceneParentChildHandler.AuthorityRootParent.IsSpawned)
             {
                 m_ErrorValidationLog.Append("Server-Side root parent is still spawned!");
-                GenerateParentIsNotCorrect(childOfRoot_ServerSide, false, InSceneParentChildHandler.ServerRootParent.IsSpawned);
+                GenerateParentIsNotCorrect(childOfRoot_ServerSide, false, InSceneParentChildHandler.AuthorityRootParent.IsSpawned);
                 return false;
             }
 
@@ -370,12 +428,12 @@ public IEnumerator DespawnParentTest([Values] ParentingSpace parentingSpace)
 
             // [Currently Connected Clients]
             // remove the parents, change all transform values, and re-parent
-            InSceneParentChildHandler.ServerRootParent.DeparentSetValuesAndReparent();
-            yield return WaitForConditionOrTimeOut(ValidateClientAgainstServerTransformValues);
+            InSceneParentChildHandler.AuthorityRootParent.DeparentSetValuesAndReparent();
+            yield return WaitForConditionOrTimeOut(ValidateClientsAgainstAuthorityTransformValues);
             AssertOnTimeout($"Timed out waiting for all clients transform values to match the server transform values!\n {m_ErrorValidationLog}");
 
             // Now despawn the root parent
-            InSceneParentChildHandler.ServerRootParent.NetworkObject.Despawn(false);
+            InSceneParentChildHandler.AuthorityRootParent.NetworkObject.Despawn(false);
 
             // Verify all clients despawned the parent object and the child of the parent has root as its parent
             yield return WaitForConditionOrTimeOut(ValidateRootParentDespawnedAndChildAtRoot);
@@ -424,6 +482,12 @@ public IEnumerator InSceneNestedUnderGameObjectTest()
         /// </summary>
         private bool AllClientInstancesMatchServerInstance()
         {
+            m_ErrorValidationLog.Clear();
+            if (ParentingAutoSyncManager.ServerInstance == null)
+            {
+                m_ErrorValidationLog.AppendLine("ServerInstance is null");
+                return false;
+            }
             for (int i = 0; i < ParentingAutoSyncManager.ServerInstance.NetworkObjectAutoSyncOnTransforms.Count; i++)
             {
                 var serverTransformToTest = ParentingAutoSyncManager.ServerInstance.NetworkObjectAutoSyncOnTransforms[i];
@@ -433,16 +497,19 @@ private bool AllClientInstancesMatchServerInstance()
                     var clientTransformToTest = clientRelativeAutoSyncManager.NetworkObjectAutoSyncOnTransforms[i];
                     if (!Approximately(clientTransformToTest.position, serverTransformToTest.position))
                     {
+                        m_ErrorValidationLog.AppendLine($"[Client-{clientRelativeAutoSyncManager.NetworkManager.LocalClientId}][AutoSync On] {nameof(NetworkObject)}-{clientRelativeAutoSyncManager.NetworkObjectId}'s position {clientRelativeAutoSyncManager.transform.position} does not equal the server-side position {serverTransformToTest.transform.position}");
                         return false;
                     }
 
                     if (!Approximately(clientTransformToTest.rotation, serverTransformToTest.rotation))
                     {
+                        m_ErrorValidationLog.AppendLine($"[Client-{clientRelativeAutoSyncManager.NetworkManager.LocalClientId}][AutoSync On] {nameof(NetworkObject)}-{clientRelativeAutoSyncManager.NetworkObjectId}'s rotation {clientRelativeAutoSyncManager.transform.eulerAngles} does not equal the server-side position {serverTransformToTest.transform.eulerAngles}");
                         return false;
                     }
 
                     if (!Approximately(clientTransformToTest.localScale, serverTransformToTest.localScale))
                     {
+                        m_ErrorValidationLog.AppendLine($"[Client-{clientRelativeAutoSyncManager.NetworkManager.LocalClientId}][AutoSync On] {nameof(NetworkObject)}-{clientRelativeAutoSyncManager.NetworkObjectId}'s scale {clientRelativeAutoSyncManager.transform.localScale} does not equal the server-side position {serverTransformToTest.transform.localScale}");
                         return false;
                     }
                 }
@@ -457,16 +524,19 @@ private bool AllClientInstancesMatchServerInstance()
                     var clientTransformToTest = clientRelativeAutoSyncManager.NetworkObjectAutoSyncOffTransforms[i];
                     if (!Approximately(clientTransformToTest.position, serverTransformToTest.position))
                     {
+                        m_ErrorValidationLog.AppendLine($"[Client-{clientRelativeAutoSyncManager.NetworkManager.LocalClientId}][AutoSync Off] {nameof(NetworkObject)}-{clientRelativeAutoSyncManager.NetworkObjectId}'s position {clientRelativeAutoSyncManager.transform.position} does not equal the server-side position {serverTransformToTest.transform.position}");
                         return false;
                     }
 
                     if (!Approximately(clientTransformToTest.rotation, serverTransformToTest.rotation))
                     {
+                        m_ErrorValidationLog.AppendLine($"[Client-{clientRelativeAutoSyncManager.NetworkManager.LocalClientId}][AutoSync Off] {nameof(NetworkObject)}-{clientRelativeAutoSyncManager.NetworkObjectId}'s rotation {clientRelativeAutoSyncManager.transform.eulerAngles} does not equal the server-side position {serverTransformToTest.transform.eulerAngles}");
                         return false;
                     }
 
                     if (!Approximately(clientTransformToTest.localScale, serverTransformToTest.localScale))
                     {
+                        m_ErrorValidationLog.AppendLine($"[Client-{clientRelativeAutoSyncManager.NetworkManager.LocalClientId}][AutoSync Off] {nameof(NetworkObject)}-{clientRelativeAutoSyncManager.NetworkObjectId}'s scale {clientRelativeAutoSyncManager.transform.localScale} does not equal the server-side position {serverTransformToTest.transform.localScale}");
                         return false;
                     }
                 }
@@ -481,16 +551,19 @@ private bool AllClientInstancesMatchServerInstance()
                     var clientTransformToTest = clientRelativeAutoSyncManager.GameObjectAutoSyncOnTransforms[i];
                     if (!Approximately(clientTransformToTest.position, serverTransformToTest.position))
                     {
+                        m_ErrorValidationLog.AppendLine($"[Client-{clientRelativeAutoSyncManager.NetworkManager.LocalClientId}][GO-AutoSync On] {nameof(NetworkObject)}-{clientRelativeAutoSyncManager.NetworkObjectId}'s position {clientRelativeAutoSyncManager.transform.position} does not equal the server-side position {serverTransformToTest.transform.position}");
                         return false;
                     }
 
                     if (!Approximately(clientTransformToTest.rotation, serverTransformToTest.rotation))
                     {
+                        m_ErrorValidationLog.AppendLine($"[Client-{clientRelativeAutoSyncManager.NetworkManager.LocalClientId}][GO-AutoSync On] {nameof(NetworkObject)}-{clientRelativeAutoSyncManager.NetworkObjectId}'s rotation {clientRelativeAutoSyncManager.transform.eulerAngles} does not equal the server-side position {serverTransformToTest.transform.eulerAngles}");
                         return false;
                     }
 
                     if (!Approximately(clientTransformToTest.localScale, serverTransformToTest.localScale))
                     {
+                        m_ErrorValidationLog.AppendLine($"[Client-{clientRelativeAutoSyncManager.NetworkManager.LocalClientId}][GO-AutoSync On] {nameof(NetworkObject)}-{clientRelativeAutoSyncManager.NetworkObjectId}'s scale {clientRelativeAutoSyncManager.transform.localScale} does not equal the server-side position {serverTransformToTest.transform.localScale}");
                         return false;
                     }
                 }
@@ -505,16 +578,19 @@ private bool AllClientInstancesMatchServerInstance()
                     var clientTransformToTest = clientRelativeAutoSyncManager.GameObjectAutoSyncOffTransforms[i];
                     if (!Approximately(clientTransformToTest.position, serverTransformToTest.position))
                     {
+                        m_ErrorValidationLog.AppendLine($"[Client-{clientRelativeAutoSyncManager.NetworkManager.LocalClientId}][GO-AutoSync Off] {nameof(NetworkObject)}-{clientRelativeAutoSyncManager.NetworkObjectId}'s position {clientRelativeAutoSyncManager.transform.position} does not equal the server-side position {serverTransformToTest.transform.position}");
                         return false;
                     }
 
                     if (!Approximately(clientTransformToTest.rotation, serverTransformToTest.rotation))
                     {
+                        m_ErrorValidationLog.AppendLine($"[Client-{clientRelativeAutoSyncManager.NetworkManager.LocalClientId}][GO-AutoSync Off] {nameof(NetworkObject)}-{clientRelativeAutoSyncManager.NetworkObjectId}'s rotation {clientRelativeAutoSyncManager.transform.eulerAngles} does not equal the server-side position {serverTransformToTest.transform.eulerAngles}");
                         return false;
                     }
 
                     if (!Approximately(clientTransformToTest.localScale, serverTransformToTest.localScale))
                     {
+                        m_ErrorValidationLog.AppendLine($"[Client-{clientRelativeAutoSyncManager.NetworkManager.LocalClientId}][GO-AutoSync Off] {nameof(NetworkObject)}-{clientRelativeAutoSyncManager.NetworkObjectId}'s scale {clientRelativeAutoSyncManager.transform.localScale} does not equal the server-side position {serverTransformToTest.transform.localScale}");
                         return false;
                     }
                 }
@@ -541,7 +617,7 @@ public IEnumerator InSceneNestedAutoSyncObjectTest()
             AssertOnTimeout($"Timed out waiting for all clients to load scene {k_TestSceneToLoad}!");
 
             yield return WaitForConditionOrTimeOut(AllClientInstancesMatchServerInstance);
-            AssertOnTimeout($"Timed out waiting for all client transforms to match the server-side values in test scene {k_TestSceneToLoad}!");
+            AssertOnTimeout($"Timed out waiting for all client transforms to match the server-side values in test scene {k_TestSceneToLoad}!\n {m_ErrorValidationLog.ToString()}");
         }
     }
 }
diff --git a/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingInSceneObjectsTests.cs.meta b/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingInSceneObjectsTests.cs.meta
index 383199e0df..4487bdd582 100644
--- a/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingInSceneObjectsTests.cs.meta
+++ b/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingInSceneObjectsTests.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: eb1bdec28131915419a2825132406932
+guid: e5024637f645a694b83e79c89a71ee62
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingWorldPositionStaysTests.cs b/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingWorldPositionStaysTests.cs
index 93ac3eac93..84829a6c8e 100644
--- a/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingWorldPositionStaysTests.cs
+++ b/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingWorldPositionStaysTests.cs
@@ -11,6 +11,8 @@
 
 namespace TestProject.RuntimeTests
 {
+    [TestFixture(NetworkTopologyTypes.DistributedAuthority)]
+    [TestFixture(NetworkTopologyTypes.ClientServer)]
     public class ParentingWorldPositionStaysTests : IntegrationTestWithApproximation
     {
         private const int k_NestedChildren = 10;
@@ -156,6 +158,8 @@ public enum NetworkTransformSettings
         private Quaternion m_ChildStartRotation = Quaternion.Euler(-35.0f, 0.0f, -180.0f);
         private Vector3 m_ChildStartScale = Vector3.one;
 
+        public ParentingWorldPositionStaysTests(NetworkTopologyTypes networkTopologyType) : base(networkTopologyType) { }
+
         protected override IEnumerator OnSetup()
         {
             TestComponentHelper.ClientsRegistered.Clear();
@@ -214,14 +218,6 @@ protected override void OnServerAndClientsCreated()
             base.OnServerAndClientsCreated();
         }
 
-        protected override void OnNewClientCreated(NetworkManager networkManager)
-        {
-            foreach (var networkPrefab in m_ServerNetworkManager.NetworkConfig.Prefabs.Prefabs)
-            {
-                networkManager.NetworkConfig.Prefabs.Add(networkPrefab);
-            }
-        }
-
         private bool HaveAllClientsSpawnedObjects()
         {
             foreach (var client in m_ClientNetworkManagers)
diff --git a/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingWorldPositionStaysTests.cs.meta b/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingWorldPositionStaysTests.cs.meta
index 3b3e7d27fb..9035651c91 100644
--- a/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingWorldPositionStaysTests.cs.meta
+++ b/testproject/Assets/Tests/Runtime/ObjectParenting/ParentingWorldPositionStaysTests.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ea191714be7765a41ba7cbd26b6ecfa0
+guid: f7a30f85ec3dafb4f93007ce13c0ec47
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/testproject/Assets/Tests/Runtime/ObjectParenting/PlayerPrefab.prefab.meta b/testproject/Assets/Tests/Runtime/ObjectParenting/PlayerPrefab.prefab.meta
index c0781023b2..58d609faa9 100644
--- a/testproject/Assets/Tests/Runtime/ObjectParenting/PlayerPrefab.prefab.meta
+++ b/testproject/Assets/Tests/Runtime/ObjectParenting/PlayerPrefab.prefab.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 421bcf732fe69486d8abecfa5eee63bb
+guid: c3f26b8822ab9ec4dbda31fd1bb9965d
 PrefabImporter:
   externalObjects: {}
   userData: 
diff --git a/testproject/Assets/Tests/Runtime/PrefabExtendedTests.cs b/testproject/Assets/Tests/Runtime/PrefabExtendedTests.cs
index 8b05791995..7bfe12083f 100644
--- a/testproject/Assets/Tests/Runtime/PrefabExtendedTests.cs
+++ b/testproject/Assets/Tests/Runtime/PrefabExtendedTests.cs
@@ -12,7 +12,7 @@
 
 namespace TestProject.RuntimeTests
 {
-
+    // DAMODE-TODO: When scene management is working in distributed authority mode we need to update this test
     [TestFixture(SceneManagementTypes.SceneManagementEnabled)]
     [TestFixture(SceneManagementTypes.SceneManagementDisabled)]
     public class PrefabExtendedTests : NetcodeIntegrationTest
@@ -129,11 +129,10 @@ protected override void OnNewClientCreated(NetworkManager networkManager)
         {
             networkManager.NetworkConfig.EnableSceneManagement = m_SceneManagementEnabled;
             networkManager.NetworkConfig.Prefabs.NetworkPrefabsLists.Add(PrefabTestConfig.Instance.TestPrefabs);
-            base.OnNewClientCreated(networkManager);
         }
 
         /// <summary>
-        /// Validates that all spawned NetworkObjects are present and their corresponding 
+        /// Validates that all spawned NetworkObjects are present and their corresponding
         /// GlobalObjectIdHash values match
         /// </summary>
         private bool ValidateAllClientsSpawnedObjects()
@@ -212,13 +211,6 @@ public IEnumerator TestPrefabsSpawning([Values] InstantiateAndSpawnMethods insta
             var firstError = $"[Netcode] Failed to create object locally. [globalObjectIdHash={gloabalObjectId}]. NetworkPrefab could not be found. Is the prefab registered with NetworkManager?";
             var secondError = $"[Netcode] Failed to spawn NetworkObject for Hash {gloabalObjectId}.";
             m_InstantiateAndSpawnType = instantiateAndSpawnType;
-            if (!m_SceneManagementEnabled)
-            {
-                // When scene management is disabled, in-scene defined NetworkObjects are not synchronized.
-                // Expect 2 error messages about not being able to find the in-scene defined NetworkObject in the PrefabTestScene.
-                LogAssert.Expect(LogType.Error, firstError);
-                LogAssert.Expect(LogType.Error, secondError);
-            }
 
             // We have to spawn the first client manually in order to account for the errors when scene management is disabled.
             // Spawn the client prior to dynamically spawning our prefab instances. Two of the in-scene placed NetworkObjects
@@ -227,7 +219,7 @@ public IEnumerator TestPrefabsSpawning([Values] InstantiateAndSpawnMethods insta
             yield return CreateAndStartNewClient();
 
             var spawnManager = m_ServerNetworkManager.SpawnManager;
-            // If scene management is enabled, then we want to verify against the editor 
+            // If scene management is enabled, then we want to verify against the editor
             // assigned in-scene placed NetworkObjects
             if (m_SceneManagementEnabled)
             {
@@ -278,20 +270,11 @@ public IEnumerator TestPrefabsSpawning([Values] InstantiateAndSpawnMethods insta
 
             // Validate that the client synchronized with the in-scene placed and dynamically spawned NetworkObjects
             yield return WaitForConditionOrTimeOut(ValidateAllClientsSpawnedObjects);
-            AssertOnTimeout($"[First Stage] Validating spawned objects faild with the following error: {m_ErrorLog}");
+            AssertOnTimeout($"[First Stage][{instantiateAndSpawnType}] Validating spawned objects faild with the following error: {m_ErrorLog}");
 
-            // Finally, let's test a late joining client and make sure it synchronizes with the in-scene placed and
-            // dynamically spawned NetworkObjects
-            if (!m_SceneManagementEnabled)
-            {
-                // When scene management is disabled, in-scene defined NetworkObjects are not synchronized.
-                // Expect 2 error messages about not being able to find the in-scene defined NetworkObject in the PrefabTestScene.
-                LogAssert.Expect(LogType.Error, firstError);
-                LogAssert.Expect(LogType.Error, secondError);
-            }
             yield return CreateAndStartNewClient();
             yield return WaitForConditionOrTimeOut(ValidateAllClientsSpawnedObjects);
-            AssertOnTimeout($"[Second Stage] Validating spawned objects faild with the following error: {m_ErrorLog}");
+            AssertOnTimeout($"[Second Stage][{instantiateAndSpawnType}] Validating spawned objects faild with the following error: {m_ErrorLog}");
 
             if (instantiateAndSpawnType != InstantiateAndSpawnMethods.Manual)
             {
@@ -303,7 +286,7 @@ public IEnumerator TestPrefabsSpawning([Values] InstantiateAndSpawnMethods insta
         [UnityTest]
         public IEnumerator TestsInstantiateAndSpawnErrors([Values] InstantiateAndSpawnMethods instantiateAndSpawnType)
         {
-            // If scene management is enabled, then we want to verify against the editor 
+            // If scene management is enabled, then we want to verify against the editor
             // assigned in-scene placed NetworkObjects
             if (m_SceneManagementEnabled)
             {
@@ -344,7 +327,7 @@ public IEnumerator TestsInstantiateAndSpawnErrors([Values] InstantiateAndSpawnMe
             m_ServerNetworkManager.Shutdown();
             LogAssert.Expect(LogType.Warning, NetworkSpawnManager.InstantiateAndSpawnErrors[NetworkSpawnManager.InstantiateAndSpawnErrorTypes.InvokedWhenShuttingDown]);
             InstantiateAndSpawn(m_ObjectsToSpawn[0], instantiateAndSpawnType);
-            // The not listening error can only happen when trying to instantiate and spawn on a Network Prefab 
+            // The not listening error can only happen when trying to instantiate and spawn on a Network Prefab
             if (instantiateAndSpawnType == InstantiateAndSpawnMethods.NetworkObject)
             {
                 LogAssert.Expect(LogType.Error, NetworkSpawnManager.InstantiateAndSpawnErrors[NetworkSpawnManager.InstantiateAndSpawnErrorTypes.NoActiveSession]);
@@ -376,6 +359,4 @@ private NetworkObject InstantiateAndSpawn(NetworkObject prefabNetworkObject, Ins
         }
 
     }
-
-
 }
diff --git a/testproject/Assets/Tests/Runtime/RespawnInSceneObjectsAfterShutdown.cs b/testproject/Assets/Tests/Runtime/RespawnInSceneObjectsAfterShutdown.cs
index 9460c758eb..c8f441b6e1 100644
--- a/testproject/Assets/Tests/Runtime/RespawnInSceneObjectsAfterShutdown.cs
+++ b/testproject/Assets/Tests/Runtime/RespawnInSceneObjectsAfterShutdown.cs
@@ -8,6 +8,8 @@
 
 namespace TestProject.RuntimeTests
 {
+    [TestFixture(NetworkTopologyTypes.DistributedAuthority)]
+    [TestFixture(NetworkTopologyTypes.ClientServer)]
     public class RespawnInSceneObjectsAfterShutdown : NetcodeIntegrationTest
     {
         public const string SceneToLoad = "InSceneNetworkObject";
@@ -15,6 +17,8 @@ public class RespawnInSceneObjectsAfterShutdown : NetcodeIntegrationTest
         protected override int NumberOfClients => 0;
         protected Scene m_SceneLoaded;
 
+        public RespawnInSceneObjectsAfterShutdown(NetworkTopologyTypes networkTopologyType) : base(networkTopologyType) { }
+
         protected override void OnOneTimeSetup()
         {
             base.OnOneTimeSetup();
diff --git a/testproject/Assets/Tests/Runtime/RpcObserverTests.cs b/testproject/Assets/Tests/Runtime/RpcObserverTests.cs
index 780847b686..d5a7e17542 100644
--- a/testproject/Assets/Tests/Runtime/RpcObserverTests.cs
+++ b/testproject/Assets/Tests/Runtime/RpcObserverTests.cs
@@ -14,6 +14,9 @@ namespace TestProject.RuntimeTests
     /// Integration test to validate ClientRpcs will only
     /// send to observers of the NetworkObject
     /// </summary>
+#if NGO_DAMODE
+    [TestFixture(HostOrServer.DAHost)]
+#endif
     [TestFixture(HostOrServer.Host)]
     [TestFixture(HostOrServer.Server)]
     public class RpcObserverTests : NetcodeIntegrationTest
diff --git a/testproject/Assets/Tests/Runtime/RpcUserSerializableTypesTest.cs b/testproject/Assets/Tests/Runtime/RpcUserSerializableTypesTest.cs
index 832870d564..83e327e5a7 100644
--- a/testproject/Assets/Tests/Runtime/RpcUserSerializableTypesTest.cs
+++ b/testproject/Assets/Tests/Runtime/RpcUserSerializableTypesTest.cs
@@ -47,6 +47,11 @@ public void NetworkSerialize<TImplementation>(BufferSerializer<TImplementation>
             serializer.SerializeValue(ref Value);
         }
     }
+
+#if NGO_DAMODE
+    [TestFixture(NetworkTopologyTypes.DistributedAuthority)]
+    [TestFixture(NetworkTopologyTypes.ClientServer)]
+#endif 
     public class RpcUserSerializableTypesTest : NetcodeIntegrationTest
     {
         private UserSerializableClass m_UserSerializableClass;
@@ -78,6 +83,10 @@ public class RpcUserSerializableTypesTest : NetcodeIntegrationTest
 
         protected override int NumberOfClients => 1;
 
+#if NGO_DAMODE
+        public RpcUserSerializableTypesTest(NetworkTopologyTypes networkTopologyType) : base(networkTopologyType) { }
+#endif
+
         protected override NetworkManagerInstatiationMode OnSetIntegrationTestMode()
         {
             return NetworkManagerInstatiationMode.DoNotCreate;
@@ -103,15 +112,32 @@ public IEnumerator NetworkSerializableTest()
             yield return StartServerAndClients();
 
             // [Client-Side] We only need to get the client side Player's NetworkObject so we can grab that instance of the TestSerializationComponent
-            var clientClientPlayerResult = new NetcodeIntegrationTestHelpers.ResultWrapper<NetworkObject>();
-            yield return NetcodeIntegrationTestHelpers.GetNetworkObjectByRepresentation((x => x.IsPlayerObject && x.OwnerClientId == m_ClientNetworkManagers[0].LocalClientId), m_ClientNetworkManagers[0], clientClientPlayerResult);
-            var clientSideNetworkBehaviourClass = clientClientPlayerResult.Result.gameObject.GetComponent<TestSerializationComponent>();
-            clientSideNetworkBehaviourClass.OnSerializableClassUpdated = OnClientReceivedUserSerializableClassUpdated;
-            clientSideNetworkBehaviourClass.OnSerializableStructUpdated = OnClientReceivedUserSerializableStructUpdated;
-            clientSideNetworkBehaviourClass.OnTemplateStructUpdated = OnClientReceivedUserSerializableTemplateStructUpdated;
-            clientSideNetworkBehaviourClass.OnNetworkSerializableTemplateStructUpdated = OnClientReceivedUserSerializableNetworkSerializableTemplateStructUpdated; clientSideNetworkBehaviourClass.OnTemplateStructsUpdated = OnClientReceivedUserSerializableTemplateStructsUpdated;
-            clientSideNetworkBehaviourClass.OnNetworkSerializableTemplateStructsUpdated = OnClientReceivedUserSerializableNetworkSerializableTemplateStructsUpdated;
+            // Use the client's instance of the 
+            var targetContext = m_ClientNetworkManagers[0];
+#if NGO_DAMODE
+            // When in distributed authority mode:
+            // Owner Instances
+            // - Can send ClientRpcs
+            // - Receive ServerRpcs and ClientRpcs
+            // Non-Owner Instances
+            // - Can send ServerRpcs
+            // - Can receive ClientRpcs
+            if (m_DistributedAuthority)
+            {
+                // Use the server instance of the client's player
+                targetContext = m_ServerNetworkManager;
+            }
+#endif
+            var clientContextPlayerResult = new NetcodeIntegrationTestHelpers.ResultWrapper<NetworkObject>();
+            yield return NetcodeIntegrationTestHelpers.GetNetworkObjectByRepresentation((x => x.IsPlayerObject && x.OwnerClientId == m_ClientNetworkManagers[0].LocalClientId), targetContext, clientContextPlayerResult);
+
+            var clientContextNetworkBehaviourClass = clientContextPlayerResult.Result.gameObject.GetComponent<TestSerializationComponent>();
 
+            clientContextNetworkBehaviourClass.OnSerializableClassUpdated = OnClientReceivedUserSerializableClassUpdated;
+            clientContextNetworkBehaviourClass.OnSerializableStructUpdated = OnClientReceivedUserSerializableStructUpdated;
+            clientContextNetworkBehaviourClass.OnTemplateStructUpdated = OnClientReceivedUserSerializableTemplateStructUpdated;
+            clientContextNetworkBehaviourClass.OnNetworkSerializableTemplateStructUpdated = OnClientReceivedUserSerializableNetworkSerializableTemplateStructUpdated; clientContextNetworkBehaviourClass.OnTemplateStructsUpdated = OnClientReceivedUserSerializableTemplateStructsUpdated;
+            clientContextNetworkBehaviourClass.OnNetworkSerializableTemplateStructsUpdated = OnClientReceivedUserSerializableNetworkSerializableTemplateStructsUpdated;
 
             var userSerializableClass = new UserSerializableClass();
             for (int i = 0; i < 32; i++)
@@ -140,12 +166,12 @@ public IEnumerator NetworkSerializableTest()
             var networkSerializableT2vals = new[] { networkSerializableT2val };
             var enumVals = new[] { enumVal };
 
-            clientSideNetworkBehaviourClass.ClientStartTest(userSerializableClass);
-            clientSideNetworkBehaviourClass.ClientStartTest(userSerializableStruct);
-            clientSideNetworkBehaviourClass.ClientStartTest(t1val, t2val, enumVal);
-            clientSideNetworkBehaviourClass.ClientStartTest(networkSerializableT1val, networkSerializableT2val);
-            clientSideNetworkBehaviourClass.ClientStartTest(t1vals, t2vals, enumVals);
-            clientSideNetworkBehaviourClass.ClientStartTest(networkSerializableT1vals, networkSerializableT2vals);
+            clientContextNetworkBehaviourClass.ClientStartTest(userSerializableClass);
+            clientContextNetworkBehaviourClass.ClientStartTest(userSerializableStruct);
+            clientContextNetworkBehaviourClass.ClientStartTest(t1val, t2val, enumVal);
+            clientContextNetworkBehaviourClass.ClientStartTest(networkSerializableT1val, networkSerializableT2val);
+            clientContextNetworkBehaviourClass.ClientStartTest(t1vals, t2vals, enumVals);
+            clientContextNetworkBehaviourClass.ClientStartTest(networkSerializableT1vals, networkSerializableT2vals);
 
             // Wait until the test has finished or we time out
             var timeOutPeriod = Time.realtimeSinceStartup + 5;
@@ -313,11 +339,31 @@ public IEnumerator ExtensionMethodRpcTest()
                                  serverIntListCalled && serverStrListCalled;
             };
 
-            clientSideNetworkBehaviourClass.SendMyObjectServerRpc(obj);
-            clientSideNetworkBehaviourClass.SendMySharedObjectReferencedByIdServerRpc(obj2);
-            clientSideNetworkBehaviourClass.SendMyObjectPassedWithThisRefServerRpc(obj3);
-            clientSideNetworkBehaviourClass.SendIntListServerRpc(intList);
-            clientSideNetworkBehaviourClass.SendStringListServerRpc(strList);
+#if NGO_DAMODE
+            // When in distributed authority mode:
+            // Owner Instances
+            // - Can send ClientRpcs
+            // - Receive ServerRpcs and ClientRpcs
+            // Non-Owner Instances
+            // - Can send ServerRpcs
+            // - Can receive ClientRpcs
+            if (m_DistributedAuthority)
+            {
+                serverSideNetworkBehaviourClass.SendMyObjectOwnerRpc(obj);
+                serverSideNetworkBehaviourClass.SendMySharedObjectReferencedByIdOwnerRpc(obj2);
+                serverSideNetworkBehaviourClass.SendMyObjectPassedWithThisRefOwnerRpc(obj3);
+                serverSideNetworkBehaviourClass.SendIntListOwnerRpc(intList);
+                serverSideNetworkBehaviourClass.SendStringListOwnerRpc(strList);
+            }
+            else
+#endif
+            {
+                clientSideNetworkBehaviourClass.SendMyObjectServerRpc(obj);
+                clientSideNetworkBehaviourClass.SendMySharedObjectReferencedByIdServerRpc(obj2);
+                clientSideNetworkBehaviourClass.SendMyObjectPassedWithThisRefServerRpc(obj3);
+                clientSideNetworkBehaviourClass.SendIntListServerRpc(intList);
+                clientSideNetworkBehaviourClass.SendStringListServerRpc(strList);
+            }
 
             // Wait until the test has finished or we time out
             var timeOutPeriod = Time.realtimeSinceStartup + 5;
@@ -487,11 +533,31 @@ public IEnumerator ExtensionMethodArrayRpcTest()
                                  serverIntListCalled && serverStrListCalled;
             };
 
-            clientSideNetworkBehaviourClass.SendMyObjectServerRpc(objs);
-            clientSideNetworkBehaviourClass.SendMySharedObjectReferencedByIdServerRpc(objs2);
-            clientSideNetworkBehaviourClass.SendMyObjectPassedWithThisRefServerRpc(objs3);
-            clientSideNetworkBehaviourClass.SendIntListServerRpc(intList);
-            clientSideNetworkBehaviourClass.SendStringListServerRpc(strList);
+#if NGO_DAMODE
+            // When in distributed authority mode:
+            // Owner Instances
+            // - Can send ClientRpcs
+            // - Receive ServerRpcs and ClientRpcs
+            // Non-Owner Instances
+            // - Can send ServerRpcs
+            // - Can receive ClientRpcs
+            if (m_DistributedAuthority)
+            {
+                serverSideNetworkBehaviourClass.SendMyObjectOwnerRpc(objs);
+                serverSideNetworkBehaviourClass.SendMySharedObjectReferencedByIdOwnerRpc(objs2);
+                serverSideNetworkBehaviourClass.SendMyObjectPassedWithThisRefOwnerRpc(objs3);
+                serverSideNetworkBehaviourClass.SendIntListOwnerRpc(intList);
+                serverSideNetworkBehaviourClass.SendStringListOwnerRpc(strList);
+            }
+            else
+#endif
+            {
+                clientSideNetworkBehaviourClass.SendMyObjectServerRpc(objs);
+                clientSideNetworkBehaviourClass.SendMySharedObjectReferencedByIdServerRpc(objs2);
+                clientSideNetworkBehaviourClass.SendMyObjectPassedWithThisRefServerRpc(objs3);
+                clientSideNetworkBehaviourClass.SendIntListServerRpc(intList);
+                clientSideNetworkBehaviourClass.SendStringListServerRpc(strList);
+            }
 
             // Wait until the test has finished or we time out
             var timeOutPeriod = Time.realtimeSinceStartup + 5;
@@ -630,15 +696,36 @@ public IEnumerator NetworkSerializableArrayTestHandler(int arraySize, bool sendN
             var serverClientPlayerResult = new NetcodeIntegrationTestHelpers.ResultWrapper<NetworkObject>();
             yield return NetcodeIntegrationTestHelpers.GetNetworkObjectByRepresentation((x => x.IsPlayerObject && x.OwnerClientId == m_ClientNetworkManagers[0].LocalClientId), m_ServerNetworkManager, serverClientPlayerResult);
             var serverSideNetworkBehaviourClass = serverClientPlayerResult.Result.gameObject.GetComponent<TestCustomTypesArrayComponent>();
-            serverSideNetworkBehaviourClass.OnSerializableClassesUpdatedServerRpc = OnServerReceivedUserSerializableClassesUpdated;
-            serverSideNetworkBehaviourClass.OnSerializableStructsUpdatedServerRpc = OnServerReceivedUserSerializableStructsUpdated;
+
 
             // [Client-Side] Get the client side Player's NetworkObject so we can grab that instance of the TestCustomTypesArrayComponent
             var clientClientPlayerResult = new NetcodeIntegrationTestHelpers.ResultWrapper<NetworkObject>();
             yield return NetcodeIntegrationTestHelpers.GetNetworkObjectByRepresentation((x => x.IsPlayerObject && x.OwnerClientId == m_ClientNetworkManagers[0].LocalClientId), m_ClientNetworkManagers[0], clientClientPlayerResult);
             var clientSideNetworkBehaviourClass = clientClientPlayerResult.Result.gameObject.GetComponent<TestCustomTypesArrayComponent>();
-            clientSideNetworkBehaviourClass.OnSerializableClassesUpdatedClientRpc = OnClientReceivedUserSerializableClassesUpdated;
-            clientSideNetworkBehaviourClass.OnSerializableStructsUpdatedClientRpc = OnClientReceivedUserSerializableStructsUpdated;
+
+#if NGO_DAMODE
+            // When in distributed authority mode:
+            // Owner Instances
+            // - Can send ClientRpcs
+            // - Receive ServerRpcs and ClientRpcs
+            // Non-Owner Instances
+            // - Can send ServerRpcs
+            // - Can receive ClientRpcs
+            if (m_DistributedAuthority)
+            {
+                clientSideNetworkBehaviourClass.OnSerializableClassesUpdatedServerRpc = OnServerReceivedUserSerializableClassesUpdated;
+                clientSideNetworkBehaviourClass.OnSerializableStructsUpdatedServerRpc = OnServerReceivedUserSerializableStructsUpdated;
+                serverSideNetworkBehaviourClass.OnSerializableClassesUpdatedClientRpc = OnClientReceivedUserSerializableClassesUpdated;
+                serverSideNetworkBehaviourClass.OnSerializableStructsUpdatedClientRpc = OnClientReceivedUserSerializableStructsUpdated;
+            }
+            else
+#endif
+            {
+                serverSideNetworkBehaviourClass.OnSerializableClassesUpdatedServerRpc = OnServerReceivedUserSerializableClassesUpdated;
+                serverSideNetworkBehaviourClass.OnSerializableStructsUpdatedServerRpc = OnServerReceivedUserSerializableStructsUpdated;
+                clientSideNetworkBehaviourClass.OnSerializableClassesUpdatedClientRpc = OnClientReceivedUserSerializableClassesUpdated;
+                clientSideNetworkBehaviourClass.OnSerializableStructsUpdatedClientRpc = OnClientReceivedUserSerializableStructsUpdated;
+            }
 
             m_UserSerializableClassArray = new List<UserSerializableClass>();
             m_UserSerializableStructArray = new List<UserSerializableStruct>();
@@ -662,14 +749,47 @@ public IEnumerator NetworkSerializableArrayTestHandler(int arraySize, bool sendN
                     };
                     m_UserSerializableStructArray.Add(userSerializableStruct);
                 }
-
-                clientSideNetworkBehaviourClass.ClientStartTest(m_UserSerializableClassArray.ToArray());
-                clientSideNetworkBehaviourClass.ClientStartStructTest(m_UserSerializableStructArray.ToArray());
+#if NGO_DAMODE
+                // When in distributed authority mode:
+                // Owner Instances
+                // - Can send ClientRpcs
+                // - Receive ServerRpcs and ClientRpcs
+                // Non-Owner Instances
+                // - Can send ServerRpcs
+                // - Can receive ClientRpcs
+                if (m_DistributedAuthority)
+                {
+                    serverSideNetworkBehaviourClass.ClientStartTest(m_UserSerializableClassArray.ToArray());
+                    serverSideNetworkBehaviourClass.ClientStartStructTest(m_UserSerializableStructArray.ToArray());
+                }
+                else
+#endif
+                {
+                    clientSideNetworkBehaviourClass.ClientStartTest(m_UserSerializableClassArray.ToArray());
+                    clientSideNetworkBehaviourClass.ClientStartStructTest(m_UserSerializableStructArray.ToArray());
+                }
             }
             else
             {
-                clientSideNetworkBehaviourClass.ClientStartTest(null);
-                clientSideNetworkBehaviourClass.ClientStartStructTest(null);
+#if NGO_DAMODE
+                // When in distributed authority mode:
+                // Owner Instances
+                // - Can send ClientRpcs
+                // - Receive ServerRpcs and ClientRpcs
+                // Non-Owner Instances
+                // - Can send ServerRpcs
+                // - Can receive ClientRpcs
+                if (m_DistributedAuthority)
+                {
+                    serverSideNetworkBehaviourClass.ClientStartTest(null);
+                    serverSideNetworkBehaviourClass.ClientStartStructTest(null);
+                }
+                else
+#endif
+                {
+                    clientSideNetworkBehaviourClass.ClientStartTest(null);
+                    clientSideNetworkBehaviourClass.ClientStartStructTest(null);
+                }
             }
 
             // Wait until the test has finished or we time out
@@ -831,21 +951,26 @@ public class TestSerializationComponent : NetworkBehaviour
         public delegate void OnMyObjectPassedWithThisRefUpdatedDelgateHandler(MyObjectPassedWithThisRef obj);
         public OnMyObjectPassedWithThisRefUpdatedDelgateHandler OnMyObjectPassedWithThisRefUpdated;
 
+        #region ClientStartTest(UserSerializableClass userSerializableClass)
         /// <summary>
         /// Starts the unit test and passes the UserSerializableClass from the client to the server
         /// </summary>
         /// <param name="userSerializableClass"></param>
         public void ClientStartTest(UserSerializableClass userSerializableClass)
         {
-            SendServerSerializedDataClassServerRpc(userSerializableClass);
+#if NGO_DAMODE
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                SendOwnerSerializedDataClassRpc(userSerializableClass);
+            }
+            else
+#endif
+            {
+                SendServerSerializedDataClassServerRpc(userSerializableClass);
+            }
         }
 
-        /// <summary>
-        /// Server receives the UserSerializableClass, modifies it, and sends it back
-        /// </summary>
-        /// <param name="userSerializableClass"></param>
-        [ServerRpc(RequireOwnership = false)]
-        private void SendServerSerializedDataClassServerRpc(UserSerializableClass userSerializableClass)
+        private void ProcessSerializedDataClass(UserSerializableClass userSerializableClass)
         {
             userSerializableClass.MyintValue++;
             userSerializableClass.MyulongValue++;
@@ -859,6 +984,29 @@ private void SendServerSerializedDataClassServerRpc(UserSerializableClass userSe
             {
                 userSerializableClass.MyByteListValues.Add((byte)i);
             }
+        }
+
+        [Rpc(SendTo.Owner)]
+        private void SendOwnerSerializedDataClassRpc(UserSerializableClass userSerializableClass)
+        {
+            ProcessSerializedDataClass(userSerializableClass);
+            SendNotOwnerSerializedDataClassRpc(userSerializableClass);
+        }
+
+        [Rpc(SendTo.NotOwner)]
+        private void SendNotOwnerSerializedDataClassRpc(UserSerializableClass userSerializableClass)
+        {
+            OnSerializableClassUpdated?.Invoke(userSerializableClass);
+        }
+
+        /// <summary>
+        /// Server receives the UserSerializableClass, modifies it, and sends it back
+        /// </summary>
+        /// <param name="userSerializableClass"></param>
+        [ServerRpc(RequireOwnership = false)]
+        private void SendServerSerializedDataClassServerRpc(UserSerializableClass userSerializableClass)
+        {
+            ProcessSerializedDataClass(userSerializableClass);
             SendClientSerializedDataClassClientRpc(userSerializableClass);
         }
 
@@ -871,10 +1019,39 @@ private void SendClientSerializedDataClassClientRpc(UserSerializableClass userSe
         {
             OnSerializableClassUpdated?.Invoke(userSerializableClass);
         }
+        #endregion
 
+        #region ClientStartTest(TemplatedType<int> t1val, TemplatedType<int>.NestedTemplatedType<int> t2val, TemplatedType<int>.Enum enumVal)
         public void ClientStartTest(TemplatedType<int> t1val, TemplatedType<int>.NestedTemplatedType<int> t2val, TemplatedType<int>.Enum enumVal)
         {
-            SendTemplateStructServerRpc(t1val, t2val, enumVal);
+#if NGO_DAMODE
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                SendTemplateStructOwnerRpc(t1val, t2val, enumVal);
+            }
+            else
+#endif
+            {
+                SendTemplateStructServerRpc(t1val, t2val, enumVal);
+            }
+        }
+
+        [Rpc(SendTo.Owner)]
+        private void SendTemplateStructOwnerRpc(TemplatedType<int> t1val, TemplatedType<int>.NestedTemplatedType<int> t2val, TemplatedType<int>.Enum enumVal)
+        {
+            Debug.Log($"Received server RPC values {t1val.Value} {t2val.Value1} {t2val.Value2} {enumVal}");
+            t1val.Value++;
+            t2val.Value1++;
+            t2val.Value2++;
+            enumVal += 1;
+            SendTemplateStructNotOwnerRpc(t1val, t2val, enumVal);
+        }
+
+        [Rpc(SendTo.NotOwner)]
+        private void SendTemplateStructNotOwnerRpc(TemplatedType<int> t1val, TemplatedType<int>.NestedTemplatedType<int> t2val, TemplatedType<int>.Enum enumVal)
+        {
+            Debug.Log($"Received client RPC values {t1val.Value} {t2val.Value1} {t2val.Value2}");
+            OnTemplateStructUpdated?.Invoke(t1val, t2val, enumVal);
         }
 
         [ServerRpc(RequireOwnership = false)]
@@ -885,7 +1062,6 @@ private void SendTemplateStructServerRpc(TemplatedType<int> t1val, TemplatedType
             t2val.Value1++;
             t2val.Value2++;
             enumVal += 1;
-
             SendTemplateStructClientRpc(t1val, t2val, enumVal);
         }
 
@@ -895,10 +1071,39 @@ private void SendTemplateStructClientRpc(TemplatedType<int> t1val, TemplatedType
             Debug.Log($"Received client RPC values {t1val.Value} {t2val.Value1} {t2val.Value2}");
             OnTemplateStructUpdated?.Invoke(t1val, t2val, enumVal);
         }
+        #endregion
 
+        #region ClientStartTest(NetworkSerializableTemplatedType<int> t1val, NetworkSerializableTemplatedType<int>.NestedTemplatedType<int> t2val)
         public void ClientStartTest(NetworkSerializableTemplatedType<int> t1val, NetworkSerializableTemplatedType<int>.NestedTemplatedType<int> t2val)
         {
-            SendNetworkSerializableTemplateStructServerRpc(t1val, t2val);
+#if NGO_DAMODE
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                SendNetworkSerializableTemplateStructOwnerRpc(t1val, t2val);
+            }
+            else
+#endif
+            {
+                SendNetworkSerializableTemplateStructServerRpc(t1val, t2val);
+            }
+        }
+
+        [Rpc(SendTo.Owner)]
+        private void SendNetworkSerializableTemplateStructOwnerRpc(NetworkSerializableTemplatedType<int> t1val, NetworkSerializableTemplatedType<int>.NestedTemplatedType<int> t2val)
+        {
+            Debug.Log($"Received NetworkSerializable server RPC values {t1val.Value} {t2val.Value1} {t2val.Value2}");
+            t1val.Value++;
+            t2val.Value1++;
+            t2val.Value2++;
+
+            SendNetworkSerializableTemplateStructNotOwnerRpc(t1val, t2val);
+        }
+
+        [Rpc(SendTo.NotOwner)]
+        private void SendNetworkSerializableTemplateStructNotOwnerRpc(NetworkSerializableTemplatedType<int> t1val, NetworkSerializableTemplatedType<int>.NestedTemplatedType<int> t2val)
+        {
+            Debug.Log($"Received NetworkSerializable client RPC values {t1val.Value} {t2val.Value1} {t2val.Value2}");
+            OnNetworkSerializableTemplateStructUpdated?.Invoke(t1val, t2val);
         }
 
         [ServerRpc(RequireOwnership = false)]
@@ -918,11 +1123,39 @@ private void SendNetworkSerializableTemplateStructClientRpc(NetworkSerializableT
             Debug.Log($"Received NetworkSerializable client RPC values {t1val.Value} {t2val.Value1} {t2val.Value2}");
             OnNetworkSerializableTemplateStructUpdated?.Invoke(t1val, t2val);
         }
+        #endregion
 
-
+        #region ClientStartTest(TemplatedType<int>[] t1val, TemplatedType<int>.NestedTemplatedType<int>[] t2val, TemplatedType<int>.Enum[] enumVal)
         public void ClientStartTest(TemplatedType<int>[] t1val, TemplatedType<int>.NestedTemplatedType<int>[] t2val, TemplatedType<int>.Enum[] enumVal)
         {
-            SendTemplateStructServerRpc(t1val, t2val, enumVal);
+#if NGO_DAMODE
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                SendTemplateStructOwnerRpc(t1val, t2val, enumVal);
+            }
+            else
+#endif
+            {
+                SendTemplateStructServerRpc(t1val, t2val, enumVal);
+            }
+        }
+
+        [Rpc(SendTo.Owner)]
+        private void SendTemplateStructOwnerRpc(TemplatedType<int>[] t1val, TemplatedType<int>.NestedTemplatedType<int>[] t2val, TemplatedType<int>.Enum[] enumVal)
+        {
+            Debug.Log($"Received server RPC values {t1val[0].Value} {t2val[0].Value1} {t2val[0].Value2} {enumVal[0]}");
+            t1val[0].Value++;
+            t2val[0].Value1++;
+            t2val[0].Value2++;
+            enumVal[0] += 1;
+            SendTemplateStructNotOwnerRpc(t1val, t2val, enumVal);
+        }
+
+        [Rpc(SendTo.NotOwner)]
+        private void SendTemplateStructNotOwnerRpc(TemplatedType<int>[] t1val, TemplatedType<int>.NestedTemplatedType<int>[] t2val, TemplatedType<int>.Enum[] enumVal)
+        {
+            Debug.Log($"Received client RPC values {t1val[0].Value} {t2val[0].Value1} {t2val[0].Value2}");
+            OnTemplateStructsUpdated?.Invoke(t1val, t2val, enumVal);
         }
 
         [ServerRpc(RequireOwnership = false)]
@@ -943,10 +1176,39 @@ private void SendTemplateStructClientRpc(TemplatedType<int>[] t1val, TemplatedTy
             Debug.Log($"Received client RPC values {t1val[0].Value} {t2val[0].Value1} {t2val[0].Value2}");
             OnTemplateStructsUpdated?.Invoke(t1val, t2val, enumVal);
         }
+        #endregion
 
+        #region ClientStartTest(NetworkSerializableTemplatedType<int>[] t1val, NetworkSerializableTemplatedType<int>.NestedTemplatedType<int>[] t2val)
         public void ClientStartTest(NetworkSerializableTemplatedType<int>[] t1val, NetworkSerializableTemplatedType<int>.NestedTemplatedType<int>[] t2val)
         {
-            SendNetworkSerializableTemplateStructServerRpc(t1val, t2val);
+#if NGO_DAMODE
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                SendNetworkSerializableTemplateStructOwnerRpc(t1val, t2val);
+            }
+            else
+#endif
+            {
+                SendNetworkSerializableTemplateStructServerRpc(t1val, t2val);
+            }
+        }
+
+        [Rpc(SendTo.Owner)]
+        private void SendNetworkSerializableTemplateStructOwnerRpc(NetworkSerializableTemplatedType<int>[] t1val, NetworkSerializableTemplatedType<int>.NestedTemplatedType<int>[] t2val)
+        {
+            Debug.Log($"Received NetworkSerializable server RPC values {t1val[0].Value} {t2val[0].Value1} {t2val[0].Value2}");
+            t1val[0].Value++;
+            t2val[0].Value1++;
+            t2val[0].Value2++;
+
+            SendNetworkSerializableTemplateStructNotOwnerRpc(t1val, t2val);
+        }
+
+        [Rpc(SendTo.NotOwner)]
+        private void SendNetworkSerializableTemplateStructNotOwnerRpc(NetworkSerializableTemplatedType<int>[] t1val, NetworkSerializableTemplatedType<int>.NestedTemplatedType<int>[] t2val)
+        {
+            Debug.Log($"Received NetworkSerializable client RPC values {t1val[0].Value} {t2val[0].Value1} {t2val[0].Value2}");
+            OnNetworkSerializableTemplateStructsUpdated?.Invoke(t1val, t2val);
         }
 
         [ServerRpc(RequireOwnership = false)]
@@ -966,14 +1228,39 @@ private void SendNetworkSerializableTemplateStructClientRpc(NetworkSerializableT
             Debug.Log($"Received NetworkSerializable client RPC values {t1val[0].Value} {t2val[0].Value1} {t2val[0].Value2}");
             OnNetworkSerializableTemplateStructsUpdated?.Invoke(t1val, t2val);
         }
+        #endregion
 
+        #region ClientStartTest(UserSerializableStruct userSerializableStruct)
         /// <summary>
         /// Starts the unit test and passes the UserSerializableStruct from the client to the server
         /// </summary>
         /// <param name="userSerializableStruct"></param>
         public void ClientStartTest(UserSerializableStruct userSerializableStruct)
         {
-            SendServerSerializedDataStructServerRpc(userSerializableStruct);
+#if NGO_DAMODE
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                SendServerSerializedDataStructOwnerRpc(userSerializableStruct);
+            }
+            else
+#endif
+            {
+                SendServerSerializedDataStructServerRpc(userSerializableStruct);
+            }
+        }
+
+        [Rpc(SendTo.Owner)]
+        private void SendServerSerializedDataStructOwnerRpc(UserSerializableStruct userSerializableStruct)
+        {
+            userSerializableStruct.MyintValue++;
+            userSerializableStruct.MyulongValue++;
+            SendClientSerializedDataStructNotOwnerRpc(userSerializableStruct);
+        }
+
+        [Rpc(SendTo.NotOwner)]
+        private void SendClientSerializedDataStructNotOwnerRpc(UserSerializableStruct userSerializableStruct)
+        {
+            OnSerializableStructUpdated?.Invoke(userSerializableStruct);
         }
 
         /// <summary>
@@ -998,68 +1285,152 @@ private void SendClientSerializedDataStructClientRpc(UserSerializableStruct user
         {
             OnSerializableStructUpdated?.Invoke(userSerializableStruct);
         }
+        #endregion
 
-        [ClientRpc]
-        public void SendMyObjectClientRpc(MyObject obj)
+
+
+
+
+
+        #region SendMyObject
+        [Rpc(SendTo.NotOwner)]
+        public void SendMyObjectNotOwnerRpc(MyObject obj)
         {
             OnMyObjectUpdated?.Invoke(obj);
         }
-        [ClientRpc]
-        public void SendIntListClientRpc(List<int> lst)
+
+        [Rpc(SendTo.Owner)]
+        public void SendMyObjectOwnerRpc(MyObject obj)
         {
-            OnIntListUpdated?.Invoke(lst);
+            OnMyObjectUpdated?.Invoke(obj);
+            SendMyObjectNotOwnerRpc(obj);
         }
+
         [ClientRpc]
-        public void SendStringListClientRpc(List<string> lst)
+        public void SendMyObjectClientRpc(MyObject obj)
         {
-            OnStringListUpdated?.Invoke(lst);
+            OnMyObjectUpdated?.Invoke(obj);
         }
-        [ClientRpc]
-        public void SendMyObjectPassedWithThisRefClientRpc(MyObjectPassedWithThisRef obj)
+
+        [ServerRpc(RequireOwnership = false)]
+        public void SendMyObjectServerRpc(MyObject obj)
         {
-            OnMyObjectPassedWithThisRefUpdated?.Invoke(obj);
+            OnMyObjectUpdated?.Invoke(obj);
+            SendMyObjectClientRpc(obj);
         }
+        #endregion
 
-        [ClientRpc]
-        public void SendMySharedObjectReferencedByIdClientRpc(MySharedObjectReferencedById obj)
+        #region SendIntList
+        [Rpc(SendTo.NotOwner)]
+        public void SendIntListNotOwnerRpc(List<int> lst)
         {
-            OnMySharedObjectReferencedByIdUpdated?.Invoke(obj);
+            OnIntListUpdated?.Invoke(lst);
         }
 
-        [ServerRpc]
-        public void SendMyObjectServerRpc(MyObject obj)
+        [Rpc(SendTo.Owner)]
+        public void SendIntListOwnerRpc(List<int> lst)
         {
-            OnMyObjectUpdated?.Invoke(obj);
-            SendMyObjectClientRpc(obj);
+            OnIntListUpdated?.Invoke(lst);
+            SendIntListNotOwnerRpc(lst);
+        }
+
+        [ClientRpc]
+        public void SendIntListClientRpc(List<int> lst)
+        {
+            OnIntListUpdated?.Invoke(lst);
         }
 
-        [ServerRpc]
+        [ServerRpc(RequireOwnership = false)]
         public void SendIntListServerRpc(List<int> lst)
         {
             OnIntListUpdated?.Invoke(lst);
             SendIntListClientRpc(lst);
         }
+        #endregion
 
-        [ServerRpc]
+        #region SendStringList
+        [Rpc(SendTo.NotOwner)]
+        public void SendStringListNotOwnerRpc(List<string> lst)
+        {
+            OnStringListUpdated?.Invoke(lst);
+        }
+
+        [Rpc(SendTo.Owner)]
+        public void SendStringListOwnerRpc(List<string> lst)
+        {
+            OnStringListUpdated?.Invoke(lst);
+            SendStringListNotOwnerRpc(lst);
+        }
+
+        [ClientRpc]
+        public void SendStringListClientRpc(List<string> lst)
+        {
+            OnStringListUpdated?.Invoke(lst);
+        }
+
+        [ServerRpc(RequireOwnership = false)]
         public void SendStringListServerRpc(List<string> lst)
         {
             OnStringListUpdated?.Invoke(lst);
             SendStringListClientRpc(lst);
         }
+        #endregion
+
+        #region SendMyObjectPassedWithThisRef
+        [Rpc(SendTo.NotOwner)]
+        public void SendMyObjectPassedWithThisRefNotOwnerRpc(MyObjectPassedWithThisRef obj)
+        {
+            OnMyObjectPassedWithThisRefUpdated?.Invoke(obj);
+        }
+
+        [Rpc(SendTo.Owner)]
+        public void SendMyObjectPassedWithThisRefOwnerRpc(MyObjectPassedWithThisRef obj)
+        {
+            OnMyObjectPassedWithThisRefUpdated?.Invoke(obj);
+            SendMyObjectPassedWithThisRefNotOwnerRpc(obj);
+        }
 
-        [ServerRpc]
+        [ClientRpc]
+        public void SendMyObjectPassedWithThisRefClientRpc(MyObjectPassedWithThisRef obj)
+        {
+            OnMyObjectPassedWithThisRefUpdated?.Invoke(obj);
+        }
+
+        [ServerRpc(RequireOwnership = false)]
         public void SendMyObjectPassedWithThisRefServerRpc(MyObjectPassedWithThisRef obj)
         {
             OnMyObjectPassedWithThisRefUpdated?.Invoke(obj);
             SendMyObjectPassedWithThisRefClientRpc(obj);
         }
+        #endregion
+
+        #region SendMySharedObjectReferencedById
+        [Rpc(SendTo.NotOwner)]
+        public void SendMySharedObjectReferencedByIdNotOwnerRpc(MySharedObjectReferencedById obj)
+        {
+            OnMySharedObjectReferencedByIdUpdated?.Invoke(obj);
+        }
 
-        [ServerRpc]
+        [Rpc(SendTo.Owner)]
+        public void SendMySharedObjectReferencedByIdOwnerRpc(MySharedObjectReferencedById obj)
+        {
+            OnMySharedObjectReferencedByIdUpdated?.Invoke(obj);
+            SendMySharedObjectReferencedByIdNotOwnerRpc(obj);
+        }
+
+        [ClientRpc]
+        public void SendMySharedObjectReferencedByIdClientRpc(MySharedObjectReferencedById obj)
+        {
+            OnMySharedObjectReferencedByIdUpdated?.Invoke(obj);
+        }
+
+        [ServerRpc(RequireOwnership = false)]
         public void SendMySharedObjectReferencedByIdServerRpc(MySharedObjectReferencedById obj)
         {
             OnMySharedObjectReferencedByIdUpdated?.Invoke(obj);
             SendMySharedObjectReferencedByIdClientRpc(obj);
         }
+        #endregion
     }
 
     /// <summary>
@@ -1090,6 +1461,7 @@ public class TestCustomTypesArrayComponent : NetworkBehaviour
         public OnSerializableStructsUpdatedDelgateHandler OnSerializableStructsUpdatedServerRpc;
         public OnSerializableStructsUpdatedDelgateHandler OnSerializableStructsUpdatedClientRpc;
 
+        #region ClientStartTest(UserSerializableClass[] userSerializableClasses)
         /// <summary>
         /// Starts the unit test and passes the userSerializableClasses array
         /// from the client to the server
@@ -1097,7 +1469,39 @@ public class TestCustomTypesArrayComponent : NetworkBehaviour
         /// <param name="userSerializableClass"></param>
         public void ClientStartTest(UserSerializableClass[] userSerializableClasses)
         {
-            SendServerSerializedDataClassArryServerRpc(userSerializableClasses);
+#if NGO_DAMODE
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                SendServerSerializedDataClassArryOwnerRpc(userSerializableClasses);
+            }
+            else
+#endif
+            {
+                SendServerSerializedDataClassArryServerRpc(userSerializableClasses);
+            }
+        }
+
+        /// <summary>
+        /// Server receives the UserSerializableClasses array, invokes the callback
+        /// that checks the order, and then passes it back to the client
+        /// </summary>
+        /// <param name="userSerializableClass"></param>
+        [Rpc(SendTo.Owner)]
+        private void SendServerSerializedDataClassArryOwnerRpc(UserSerializableClass[] userSerializableClasses)
+        {
+            OnSerializableClassesUpdatedServerRpc?.Invoke(userSerializableClasses);
+            SendClientSerializedDataClassArrayNotOwnerRpc(userSerializableClasses);
+        }
+
+        /// <summary>
+        /// Client receives the UserSerializableClass array and invokes the callback
+        /// for verification and signaling the test is complete.
+        /// </summary>
+        /// <param name="userSerializableClasses"></param>
+        [Rpc(SendTo.NotOwner)]
+        private void SendClientSerializedDataClassArrayNotOwnerRpc(UserSerializableClass[] userSerializableClasses)
+        {
+            OnSerializableClassesUpdatedClientRpc?.Invoke(userSerializableClasses);
         }
 
         /// <summary>
@@ -1122,7 +1526,9 @@ private void SendClientSerializedDataClassArrayClientRpc(UserSerializableClass[]
         {
             OnSerializableClassesUpdatedClientRpc?.Invoke(userSerializableClasses);
         }
+        #endregion
 
+        #region ClientStartStructTest(UserSerializableStruct[] userSerializableStructs)
         /// <summary>
         /// Starts the unit test and passes the userSerializableStructs array
         /// from the client to the server
@@ -1130,7 +1536,39 @@ private void SendClientSerializedDataClassArrayClientRpc(UserSerializableClass[]
         /// <param name="userSerializableStructs"></param>
         public void ClientStartStructTest(UserSerializableStruct[] userSerializableStructs)
         {
-            SendServerSerializedDataStructArrayServerRpc(userSerializableStructs);
+#if NGO_DAMODE
+            if (NetworkManager.DistributedAuthorityMode)
+            {
+                SendServerSerializedDataStructArrayOwnerRpc(userSerializableStructs);
+            }
+            else
+#endif
+            {
+                SendServerSerializedDataStructArrayServerRpc(userSerializableStructs);
+            }
+        }
+
+        /// <summary>
+        /// Owner receives the UserSerializableStructs array, invokes the callback
+        /// that checks the order, and then passes it back to the client
+        /// </summary>
+        /// <param name="userSerializableStructs"></param>
+        [Rpc(SendTo.Owner)]
+        private void SendServerSerializedDataStructArrayOwnerRpc(UserSerializableStruct[] userSerializableStructs)
+        {
+            OnSerializableStructsUpdatedServerRpc?.Invoke(userSerializableStructs);
+            SendClientSerializedDataStructArrayNotOwnerRpc(userSerializableStructs);
+        }
+
+        /// <summary>
+        /// NotOwner receives the userSerializableStructs array and invokes the callback
+        /// for verification and signaling the test is complete.
+        /// </summary>
+        /// <param name="userSerializableStructs"></param>
+        [Rpc(SendTo.NotOwner)]
+        private void SendClientSerializedDataStructArrayNotOwnerRpc(UserSerializableStruct[] userSerializableStructs)
+        {
+            OnSerializableStructsUpdatedClientRpc?.Invoke(userSerializableStructs);
         }
 
         /// <summary>
@@ -1155,72 +1593,149 @@ private void SendClientSerializedDataStructArrayClientRpc(UserSerializableStruct
         {
             OnSerializableStructsUpdatedClientRpc?.Invoke(userSerializableStructs);
         }
+        #endregion
 
-        [ClientRpc]
-        public void SendMyObjectClientRpc(MyObject[] objs)
+        #region SendMyObject Array
+        [Rpc(SendTo.NotOwner)]
+        public void SendMyObjectNotOwnerRpc(MyObject[] objs)
         {
             OnMyObjectUpdated?.Invoke(objs);
         }
 
-        [ClientRpc]
-        public void SendIntListClientRpc(List<int>[] lists)
+        [Rpc(SendTo.Owner)]
+        public void SendMyObjectOwnerRpc(MyObject[] objs)
         {
-            OnIntListUpdated?.Invoke(lists);
+            OnMyObjectUpdated?.Invoke(objs);
+            SendMyObjectNotOwnerRpc(objs);
         }
 
         [ClientRpc]
-        public void SendStringListClientRpc(List<string>[] lists)
+        public void SendMyObjectClientRpc(MyObject[] objs)
         {
-            OnStringListUpdated?.Invoke(lists);
+            OnMyObjectUpdated?.Invoke(objs);
         }
 
-        [ClientRpc]
-        public void SendMyObjectPassedWithThisRefClientRpc(MyObjectPassedWithThisRef[] objs)
+        [ServerRpc(RequireOwnership = false)]
+        public void SendMyObjectServerRpc(MyObject[] objs)
         {
-            OnMyObjectPassedWithThisRefUpdated?.Invoke(objs);
+            OnMyObjectUpdated?.Invoke(objs);
+            SendMyObjectClientRpc(objs);
         }
+        #endregion
 
-        [ClientRpc]
-        public void SendMySharedObjectReferencedByIdClientRpc(MySharedObjectReferencedById[] objs)
+        #region SendIntList Array
+        [Rpc(SendTo.NotOwner)]
+        public void SendIntListNotOwnerRpc(List<int>[] lists)
         {
-            OnMySharedObjectReferencedByIdUpdated?.Invoke(objs);
+            OnIntListUpdated?.Invoke(lists);
         }
 
-        [ServerRpc]
-        public void SendMyObjectServerRpc(MyObject[] objs)
+        [Rpc(SendTo.Owner)]
+        public void SendIntListOwnerRpc(List<int>[] lists)
         {
-            OnMyObjectUpdated?.Invoke(objs);
-            SendMyObjectClientRpc(objs);
+            OnIntListUpdated?.Invoke(lists);
+            SendIntListNotOwnerRpc(lists);
         }
 
-        [ServerRpc]
+        [ClientRpc]
+        public void SendIntListClientRpc(List<int>[] lists)
+        {
+            OnIntListUpdated?.Invoke(lists);
+        }
+
+        [ServerRpc(RequireOwnership = false)]
         public void SendIntListServerRpc(List<int>[] lists)
         {
             OnIntListUpdated?.Invoke(lists);
             SendIntListClientRpc(lists);
         }
+        #endregion
 
-        [ServerRpc]
+        #region SendStringList Array
+        [Rpc(SendTo.NotOwner)]
+        public void SendStringListNotOwnerRpc(List<string>[] lists)
+        {
+            OnStringListUpdated?.Invoke(lists);
+        }
+
+        [Rpc(SendTo.Owner)]
+        public void SendStringListOwnerRpc(List<string>[] lists)
+        {
+            OnStringListUpdated?.Invoke(lists);
+            SendStringListNotOwnerRpc(lists);
+        }
+
+        [ClientRpc]
+        public void SendStringListClientRpc(List<string>[] lists)
+        {
+            OnStringListUpdated?.Invoke(lists);
+        }
+
+        [ServerRpc(RequireOwnership = false)]
         public void SendStringListServerRpc(List<string>[] lists)
         {
             OnStringListUpdated?.Invoke(lists);
             SendStringListClientRpc(lists);
         }
+        #endregion
+
+        #region SendMyObjectPassedWithThisRef Array
+        [Rpc(SendTo.NotOwner)]
+        public void SendMyObjectPassedWithThisRefNotOwnerRpc(MyObjectPassedWithThisRef[] objs)
+        {
+            OnMyObjectPassedWithThisRefUpdated?.Invoke(objs);
+        }
+
+        [Rpc(SendTo.Owner)]
+        public void SendMyObjectPassedWithThisRefOwnerRpc(MyObjectPassedWithThisRef[] objs)
+        {
+            OnMyObjectPassedWithThisRefUpdated?.Invoke(objs);
+            SendMyObjectPassedWithThisRefNotOwnerRpc(objs);
+        }
+
+        [ClientRpc]
+        public void SendMyObjectPassedWithThisRefClientRpc(MyObjectPassedWithThisRef[] objs)
+        {
+            OnMyObjectPassedWithThisRefUpdated?.Invoke(objs);
+        }
 
-        [ServerRpc]
+        [ServerRpc(RequireOwnership = false)]
         public void SendMyObjectPassedWithThisRefServerRpc(MyObjectPassedWithThisRef[] objs)
         {
             OnMyObjectPassedWithThisRefUpdated?.Invoke(objs);
             SendMyObjectPassedWithThisRefClientRpc(objs);
         }
+        #endregion
+
+        #region SendMySharedObjectReferencedById Array
+        [Rpc(SendTo.NotOwner)]
+        public void SendMySharedObjectReferencedByIdNotOwnerRpc(MySharedObjectReferencedById[] objs)
+        {
+            OnMySharedObjectReferencedByIdUpdated?.Invoke(objs);
+        }
+
+        [Rpc(SendTo.Owner)]
+        public void SendMySharedObjectReferencedByIdOwnerRpc(MySharedObjectReferencedById[] objs)
+        {
+            OnMySharedObjectReferencedByIdUpdated?.Invoke(objs);
+
+            SendMySharedObjectReferencedByIdNotOwnerRpc(objs);
+        }
 
+        [ClientRpc]
+        public void SendMySharedObjectReferencedByIdClientRpc(MySharedObjectReferencedById[] objs)
+        {
+            OnMySharedObjectReferencedByIdUpdated?.Invoke(objs);
+        }
 
-        [ServerRpc]
+        [ServerRpc(RequireOwnership = false)]
         public void SendMySharedObjectReferencedByIdServerRpc(MySharedObjectReferencedById[] objs)
         {
             OnMySharedObjectReferencedByIdUpdated?.Invoke(objs);
+
             SendMySharedObjectReferencedByIdClientRpc(objs);
         }
+        #endregion
     }
 
     /// <summary>
diff --git a/testproject/Assets/Tests/Runtime/SceneObjectsNotDestroyedOnShutdownTest.cs b/testproject/Assets/Tests/Runtime/SceneObjectsNotDestroyedOnShutdownTest.cs
index 4c190c424c..c0d5e87b04 100644
--- a/testproject/Assets/Tests/Runtime/SceneObjectsNotDestroyedOnShutdownTest.cs
+++ b/testproject/Assets/Tests/Runtime/SceneObjectsNotDestroyedOnShutdownTest.cs
@@ -27,17 +27,19 @@ public IEnumerator SceneObjectsNotDestroyedOnShutdown()
 
             yield return WaitForConditionOrTimeOut(() => m_TestScene.IsValid() && m_TestScene.isLoaded);
             AssertOnTimeout($"Timed out waiting for scene {k_TestScene} to load!");
-
 #if UNITY_2023_1_OR_NEWER
-            var loadedInSceneObject = Object.FindObjectsByType<NetworkObject>(FindObjectsSortMode.InstanceID).Where((c) => c.name == k_SceneObjectName).FirstOrDefault();
+            var loadedInSceneObject = Object.FindObjectsByType<NetworkObject>(FindObjectsSortMode.InstanceID).Where((c) => c.name.Contains(k_SceneObjectName)).FirstOrDefault();
 #else
             var loadedInSceneObject = Object.FindObjectsOfType<NetworkObject>().Where((c) => c.name.Contains(k_SceneObjectName)).FirstOrDefault();
 #endif
             Assert.IsNotNull(loadedInSceneObject, $"Failed to find {k_SceneObjectName} before starting client!");
+
+            AssertOnTimeout($"Timed out waiting to find {k_SceneObjectName} after scene load and before starting client!\"");
+
             yield return CreateAndStartNewClient();
 
 #if UNITY_2023_1_OR_NEWER
-            var loadedInSceneObjects = Object.FindObjectsByType<NetworkObject>(FindObjectsSortMode.InstanceID).Where((c) => c.name == k_SceneObjectName);
+            var loadedInSceneObjects = Object.FindObjectsByType<NetworkObject>(FindObjectsSortMode.InstanceID).Where((c) => c.name.Contains(k_SceneObjectName));
 #else
             var loadedInSceneObjects = Object.FindObjectsOfType<NetworkObject>().Where((c) => c.name.Contains(k_SceneObjectName));
 #endif
@@ -45,7 +47,7 @@ public IEnumerator SceneObjectsNotDestroyedOnShutdown()
             m_ClientNetworkManagers[0].Shutdown();
             yield return m_DefaultWaitForTick;
 #if UNITY_2023_1_OR_NEWER
-            loadedInSceneObjects = Object.FindObjectsByType<NetworkObject>(FindObjectsSortMode.InstanceID).Where((c) => c.name == k_SceneObjectName);
+            loadedInSceneObjects = Object.FindObjectsByType<NetworkObject>(FindObjectsSortMode.InstanceID).Where((c) => c.name.Contains(k_SceneObjectName));
 #else
             loadedInSceneObjects = Object.FindObjectsOfType<NetworkObject>().Where((c) => c.name.Contains(k_SceneObjectName));
 #endif
@@ -62,7 +64,7 @@ public IEnumerator ChildSceneObjectsDoNotDestroyOnShutdown()
             AssertOnTimeout($"Timed out waiting for scene {k_TestScene} to load!");
 
 #if UNITY_2023_1_OR_NEWER
-            var loadedInSceneObject = Object.FindObjectsByType<NetworkObject>(FindObjectsSortMode.InstanceID).Where((c) => c.name == k_SceneObjectName).FirstOrDefault();
+            var loadedInSceneObject = Object.FindObjectsByType<NetworkObject>(FindObjectsSortMode.InstanceID).Where((c) => c.name.Contains(k_SceneObjectName)).FirstOrDefault();
 #else
             var loadedInSceneObject = Object.FindObjectsOfType<NetworkObject>().Where((c) => c.name.Contains(k_SceneObjectName)).FirstOrDefault();
 #endif
@@ -76,7 +78,7 @@ public IEnumerator ChildSceneObjectsDoNotDestroyOnShutdown()
             AssertOnTimeout($"Client-{clientId} player never parented {k_SceneObjectName}!");
 
 #if UNITY_2023_1_OR_NEWER
-            var loadedInSceneObjects = Object.FindObjectsByType<NetworkObject>(FindObjectsSortMode.InstanceID).Where((c) => c.name == k_SceneObjectName);
+            var loadedInSceneObjects = Object.FindObjectsByType<NetworkObject>(FindObjectsSortMode.InstanceID).Where((c) => c.name.Contains(k_SceneObjectName));
 #else
             var loadedInSceneObjects = Object.FindObjectsOfType<NetworkObject>().Where((c) => c.name.Contains(k_SceneObjectName));
 #endif
@@ -88,7 +90,7 @@ public IEnumerator ChildSceneObjectsDoNotDestroyOnShutdown()
             yield return WaitForConditionOrTimeOut(() => PlayerNoLongerExistsWithChildren(clientId));
             AssertOnTimeout($"Client-{clientId} player still exits with children after client shutdown!");
 #if UNITY_2023_1_OR_NEWER
-            loadedInSceneObjects = Object.FindObjectsByType<NetworkObject>(FindObjectsSortMode.InstanceID).Where((c) => c.name == k_SceneObjectName);
+            loadedInSceneObjects = Object.FindObjectsByType<NetworkObject>(FindObjectsSortMode.InstanceID).Where((c) => c.name.Contains(k_SceneObjectName));
 #else
             loadedInSceneObjects = Object.FindObjectsOfType<NetworkObject>().Where((c) => c.name.Contains(k_SceneObjectName));
 #endif
diff --git a/testproject/Assets/Tests/Runtime/SenderIdTests.cs b/testproject/Assets/Tests/Runtime/SenderIdTests.cs
index 92ebf2f4a1..d0ee7eaa30 100644
--- a/testproject/Assets/Tests/Runtime/SenderIdTests.cs
+++ b/testproject/Assets/Tests/Runtime/SenderIdTests.cs
@@ -10,6 +10,9 @@
 
 namespace TestProject.RuntimeTests
 {
+
+    [TestFixture(NetworkTopologyTypes.DistributedAuthority)]
+    [TestFixture(NetworkTopologyTypes.ClientServer)]
     public class SenderIdTests : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 2;
@@ -17,6 +20,8 @@ public class SenderIdTests : NetcodeIntegrationTest
         private NetworkManager FirstClient => m_ClientNetworkManagers[0];
         private NetworkManager SecondClient => m_ClientNetworkManagers[1];
 
+        public SenderIdTests(NetworkTopologyTypes networkTopologyType) : base(networkTopologyType) { }
+
         [UnityTest]
         public IEnumerator WhenSendingMessageFromServerToClient_SenderIdIsCorrect()
         {
diff --git a/testproject/Assets/Tests/Runtime/ServerDisconnectsClientTest.cs b/testproject/Assets/Tests/Runtime/ServerDisconnectsClientTest.cs
index 29ef366237..4702ba74ec 100644
--- a/testproject/Assets/Tests/Runtime/ServerDisconnectsClientTest.cs
+++ b/testproject/Assets/Tests/Runtime/ServerDisconnectsClientTest.cs
@@ -8,9 +8,15 @@
 
 namespace TestProject.RuntimeTests
 {
+
+    [TestFixture(NetworkTopologyTypes.DistributedAuthority)]
+    [TestFixture(NetworkTopologyTypes.ClientServer)]
     public class ServerDisconnectsClientTest : NetcodeIntegrationTest
     {
         protected override int NumberOfClients => 1;
+
+        public ServerDisconnectsClientTest(NetworkTopologyTypes networkTopologyType) : base(networkTopologyType) { }
+
         protected override void OnCreatePlayerPrefab()
         {
             m_PlayerPrefab.AddComponent<ClientSendRpcUponDisconnect>();
diff --git a/testproject/Assets/Tests/Runtime/Support/NetworkObjectSpawnerForTests.cs b/testproject/Assets/Tests/Runtime/Support/NetworkObjectSpawnerForTests.cs
new file mode 100644
index 0000000000..f4102366fc
--- /dev/null
+++ b/testproject/Assets/Tests/Runtime/Support/NetworkObjectSpawnerForTests.cs
@@ -0,0 +1,90 @@
+using System.Collections.Generic;
+using Unity.Netcode;
+using UnityEngine;
+
+namespace TestProject.RuntimeTests
+{
+    internal class NetworkObjectSpawnerForTests : NetworkBehaviour
+    {
+        internal static Dictionary<ulong, NetworkObjectSpawnerForTests> Instances = new Dictionary<ulong, NetworkObjectSpawnerForTests>();
+
+        internal static Dictionary<ulong, List<NetworkObject>> SpawnedInstances = new Dictionary<ulong, List<NetworkObject>>();
+
+        internal static GameObject ObjectToSpawn;
+
+        internal static void Reset()
+        {
+            Instances.Clear();
+            SpawnedInstances.Clear();
+            if (ObjectToSpawn)
+            {
+                DestroyImmediate(ObjectToSpawn);
+            }
+            ObjectToSpawn = null;
+        }
+
+        internal static bool SpawnAfterInSceneSynchronized;
+        internal static bool SpawnAfterSynchronized;
+        internal static bool OnlyAuthoritySpawns;
+
+        public override void OnNetworkSpawn()
+        {
+            if (!Instances.ContainsKey(NetworkManager.LocalClientId))
+            {
+                Instances.Add(NetworkManager.LocalClientId, this);
+            }
+            else
+            {
+                Debug.LogError($"Already have an instance registered for Client-{NetworkManager.LocalClientId}! (did you forget to clear in teardown?)");
+            }
+            base.OnNetworkSpawn();
+        }
+
+        protected override void OnInSceneObjectsSpawned()
+        {
+            CheckForSpawn();
+            base.OnInSceneObjectsSpawned();
+        }
+
+        protected override void OnNetworkSessionSynchronized()
+        {
+            CheckForSpawn();
+            base.OnNetworkSessionSynchronized();
+        }
+
+        private void CheckForSpawn()
+        {
+            if (!OnlyAuthoritySpawns || (OnlyAuthoritySpawns && ((NetworkManager.DistributedAuthorityMode && NetworkManager.LocalClient.IsSessionOwner) || (!NetworkManager.DistributedAuthorityMode && IsServer))))
+            {
+                if (!NetworkManager.DistributedAuthorityMode && !IsServer)
+                {
+                    SpawnRpc();
+                }
+                else
+                {
+                    Spawn(NetworkManager.LocalClientId);
+                }
+            }
+        }
+
+        [Rpc(SendTo.Server)]
+        private void SpawnRpc(RpcParams rpcParams = default)
+        {
+            Spawn(rpcParams.Receive.SenderClientId);
+        }
+
+        private void Spawn(ulong ownerId)
+        {
+            var instance = Instantiate(ObjectToSpawn);
+            var networkObject = instance.GetComponent<NetworkObject>();
+            networkObject.SpawnWithOwnership(ownerId);
+            if (!SpawnedInstances.ContainsKey(ownerId))
+            {
+                SpawnedInstances.Add(ownerId, new List<NetworkObject>());
+            }
+            SpawnedInstances[ownerId].Add(networkObject);
+        }
+
+
+    }
+}
diff --git a/testproject/Assets/Tests/Runtime/Support/NetworkObjectSpawnerForTests.cs.meta b/testproject/Assets/Tests/Runtime/Support/NetworkObjectSpawnerForTests.cs.meta
new file mode 100644
index 0000000000..d1f61ba582
--- /dev/null
+++ b/testproject/Assets/Tests/Runtime/Support/NetworkObjectSpawnerForTests.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 75c714dc47c5306488e8605e46dcd87a
\ No newline at end of file
diff --git a/testproject/Assets/Tests/Runtime/testproject.runtimetests.asmdef b/testproject/Assets/Tests/Runtime/testproject.runtimetests.asmdef
index 72543caa90..17af49a925 100644
--- a/testproject/Assets/Tests/Runtime/testproject.runtimetests.asmdef
+++ b/testproject/Assets/Tests/Runtime/testproject.runtimetests.asmdef
@@ -4,6 +4,7 @@
     "references": [
         "Unity.Netcode.Runtime",
         "Unity.Netcode.RuntimeTests",
+        "Unity.Netcode.Editor",
         "TestProject.ManualTests",
         "TestProject",
         "Unity.Addressables",
@@ -36,26 +37,6 @@
             "name": "com.unity.addressables",
             "expression": "",
             "define": "TESTPROJECT_USE_ADDRESSABLES"
-        },
-        {
-            "name": "com.unity.transport",
-            "expression": "2.0.0-exp",
-            "define": "UTP_TRANSPORT_2_0_ABOVE"
-        },
-        {
-            "name": "com.unity.modules.animation",
-            "expression": "",
-            "define": "COM_UNITY_MODULES_ANIMATION"
-        },
-        {
-            "name": "com.unity.modules.physics",
-            "expression": "",
-            "define": "COM_UNITY_MODULES_PHYSICS"
-        },
-        {
-            "name": "com.unity.modules.physics2d",
-            "expression": "",
-            "define": "COM_UNITY_MODULES_PHYSICS2D"
         }
     ],
     "noEngineReferences": false
diff --git a/testproject/Packages/manifest.json b/testproject/Packages/manifest.json
index 427d544b3e..50e5a2a32e 100644
--- a/testproject/Packages/manifest.json
+++ b/testproject/Packages/manifest.json
@@ -1,21 +1,21 @@
 {
   "dependencies": {
-    "com.unity.addressables": "1.21.9",
-    "com.unity.ai.navigation": "1.1.1",
-    "com.unity.collab-proxy": "1.17.7",
-    "com.unity.ide.rider": "3.0.18",
-    "com.unity.ide.visualstudio": "2.0.17",
-    "com.unity.mathematics": "1.2.6",
+    "com.unity.addressables": "2.2.2",
+    "com.unity.ai.navigation": "2.0.5",
+    "com.unity.collab-proxy": "2.6.0",
+    "com.unity.ide.rider": "3.0.31",
+    "com.unity.ide.visualstudio": "2.0.22",
+    "com.unity.mathematics": "1.3.2",
     "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects",
     "com.unity.package-validation-suite": "0.49.0-preview",
-    "com.unity.services.authentication": "2.4.0",
-    "com.unity.services.core": "1.8.1",
-    "com.unity.services.relay": "1.0.5",
-    "com.unity.test-framework": "1.3.3",
-    "com.unity.test-framework.performance": "2.8.1-preview",
-    "com.unity.textmeshpro": "3.0.6",
-    "com.unity.timeline": "1.8.2",
-    "com.unity.ugui": "1.0.0",
+    "com.unity.services.authentication": "3.4.0",
+    "com.unity.services.core": "1.14.0",
+    "com.unity.test-framework": "1.4.6",
+    "com.unity.test-framework.performance": "3.0.3",
+    "com.unity.timeline": "1.8.7",
+    "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10",
+    "com.unity.ugui": "2.0.0",
+    "com.unity.modules.accessibility": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
diff --git a/testproject/Packages/packages-lock.json b/testproject/Packages/packages-lock.json
index 5c50733307..4788651e18 100644
--- a/testproject/Packages/packages-lock.json
+++ b/testproject/Packages/packages-lock.json
@@ -1,21 +1,22 @@
 {
   "dependencies": {
     "com.unity.addressables": {
-      "version": "1.21.9",
+      "version": "2.2.2",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.scriptablebuildpipeline": "1.21.3",
+        "com.unity.profiling.core": "1.0.2",
         "com.unity.modules.assetbundle": "1.0.0",
-        "com.unity.modules.imageconversion": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.modules.imageconversion": "1.0.0",
         "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.scriptablebuildpipeline": "2.1.4",
         "com.unity.modules.unitywebrequestassetbundle": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.ai.navigation": {
-      "version": "1.1.1",
+      "version": "2.0.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -24,42 +25,43 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.burst": {
-      "version": "1.6.6",
+      "version": "1.8.19",
       "depth": 2,
       "source": "registry",
       "dependencies": {
-        "com.unity.mathematics": "1.2.1"
+        "com.unity.mathematics": "1.2.1",
+        "com.unity.modules.jsonserialize": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.collab-proxy": {
-      "version": "1.17.7",
+      "version": "2.6.0",
       "depth": 0,
       "source": "registry",
-      "dependencies": {
-        "com.unity.services.core": "1.0.1"
-      },
+      "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.collections": {
-      "version": "1.2.4",
+      "version": "2.5.1",
       "depth": 2,
       "source": "registry",
       "dependencies": {
-        "com.unity.burst": "1.6.6",
-        "com.unity.test-framework": "1.1.31"
+        "com.unity.burst": "1.8.17",
+        "com.unity.test-framework": "1.4.5",
+        "com.unity.nuget.mono-cecil": "1.11.4",
+        "com.unity.test-framework.performance": "3.0.3"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.ext.nunit": {
-      "version": "2.0.3",
+      "version": "2.0.5",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.18",
+      "version": "3.0.31",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -68,7 +70,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.17",
+      "version": "2.0.22",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -77,7 +79,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.mathematics": {
-      "version": "1.2.6",
+      "version": "1.3.2",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
@@ -88,19 +90,19 @@
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.unity.nuget.mono-cecil": "1.10.1",
-        "com.unity.transport": "1.3.4"
+        "com.unity.nuget.mono-cecil": "1.11.4",
+        "com.unity.transport": "2.4.0"
       }
     },
     "com.unity.nuget.mono-cecil": {
-      "version": "1.10.1",
+      "version": "1.11.4",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.nuget.newtonsoft-json": {
-      "version": "3.0.2",
+      "version": "3.2.1",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
@@ -115,69 +117,61 @@
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.profiling.core": {
+      "version": "1.0.2",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
     "com.unity.scriptablebuildpipeline": {
-      "version": "1.21.3",
+      "version": "2.1.4",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.services.authentication": {
-      "version": "2.4.0",
+      "version": "3.4.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.nuget.newtonsoft-json": "3.0.2",
-        "com.unity.services.core": "1.7.0",
-        "com.unity.modules.unitywebrequest": "1.0.0",
-        "com.unity.ugui": "1.0.0"
+        "com.unity.ugui": "1.0.0",
+        "com.unity.services.core": "1.14.0",
+        "com.unity.nuget.newtonsoft-json": "3.2.1",
+        "com.unity.modules.unitywebrequest": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.services.core": {
-      "version": "1.8.1",
+      "version": "1.14.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.modules.unitywebrequest": "1.0.0",
-        "com.unity.nuget.newtonsoft-json": "3.0.2",
-        "com.unity.modules.androidjni": "1.0.0"
+        "com.unity.modules.androidjni": "1.0.0",
+        "com.unity.nuget.newtonsoft-json": "3.2.1",
+        "com.unity.modules.unitywebrequest": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.services.qos": {
-      "version": "1.1.0",
+    "com.unity.sysroot": {
+      "version": "2.0.10",
       "depth": 1,
       "source": "registry",
-      "dependencies": {
-        "com.unity.services.core": "1.4.0",
-        "com.unity.modules.unitywebrequest": "1.0.0",
-        "com.unity.nuget.newtonsoft-json": "3.0.2",
-        "com.unity.services.authentication": "2.0.0",
-        "com.unity.collections": "1.2.4"
-      },
+      "dependencies": {},
       "url": "https://packages.unity.com"
     },
-    "com.unity.services.relay": {
-      "version": "1.0.5",
-      "depth": 0,
+    "com.unity.sysroot.linux-x86_64": {
+      "version": "2.0.9",
+      "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.services.core": "1.4.0",
-        "com.unity.services.authentication": "2.0.0",
-        "com.unity.services.qos": "1.1.0",
-        "com.unity.modules.unitywebrequest": "1.0.0",
-        "com.unity.modules.unitywebrequestassetbundle": "1.0.0",
-        "com.unity.modules.unitywebrequestaudio": "1.0.0",
-        "com.unity.modules.unitywebrequesttexture": "1.0.0",
-        "com.unity.modules.unitywebrequestwww": "1.0.0",
-        "com.unity.nuget.newtonsoft-json": "3.0.2",
-        "com.unity.transport": "1.3.0"
+        "com.unity.sysroot": "2.0.10"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.3.3",
+      "version": "1.4.6",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -188,49 +182,50 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework.performance": {
-      "version": "2.8.1-preview",
+      "version": "3.0.3",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.test-framework": "1.1.0",
+        "com.unity.test-framework": "1.1.31",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.textmeshpro": {
-      "version": "3.0.6",
+    "com.unity.timeline": {
+      "version": "1.8.7",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.ugui": "1.0.0"
+        "com.unity.modules.audio": "1.0.0",
+        "com.unity.modules.director": "1.0.0",
+        "com.unity.modules.animation": "1.0.0",
+        "com.unity.modules.particlesystem": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.timeline": {
-      "version": "1.8.2",
+    "com.unity.toolchain.win-x86_64-linux-x86_64": {
+      "version": "2.0.10",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.modules.director": "1.0.0",
-        "com.unity.modules.animation": "1.0.0",
-        "com.unity.modules.audio": "1.0.0",
-        "com.unity.modules.particlesystem": "1.0.0"
+        "com.unity.sysroot": "2.0.10",
+        "com.unity.sysroot.linux-x86_64": "2.0.9"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.transport": {
-      "version": "1.3.4",
+      "version": "2.4.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.collections": "1.2.4",
-        "com.unity.burst": "1.6.6",
-        "com.unity.mathematics": "1.2.6"
+        "com.unity.burst": "1.8.12",
+        "com.unity.collections": "2.2.1",
+        "com.unity.mathematics": "1.3.1"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.ugui": {
-      "version": "1.0.0",
+      "version": "2.0.0",
       "depth": 0,
       "source": "builtin",
       "dependencies": {
@@ -238,6 +233,12 @@
         "com.unity.modules.imgui": "1.0.0"
       }
     },
+    "com.unity.modules.accessibility": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
     "com.unity.modules.ai": {
       "version": "1.0.0",
       "depth": 0,
@@ -285,6 +286,12 @@
         "com.unity.modules.animation": "1.0.0"
       }
     },
+    "com.unity.modules.hierarchycore": {
+      "version": "1.0.0",
+      "depth": 1,
+      "source": "builtin",
+      "dependencies": {}
+    },
     "com.unity.modules.imageconversion": {
       "version": "1.0.0",
       "depth": 0,
@@ -374,17 +381,7 @@
         "com.unity.modules.ui": "1.0.0",
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0",
-        "com.unity.modules.uielementsnative": "1.0.0"
-      }
-    },
-    "com.unity.modules.uielementsnative": {
-      "version": "1.0.0",
-      "depth": 1,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.modules.ui": "1.0.0",
-        "com.unity.modules.imgui": "1.0.0",
-        "com.unity.modules.jsonserialize": "1.0.0"
+        "com.unity.modules.hierarchycore": "1.0.0"
       }
     },
     "com.unity.modules.umbra": {
diff --git a/testproject/ProjectSettings/EditorBuildSettings.asset b/testproject/ProjectSettings/EditorBuildSettings.asset
index 226cba148b..b2632cd9f5 100644
--- a/testproject/ProjectSettings/EditorBuildSettings.asset
+++ b/testproject/ProjectSettings/EditorBuildSettings.asset
@@ -89,9 +89,6 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Samples/Physics/PhysicsSample.unity
     guid: 2c76877ad66aa22458c62a0d74514a91
-  - enabled: 1
-    path: Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity
-    guid: 7522f8723c5674939a3c24acfd83a688
   - enabled: 1
     path: Assets/Tests/Manual/IntegrationTestScenes/UnitTestBaseScene.unity
     guid: fa0b4956a4a0aee48ae43f9116d28354
@@ -110,9 +107,6 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Samples/Teleport/TeleportSample.unity
     guid: efa247d1f78ca694f8d2dcb5672e8f8b
-  - enabled: 1
-    path: Assets/Tests/Runtime/ObjectParenting/ParentingInSceneObjects.unity
-    guid: 49fd14bff1eceda4f9299721a9029750
   - enabled: 1
     path: Assets/Tests/Manual/NestedNetworkTransforms/NestedNetworkTransforms.unity
     guid: 92b8cccf28cbaba40854a025b66e2ac3
@@ -125,6 +119,9 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Tests/Manual/NestedNetworkTransforms/LerpVsSlerpScene.unity
     guid: 54ca4944ec2b95640a68bc35403a4977
+  - enabled: 1
+    path: Assets/Tests/Runtime/ObjectParenting/ParentingInSceneObjects.unity
+    guid: d04d395e163705441935990f702c782f
   - enabled: 1
     path: Assets/Tests/Manual/IntegrationTestScenes/GenericInScenePlacedObject.unity
     guid: 43c36dc1d38660e4d9879e84e580e22f
@@ -143,6 +140,9 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Tests/Manual/PrefabTestAssets/PrefabTestScene.unity
     guid: 6449955dcdde54944ba1cdb97a23bd29
+  - enabled: 1
+    path: Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity
+    guid: abe92ece17d830e41a66dff7edc9245d
   - enabled: 1
     path: Assets/Tests/Manual/IntegrationTestScenes/InSceneUnderGameObject.unity
     guid: 778ea62ad5daee5408d1ec1fce28673f
@@ -152,9 +152,13 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Tests/Manual/IntegrationTestScenes/SessionSynchronize.unity
     guid: 468b795904b98234593ebc31bf0d578a
+  - enabled: 1
+    path: Assets/Tests/Manual/IntegrationTestScenes/NetworkObjectSpawnerTest.unity
+    guid: 28ec9a0d98d9db64a9c57a79f38d6e0a
   - enabled: 1
     path: Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/NetworkAnimatorDualTriggerCheer.unity
-    guid: a2408927b1ca1c74bb359402d44b4c73
+    guid: e12df855278120245a8a936a6a52b5bd
   m_configObjects:
     com.unity.addressableassets: {fileID: 11400000, guid: 5a3d5c53c25349c48912726ae850f3b0,
       type: 2}
+  m_UseUCBPForAssetBundles: 0
diff --git a/testproject/ProjectSettings/ProjectSettings.asset b/testproject/ProjectSettings/ProjectSettings.asset
index fbf187f5a1..492e94571c 100644
--- a/testproject/ProjectSettings/ProjectSettings.asset
+++ b/testproject/ProjectSettings/ProjectSettings.asset
@@ -3,7 +3,7 @@
 --- !u!129 &1
 PlayerSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 22
+  serializedVersion: 28
   productGUID: bba99b16607b94720b7d04f7f1a82989
   AndroidProfiler: 0
   AndroidFilterTouchesWhenObscured: 0
@@ -17,8 +17,8 @@ PlayerSettings:
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
-  m_ShowUnitySplashScreen: 1
-  m_ShowUnitySplashLogo: 1
+  m_ShowUnitySplashScreen: 0
+  m_ShowUnitySplashLogo: 0
   m_SplashScreenOverlayOpacity: 1
   m_SplashScreenAnimation: 1
   m_SplashScreenLogoStyle: 1
@@ -48,14 +48,17 @@ PlayerSettings:
   defaultScreenHeightWeb: 600
   m_StereoRenderingPath: 0
   m_ActiveColorSpace: 0
+  unsupportedMSAAFallback: 0
+  m_SpriteBatchMaxVertexCount: 65535
+  m_SpriteBatchVertexThreshold: 300
   m_MTRendering: 1
   mipStripping: 0
   numberOfMipsStripped: 0
-  m_StackTraceTypes: 010000000100000001000000010000000100000001000000
+  numberOfMipsStrippedPerMipmapLimitGroup: {}
+  m_StackTraceTypes: 020000000200000001000000010000000200000001000000
   iosShowActivityIndicatorOnLoading: -1
   androidShowActivityIndicatorOnLoading: -1
   iosUseCustomAppBackgroundBehavior: 0
-  iosAllowHTTPDownload: 1
   allowedAutorotateToPortrait: 1
   allowedAutorotateToPortraitUpsideDown: 1
   allowedAutorotateToLandscapeRight: 1
@@ -68,10 +71,18 @@ PlayerSettings:
   androidRenderOutsideSafeArea: 1
   androidUseSwappy: 1
   androidBlitType: 0
+  androidResizeableActivity: 0
+  androidDefaultWindowWidth: 1920
+  androidDefaultWindowHeight: 1080
+  androidMinimumWindowWidth: 400
+  androidMinimumWindowHeight: 300
+  androidFullscreenMode: 1
+  androidAutoRotationBehavior: 1
+  androidPredictiveBackSupport: 0
+  androidApplicationEntry: 1
   defaultIsNativeResolution: 1
   macRetinaSupport: 1
   runInBackground: 1
-  captureSingleScreen: 0
   muteOtherAudioSources: 0
   Prepare IOS For Recording: 0
   Force IOS Speakers When Recording: 0
@@ -79,6 +90,7 @@ PlayerSettings:
   hideHomeButton: 0
   submitAnalytics: 1
   usePlayerLog: 1
+  dedicatedServerOptimizations: 0
   bakeCollisionMeshes: 0
   forceSingleInstance: 0
   useFlipModelSwapchain: 1
@@ -86,6 +98,7 @@ PlayerSettings:
   useMacAppStoreValidation: 0
   macAppStoreCategory: public.app-category.games
   gpuSkinning: 1
+  meshDeformation: 2
   xboxPIXTextureCapture: 0
   xboxEnableAvatar: 0
   xboxEnableKinect: 0
@@ -113,20 +126,20 @@ PlayerSettings:
   switchNVNShaderPoolsGranularity: 33554432
   switchNVNDefaultPoolsGranularity: 16777216
   switchNVNOtherPoolsGranularity: 16777216
+  switchGpuScratchPoolGranularity: 2097152
+  switchAllowGpuScratchShrinking: 0
   switchNVNMaxPublicTextureIDCount: 0
   switchNVNMaxPublicSamplerIDCount: 0
-  stadiaPresentMode: 0
-  stadiaTargetFramerate: 0
+  switchMaxWorkerMultiple: 8
+  switchNVNGraphicsFirmwareMemory: 32
   vulkanNumSwapchainBuffers: 3
   vulkanEnableSetSRGBWrite: 0
   vulkanEnablePreTransform: 0
   vulkanEnableLateAcquireNextImage: 0
-  m_SupportedAspectRatios:
-    4:3: 1
-    5:4: 1
-    16:10: 1
-    16:9: 1
-    Others: 1
+  vulkanEnableCommandBufferRecycling: 1
+  loadStoreDebugModeEnabled: 0
+  visionOSBundleVersion: 1.0
+  tvOSBundleVersion: 1.0
   bundleVersion: 0.1
   preloadedAssets: []
   metroInputSource: 0
@@ -138,22 +151,27 @@ PlayerSettings:
     enable360StereoCapture: 0
   isWsaHolographicRemotingEnabled: 0
   enableFrameTimingStats: 0
+  enableOpenGLProfilerGPURecorders: 1
+  allowHDRDisplaySupport: 0
   useHDRDisplay: 0
-  D3DHDRBitDepth: 0
+  hdrBitDepth: 0
   m_ColorGamuts: 00000000
   targetPixelDensity: 30
   resolutionScalingMode: 0
+  resetResolutionOnWindowResize: 0
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
+  androidMinAspectRatio: 1
   applicationIdentifier:
-    Standalone: com.UnityTechnologies.testproject
+    Standalone: com.Unity-Technologies.testproject
   buildNumber:
     Standalone: 0
+    VisionOS: 0
     iPhone: 0
     tvOS: 0
   overrideDefaultApplicationIdentifier: 0
   AndroidBundleVersionCode: 1
-  AndroidMinSdkVersion: 19
+  AndroidMinSdkVersion: 23
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1
   aotOptions: nimt-trampolines=1024
@@ -163,15 +181,20 @@ PlayerSettings:
   ForceInternetPermission: 0
   ForceSDCardPermission: 0
   CreateWallpaper: 0
-  APKExpansionFiles: 0
+  androidSplitApplicationBinary: 0
   keepLoadedShadersAlive: 0
   StripUnusedMeshComponents: 1
+  strictShaderVariantMatching: 0
   VertexChannelCompressionMask: 4054
   iPhoneSdkVersion: 988
-  iOSTargetOSVersionString: 11.0
+  iOSSimulatorArchitecture: 0
+  iOSTargetOSVersionString: 13.0
   tvOSSdkVersion: 0
+  tvOSSimulatorArchitecture: 0
   tvOSRequireExtendedGameController: 0
-  tvOSTargetOSVersionString: 11.0
+  tvOSTargetOSVersionString: 13.0
+  VisionOSSdkVersion: 0
+  VisionOSTargetOSVersionString: 1.0
   uIPrerenderedIcon: 0
   uIRequiresPersistentWiFi: 0
   uIRequiresFullScreen: 1
@@ -196,7 +219,6 @@ PlayerSettings:
     rgba: 0
   iOSLaunchScreenFillPct: 100
   iOSLaunchScreenSize: 100
-  iOSLaunchScreenCustomXibPath:
   iOSLaunchScreeniPadType: 0
   iOSLaunchScreeniPadImage: {fileID: 0}
   iOSLaunchScreeniPadBackgroundColor:
@@ -204,22 +226,25 @@ PlayerSettings:
     rgba: 0
   iOSLaunchScreeniPadFillPct: 100
   iOSLaunchScreeniPadSize: 100
-  iOSLaunchScreeniPadCustomXibPath:
-  iOSLaunchScreenCustomStoryboardPath:
-  iOSLaunchScreeniPadCustomStoryboardPath:
+  iOSLaunchScreenCustomStoryboardPath: 
+  iOSLaunchScreeniPadCustomStoryboardPath: 
   iOSDeviceRequirements: []
   iOSURLSchemes: []
+  macOSURLSchemes: []
   iOSBackgroundModes: 0
   iOSMetalForceHardShadows: 0
   metalEditorSupport: 1
   metalAPIValidation: 1
+  metalCompileShaderBinary: 0
   iOSRenderExtraFrameOnPause: 0
   iosCopyPluginsCodeInsteadOfSymlink: 0
-  appleDeveloperTeamID:
-  iOSManualSigningProvisioningProfileID:
-  tvOSManualSigningProvisioningProfileID:
+  appleDeveloperTeamID: 
+  iOSManualSigningProvisioningProfileID: 
+  tvOSManualSigningProvisioningProfileID: 
+  VisionOSManualSigningProvisioningProfileID: 
   iOSManualSigningProvisioningProfileType: 0
   tvOSManualSigningProvisioningProfileType: 0
+  VisionOSManualSigningProvisioningProfileType: 0
   appleEnableAutomaticSigning: 0
   iOSRequireARKit: 0
   iOSAutomaticallyDetectAndAddCapabilities: 1
@@ -234,12 +259,15 @@ PlayerSettings:
   useCustomLauncherGradleManifest: 0
   useCustomBaseGradleTemplate: 0
   useCustomGradlePropertiesTemplate: 0
+  useCustomGradleSettingsTemplate: 0
   useCustomProguardFile: 0
   AndroidTargetArchitectures: 1
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
-  AndroidKeystoreName:
-  AndroidKeyaliasName:
+  AndroidKeystoreName: 
+  AndroidKeyaliasName: 
+  AndroidEnableArmv9SecurityFeatures: 0
+  AndroidEnableArm64MTE: 0
   AndroidBuildApkPerCpuArchitecture: 0
   AndroidTVCompatibility: 0
   AndroidIsGame: 1
@@ -252,11 +280,12 @@ PlayerSettings:
     height: 180
     banner: {fileID: 0}
   androidGamepadSupportLevel: 0
-  AndroidMinifyWithR8: 0
   AndroidMinifyRelease: 0
   AndroidMinifyDebug: 0
   AndroidValidateAppBundleSize: 1
   AndroidAppBundleSizeToValidate: 150
+  AndroidReportGooglePlayAppDependencies: 1
+  androidSymbolsSizeThreshold: 800
   m_BuildTargetIcons: []
   m_BuildTargetPlatformIcons: []
   m_BuildTargetBatching:
@@ -275,6 +304,7 @@ PlayerSettings:
   - m_BuildTarget: WebGL
     m_StaticBatching: 0
     m_DynamicBatching: 0
+  m_BuildTargetShaderSettings: []
   m_BuildTargetGraphicsJobs:
   - m_BuildTarget: MacStandaloneSupport
     m_GraphicsJobs: 0
@@ -310,7 +340,7 @@ PlayerSettings:
   m_BuildTargetGraphicsAPIs:
   - m_BuildTarget: AndroidPlayer
     m_APIs: 150000000b000000
-    m_Automatic: 0
+    m_Automatic: 1
   - m_BuildTarget: iOSSupport
     m_APIs: 10000000
     m_Automatic: 1
@@ -326,6 +356,8 @@ PlayerSettings:
     m_Devices:
     - Oculus
     - OpenVR
+  m_DefaultShaderChunkSizeInMB: 16
+  m_DefaultShaderChunkCount: 0
   openGLRequireES31: 0
   openGLRequireES31AEP: 0
   openGLRequireES32: 0
@@ -336,58 +368,65 @@ PlayerSettings:
     tvOS: 1
   m_BuildTargetGroupLightmapEncodingQuality: []
   m_BuildTargetGroupLightmapSettings: []
+  m_BuildTargetGroupLoadStoreDebugModeSettings: []
   m_BuildTargetNormalMapEncoding: []
+  m_BuildTargetDefaultTextureCompressionFormat: []
   playModeTestRunnerEnabled: 1
   runPlayModeTestAsEditModeTest: 0
   actionOnDotNetUnhandledException: 1
+  editorGfxJobOverride: 1
   enableInternalProfiler: 0
   logObjCUncaughtExceptions: 1
   enableCrashReportAPI: 0
-  cameraUsageDescription:
-  locationUsageDescription:
-  microphoneUsageDescription:
-  switchNMETAOverride:
-  switchNetLibKey:
+  cameraUsageDescription: 
+  locationUsageDescription: 
+  microphoneUsageDescription: 
+  bluetoothUsageDescription: 
+  macOSTargetOSVersion: 11.0
+  switchNMETAOverride: 
+  switchNetLibKey: 
   switchSocketMemoryPoolSize: 6144
   switchSocketAllocatorPoolSize: 128
   switchSocketConcurrencyLimit: 14
   switchScreenResolutionBehavior: 2
   switchUseCPUProfiler: 0
-  switchUseGOLDLinker: 0
+  switchEnableFileSystemTrace: 0
+  switchLTOSetting: 0
   switchApplicationID: 0x01004b9000490000
-  switchNSODependencies:
-  switchTitleNames_0:
-  switchTitleNames_1:
-  switchTitleNames_2:
-  switchTitleNames_3:
-  switchTitleNames_4:
-  switchTitleNames_5:
-  switchTitleNames_6:
-  switchTitleNames_7:
-  switchTitleNames_8:
-  switchTitleNames_9:
-  switchTitleNames_10:
-  switchTitleNames_11:
-  switchTitleNames_12:
-  switchTitleNames_13:
-  switchTitleNames_14:
-  switchTitleNames_15:
-  switchPublisherNames_0:
-  switchPublisherNames_1:
-  switchPublisherNames_2:
-  switchPublisherNames_3:
-  switchPublisherNames_4:
-  switchPublisherNames_5:
-  switchPublisherNames_6:
-  switchPublisherNames_7:
-  switchPublisherNames_8:
-  switchPublisherNames_9:
-  switchPublisherNames_10:
-  switchPublisherNames_11:
-  switchPublisherNames_12:
-  switchPublisherNames_13:
-  switchPublisherNames_14:
-  switchPublisherNames_15:
+  switchNSODependencies: 
+  switchCompilerFlags: 
+  switchTitleNames_0: 
+  switchTitleNames_1: 
+  switchTitleNames_2: 
+  switchTitleNames_3: 
+  switchTitleNames_4: 
+  switchTitleNames_5: 
+  switchTitleNames_6: 
+  switchTitleNames_7: 
+  switchTitleNames_8: 
+  switchTitleNames_9: 
+  switchTitleNames_10: 
+  switchTitleNames_11: 
+  switchTitleNames_12: 
+  switchTitleNames_13: 
+  switchTitleNames_14: 
+  switchTitleNames_15: 
+  switchPublisherNames_0: 
+  switchPublisherNames_1: 
+  switchPublisherNames_2: 
+  switchPublisherNames_3: 
+  switchPublisherNames_4: 
+  switchPublisherNames_5: 
+  switchPublisherNames_6: 
+  switchPublisherNames_7: 
+  switchPublisherNames_8: 
+  switchPublisherNames_9: 
+  switchPublisherNames_10: 
+  switchPublisherNames_11: 
+  switchPublisherNames_12: 
+  switchPublisherNames_13: 
+  switchPublisherNames_14: 
+  switchPublisherNames_15: 
   switchIcons_0: {fileID: 0}
   switchIcons_1: {fileID: 0}
   switchIcons_2: {fileID: 0}
@@ -420,19 +459,18 @@ PlayerSettings:
   switchSmallIcons_13: {fileID: 0}
   switchSmallIcons_14: {fileID: 0}
   switchSmallIcons_15: {fileID: 0}
-  switchManualHTML:
-  switchAccessibleURLs:
-  switchLegalInformation:
+  switchManualHTML: 
+  switchAccessibleURLs: 
+  switchLegalInformation: 
   switchMainThreadStackSize: 1048576
-  switchPresenceGroupId:
+  switchPresenceGroupId: 
   switchLogoHandling: 0
   switchReleaseVersion: 0
   switchDisplayVersion: 1.0.0
   switchStartupUserAccount: 0
-  switchTouchScreenUsage: 0
   switchSupportedLanguagesMask: 0
   switchLogoType: 0
-  switchApplicationErrorCodeCategory:
+  switchApplicationErrorCodeCategory: 
   switchUserAccountSaveDataSize: 0
   switchUserAccountSaveDataJournalSize: 0
   switchApplicationAttribute: 0
@@ -452,14 +490,14 @@ PlayerSettings:
   switchRatingsInt_10: 0
   switchRatingsInt_11: 0
   switchRatingsInt_12: 0
-  switchLocalCommunicationIds_0:
-  switchLocalCommunicationIds_1:
-  switchLocalCommunicationIds_2:
-  switchLocalCommunicationIds_3:
-  switchLocalCommunicationIds_4:
-  switchLocalCommunicationIds_5:
-  switchLocalCommunicationIds_6:
-  switchLocalCommunicationIds_7:
+  switchLocalCommunicationIds_0: 
+  switchLocalCommunicationIds_1: 
+  switchLocalCommunicationIds_2: 
+  switchLocalCommunicationIds_3: 
+  switchLocalCommunicationIds_4: 
+  switchLocalCommunicationIds_5: 
+  switchLocalCommunicationIds_6: 
+  switchLocalCommunicationIds_7: 
   switchParentalControl: 0
   switchAllowsScreenshot: 1
   switchAllowsVideoCapturing: 1
@@ -471,6 +509,7 @@ PlayerSettings:
   switchNativeFsCacheSize: 32
   switchIsHoldTypeHorizontal: 0
   switchSupportedNpadCount: 8
+  switchEnableTouchScreen: 1
   switchSocketConfigEnabled: 0
   switchTcpInitialSendBufferSize: 32
   switchTcpInitialReceiveBufferSize: 64
@@ -481,40 +520,44 @@ PlayerSettings:
   switchSocketBufferEfficiency: 4
   switchSocketInitializeEnabled: 1
   switchNetworkInterfaceManagerInitializeEnabled: 1
-  switchPlayerConnectionEnabled: 1
+  switchDisableHTCSPlayerConnection: 0
   switchUseNewStyleFilepaths: 0
+  switchUseLegacyFmodPriorities: 0
   switchUseMicroSleepForYield: 1
+  switchEnableRamDiskSupport: 0
   switchMicroSleepForYieldTime: 25
+  switchRamDiskSpaceSize: 12
+  switchUpgradedPlayerSettingsToNMETA: 0
   ps4NPAgeRating: 12
-  ps4NPTitleSecret:
-  ps4NPTrophyPackPath:
+  ps4NPTitleSecret: 
+  ps4NPTrophyPackPath: 
   ps4ParentalLevel: 11
   ps4ContentID: ED1633-NPXX51362_00-0000000000000000
   ps4Category: 0
   ps4MasterVersion: 01.00
   ps4AppVersion: 01.00
   ps4AppType: 0
-  ps4ParamSfxPath:
+  ps4ParamSfxPath: 
   ps4VideoOutPixelFormat: 0
   ps4VideoOutInitialWidth: 1920
   ps4VideoOutBaseModeInitialWidth: 1920
   ps4VideoOutReprojectionRate: 60
-  ps4PronunciationXMLPath:
-  ps4PronunciationSIGPath:
-  ps4BackgroundImagePath:
-  ps4StartupImagePath:
-  ps4StartupImagesFolder:
-  ps4IconImagesFolder:
-  ps4SaveDataImagePath:
-  ps4SdkOverride:
-  ps4BGMPath:
-  ps4ShareFilePath:
-  ps4ShareOverlayImagePath:
-  ps4PrivacyGuardImagePath:
-  ps4ExtraSceSysFile:
-  ps4NPtitleDatPath:
+  ps4PronunciationXMLPath: 
+  ps4PronunciationSIGPath: 
+  ps4BackgroundImagePath: 
+  ps4StartupImagePath: 
+  ps4StartupImagesFolder: 
+  ps4IconImagesFolder: 
+  ps4SaveDataImagePath: 
+  ps4SdkOverride: 
+  ps4BGMPath: 
+  ps4ShareFilePath: 
+  ps4ShareOverlayImagePath: 
+  ps4PrivacyGuardImagePath: 
+  ps4ExtraSceSysFile: 
+  ps4NPtitleDatPath: 
   ps4RemotePlayKeyAssignment: -1
-  ps4RemotePlayKeyMappingDir:
+  ps4RemotePlayKeyMappingDir: 
   ps4PlayTogetherPlayerCount: 0
   ps4EnterButtonAssignment: 1
   ps4ApplicationParam1: 0
@@ -542,9 +585,9 @@ PlayerSettings:
   ps4ScriptOptimizationLevel: 0
   ps4Audio3dVirtualSpeakerCount: 14
   ps4attribCpuUsage: 0
-  ps4PatchPkgPath:
-  ps4PatchLatestPkgPath:
-  ps4PatchChangeinfoPath:
+  ps4PatchPkgPath: 
+  ps4PatchLatestPkgPath: 
+  ps4PatchChangeinfoPath: 
   ps4PatchDayOne: 0
   ps4attribUserManagement: 0
   ps4attribMoveSupport: 0
@@ -555,22 +598,24 @@ PlayerSettings:
   ps4videoRecordingFeaturesUsed: 0
   ps4contentSearchFeaturesUsed: 0
   ps4CompatibilityPS5: 0
+  ps4AllowPS5Detection: 0
   ps4GPU800MHz: 1
   ps4attribEyeToEyeDistanceSettingVR: 0
   ps4IncludedModules: []
   ps4attribVROutputEnabled: 0
-  monoEnv:
+  monoEnv: 
   splashScreenBackgroundSourceLandscape: {fileID: 0}
   splashScreenBackgroundSourcePortrait: {fileID: 0}
   blurSplashScreenBackground: 1
-  spritePackerPolicy:
+  spritePackerPolicy: 
   webGLMemorySize: 16
   webGLExceptionSupport: 1
   webGLNameFilesAsHashes: 0
+  webGLShowDiagnostics: 0
   webGLDataCaching: 1
   webGLDebugSymbols: 0
-  webGLEmscriptenArgs:
-  webGLModulesDirectory:
+  webGLEmscriptenArgs: 
+  webGLModulesDirectory: 
   webGLTemplate: APPLICATION:Default
   webGLAnalyzeBuildSize: 0
   webGLUseEmbeddedResources: 0
@@ -579,39 +624,65 @@ PlayerSettings:
   webGLLinkerTarget: 1
   webGLThreadsSupport: 0
   webGLDecompressionFallback: 0
+  webGLInitialMemorySize: 32
+  webGLMaximumMemorySize: 2048
+  webGLMemoryGrowthMode: 2
+  webGLMemoryLinearGrowthStep: 16
+  webGLMemoryGeometricGrowthStep: 0.2
+  webGLMemoryGeometricGrowthCap: 96
+  webGLEnableWebGPU: 0
+  webGLPowerPreference: 2
+  webGLWebAssemblyTable: 0
+  webGLWebAssemblyBigInt: 0
+  webGLCloseOnQuit: 0
+  webWasm2023: 0
   scriptingDefineSymbols:
-    1: DEBUG_NETWORKTRANSFORM;UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT 
+    Standalone: UNITY_NETCODE_NATIVE_COLLECTION_SUPPORT
   additionalCompilerArguments:
-    1:
+    Standalone:
     - -warnaserror
   platformArchitecture: {}
   scriptingBackend: {}
   il2cppCompilerConfiguration: {}
-  managedStrippingLevel: {}
+  il2cppCodeGeneration: {}
+  il2cppStacktraceInformation: {}
+  managedStrippingLevel:
+    EmbeddedLinux: 1
+    GameCoreScarlett: 1
+    GameCoreXboxOne: 1
+    Nintendo Switch: 1
+    PS4: 1
+    PS5: 1
+    QNX: 1
+    Stadia: 1
+    VisionOS: 1
+    WebGL: 1
+    Windows Store Apps: 1
+    XboxOne: 1
+    iPhone: 1
+    tvOS: 1
   incrementalIl2cppBuild: {}
   suppressCommonWarnings: 1
   allowUnsafeCode: 0
   useDeterministicCompilation: 1
-  useReferenceAssemblies: 1
-  enableRoslynAnalyzers: 1
-  additionalIl2CppArgs:
+  additionalIl2CppArgs: 
   scriptingRuntimeVersion: 1
   gcIncremental: 1
-  assemblyVersionValidation: 1
   gcWBarrierValidation: 0
   apiCompatibilityLevelPerPlatform: {}
+  editorAssembliesCompatibilityLevel: 1
   m_RenderingPath: 1
   m_MobileRenderingPath: 1
-  metroPackageName: Template_3D
-  metroPackageVersion:
-  metroCertificatePath:
-  metroCertificatePassword:
-  metroCertificateSubject:
-  metroCertificateIssuer:
+  metroPackageName: Template3D
+  metroPackageVersion: 1.0.0.0
+  metroCertificatePath: 
+  metroCertificatePassword: 
+  metroCertificateSubject: 
+  metroCertificateIssuer: 
   metroCertificateNotAfter: 0000000000000000
   metroApplicationDescription: Template_3D
   wsaImages: {}
-  metroTileShortName:
+  metroTileShortName: testproject
   metroTileShowName: 0
   metroMediumTileShowName: 0
   metroLargeTileShowName: 0
@@ -624,24 +695,26 @@ PlayerSettings:
   metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628,
     a: 1}
   metroSplashScreenUseBackgroundColor: 0
+  syncCapabilities: 0
   platformCapabilities: {}
   metroTargetDeviceFamilies: {}
-  metroFTAName:
+  metroFTAName: 
   metroFTAFileTypes: []
-  metroProtocolName:
-  XboxOneProductId:
-  XboxOneUpdateKey:
-  XboxOneSandboxId:
-  XboxOneContentId:
-  XboxOneTitleId:
-  XboxOneSCId:
-  XboxOneGameOsOverridePath:
-  XboxOnePackagingOverridePath:
-  XboxOneAppManifestOverridePath:
+  metroProtocolName: 
+  vcxProjDefaultLanguage: 
+  XboxOneProductId: 
+  XboxOneUpdateKey: 
+  XboxOneSandboxId: 
+  XboxOneContentId: 
+  XboxOneTitleId: 
+  XboxOneSCId: 
+  XboxOneGameOsOverridePath: 
+  XboxOnePackagingOverridePath: 
+  XboxOneAppManifestOverridePath: 
   XboxOneVersion: 1.0.0.0
   XboxOnePackageEncryption: 0
   XboxOnePackageUpdateGranularity: 2
-  XboxOneDescription:
+  XboxOneDescription: 
   XboxOneLanguage:
   - enus
   XboxOneCapability: []
@@ -654,8 +727,8 @@ PlayerSettings:
   XboxOneAllowedProductIds: []
   XboxOnePersistentLocalStorageSize: 0
   XboxOneXTitleMemory: 8
-  XboxOneOverrideIdentityName:
-  XboxOneOverrideIdentityPublisher:
+  XboxOneOverrideIdentityName: 
+  XboxOneOverrideIdentityPublisher: 
   vrEditorSettings: {}
   cloudServicesEnabled:
     Analytics: 0
@@ -667,23 +740,36 @@ PlayerSettings:
     UNet: 1
     Unity Ads: 0
   luminIcon:
-    m_Name:
-    m_ModelFolderPath:
-    m_PortalFolderPath:
+    m_Name: 
+    m_ModelFolderPath: 
+    m_PortalFolderPath: 
   luminCert:
-    m_CertPath:
+    m_CertPath: 
     m_SignPackage: 1
   luminIsChannelApp: 0
   luminVersion:
     m_VersionCode: 1
-    m_VersionName:
+    m_VersionName: 
+  hmiPlayerDataPath: 
+  hmiForceSRGBBlit: 1
+  embeddedLinuxEnableGamepadInput: 1
+  hmiCpuConfiguration: 
+  hmiLogStartupTiming: 0
+  qnxGraphicConfPath: 
   apiCompatibilityLevel: 6
+  captureStartupLogs: {}
   activeInputHandler: 0
-  cloudProjectId:
+  windowsGamepadBackendHint: 0
+  cloudProjectId: 
   framebufferDepthMemorylessMode: 0
   qualitySettingsNames: []
   projectName: relay-stg
   organizationId: relay-stg
   cloudEnabled: 0
   legacyClampBlendShapeWeights: 0
+  hmiLoadingImage: {fileID: 0}
+  platformRequiresReadableAssets: 0
   virtualTexturingSupportEnabled: 0
+  insecureHttpOption: 0
+  androidVulkanDenyFilterList: []
+  androidVulkanAllowFilterList: []
diff --git a/testproject/ProjectSettings/ProjectVersion.txt b/testproject/ProjectSettings/ProjectVersion.txt
index dd7e0b04f1..307f912404 100644
--- a/testproject/ProjectSettings/ProjectVersion.txt
+++ b/testproject/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2020.3.40f1
-m_EditorVersionWithRevision: 2020.3.40f1 (ba48d4efcef1)
+m_EditorVersion: 6000.0.38f1
+m_EditorVersionWithRevision: 6000.0.38f1 (82314a941f2d)