diff --git a/.github/codecov.yml b/.github/codecov.yml
new file mode 100644
index 000000000..89827310d
--- /dev/null
+++ b/.github/codecov.yml
@@ -0,0 +1,36 @@
+codecov:
+  require_ci_to_pass: false
+  notify:
+    wait_for_ci: true
+
+coverage:
+  precision: 2
+  round: down
+  range: "50...70"
+  status:
+    patch: true
+    default_rules:
+      flag_coverage_not_uploaded_behavior: exclude
+    project:
+      default:
+        target: auto
+        # Threshold used for the PR Check
+        threshold: 1%
+        base: auto 
+        if_ci_failed: success
+        informational: false
+        only_pulls: true
+
+# PR Comment configuration
+comment:
+  layout: "reach,diff,flags,files"
+  behavior: default
+  require_changes: false
+  require_base: false
+  require_head: false
+  # Set this to the number of coverage jobs run in the PR
+  after_n_builds: 1
+
+flag_management:
+  default_rules:
+    carryforward: true
diff --git a/.gitignore b/.gitignore
index 3906e9a6c..dfd9b6ece 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,14 +8,14 @@ npm-debug.log.meta
 .idea
 .yamato/expectations/*
 
-/projects/**/.idea
-/projects/**/.vs
-/projects/**/Builds
-/projects/**/Library
-/projects/**/Logs
-/projects/**/obj
-/projects/**/Tests_ProRes
-/projects/**/Temp
+/Projects/**/.idea
+/Projects/**/.vs
+/Projects/**/Builds
+/Projects/**/Library
+/Projects/**/Logs
+/Projects/**/obj
+/Projects/**/Tests_ProRes
+/Projects/**/Temp
 *.csproj
 *.sln
 !Tools/**/*sln
diff --git a/.yamato/build-docs.yml b/.yamato/build-docs.yml
index d956e7e25..5efac1fc3 100644
--- a/.yamato/build-docs.yml
+++ b/.yamato/build-docs.yml
@@ -1,14 +1,18 @@
-# Auto-generated by Recipe Engine, do not modify manually.
+#######################################################
+###                                                 ###
+###  Auto-generated by Recipe Engine, DO NOT EDIT.  ###
+###                                                 ###
+#######################################################
 
-# Generate codecov data for Cinemachine on MacOS
-code_coverage_-_macos_-_trunk:
-  name: Code coverage - MacOS  - trunk
+# Build documentation for Cinemachine on MacOS
+build_documentation_-_macos_-_trunk:
+  name: Build Documentation - MacOS  - trunk
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - brick_source: git@github.cds.internal.unity3d.com:wind-xu/virtual_production_doc_generation.git@v0.3.0
+  - brick_source: git@github.cds.internal.unity3d.com:wind-xu/virtual_production_doc_generation.git@v0.5.3
     variables:
       EDITOR_VERSION: trunk
       PACKAGE_NAME: com.unity.cinemachine
diff --git a/.yamato/clean-console-tests.yml b/.yamato/clean-console-tests.yml
new file mode 100644
index 000000000..1ad12d0fe
--- /dev/null
+++ b/.yamato/clean-console-tests.yml
@@ -0,0 +1,366 @@
+#######################################################
+###                                                 ###
+###  Auto-generated by Recipe Engine, DO NOT EDIT.  ###
+###                                                 ###
+#######################################################
+
+# Clean console tests for Cinemachine on MacOS
+clean_console_tests_-_2022_3_-_macos:
+  name: Clean console tests - 2022.3 - MacOS
+  agent:
+    image: package-ci/macos-13:v4
+    type: Unity::VM::osx
+    flavor: b1.xlarge
+  commands:
+  - brick_source: git@github.cds.internal.unity3d.com:wind-xu/clean_console_test_brick.git@v0.3.7
+    variables:
+      EDITOR_VERSION: 2022.3/staging
+      CLEAN_CONSOLE_TEST_FOR: package
+      PACKAGE_PATH: com.unity.cinemachine
+      EXEMPTION_FILE_DIR: .yamato
+      WARNINGS_AS_ERRORS: false
+  artifacts:
+    logs:
+      paths:
+      - TestResults/**/*
+
+# Clean console tests for Cinemachine on Ubuntu
+clean_console_tests_-_2022_3_-_ubuntu:
+  name: Clean console tests - 2022.3 - Ubuntu
+  agent:
+    image: package-ci/ubuntu-18.04:v4
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - brick_source: git@github.cds.internal.unity3d.com:wind-xu/clean_console_test_brick.git@v0.3.7
+    variables:
+      EDITOR_VERSION: 2022.3/staging
+      CLEAN_CONSOLE_TEST_FOR: package
+      PACKAGE_PATH: com.unity.cinemachine
+      EXEMPTION_FILE_DIR: .yamato
+      WARNINGS_AS_ERRORS: false
+  artifacts:
+    logs:
+      paths:
+      - TestResults/**/*
+
+# Clean console tests for Cinemachine on Windows
+clean_console_tests_-_2022_3_-_windows:
+  name: Clean console tests - 2022.3 - Windows
+  agent:
+    image: package-ci/win10:v4
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - brick_source: git@github.cds.internal.unity3d.com:wind-xu/clean_console_test_brick.git@v0.3.7
+    variables:
+      EDITOR_VERSION: 2022.3/staging
+      CLEAN_CONSOLE_TEST_FOR: package
+      PACKAGE_PATH: com.unity.cinemachine
+      EXEMPTION_FILE_DIR: .yamato
+      WARNINGS_AS_ERRORS: false
+  artifacts:
+    logs:
+      paths:
+      - TestResults/**/*
+
+# Clean console tests for Cinemachine on MacOS
+clean_console_tests_-_6000_0_-_macos:
+  name: Clean console tests - 6000.0 - MacOS
+  agent:
+    image: package-ci/macos-13:v4
+    type: Unity::VM::osx
+    flavor: b1.xlarge
+  commands:
+  - brick_source: git@github.cds.internal.unity3d.com:wind-xu/clean_console_test_brick.git@v0.3.7
+    variables:
+      EDITOR_VERSION: 6000.0/staging
+      CLEAN_CONSOLE_TEST_FOR: package
+      PACKAGE_PATH: com.unity.cinemachine
+      EXEMPTION_FILE_DIR: .yamato
+      WARNINGS_AS_ERRORS: false
+  artifacts:
+    logs:
+      paths:
+      - TestResults/**/*
+
+# Clean console tests for Cinemachine on Ubuntu
+clean_console_tests_-_6000_0_-_ubuntu:
+  name: Clean console tests - 6000.0 - Ubuntu
+  agent:
+    image: package-ci/ubuntu-22.04:v4
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - brick_source: git@github.cds.internal.unity3d.com:wind-xu/clean_console_test_brick.git@v0.3.7
+    variables:
+      EDITOR_VERSION: 6000.0/staging
+      CLEAN_CONSOLE_TEST_FOR: package
+      PACKAGE_PATH: com.unity.cinemachine
+      EXEMPTION_FILE_DIR: .yamato
+      WARNINGS_AS_ERRORS: false
+  artifacts:
+    logs:
+      paths:
+      - TestResults/**/*
+
+# Clean console tests for Cinemachine on Windows
+clean_console_tests_-_6000_0_-_windows:
+  name: Clean console tests - 6000.0 - Windows
+  agent:
+    image: package-ci/win10:v4
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - brick_source: git@github.cds.internal.unity3d.com:wind-xu/clean_console_test_brick.git@v0.3.7
+    variables:
+      EDITOR_VERSION: 6000.0/staging
+      CLEAN_CONSOLE_TEST_FOR: package
+      PACKAGE_PATH: com.unity.cinemachine
+      EXEMPTION_FILE_DIR: .yamato
+      WARNINGS_AS_ERRORS: false
+  artifacts:
+    logs:
+      paths:
+      - TestResults/**/*
+
+# Clean console tests for Cinemachine on MacOS
+clean_console_tests_-_6000_3_-_macos:
+  name: Clean console tests - 6000.3 - MacOS
+  agent:
+    image: package-ci/macos-13:v4
+    type: Unity::VM::osx
+    flavor: b1.xlarge
+  commands:
+  - brick_source: git@github.cds.internal.unity3d.com:wind-xu/clean_console_test_brick.git@v0.3.7
+    variables:
+      EDITOR_VERSION: 6000.3/staging
+      CLEAN_CONSOLE_TEST_FOR: package
+      PACKAGE_PATH: com.unity.cinemachine
+      EXEMPTION_FILE_DIR: .yamato
+      WARNINGS_AS_ERRORS: false
+  artifacts:
+    logs:
+      paths:
+      - TestResults/**/*
+
+# Clean console tests for Cinemachine on Ubuntu
+clean_console_tests_-_6000_3_-_ubuntu:
+  name: Clean console tests - 6000.3 - Ubuntu
+  agent:
+    image: package-ci/ubuntu-22.04:v4
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - brick_source: git@github.cds.internal.unity3d.com:wind-xu/clean_console_test_brick.git@v0.3.7
+    variables:
+      EDITOR_VERSION: 6000.3/staging
+      CLEAN_CONSOLE_TEST_FOR: package
+      PACKAGE_PATH: com.unity.cinemachine
+      EXEMPTION_FILE_DIR: .yamato
+      WARNINGS_AS_ERRORS: false
+  artifacts:
+    logs:
+      paths:
+      - TestResults/**/*
+
+# Clean console tests for Cinemachine on Windows
+clean_console_tests_-_6000_3_-_windows:
+  name: Clean console tests - 6000.3 - Windows
+  agent:
+    image: package-ci/win10:v4
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - brick_source: git@github.cds.internal.unity3d.com:wind-xu/clean_console_test_brick.git@v0.3.7
+    variables:
+      EDITOR_VERSION: 6000.3/staging
+      CLEAN_CONSOLE_TEST_FOR: package
+      PACKAGE_PATH: com.unity.cinemachine
+      EXEMPTION_FILE_DIR: .yamato
+      WARNINGS_AS_ERRORS: false
+  artifacts:
+    logs:
+      paths:
+      - TestResults/**/*
+
+# Clean console tests for Cinemachine on MacOS
+clean_console_tests_-_6000_4_-_macos:
+  name: Clean console tests - 6000.4 - MacOS
+  agent:
+    image: package-ci/macos-13:v4
+    type: Unity::VM::osx
+    flavor: b1.xlarge
+  commands:
+  - brick_source: git@github.cds.internal.unity3d.com:wind-xu/clean_console_test_brick.git@v0.3.7
+    variables:
+      EDITOR_VERSION: 6000.4/staging
+      CLEAN_CONSOLE_TEST_FOR: package
+      PACKAGE_PATH: com.unity.cinemachine
+      EXEMPTION_FILE_DIR: .yamato
+      WARNINGS_AS_ERRORS: false
+  artifacts:
+    logs:
+      paths:
+      - TestResults/**/*
+
+# Clean console tests for Cinemachine on Ubuntu
+clean_console_tests_-_6000_4_-_ubuntu:
+  name: Clean console tests - 6000.4 - Ubuntu
+  agent:
+    image: package-ci/ubuntu-22.04:v4
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - brick_source: git@github.cds.internal.unity3d.com:wind-xu/clean_console_test_brick.git@v0.3.7
+    variables:
+      EDITOR_VERSION: 6000.4/staging
+      CLEAN_CONSOLE_TEST_FOR: package
+      PACKAGE_PATH: com.unity.cinemachine
+      EXEMPTION_FILE_DIR: .yamato
+      WARNINGS_AS_ERRORS: false
+  artifacts:
+    logs:
+      paths:
+      - TestResults/**/*
+
+# Clean console tests for Cinemachine on Windows
+clean_console_tests_-_6000_4_-_windows:
+  name: Clean console tests - 6000.4 - Windows
+  agent:
+    image: package-ci/win10:v4
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - brick_source: git@github.cds.internal.unity3d.com:wind-xu/clean_console_test_brick.git@v0.3.7
+    variables:
+      EDITOR_VERSION: 6000.4/staging
+      CLEAN_CONSOLE_TEST_FOR: package
+      PACKAGE_PATH: com.unity.cinemachine
+      EXEMPTION_FILE_DIR: .yamato
+      WARNINGS_AS_ERRORS: false
+  artifacts:
+    logs:
+      paths:
+      - TestResults/**/*
+
+# Clean console tests for Cinemachine on MacOS
+clean_console_tests_-_6000_5_-_macos:
+  name: Clean console tests - 6000.5 - MacOS
+  agent:
+    image: package-ci/macos-13:v4
+    type: Unity::VM::osx
+    flavor: b1.xlarge
+  commands:
+  - brick_source: git@github.cds.internal.unity3d.com:wind-xu/clean_console_test_brick.git@v0.3.7
+    variables:
+      EDITOR_VERSION: 6000.5/staging
+      CLEAN_CONSOLE_TEST_FOR: package
+      PACKAGE_PATH: com.unity.cinemachine
+      EXEMPTION_FILE_DIR: .yamato
+      WARNINGS_AS_ERRORS: false
+  artifacts:
+    logs:
+      paths:
+      - TestResults/**/*
+
+# Clean console tests for Cinemachine on Ubuntu
+clean_console_tests_-_6000_5_-_ubuntu:
+  name: Clean console tests - 6000.5 - Ubuntu
+  agent:
+    image: package-ci/ubuntu-22.04:v4
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - brick_source: git@github.cds.internal.unity3d.com:wind-xu/clean_console_test_brick.git@v0.3.7
+    variables:
+      EDITOR_VERSION: 6000.5/staging
+      CLEAN_CONSOLE_TEST_FOR: package
+      PACKAGE_PATH: com.unity.cinemachine
+      EXEMPTION_FILE_DIR: .yamato
+      WARNINGS_AS_ERRORS: false
+  artifacts:
+    logs:
+      paths:
+      - TestResults/**/*
+
+# Clean console tests for Cinemachine on Windows
+clean_console_tests_-_6000_5_-_windows:
+  name: Clean console tests - 6000.5 - Windows
+  agent:
+    image: package-ci/win10:v4
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - brick_source: git@github.cds.internal.unity3d.com:wind-xu/clean_console_test_brick.git@v0.3.7
+    variables:
+      EDITOR_VERSION: 6000.5/staging
+      CLEAN_CONSOLE_TEST_FOR: package
+      PACKAGE_PATH: com.unity.cinemachine
+      EXEMPTION_FILE_DIR: .yamato
+      WARNINGS_AS_ERRORS: false
+  artifacts:
+    logs:
+      paths:
+      - TestResults/**/*
+
+# Clean console tests for Cinemachine on MacOS
+clean_console_tests_-_6000_6_-_macos:
+  name: Clean console tests - 6000.6 - MacOS
+  agent:
+    image: package-ci/macos-13:v4
+    type: Unity::VM::osx
+    flavor: b1.xlarge
+  commands:
+  - brick_source: git@github.cds.internal.unity3d.com:wind-xu/clean_console_test_brick.git@v0.3.7
+    variables:
+      EDITOR_VERSION: trunk
+      CLEAN_CONSOLE_TEST_FOR: package
+      PACKAGE_PATH: com.unity.cinemachine
+      EXEMPTION_FILE_DIR: .yamato
+      WARNINGS_AS_ERRORS: false
+  artifacts:
+    logs:
+      paths:
+      - TestResults/**/*
+
+# Clean console tests for Cinemachine on Ubuntu
+clean_console_tests_-_6000_6_-_ubuntu:
+  name: Clean console tests - 6000.6 - Ubuntu
+  agent:
+    image: package-ci/ubuntu-22.04:v4
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - brick_source: git@github.cds.internal.unity3d.com:wind-xu/clean_console_test_brick.git@v0.3.7
+    variables:
+      EDITOR_VERSION: trunk
+      CLEAN_CONSOLE_TEST_FOR: package
+      PACKAGE_PATH: com.unity.cinemachine
+      EXEMPTION_FILE_DIR: .yamato
+      WARNINGS_AS_ERRORS: false
+  artifacts:
+    logs:
+      paths:
+      - TestResults/**/*
+
+# Clean console tests for Cinemachine on Windows
+clean_console_tests_-_6000_6_-_windows:
+  name: Clean console tests - 6000.6 - Windows
+  agent:
+    image: package-ci/win10:v4
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - brick_source: git@github.cds.internal.unity3d.com:wind-xu/clean_console_test_brick.git@v0.3.7
+    variables:
+      EDITOR_VERSION: trunk
+      CLEAN_CONSOLE_TEST_FOR: package
+      PACKAGE_PATH: com.unity.cinemachine
+      EXEMPTION_FILE_DIR: .yamato
+      WARNINGS_AS_ERRORS: false
+  artifacts:
+    logs:
+      paths:
+      - TestResults/**/*
+
diff --git a/.yamato/code-coverage.yml b/.yamato/code-coverage.yml
index 015fa0f28..6b4b16be8 100644
--- a/.yamato/code-coverage.yml
+++ b/.yamato/code-coverage.yml
@@ -1,10 +1,14 @@
-# Auto-generated by Recipe Engine, do not modify manually.
+#######################################################
+###                                                 ###
+###  Auto-generated by Recipe Engine, DO NOT EDIT.  ###
+###                                                 ###
+#######################################################
 
 # Generate codecov data for Cinemachine on Ubuntu
 code_coverage_-_ubuntu_-_trunk:
   name: Code coverage - Ubuntu  - trunk
   agent:
-    image: package-ci/ubuntu-22.04:default
+    image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
diff --git a/.yamato/generated-scripts/infrastructure-instability-detection-linux.sh b/.yamato/generated-scripts/infrastructure-instability-detection-linux.sh
index 238012123..d21a56de2 100644
--- a/.yamato/generated-scripts/infrastructure-instability-detection-linux.sh
+++ b/.yamato/generated-scripts/infrastructure-instability-detection-linux.sh
@@ -13,8 +13,8 @@ if [ -d "infrastructure_instability_detection_standalone" ]; then
   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
+echo "downloading and extracting infrastructure_instability_detection_standalone@1.2.2"
+curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.2.2/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"
diff --git a/.yamato/generated-scripts/infrastructure-instability-detection-mac.sh b/.yamato/generated-scripts/infrastructure-instability-detection-mac.sh
index e37062e97..aef156dad 100644
--- a/.yamato/generated-scripts/infrastructure-instability-detection-mac.sh
+++ b/.yamato/generated-scripts/infrastructure-instability-detection-mac.sh
@@ -13,8 +13,8 @@ if [ -d "infrastructure_instability_detection_standalone" ]; then
   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
+echo "downloading and extracting infrastructure_instability_detection_standalone@1.2.2"
+curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.2.2/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"
diff --git a/.yamato/generated-scripts/infrastructure-instability-detection-win.cmd b/.yamato/generated-scripts/infrastructure-instability-detection-win.cmd
index cae7b2667..40d3bc8b3 100644
--- a/.yamato/generated-scripts/infrastructure-instability-detection-win.cmd
+++ b/.yamato/generated-scripts/infrastructure-instability-detection-win.cmd
@@ -2,7 +2,7 @@
 rem This is an auto-generated script. Do not edit manually!
 
 if exist "%TEMP%\BugReporterCrashReportJson"  for /f "delims=" %%i in ('dir /b /a-d "%TEMP%\BugReporterCrashReportJson\*.json"') do curl -X POST  -H "Content-Type: application/json" -T "%TEMP%\BugReporterCrashReportJson\%%i" "https://internal-crash-collector.prd.cds.internal.unity3d.com/api/crash" || echo Failed to upload %%i. Ignoring...
-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
+curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.2.2/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
diff --git a/.yamato/project-test.yml b/.yamato/project-test.yml
index 2f4fca57b..2b133f0ba 100644
--- a/.yamato/project-test.yml
+++ b/.yamato/project-test.yml
@@ -1,16 +1,20 @@
-# Auto-generated by Recipe Engine, do not modify manually.
+#######################################################
+###                                                 ###
+###  Auto-generated by Recipe Engine, DO NOT EDIT.  ###
+###                                                 ###
+#######################################################
 
 # Run HDRP project tests for Cinemachine on MacOS
 test_project_-_cinemachine_-_hdrp_-_2022_3_-_macos:
   name: Test Project - cinemachine - HDRP - 2022.3 - MacOS
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
   - command: unity-downloader-cli -u 2022.3/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/HDRP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_MacOS_2022.3_project;flags:cinemachine_MacOS_2022.3_project"
   artifacts:
     artifacts:
       paths:
@@ -22,13 +26,13 @@ test_project_-_cinemachine_-_hdrp_-_2022_3_-_macos:
 test_project_-_cinemachine_-_hdrp_-_2022_3_-_ubuntu:
   name: Test Project - cinemachine - HDRP - 2022.3 - Ubuntu
   agent:
-    image: package-ci/ubuntu-22.04:default
+    image: package-ci/ubuntu-18.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 2022.3/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/HDRP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Ubuntu_2022.3_project;flags:cinemachine_Ubuntu_2022.3_project"
   artifacts:
     artifacts:
       paths:
@@ -40,13 +44,13 @@ test_project_-_cinemachine_-_hdrp_-_2022_3_-_ubuntu:
 test_project_-_cinemachine_-_hdrp_-_2022_3_-_windows:
   name: Test Project - cinemachine - HDRP - 2022.3 - Windows
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 2022.3/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/HDRP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner.exe --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner.exe --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Windows_2022.3_project;flags:cinemachine_Windows_2022.3_project"
   artifacts:
     artifacts:
       paths:
@@ -58,13 +62,13 @@ test_project_-_cinemachine_-_hdrp_-_2022_3_-_windows:
 test_project_-_cinemachine_-_hdrp_-_6000_0_-_macos:
   name: Test Project - cinemachine - HDRP - 6000.0 - MacOS
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
   - command: unity-downloader-cli -u 6000.0/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/HDRP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_MacOS_6000.0_project;flags:cinemachine_MacOS_6000.0_project"
   artifacts:
     artifacts:
       paths:
@@ -76,13 +80,13 @@ test_project_-_cinemachine_-_hdrp_-_6000_0_-_macos:
 test_project_-_cinemachine_-_hdrp_-_6000_0_-_ubuntu:
   name: Test Project - cinemachine - HDRP - 6000.0 - Ubuntu
   agent:
-    image: package-ci/ubuntu-22.04:default
+    image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 6000.0/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/HDRP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Ubuntu_6000.0_project;flags:cinemachine_Ubuntu_6000.0_project"
   artifacts:
     artifacts:
       paths:
@@ -94,13 +98,13 @@ test_project_-_cinemachine_-_hdrp_-_6000_0_-_ubuntu:
 test_project_-_cinemachine_-_hdrp_-_6000_0_-_windows:
   name: Test Project - cinemachine - HDRP - 6000.0 - Windows
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 6000.0/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/HDRP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner.exe --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner.exe --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Windows_6000.0_project;flags:cinemachine_Windows_6000.0_project"
   artifacts:
     artifacts:
       paths:
@@ -112,13 +116,13 @@ test_project_-_cinemachine_-_hdrp_-_6000_0_-_windows:
 test_project_-_cinemachine_-_hdrp_-_6000_3_-_macos:
   name: Test Project - cinemachine - HDRP - 6000.3 - MacOS
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
   - command: unity-downloader-cli -u 6000.3/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/HDRP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_MacOS_6000.3_project;flags:cinemachine_MacOS_6000.3_project"
   artifacts:
     artifacts:
       paths:
@@ -130,13 +134,13 @@ test_project_-_cinemachine_-_hdrp_-_6000_3_-_macos:
 test_project_-_cinemachine_-_hdrp_-_6000_3_-_ubuntu:
   name: Test Project - cinemachine - HDRP - 6000.3 - Ubuntu
   agent:
-    image: package-ci/ubuntu-22.04:default
+    image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 6000.3/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/HDRP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Ubuntu_6000.3_project;flags:cinemachine_Ubuntu_6000.3_project"
   artifacts:
     artifacts:
       paths:
@@ -148,13 +152,13 @@ test_project_-_cinemachine_-_hdrp_-_6000_3_-_ubuntu:
 test_project_-_cinemachine_-_hdrp_-_6000_3_-_windows:
   name: Test Project - cinemachine - HDRP - 6000.3 - Windows
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 6000.3/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/HDRP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner.exe --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner.exe --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Windows_6000.3_project;flags:cinemachine_Windows_6000.3_project"
   artifacts:
     artifacts:
       paths:
@@ -166,13 +170,13 @@ test_project_-_cinemachine_-_hdrp_-_6000_3_-_windows:
 test_project_-_cinemachine_-_hdrp_-_6000_4_-_macos:
   name: Test Project - cinemachine - HDRP - 6000.4 - MacOS
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
   - command: unity-downloader-cli -u 6000.4/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/HDRP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_MacOS_6000.4_project;flags:cinemachine_MacOS_6000.4_project"
   artifacts:
     artifacts:
       paths:
@@ -184,13 +188,13 @@ test_project_-_cinemachine_-_hdrp_-_6000_4_-_macos:
 test_project_-_cinemachine_-_hdrp_-_6000_4_-_ubuntu:
   name: Test Project - cinemachine - HDRP - 6000.4 - Ubuntu
   agent:
-    image: package-ci/ubuntu-22.04:default
+    image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 6000.4/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/HDRP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Ubuntu_6000.4_project;flags:cinemachine_Ubuntu_6000.4_project"
   artifacts:
     artifacts:
       paths:
@@ -202,13 +206,13 @@ test_project_-_cinemachine_-_hdrp_-_6000_4_-_ubuntu:
 test_project_-_cinemachine_-_hdrp_-_6000_4_-_windows:
   name: Test Project - cinemachine - HDRP - 6000.4 - Windows
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 6000.4/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/HDRP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner.exe --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner.exe --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Windows_6000.4_project;flags:cinemachine_Windows_6000.4_project"
   artifacts:
     artifacts:
       paths:
@@ -220,13 +224,13 @@ test_project_-_cinemachine_-_hdrp_-_6000_4_-_windows:
 test_project_-_cinemachine_-_hdrp_-_6000_5_-_macos:
   name: Test Project - cinemachine - HDRP - 6000.5 - MacOS
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
   - command: unity-downloader-cli -u 6000.5/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/HDRP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_MacOS_6000.5_project;flags:cinemachine_MacOS_6000.5_project"
   artifacts:
     artifacts:
       paths:
@@ -238,13 +242,13 @@ test_project_-_cinemachine_-_hdrp_-_6000_5_-_macos:
 test_project_-_cinemachine_-_hdrp_-_6000_5_-_ubuntu:
   name: Test Project - cinemachine - HDRP - 6000.5 - Ubuntu
   agent:
-    image: package-ci/ubuntu-22.04:default
+    image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 6000.5/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/HDRP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Ubuntu_6000.5_project;flags:cinemachine_Ubuntu_6000.5_project"
   artifacts:
     artifacts:
       paths:
@@ -256,13 +260,13 @@ test_project_-_cinemachine_-_hdrp_-_6000_5_-_ubuntu:
 test_project_-_cinemachine_-_hdrp_-_6000_5_-_windows:
   name: Test Project - cinemachine - HDRP - 6000.5 - Windows
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 6000.5/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/HDRP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner.exe --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner.exe --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Windows_6000.5_project;flags:cinemachine_Windows_6000.5_project"
   artifacts:
     artifacts:
       paths:
@@ -274,13 +278,13 @@ test_project_-_cinemachine_-_hdrp_-_6000_5_-_windows:
 test_project_-_cinemachine_-_hdrp_-_6000_6_-_macos:
   name: Test Project - cinemachine - HDRP - 6000.6 - MacOS
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
   - command: unity-downloader-cli -u trunk -c Editor --fast
   - command: upm-pvp create-test-project Projects/HDRP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_MacOS_6000.6_project;flags:cinemachine_MacOS_6000.6_project"
   artifacts:
     artifacts:
       paths:
@@ -292,13 +296,13 @@ test_project_-_cinemachine_-_hdrp_-_6000_6_-_macos:
 test_project_-_cinemachine_-_hdrp_-_6000_6_-_ubuntu:
   name: Test Project - cinemachine - HDRP - 6000.6 - Ubuntu
   agent:
-    image: package-ci/ubuntu-22.04:default
+    image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u trunk -c Editor --fast
   - command: upm-pvp create-test-project Projects/HDRP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Ubuntu_6000.6_project;flags:cinemachine_Ubuntu_6000.6_project"
   artifacts:
     artifacts:
       paths:
@@ -310,13 +314,13 @@ test_project_-_cinemachine_-_hdrp_-_6000_6_-_ubuntu:
 test_project_-_cinemachine_-_hdrp_-_6000_6_-_windows:
   name: Test Project - cinemachine - HDRP - 6000.6 - Windows
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u trunk -c Editor --fast
   - command: upm-pvp create-test-project Projects/HDRP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner.exe --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner.exe --testproject=Projects/HDRP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Windows_6000.6_project;flags:cinemachine_Windows_6000.6_project"
   artifacts:
     artifacts:
       paths:
@@ -328,13 +332,13 @@ test_project_-_cinemachine_-_hdrp_-_6000_6_-_windows:
 test_project_-_cinemachine_-_standalone_-_2022_3_-_macos:
   name: Test Project - cinemachine - Standalone - 2022.3 - MacOS
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
   - command: unity-downloader-cli -u 2022.3/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/Standalone --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_MacOS_2022.3_project;flags:cinemachine_MacOS_2022.3_project"
   artifacts:
     artifacts:
       paths:
@@ -346,13 +350,13 @@ test_project_-_cinemachine_-_standalone_-_2022_3_-_macos:
 test_project_-_cinemachine_-_standalone_-_2022_3_-_ubuntu:
   name: Test Project - cinemachine - Standalone - 2022.3 - Ubuntu
   agent:
-    image: package-ci/ubuntu-22.04:default
+    image: package-ci/ubuntu-18.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 2022.3/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/Standalone --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Ubuntu_2022.3_project;flags:cinemachine_Ubuntu_2022.3_project"
   artifacts:
     artifacts:
       paths:
@@ -364,13 +368,13 @@ test_project_-_cinemachine_-_standalone_-_2022_3_-_ubuntu:
 test_project_-_cinemachine_-_standalone_-_2022_3_-_windows:
   name: Test Project - cinemachine - Standalone - 2022.3 - Windows
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 2022.3/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/Standalone --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner.exe --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner.exe --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Windows_2022.3_project;flags:cinemachine_Windows_2022.3_project"
   artifacts:
     artifacts:
       paths:
@@ -382,13 +386,13 @@ test_project_-_cinemachine_-_standalone_-_2022_3_-_windows:
 test_project_-_cinemachine_-_standalone_-_6000_0_-_macos:
   name: Test Project - cinemachine - Standalone - 6000.0 - MacOS
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
   - command: unity-downloader-cli -u 6000.0/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/Standalone --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_MacOS_6000.0_project;flags:cinemachine_MacOS_6000.0_project"
   artifacts:
     artifacts:
       paths:
@@ -400,13 +404,13 @@ test_project_-_cinemachine_-_standalone_-_6000_0_-_macos:
 test_project_-_cinemachine_-_standalone_-_6000_0_-_ubuntu:
   name: Test Project - cinemachine - Standalone - 6000.0 - Ubuntu
   agent:
-    image: package-ci/ubuntu-22.04:default
+    image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 6000.0/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/Standalone --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Ubuntu_6000.0_project;flags:cinemachine_Ubuntu_6000.0_project"
   artifacts:
     artifacts:
       paths:
@@ -418,13 +422,13 @@ test_project_-_cinemachine_-_standalone_-_6000_0_-_ubuntu:
 test_project_-_cinemachine_-_standalone_-_6000_0_-_windows:
   name: Test Project - cinemachine - Standalone - 6000.0 - Windows
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 6000.0/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/Standalone --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner.exe --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner.exe --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Windows_6000.0_project;flags:cinemachine_Windows_6000.0_project"
   artifacts:
     artifacts:
       paths:
@@ -436,13 +440,13 @@ test_project_-_cinemachine_-_standalone_-_6000_0_-_windows:
 test_project_-_cinemachine_-_standalone_-_6000_3_-_macos:
   name: Test Project - cinemachine - Standalone - 6000.3 - MacOS
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
   - command: unity-downloader-cli -u 6000.3/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/Standalone --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_MacOS_6000.3_project;flags:cinemachine_MacOS_6000.3_project"
   artifacts:
     artifacts:
       paths:
@@ -454,13 +458,13 @@ test_project_-_cinemachine_-_standalone_-_6000_3_-_macos:
 test_project_-_cinemachine_-_standalone_-_6000_3_-_ubuntu:
   name: Test Project - cinemachine - Standalone - 6000.3 - Ubuntu
   agent:
-    image: package-ci/ubuntu-22.04:default
+    image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 6000.3/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/Standalone --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Ubuntu_6000.3_project;flags:cinemachine_Ubuntu_6000.3_project"
   artifacts:
     artifacts:
       paths:
@@ -472,13 +476,13 @@ test_project_-_cinemachine_-_standalone_-_6000_3_-_ubuntu:
 test_project_-_cinemachine_-_standalone_-_6000_3_-_windows:
   name: Test Project - cinemachine - Standalone - 6000.3 - Windows
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 6000.3/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/Standalone --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner.exe --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner.exe --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Windows_6000.3_project;flags:cinemachine_Windows_6000.3_project"
   artifacts:
     artifacts:
       paths:
@@ -490,13 +494,13 @@ test_project_-_cinemachine_-_standalone_-_6000_3_-_windows:
 test_project_-_cinemachine_-_standalone_-_6000_4_-_macos:
   name: Test Project - cinemachine - Standalone - 6000.4 - MacOS
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
   - command: unity-downloader-cli -u 6000.4/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/Standalone --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_MacOS_6000.4_project;flags:cinemachine_MacOS_6000.4_project"
   artifacts:
     artifacts:
       paths:
@@ -508,13 +512,13 @@ test_project_-_cinemachine_-_standalone_-_6000_4_-_macos:
 test_project_-_cinemachine_-_standalone_-_6000_4_-_ubuntu:
   name: Test Project - cinemachine - Standalone - 6000.4 - Ubuntu
   agent:
-    image: package-ci/ubuntu-22.04:default
+    image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 6000.4/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/Standalone --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Ubuntu_6000.4_project;flags:cinemachine_Ubuntu_6000.4_project"
   artifacts:
     artifacts:
       paths:
@@ -526,13 +530,13 @@ test_project_-_cinemachine_-_standalone_-_6000_4_-_ubuntu:
 test_project_-_cinemachine_-_standalone_-_6000_4_-_windows:
   name: Test Project - cinemachine - Standalone - 6000.4 - Windows
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 6000.4/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/Standalone --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner.exe --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner.exe --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Windows_6000.4_project;flags:cinemachine_Windows_6000.4_project"
   artifacts:
     artifacts:
       paths:
@@ -544,13 +548,13 @@ test_project_-_cinemachine_-_standalone_-_6000_4_-_windows:
 test_project_-_cinemachine_-_standalone_-_6000_5_-_macos:
   name: Test Project - cinemachine - Standalone - 6000.5 - MacOS
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
   - command: unity-downloader-cli -u 6000.5/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/Standalone --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_MacOS_6000.5_project;flags:cinemachine_MacOS_6000.5_project"
   artifacts:
     artifacts:
       paths:
@@ -562,13 +566,13 @@ test_project_-_cinemachine_-_standalone_-_6000_5_-_macos:
 test_project_-_cinemachine_-_standalone_-_6000_5_-_ubuntu:
   name: Test Project - cinemachine - Standalone - 6000.5 - Ubuntu
   agent:
-    image: package-ci/ubuntu-22.04:default
+    image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 6000.5/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/Standalone --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Ubuntu_6000.5_project;flags:cinemachine_Ubuntu_6000.5_project"
   artifacts:
     artifacts:
       paths:
@@ -580,13 +584,13 @@ test_project_-_cinemachine_-_standalone_-_6000_5_-_ubuntu:
 test_project_-_cinemachine_-_standalone_-_6000_5_-_windows:
   name: Test Project - cinemachine - Standalone - 6000.5 - Windows
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 6000.5/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/Standalone --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner.exe --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner.exe --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Windows_6000.5_project;flags:cinemachine_Windows_6000.5_project"
   artifacts:
     artifacts:
       paths:
@@ -598,13 +602,13 @@ test_project_-_cinemachine_-_standalone_-_6000_5_-_windows:
 test_project_-_cinemachine_-_standalone_-_6000_6_-_macos:
   name: Test Project - cinemachine - Standalone - 6000.6 - MacOS
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
   - command: unity-downloader-cli -u trunk -c Editor --fast
   - command: upm-pvp create-test-project Projects/Standalone --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_MacOS_6000.6_project;flags:cinemachine_MacOS_6000.6_project"
   artifacts:
     artifacts:
       paths:
@@ -616,13 +620,13 @@ test_project_-_cinemachine_-_standalone_-_6000_6_-_macos:
 test_project_-_cinemachine_-_standalone_-_6000_6_-_ubuntu:
   name: Test Project - cinemachine - Standalone - 6000.6 - Ubuntu
   agent:
-    image: package-ci/ubuntu-22.04:default
+    image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u trunk -c Editor --fast
   - command: upm-pvp create-test-project Projects/Standalone --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Ubuntu_6000.6_project;flags:cinemachine_Ubuntu_6000.6_project"
   artifacts:
     artifacts:
       paths:
@@ -634,13 +638,13 @@ test_project_-_cinemachine_-_standalone_-_6000_6_-_ubuntu:
 test_project_-_cinemachine_-_standalone_-_6000_6_-_windows:
   name: Test Project - cinemachine - Standalone - 6000.6 - Windows
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u trunk -c Editor --fast
   - command: upm-pvp create-test-project Projects/Standalone --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner.exe --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner.exe --testproject=Projects/Standalone --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Windows_6000.6_project;flags:cinemachine_Windows_6000.6_project"
   artifacts:
     artifacts:
       paths:
@@ -652,13 +656,13 @@ test_project_-_cinemachine_-_standalone_-_6000_6_-_windows:
 test_project_-_cinemachine_-_urp_-_2022_3_-_macos:
   name: Test Project - cinemachine - URP - 2022.3 - MacOS
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
   - command: unity-downloader-cli -u 2022.3/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/URP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_MacOS_2022.3_project;flags:cinemachine_MacOS_2022.3_project"
   artifacts:
     artifacts:
       paths:
@@ -670,13 +674,13 @@ test_project_-_cinemachine_-_urp_-_2022_3_-_macos:
 test_project_-_cinemachine_-_urp_-_2022_3_-_ubuntu:
   name: Test Project - cinemachine - URP - 2022.3 - Ubuntu
   agent:
-    image: package-ci/ubuntu-22.04:default
+    image: package-ci/ubuntu-18.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 2022.3/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/URP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Ubuntu_2022.3_project;flags:cinemachine_Ubuntu_2022.3_project"
   artifacts:
     artifacts:
       paths:
@@ -688,13 +692,13 @@ test_project_-_cinemachine_-_urp_-_2022_3_-_ubuntu:
 test_project_-_cinemachine_-_urp_-_2022_3_-_windows:
   name: Test Project - cinemachine - URP - 2022.3 - Windows
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 2022.3/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/URP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner.exe --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner.exe --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Windows_2022.3_project;flags:cinemachine_Windows_2022.3_project"
   artifacts:
     artifacts:
       paths:
@@ -706,13 +710,13 @@ test_project_-_cinemachine_-_urp_-_2022_3_-_windows:
 test_project_-_cinemachine_-_urp_-_6000_0_-_macos:
   name: Test Project - cinemachine - URP - 6000.0 - MacOS
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
   - command: unity-downloader-cli -u 6000.0/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/URP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_MacOS_6000.0_project;flags:cinemachine_MacOS_6000.0_project"
   artifacts:
     artifacts:
       paths:
@@ -724,13 +728,13 @@ test_project_-_cinemachine_-_urp_-_6000_0_-_macos:
 test_project_-_cinemachine_-_urp_-_6000_0_-_ubuntu:
   name: Test Project - cinemachine - URP - 6000.0 - Ubuntu
   agent:
-    image: package-ci/ubuntu-22.04:default
+    image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 6000.0/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/URP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Ubuntu_6000.0_project;flags:cinemachine_Ubuntu_6000.0_project"
   artifacts:
     artifacts:
       paths:
@@ -742,13 +746,13 @@ test_project_-_cinemachine_-_urp_-_6000_0_-_ubuntu:
 test_project_-_cinemachine_-_urp_-_6000_0_-_windows:
   name: Test Project - cinemachine - URP - 6000.0 - Windows
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 6000.0/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/URP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner.exe --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner.exe --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Windows_6000.0_project;flags:cinemachine_Windows_6000.0_project"
   artifacts:
     artifacts:
       paths:
@@ -760,13 +764,13 @@ test_project_-_cinemachine_-_urp_-_6000_0_-_windows:
 test_project_-_cinemachine_-_urp_-_6000_3_-_macos:
   name: Test Project - cinemachine - URP - 6000.3 - MacOS
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
   - command: unity-downloader-cli -u 6000.3/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/URP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_MacOS_6000.3_project;flags:cinemachine_MacOS_6000.3_project"
   artifacts:
     artifacts:
       paths:
@@ -778,13 +782,13 @@ test_project_-_cinemachine_-_urp_-_6000_3_-_macos:
 test_project_-_cinemachine_-_urp_-_6000_3_-_ubuntu:
   name: Test Project - cinemachine - URP - 6000.3 - Ubuntu
   agent:
-    image: package-ci/ubuntu-22.04:default
+    image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 6000.3/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/URP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Ubuntu_6000.3_project;flags:cinemachine_Ubuntu_6000.3_project"
   artifacts:
     artifacts:
       paths:
@@ -796,13 +800,13 @@ test_project_-_cinemachine_-_urp_-_6000_3_-_ubuntu:
 test_project_-_cinemachine_-_urp_-_6000_3_-_windows:
   name: Test Project - cinemachine - URP - 6000.3 - Windows
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 6000.3/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/URP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner.exe --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner.exe --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Windows_6000.3_project;flags:cinemachine_Windows_6000.3_project"
   artifacts:
     artifacts:
       paths:
@@ -814,13 +818,13 @@ test_project_-_cinemachine_-_urp_-_6000_3_-_windows:
 test_project_-_cinemachine_-_urp_-_6000_4_-_macos:
   name: Test Project - cinemachine - URP - 6000.4 - MacOS
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
   - command: unity-downloader-cli -u 6000.4/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/URP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_MacOS_6000.4_project;flags:cinemachine_MacOS_6000.4_project"
   artifacts:
     artifacts:
       paths:
@@ -832,13 +836,13 @@ test_project_-_cinemachine_-_urp_-_6000_4_-_macos:
 test_project_-_cinemachine_-_urp_-_6000_4_-_ubuntu:
   name: Test Project - cinemachine - URP - 6000.4 - Ubuntu
   agent:
-    image: package-ci/ubuntu-22.04:default
+    image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 6000.4/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/URP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Ubuntu_6000.4_project;flags:cinemachine_Ubuntu_6000.4_project"
   artifacts:
     artifacts:
       paths:
@@ -850,13 +854,13 @@ test_project_-_cinemachine_-_urp_-_6000_4_-_ubuntu:
 test_project_-_cinemachine_-_urp_-_6000_4_-_windows:
   name: Test Project - cinemachine - URP - 6000.4 - Windows
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 6000.4/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/URP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner.exe --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner.exe --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Windows_6000.4_project;flags:cinemachine_Windows_6000.4_project"
   artifacts:
     artifacts:
       paths:
@@ -868,13 +872,13 @@ test_project_-_cinemachine_-_urp_-_6000_4_-_windows:
 test_project_-_cinemachine_-_urp_-_6000_5_-_macos:
   name: Test Project - cinemachine - URP - 6000.5 - MacOS
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
   - command: unity-downloader-cli -u 6000.5/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/URP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_MacOS_6000.5_project;flags:cinemachine_MacOS_6000.5_project"
   artifacts:
     artifacts:
       paths:
@@ -886,13 +890,13 @@ test_project_-_cinemachine_-_urp_-_6000_5_-_macos:
 test_project_-_cinemachine_-_urp_-_6000_5_-_ubuntu:
   name: Test Project - cinemachine - URP - 6000.5 - Ubuntu
   agent:
-    image: package-ci/ubuntu-22.04:default
+    image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 6000.5/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/URP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Ubuntu_6000.5_project;flags:cinemachine_Ubuntu_6000.5_project"
   artifacts:
     artifacts:
       paths:
@@ -904,13 +908,13 @@ test_project_-_cinemachine_-_urp_-_6000_5_-_ubuntu:
 test_project_-_cinemachine_-_urp_-_6000_5_-_windows:
   name: Test Project - cinemachine - URP - 6000.5 - Windows
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u 6000.5/staging -c Editor --fast
   - command: upm-pvp create-test-project Projects/URP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner.exe --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner.exe --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Windows_6000.5_project;flags:cinemachine_Windows_6000.5_project"
   artifacts:
     artifacts:
       paths:
@@ -922,13 +926,13 @@ test_project_-_cinemachine_-_urp_-_6000_5_-_windows:
 test_project_-_cinemachine_-_urp_-_6000_6_-_macos:
   name: Test Project - cinemachine - URP - 6000.6 - MacOS
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
   - command: unity-downloader-cli -u trunk -c Editor --fast
   - command: upm-pvp create-test-project Projects/URP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_MacOS_6000.6_project;flags:cinemachine_MacOS_6000.6_project"
   artifacts:
     artifacts:
       paths:
@@ -940,13 +944,13 @@ test_project_-_cinemachine_-_urp_-_6000_6_-_macos:
 test_project_-_cinemachine_-_urp_-_6000_6_-_ubuntu:
   name: Test Project - cinemachine - URP - 6000.6 - Ubuntu
   agent:
-    image: package-ci/ubuntu-22.04:default
+    image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u trunk -c Editor --fast
   - command: upm-pvp create-test-project Projects/URP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Ubuntu_6000.6_project;flags:cinemachine_Ubuntu_6000.6_project"
   artifacts:
     artifacts:
       paths:
@@ -958,13 +962,13 @@ test_project_-_cinemachine_-_urp_-_6000_6_-_ubuntu:
 test_project_-_cinemachine_-_urp_-_6000_6_-_windows:
   name: Test Project - cinemachine - URP - 6000.6 - Windows
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
   - command: unity-downloader-cli -u trunk -c Editor --fast
   - command: upm-pvp create-test-project Projects/URP --packages "upm-ci~/packages/*.tgz" --unity .Editor
-  - command: UnifiedTestRunner.exe --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode
+  - command: UnifiedTestRunner.exe --testproject=Projects/URP --editor-location=.Editor --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=editor --suite=PlayMode --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Windows_6000.6_project;flags:cinemachine_Windows_6000.6_project"
   artifacts:
     artifacts:
       paths:
diff --git a/.yamato/triggers.yml b/.yamato/triggers.yml
index 928b3338e..d05c520ee 100644
--- a/.yamato/triggers.yml
+++ b/.yamato/triggers.yml
@@ -1,10 +1,13 @@
-# Auto-generated by Recipe Engine, do not modify manually.
+#######################################################
+###                                                 ###
+###  Auto-generated by Recipe Engine, DO NOT EDIT.  ###
+###                                                 ###
+#######################################################
 
-# All tests defined in recipes.
+# All tests defined in recipes. Run in changes to main and release branches.
 all_trigger:
   name: All Trigger
   dependencies:
-  - path: .yamato/code-coverage.yml#code_coverage_-_ubuntu_-_trunk
   - path: .yamato/project-test.yml#test_project_-_cinemachine_-_hdrp_-_2022_3_-_macos
   - path: .yamato/project-test.yml#test_project_-_cinemachine_-_hdrp_-_2022_3_-_ubuntu
   - path: .yamato/project-test.yml#test_project_-_cinemachine_-_hdrp_-_2022_3_-_windows
@@ -59,31 +62,52 @@ all_trigger:
   - path: .yamato/project-test.yml#test_project_-_cinemachine_-_urp_-_6000_6_-_macos
   - path: .yamato/project-test.yml#test_project_-_cinemachine_-_urp_-_6000_6_-_ubuntu
   - path: .yamato/project-test.yml#test_project_-_cinemachine_-_urp_-_6000_6_-_windows
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_macos
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_ubuntu
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_windows
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_macos
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_ubuntu
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_windows
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_macos
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_ubuntu
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_windows
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_macos
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_ubuntu
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_windows
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_macos
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_ubuntu
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_windows
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_macos
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_ubuntu
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_windows
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_macos13
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_ubuntu1804
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_win10
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_macos13
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_ubuntu2204
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_win10
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_macos13
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_ubuntu2204
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_win10
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_macos13
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_ubuntu2204
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_win10
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_macos13
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_ubuntu2204
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_win10
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_macos13
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_ubuntu2204
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_win10
   triggers:
-    expression: NOT pull_request.draft
+    branches:
+      only:
+      - release/2.10
+      - release[/]\\d+[.]\\d+)
 
-# Nightly check on main
+# Nightly check on release/2.10
 nightly_trigger:
   name: Nightly Trigger
   dependencies:
+  - path: .yamato/clean-console-tests.yml#clean_console_tests_-_2022_3_-_macos
+  - path: .yamato/clean-console-tests.yml#clean_console_tests_-_2022_3_-_ubuntu
+  - path: .yamato/clean-console-tests.yml#clean_console_tests_-_2022_3_-_windows
+  - path: .yamato/clean-console-tests.yml#clean_console_tests_-_6000_0_-_macos
+  - path: .yamato/clean-console-tests.yml#clean_console_tests_-_6000_0_-_ubuntu
+  - path: .yamato/clean-console-tests.yml#clean_console_tests_-_6000_0_-_windows
+  - path: .yamato/clean-console-tests.yml#clean_console_tests_-_6000_3_-_macos
+  - path: .yamato/clean-console-tests.yml#clean_console_tests_-_6000_3_-_ubuntu
+  - path: .yamato/clean-console-tests.yml#clean_console_tests_-_6000_3_-_windows
+  - path: .yamato/clean-console-tests.yml#clean_console_tests_-_6000_4_-_macos
+  - path: .yamato/clean-console-tests.yml#clean_console_tests_-_6000_4_-_ubuntu
+  - path: .yamato/clean-console-tests.yml#clean_console_tests_-_6000_4_-_windows
+  - path: .yamato/clean-console-tests.yml#clean_console_tests_-_6000_5_-_macos
+  - path: .yamato/clean-console-tests.yml#clean_console_tests_-_6000_5_-_ubuntu
+  - path: .yamato/clean-console-tests.yml#clean_console_tests_-_6000_5_-_windows
+  - path: .yamato/clean-console-tests.yml#clean_console_tests_-_6000_6_-_macos
+  - path: .yamato/clean-console-tests.yml#clean_console_tests_-_6000_6_-_ubuntu
+  - path: .yamato/clean-console-tests.yml#clean_console_tests_-_6000_6_-_windows
   - path: .yamato/project-test.yml#test_project_-_cinemachine_-_hdrp_-_2022_3_-_macos
   - path: .yamato/project-test.yml#test_project_-_cinemachine_-_hdrp_-_2022_3_-_ubuntu
   - path: .yamato/project-test.yml#test_project_-_cinemachine_-_hdrp_-_2022_3_-_windows
@@ -138,48 +162,59 @@ nightly_trigger:
   - path: .yamato/project-test.yml#test_project_-_cinemachine_-_urp_-_6000_6_-_macos
   - path: .yamato/project-test.yml#test_project_-_cinemachine_-_urp_-_6000_6_-_ubuntu
   - path: .yamato/project-test.yml#test_project_-_cinemachine_-_urp_-_6000_6_-_windows
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_macos
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_ubuntu
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_windows
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_macos
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_ubuntu
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_windows
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_macos
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_ubuntu
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_windows
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_macos
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_ubuntu
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_windows
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_macos
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_ubuntu
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_windows
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_macos
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_ubuntu
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_windows
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_macos13
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_ubuntu1804
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_win10
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_macos13
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_ubuntu2204
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_win10
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_macos13
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_ubuntu2204
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_win10
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_macos13
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_ubuntu2204
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_win10
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_macos13
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_ubuntu2204
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_win10
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_macos13
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_ubuntu2204
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_win10
+  triggers:
+    recurring:
+    - branch: release/2.10
+      frequency: daily
 
-# Tests to run on PRs and mainline branches.
-package_ci:
-  name: Package CI
+# Tests to run on PRs.
+pull_request_tests_trigger:
+  name: Pull Request Tests Trigger
   dependencies:
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_windows
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_macos
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_ubuntu
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_windows
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_macos
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_ubuntu
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_windows
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_macos
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_ubuntu
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_windows
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_macos
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_ubuntu
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_windows
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_macos
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_ubuntu
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_windows
+  - path: .yamato/project-test.yml#test_project_-_cinemachine_-_hdrp_-_2022_3_-_windows
+  - path: .yamato/project-test.yml#test_project_-_cinemachine_-_hdrp_-_6000_0_-_windows
+  - path: .yamato/project-test.yml#test_project_-_cinemachine_-_hdrp_-_6000_3_-_windows
+  - path: .yamato/project-test.yml#test_project_-_cinemachine_-_hdrp_-_6000_4_-_windows
+  - path: .yamato/project-test.yml#test_project_-_cinemachine_-_hdrp_-_6000_5_-_windows
+  - path: .yamato/project-test.yml#test_project_-_cinemachine_-_hdrp_-_6000_6_-_windows
+  - path: .yamato/project-test.yml#test_project_-_cinemachine_-_standalone_-_2022_3_-_windows
+  - path: .yamato/project-test.yml#test_project_-_cinemachine_-_standalone_-_6000_0_-_windows
+  - path: .yamato/project-test.yml#test_project_-_cinemachine_-_standalone_-_6000_3_-_windows
+  - path: .yamato/project-test.yml#test_project_-_cinemachine_-_standalone_-_6000_4_-_windows
+  - path: .yamato/project-test.yml#test_project_-_cinemachine_-_standalone_-_6000_5_-_windows
+  - path: .yamato/project-test.yml#test_project_-_cinemachine_-_standalone_-_6000_6_-_windows
+  - path: .yamato/project-test.yml#test_project_-_cinemachine_-_urp_-_2022_3_-_windows
+  - path: .yamato/project-test.yml#test_project_-_cinemachine_-_urp_-_6000_0_-_windows
+  - path: .yamato/project-test.yml#test_project_-_cinemachine_-_urp_-_6000_3_-_windows
+  - path: .yamato/project-test.yml#test_project_-_cinemachine_-_urp_-_6000_4_-_windows
+  - path: .yamato/project-test.yml#test_project_-_cinemachine_-_urp_-_6000_5_-_windows
+  - path: .yamato/project-test.yml#test_project_-_cinemachine_-_urp_-_6000_6_-_windows
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_win10
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_win10
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_win10
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_win10
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_win10
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_win10
   triggers:
-    branches:
-      only:
-      - main
-      - release[/]\\d+[.]\\d+)
+    expression: NOT pull_request.draft
+    cancel_old_ci: true
+    cancel_leftover_jobs: Always
 
diff --git a/.yamato/wrench/api-validation-jobs.yml b/.yamato/wrench/api-validation-jobs.yml
index 36e616081..a038baa78 100644
--- a/.yamato/wrench/api-validation-jobs.yml
+++ b/.yamato/wrench/api-validation-jobs.yml
@@ -1,19 +1,23 @@
-# Auto-generated by Recipe Engine, do not modify manually.
+#######################################################
+###                                                 ###
+###  Auto-generated by Recipe Engine, DO NOT EDIT.  ###
+###                                                 ###
+#######################################################
 # 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_-_cinemachine_-_2022_3_-_windows
+  - path: .yamato/wrench/api-validation-jobs.yml#api_validation_-_cinemachine_-_2022_3_-_win10
 
-# upm-ci validation tests for API Validation - cinemachine - 2022.3 - windows (2022.3 - Windows).
-api_validation_-_cinemachine_-_2022_3_-_windows:
-  name: API Validation - cinemachine - 2022.3 - windows
+# upm-ci validation tests for API Validation - cinemachine - 2022.3 - win10 (2022.3 - Windows).
+api_validation_-_cinemachine_-_2022_3_-_win10:
+  name: API Validation - cinemachine - 2022.3 - win10
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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
@@ -51,8 +55,12 @@ api_validation_-_cinemachine_-_2022_3_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
 
diff --git a/.yamato/wrench/package-pack-jobs.yml b/.yamato/wrench/package-pack-jobs.yml
index e578ceaf3..637d3d42c 100644
--- a/.yamato/wrench/package-pack-jobs.yml
+++ b/.yamato/wrench/package-pack-jobs.yml
@@ -1,11 +1,15 @@
-# Auto-generated by Recipe Engine, do not modify manually.
+#######################################################
+###                                                 ###
+###  Auto-generated by Recipe Engine, DO NOT EDIT.  ###
+###                                                 ###
+#######################################################
 # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
 
 # Pack Cinemachine
 package_pack_-_cinemachine:
   name: Package Pack - cinemachine
   agent:
-    image: package-ci/ubuntu-22.04:default
+    image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
@@ -24,5 +28,5 @@ package_pack_-_cinemachine:
     UPMCI_ACK_LARGE_PACKAGE: 1
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
 
diff --git a/.yamato/wrench/player-build.yml b/.yamato/wrench/player-build.yml
new file mode 100644
index 000000000..9b12542ef
--- /dev/null
+++ b/.yamato/wrench/player-build.yml
@@ -0,0 +1,8 @@
+#######################################################
+###                                                 ###
+###  Auto-generated by Recipe Engine, DO NOT EDIT.  ###
+###                                                 ###
+#######################################################
+# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
+{}
+
diff --git a/.yamato/wrench/player-test.yml b/.yamato/wrench/player-test.yml
new file mode 100644
index 000000000..9b12542ef
--- /dev/null
+++ b/.yamato/wrench/player-test.yml
@@ -0,0 +1,8 @@
+#######################################################
+###                                                 ###
+###  Auto-generated by Recipe Engine, DO NOT EDIT.  ###
+###                                                 ###
+#######################################################
+# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
+{}
+
diff --git a/.yamato/wrench/preview-a-p-v.yml b/.yamato/wrench/preview-a-p-v.yml
index 343c0795d..ea6b9f725 100644
--- a/.yamato/wrench/preview-a-p-v.yml
+++ b/.yamato/wrench/preview-a-p-v.yml
@@ -1,41 +1,45 @@
-# Auto-generated by Recipe Engine, do not modify manually.
+#######################################################
+###                                                 ###
+###  Auto-generated by Recipe Engine, DO NOT EDIT.  ###
+###                                                 ###
+#######################################################
 # 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_-_2022_3_-_macos
-  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_2022_3_-_ubuntu
-  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_2022_3_-_windows
-  - 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_3_-_macos
-  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_ubuntu
-  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_windows
-  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_4_-_macos
-  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_4_-_ubuntu
-  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_4_-_windows
-  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_5_-_macos
-  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_5_-_ubuntu
-  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_5_-_windows
-  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_6_-_macos
-  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_6_-_ubuntu
-  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_6_-_windows
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_2022_3_-_macos13
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_2022_3_-_ubuntu1804
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_2022_3_-_win10
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_macos13
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_ubuntu2204
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_0_-_win10
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_macos13
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_ubuntu2204
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_win10
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_4_-_macos13
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_4_-_ubuntu2204
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_4_-_win10
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_5_-_macos13
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_5_-_ubuntu2204
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_5_-_win10
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_6_-_macos13
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_6_-_ubuntu2204
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_6_-_win10
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
 
 # Functional tests for dependents found in the latest 2022.3 manifest (MacOS).
-preview_apv_-_2022_3_-_macos:
-  name: Preview APV - 2022.3 - macos
+preview_apv_-_2022_3_-_macos13:
+  name: Preview APV - 2022.3 - macos13
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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
@@ -76,20 +80,24 @@ preview_apv_-_2022_3_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
 
 # Functional tests for dependents found in the latest 2022.3 manifest (Ubuntu).
-preview_apv_-_2022_3_-_ubuntu:
-  name: Preview APV - 2022.3 - ubuntu
+preview_apv_-_2022_3_-_ubuntu1804:
+  name: Preview APV - 2022.3 - ubuntu1804
   agent:
-    image: package-ci/ubuntu-22.04:default
+    image: package-ci/ubuntu-18.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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
@@ -130,21 +138,25 @@ preview_apv_-_2022_3_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
 
 # Functional tests for dependents found in the latest 2022.3 manifest (Windows).
-preview_apv_-_2022_3_-_windows:
-  name: Preview APV - 2022.3 - windows
+preview_apv_-_2022_3_-_win10:
+  name: Preview APV - 2022.3 - win10
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     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-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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
@@ -185,20 +197,24 @@ preview_apv_-_2022_3_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
 
 # Functional tests for dependents found in the latest 6000.0 manifest (MacOS).
-preview_apv_-_6000_0_-_macos:
-  name: Preview APV - 6000.0 - macos
+preview_apv_-_6000_0_-_macos13:
+  name: Preview APV - 6000.0 - macos13
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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
@@ -239,20 +255,24 @@ preview_apv_-_6000_0_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
 
 # Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu).
-preview_apv_-_6000_0_-_ubuntu:
-  name: Preview APV - 6000.0 - ubuntu
+preview_apv_-_6000_0_-_ubuntu2204:
+  name: Preview APV - 6000.0 - ubuntu2204
   agent:
     image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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
@@ -293,21 +313,25 @@ preview_apv_-_6000_0_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
 
 # Functional tests for dependents found in the latest 6000.0 manifest (Windows).
-preview_apv_-_6000_0_-_windows:
-  name: Preview APV - 6000.0 - windows
+preview_apv_-_6000_0_-_win10:
+  name: Preview APV - 6000.0 - win10
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     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-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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
@@ -348,20 +372,24 @@ preview_apv_-_6000_0_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
 
 # Functional tests for dependents found in the latest 6000.3 manifest (MacOS).
-preview_apv_-_6000_3_-_macos:
-  name: Preview APV - 6000.3 - macos
+preview_apv_-_6000_3_-_macos13:
+  name: Preview APV - 6000.3 - macos13
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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
@@ -402,20 +430,24 @@ preview_apv_-_6000_3_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
 
 # Functional tests for dependents found in the latest 6000.3 manifest (Ubuntu).
-preview_apv_-_6000_3_-_ubuntu:
-  name: Preview APV - 6000.3 - ubuntu
+preview_apv_-_6000_3_-_ubuntu2204:
+  name: Preview APV - 6000.3 - ubuntu2204
   agent:
     image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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
@@ -456,21 +488,25 @@ preview_apv_-_6000_3_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
 
 # Functional tests for dependents found in the latest 6000.3 manifest (Windows).
-preview_apv_-_6000_3_-_windows:
-  name: Preview APV - 6000.3 - windows
+preview_apv_-_6000_3_-_win10:
+  name: Preview APV - 6000.3 - win10
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     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-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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
@@ -511,20 +547,24 @@ preview_apv_-_6000_3_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
 
 # Functional tests for dependents found in the latest 6000.4 manifest (MacOS).
-preview_apv_-_6000_4_-_macos:
-  name: Preview APV - 6000.4 - macos
+preview_apv_-_6000_4_-_macos13:
+  name: Preview APV - 6000.4 - macos13
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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
@@ -565,20 +605,24 @@ preview_apv_-_6000_4_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
 
 # Functional tests for dependents found in the latest 6000.4 manifest (Ubuntu).
-preview_apv_-_6000_4_-_ubuntu:
-  name: Preview APV - 6000.4 - ubuntu
+preview_apv_-_6000_4_-_ubuntu2204:
+  name: Preview APV - 6000.4 - ubuntu2204
   agent:
     image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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
@@ -619,21 +663,25 @@ preview_apv_-_6000_4_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
 
 # Functional tests for dependents found in the latest 6000.4 manifest (Windows).
-preview_apv_-_6000_4_-_windows:
-  name: Preview APV - 6000.4 - windows
+preview_apv_-_6000_4_-_win10:
+  name: Preview APV - 6000.4 - win10
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     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-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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
@@ -674,20 +722,24 @@ preview_apv_-_6000_4_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
 
 # Functional tests for dependents found in the latest 6000.5 manifest (MacOS).
-preview_apv_-_6000_5_-_macos:
-  name: Preview APV - 6000.5 - macos
+preview_apv_-_6000_5_-_macos13:
+  name: Preview APV - 6000.5 - macos13
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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
@@ -728,20 +780,24 @@ preview_apv_-_6000_5_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
 
 # Functional tests for dependents found in the latest 6000.5 manifest (Ubuntu).
-preview_apv_-_6000_5_-_ubuntu:
-  name: Preview APV - 6000.5 - ubuntu
+preview_apv_-_6000_5_-_ubuntu2204:
+  name: Preview APV - 6000.5 - ubuntu2204
   agent:
     image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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
@@ -782,21 +838,25 @@ preview_apv_-_6000_5_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
 
 # Functional tests for dependents found in the latest 6000.5 manifest (Windows).
-preview_apv_-_6000_5_-_windows:
-  name: Preview APV - 6000.5 - windows
+preview_apv_-_6000_5_-_win10:
+  name: Preview APV - 6000.5 - win10
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     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-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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
@@ -837,20 +897,24 @@ preview_apv_-_6000_5_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
 
 # Functional tests for dependents found in the latest 6000.6 manifest (MacOS).
-preview_apv_-_6000_6_-_macos:
-  name: Preview APV - 6000.6 - macos
+preview_apv_-_6000_6_-_macos13:
+  name: Preview APV - 6000.6 - macos13
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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
@@ -891,20 +955,24 @@ preview_apv_-_6000_6_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
 
 # Functional tests for dependents found in the latest 6000.6 manifest (Ubuntu).
-preview_apv_-_6000_6_-_ubuntu:
-  name: Preview APV - 6000.6 - ubuntu
+preview_apv_-_6000_6_-_ubuntu2204:
+  name: Preview APV - 6000.6 - ubuntu2204
   agent:
     image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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
@@ -945,21 +1013,25 @@ preview_apv_-_6000_6_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
 
 # Functional tests for dependents found in the latest 6000.6 manifest (Windows).
-preview_apv_-_6000_6_-_windows:
-  name: Preview APV - 6000.6 - windows
+preview_apv_-_6000_6_-_win10:
+  name: Preview APV - 6000.6 - win10
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     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-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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
@@ -1000,8 +1072,12 @@ preview_apv_-_6000_6_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
 
diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml
index 685d35b8a..1b1b1561c 100644
--- a/.yamato/wrench/promotion-jobs.yml
+++ b/.yamato/wrench/promotion-jobs.yml
@@ -1,15 +1,19 @@
-# Auto-generated by Recipe Engine, do not modify manually.
+#######################################################
+###                                                 ###
+###  Auto-generated by Recipe Engine, DO NOT EDIT.  ###
+###                                                 ###
+#######################################################
 # This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
 
 # Publish  for cinemachine to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
 publish_cinemachine:
   name: Publish cinemachine
   agent:
-    image: package-ci/ubuntu-22.04:default
+    image: package-ci/ubuntu-20.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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
@@ -26,202 +30,202 @@ publish_cinemachine:
       browsable: onNonSuccess
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_macos
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_macos13
     specific_options:
-      UTR:
-        location: results/UTR/validate-cinemachine-2022.3-macos
-        unzip: true
-      pvp-results:
-        location: results/pvp/validate-cinemachine-2022.3-macos
-        unzip: true
       packages:
         ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_ubuntu
-    specific_options:
-      UTR:
-        location: results/UTR/validate-cinemachine-2022.3-ubuntu
-        unzip: true
       pvp-results:
-        location: results/pvp/validate-cinemachine-2022.3-ubuntu
+        location: results/pvp/validate-cinemachine-2022.3-macos13
         unzip: true
-      packages:
-        ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_windows
-    specific_options:
       UTR:
-        location: results/UTR/validate-cinemachine-2022.3-windows
-        unzip: true
-      pvp-results:
-        location: results/pvp/validate-cinemachine-2022.3-windows
+        location: results/UTR/validate-cinemachine-2022.3-macos13
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_ubuntu1804
+    specific_options:
       packages:
         ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_macos
-    specific_options:
-      UTR:
-        location: results/UTR/validate-cinemachine-6000.0-macos
-        unzip: true
       pvp-results:
-        location: results/pvp/validate-cinemachine-6000.0-macos
+        location: results/pvp/validate-cinemachine-2022.3-ubuntu1804
         unzip: true
-      packages:
-        ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_ubuntu
-    specific_options:
       UTR:
-        location: results/UTR/validate-cinemachine-6000.0-ubuntu
-        unzip: true
-      pvp-results:
-        location: results/pvp/validate-cinemachine-6000.0-ubuntu
+        location: results/UTR/validate-cinemachine-2022.3-ubuntu1804
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_win10
+    specific_options:
       packages:
         ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_windows
-    specific_options:
-      UTR:
-        location: results/UTR/validate-cinemachine-6000.0-windows
-        unzip: true
       pvp-results:
-        location: results/pvp/validate-cinemachine-6000.0-windows
+        location: results/pvp/validate-cinemachine-2022.3-win10
         unzip: true
-      packages:
-        ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_macos
-    specific_options:
       UTR:
-        location: results/UTR/validate-cinemachine-6000.3-macos
-        unzip: true
-      pvp-results:
-        location: results/pvp/validate-cinemachine-6000.3-macos
+        location: results/UTR/validate-cinemachine-2022.3-win10
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_macos13
+    specific_options:
       packages:
         ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_ubuntu
-    specific_options:
-      UTR:
-        location: results/UTR/validate-cinemachine-6000.3-ubuntu
-        unzip: true
       pvp-results:
-        location: results/pvp/validate-cinemachine-6000.3-ubuntu
+        location: results/pvp/validate-cinemachine-6000.0-macos13
         unzip: true
-      packages:
-        ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_windows
-    specific_options:
       UTR:
-        location: results/UTR/validate-cinemachine-6000.3-windows
-        unzip: true
-      pvp-results:
-        location: results/pvp/validate-cinemachine-6000.3-windows
+        location: results/UTR/validate-cinemachine-6000.0-macos13
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_ubuntu2204
+    specific_options:
       packages:
         ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_macos
-    specific_options:
-      UTR:
-        location: results/UTR/validate-cinemachine-6000.4-macos
-        unzip: true
       pvp-results:
-        location: results/pvp/validate-cinemachine-6000.4-macos
+        location: results/pvp/validate-cinemachine-6000.0-ubuntu2204
         unzip: true
-      packages:
-        ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_ubuntu
-    specific_options:
       UTR:
-        location: results/UTR/validate-cinemachine-6000.4-ubuntu
-        unzip: true
-      pvp-results:
-        location: results/pvp/validate-cinemachine-6000.4-ubuntu
+        location: results/UTR/validate-cinemachine-6000.0-ubuntu2204
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_win10
+    specific_options:
       packages:
         ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_windows
-    specific_options:
-      UTR:
-        location: results/UTR/validate-cinemachine-6000.4-windows
-        unzip: true
       pvp-results:
-        location: results/pvp/validate-cinemachine-6000.4-windows
+        location: results/pvp/validate-cinemachine-6000.0-win10
         unzip: true
-      packages:
-        ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_macos
-    specific_options:
       UTR:
-        location: results/UTR/validate-cinemachine-6000.5-macos
+        location: results/UTR/validate-cinemachine-6000.0-win10
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_macos13
+    specific_options:
+      packages:
+        ignore_artifact: true
       pvp-results:
-        location: results/pvp/validate-cinemachine-6000.5-macos
+        location: results/pvp/validate-cinemachine-6000.3-macos13
         unzip: true
+      UTR:
+        location: results/UTR/validate-cinemachine-6000.3-macos13
+        unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_ubuntu2204
+    specific_options:
       packages:
         ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_ubuntu
-    specific_options:
+      pvp-results:
+        location: results/pvp/validate-cinemachine-6000.3-ubuntu2204
+        unzip: true
       UTR:
-        location: results/UTR/validate-cinemachine-6000.5-ubuntu
+        location: results/UTR/validate-cinemachine-6000.3-ubuntu2204
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_win10
+    specific_options:
+      packages:
+        ignore_artifact: true
       pvp-results:
-        location: results/pvp/validate-cinemachine-6000.5-ubuntu
+        location: results/pvp/validate-cinemachine-6000.3-win10
+        unzip: true
+      UTR:
+        location: results/UTR/validate-cinemachine-6000.3-win10
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_macos13
+    specific_options:
       packages:
         ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_windows
-    specific_options:
+      pvp-results:
+        location: results/pvp/validate-cinemachine-6000.4-macos13
+        unzip: true
       UTR:
-        location: results/UTR/validate-cinemachine-6000.5-windows
+        location: results/UTR/validate-cinemachine-6000.4-macos13
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_ubuntu2204
+    specific_options:
+      packages:
+        ignore_artifact: true
       pvp-results:
-        location: results/pvp/validate-cinemachine-6000.5-windows
+        location: results/pvp/validate-cinemachine-6000.4-ubuntu2204
         unzip: true
+      UTR:
+        location: results/UTR/validate-cinemachine-6000.4-ubuntu2204
+        unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_win10
+    specific_options:
       packages:
         ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_macos
-    specific_options:
+      pvp-results:
+        location: results/pvp/validate-cinemachine-6000.4-win10
+        unzip: true
       UTR:
-        location: results/UTR/validate-cinemachine-6000.6-macos
+        location: results/UTR/validate-cinemachine-6000.4-win10
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_macos13
+    specific_options:
+      packages:
+        ignore_artifact: true
       pvp-results:
-        location: results/pvp/validate-cinemachine-6000.6-macos
+        location: results/pvp/validate-cinemachine-6000.5-macos13
+        unzip: true
+      UTR:
+        location: results/UTR/validate-cinemachine-6000.5-macos13
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_ubuntu2204
+    specific_options:
       packages:
         ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_ubuntu
-    specific_options:
+      pvp-results:
+        location: results/pvp/validate-cinemachine-6000.5-ubuntu2204
+        unzip: true
       UTR:
-        location: results/UTR/validate-cinemachine-6000.6-ubuntu
+        location: results/UTR/validate-cinemachine-6000.5-ubuntu2204
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_win10
+    specific_options:
+      packages:
+        ignore_artifact: true
       pvp-results:
-        location: results/pvp/validate-cinemachine-6000.6-ubuntu
+        location: results/pvp/validate-cinemachine-6000.5-win10
         unzip: true
+      UTR:
+        location: results/UTR/validate-cinemachine-6000.5-win10
+        unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_macos13
+    specific_options:
       packages:
         ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_windows
-    specific_options:
+      pvp-results:
+        location: results/pvp/validate-cinemachine-6000.6-macos13
+        unzip: true
       UTR:
-        location: results/UTR/validate-cinemachine-6000.6-windows
+        location: results/UTR/validate-cinemachine-6000.6-macos13
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_ubuntu2204
+    specific_options:
+      packages:
+        ignore_artifact: true
       pvp-results:
-        location: results/pvp/validate-cinemachine-6000.6-windows
+        location: results/pvp/validate-cinemachine-6000.6-ubuntu2204
         unzip: true
+      UTR:
+        location: results/UTR/validate-cinemachine-6000.6-ubuntu2204
+        unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_win10
+    specific_options:
       packages:
         ignore_artifact: true
+      pvp-results:
+        location: results/pvp/validate-cinemachine-6000.6-win10
+        unzip: true
+      UTR:
+        location: results/UTR/validate-cinemachine-6000.6-win10
+        unzip: true
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
 
 # Publish Dry Run  for cinemachine to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
 publish_dry_run_cinemachine:
   name: Publish Dry Run cinemachine
   agent:
-    image: package-ci/ubuntu-22.04:default
+    image: package-ci/ubuntu-20.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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
@@ -238,190 +242,190 @@ publish_dry_run_cinemachine:
       browsable: onNonSuccess
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_macos
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_macos13
     specific_options:
-      UTR:
-        location: results/UTR/validate-cinemachine-2022.3-macos
-        unzip: true
-      pvp-results:
-        location: results/pvp/validate-cinemachine-2022.3-macos
-        unzip: true
       packages:
         ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_ubuntu
-    specific_options:
-      UTR:
-        location: results/UTR/validate-cinemachine-2022.3-ubuntu
-        unzip: true
       pvp-results:
-        location: results/pvp/validate-cinemachine-2022.3-ubuntu
+        location: results/pvp/validate-cinemachine-2022.3-macos13
         unzip: true
-      packages:
-        ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_windows
-    specific_options:
       UTR:
-        location: results/UTR/validate-cinemachine-2022.3-windows
-        unzip: true
-      pvp-results:
-        location: results/pvp/validate-cinemachine-2022.3-windows
+        location: results/UTR/validate-cinemachine-2022.3-macos13
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_ubuntu1804
+    specific_options:
       packages:
         ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_macos
-    specific_options:
-      UTR:
-        location: results/UTR/validate-cinemachine-6000.0-macos
-        unzip: true
       pvp-results:
-        location: results/pvp/validate-cinemachine-6000.0-macos
+        location: results/pvp/validate-cinemachine-2022.3-ubuntu1804
         unzip: true
-      packages:
-        ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_ubuntu
-    specific_options:
       UTR:
-        location: results/UTR/validate-cinemachine-6000.0-ubuntu
-        unzip: true
-      pvp-results:
-        location: results/pvp/validate-cinemachine-6000.0-ubuntu
+        location: results/UTR/validate-cinemachine-2022.3-ubuntu1804
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_win10
+    specific_options:
       packages:
         ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_windows
-    specific_options:
-      UTR:
-        location: results/UTR/validate-cinemachine-6000.0-windows
-        unzip: true
       pvp-results:
-        location: results/pvp/validate-cinemachine-6000.0-windows
+        location: results/pvp/validate-cinemachine-2022.3-win10
         unzip: true
-      packages:
-        ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_macos
-    specific_options:
       UTR:
-        location: results/UTR/validate-cinemachine-6000.3-macos
-        unzip: true
-      pvp-results:
-        location: results/pvp/validate-cinemachine-6000.3-macos
+        location: results/UTR/validate-cinemachine-2022.3-win10
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_macos13
+    specific_options:
       packages:
         ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_ubuntu
-    specific_options:
-      UTR:
-        location: results/UTR/validate-cinemachine-6000.3-ubuntu
-        unzip: true
       pvp-results:
-        location: results/pvp/validate-cinemachine-6000.3-ubuntu
+        location: results/pvp/validate-cinemachine-6000.0-macos13
         unzip: true
-      packages:
-        ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_windows
-    specific_options:
       UTR:
-        location: results/UTR/validate-cinemachine-6000.3-windows
-        unzip: true
-      pvp-results:
-        location: results/pvp/validate-cinemachine-6000.3-windows
+        location: results/UTR/validate-cinemachine-6000.0-macos13
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_ubuntu2204
+    specific_options:
       packages:
         ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_macos
-    specific_options:
-      UTR:
-        location: results/UTR/validate-cinemachine-6000.4-macos
-        unzip: true
       pvp-results:
-        location: results/pvp/validate-cinemachine-6000.4-macos
+        location: results/pvp/validate-cinemachine-6000.0-ubuntu2204
         unzip: true
-      packages:
-        ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_ubuntu
-    specific_options:
       UTR:
-        location: results/UTR/validate-cinemachine-6000.4-ubuntu
-        unzip: true
-      pvp-results:
-        location: results/pvp/validate-cinemachine-6000.4-ubuntu
+        location: results/UTR/validate-cinemachine-6000.0-ubuntu2204
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_win10
+    specific_options:
       packages:
         ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_windows
-    specific_options:
-      UTR:
-        location: results/UTR/validate-cinemachine-6000.4-windows
-        unzip: true
       pvp-results:
-        location: results/pvp/validate-cinemachine-6000.4-windows
+        location: results/pvp/validate-cinemachine-6000.0-win10
         unzip: true
-      packages:
-        ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_macos
-    specific_options:
       UTR:
-        location: results/UTR/validate-cinemachine-6000.5-macos
+        location: results/UTR/validate-cinemachine-6000.0-win10
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_macos13
+    specific_options:
+      packages:
+        ignore_artifact: true
       pvp-results:
-        location: results/pvp/validate-cinemachine-6000.5-macos
+        location: results/pvp/validate-cinemachine-6000.3-macos13
         unzip: true
+      UTR:
+        location: results/UTR/validate-cinemachine-6000.3-macos13
+        unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_ubuntu2204
+    specific_options:
       packages:
         ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_ubuntu
-    specific_options:
+      pvp-results:
+        location: results/pvp/validate-cinemachine-6000.3-ubuntu2204
+        unzip: true
       UTR:
-        location: results/UTR/validate-cinemachine-6000.5-ubuntu
+        location: results/UTR/validate-cinemachine-6000.3-ubuntu2204
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_win10
+    specific_options:
+      packages:
+        ignore_artifact: true
       pvp-results:
-        location: results/pvp/validate-cinemachine-6000.5-ubuntu
+        location: results/pvp/validate-cinemachine-6000.3-win10
+        unzip: true
+      UTR:
+        location: results/UTR/validate-cinemachine-6000.3-win10
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_macos13
+    specific_options:
       packages:
         ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_windows
-    specific_options:
+      pvp-results:
+        location: results/pvp/validate-cinemachine-6000.4-macos13
+        unzip: true
       UTR:
-        location: results/UTR/validate-cinemachine-6000.5-windows
+        location: results/UTR/validate-cinemachine-6000.4-macos13
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_ubuntu2204
+    specific_options:
+      packages:
+        ignore_artifact: true
       pvp-results:
-        location: results/pvp/validate-cinemachine-6000.5-windows
+        location: results/pvp/validate-cinemachine-6000.4-ubuntu2204
         unzip: true
+      UTR:
+        location: results/UTR/validate-cinemachine-6000.4-ubuntu2204
+        unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_4_-_win10
+    specific_options:
       packages:
         ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_macos
-    specific_options:
+      pvp-results:
+        location: results/pvp/validate-cinemachine-6000.4-win10
+        unzip: true
       UTR:
-        location: results/UTR/validate-cinemachine-6000.6-macos
+        location: results/UTR/validate-cinemachine-6000.4-win10
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_macos13
+    specific_options:
+      packages:
+        ignore_artifact: true
       pvp-results:
-        location: results/pvp/validate-cinemachine-6000.6-macos
+        location: results/pvp/validate-cinemachine-6000.5-macos13
+        unzip: true
+      UTR:
+        location: results/UTR/validate-cinemachine-6000.5-macos13
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_ubuntu2204
+    specific_options:
       packages:
         ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_ubuntu
-    specific_options:
+      pvp-results:
+        location: results/pvp/validate-cinemachine-6000.5-ubuntu2204
+        unzip: true
       UTR:
-        location: results/UTR/validate-cinemachine-6000.6-ubuntu
+        location: results/UTR/validate-cinemachine-6000.5-ubuntu2204
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_5_-_win10
+    specific_options:
+      packages:
+        ignore_artifact: true
       pvp-results:
-        location: results/pvp/validate-cinemachine-6000.6-ubuntu
+        location: results/pvp/validate-cinemachine-6000.5-win10
         unzip: true
+      UTR:
+        location: results/UTR/validate-cinemachine-6000.5-win10
+        unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_macos13
+    specific_options:
       packages:
         ignore_artifact: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_windows
-    specific_options:
+      pvp-results:
+        location: results/pvp/validate-cinemachine-6000.6-macos13
+        unzip: true
       UTR:
-        location: results/UTR/validate-cinemachine-6000.6-windows
+        location: results/UTR/validate-cinemachine-6000.6-macos13
         unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_ubuntu2204
+    specific_options:
+      packages:
+        ignore_artifact: true
       pvp-results:
-        location: results/pvp/validate-cinemachine-6000.6-windows
+        location: results/pvp/validate-cinemachine-6000.6-ubuntu2204
         unzip: true
+      UTR:
+        location: results/UTR/validate-cinemachine-6000.6-ubuntu2204
+        unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_6_-_win10
+    specific_options:
       packages:
         ignore_artifact: true
+      pvp-results:
+        location: results/pvp/validate-cinemachine-6000.6-win10
+        unzip: true
+      UTR:
+        location: results/UTR/validate-cinemachine-6000.6-win10
+        unzip: true
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
 
diff --git a/.yamato/wrench/publish-trigger.yml b/.yamato/wrench/publish-trigger.yml
index fa15002ae..b6fe111e2 100644
--- a/.yamato/wrench/publish-trigger.yml
+++ b/.yamato/wrench/publish-trigger.yml
@@ -1,4 +1,8 @@
-# Auto-generated by Recipe Engine, do not modify manually.
+#######################################################
+###                                                 ###
+###  Auto-generated by Recipe Engine, DO NOT EDIT.  ###
+###                                                 ###
+#######################################################
 # 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
diff --git a/.yamato/wrench/recipe-regeneration.yml b/.yamato/wrench/recipe-regeneration.yml
index c72aa26ac..700f7b8fa 100644
--- a/.yamato/wrench/recipe-regeneration.yml
+++ b/.yamato/wrench/recipe-regeneration.yml
@@ -1,11 +1,15 @@
-# Auto-generated by Recipe Engine, do not modify manually.
+#######################################################
+###                                                 ###
+###  Auto-generated by Recipe Engine, DO NOT EDIT.  ###
+###                                                 ###
+#######################################################
 # 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-22.04:default
+    image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
@@ -26,5 +30,5 @@ test_-_wrench_jobs_up_to_date:
     cancel_old_ci: true
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
 
diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml
index c3f4a71fe..34d2c233e 100644
--- a/.yamato/wrench/validation-jobs.yml
+++ b/.yamato/wrench/validation-jobs.yml
@@ -1,22 +1,26 @@
-# Auto-generated by Recipe Engine, do not modify manually.
+#######################################################
+###                                                 ###
+###  Auto-generated by Recipe Engine, DO NOT EDIT.  ###
+###                                                 ###
+#######################################################
 # 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 - cinemachine - 2022.3 - macos (2022.3 - MacOS).
-validate_-_cinemachine_-_2022_3_-_macos:
-  name: Validate - cinemachine - 2022.3 - macos
+# PVP Editor and Playmode tests for Validate - cinemachine - 2022.3 - macos13 (2022.3 - MacOS).
+validate_-_cinemachine_-_2022_3_-_macos13:
+  name: Validate - cinemachine - 2022.3 - macos13
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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 2022.3/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --filter "com.unity.cinemachine com.unity.cinemachine.tests" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -29,12 +33,15 @@ validate_-_cinemachine_-_2022_3_-_macos:
   - 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-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
+  - command: UnifiedTestRunner --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_MacOS_2022.3;flags:cinemachine_MacOS_2022.3" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
+    Coverage:
+      paths:
+      - upm-ci~/CodeCoverage/**
     Crash Dumps:
       paths:
       - CrashDumps/**
@@ -59,30 +66,34 @@ validate_-_cinemachine_-_2022_3_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
   labels:
   - Packages:cinemachine
 
-# PVP Editor and Playmode tests for Validate - cinemachine - 2022.3 - ubuntu (2022.3 - Ubuntu).
-validate_-_cinemachine_-_2022_3_-_ubuntu:
-  name: Validate - cinemachine - 2022.3 - ubuntu
+# PVP Editor and Playmode tests for Validate - cinemachine - 2022.3 - ubuntu1804 (2022.3 - Ubuntu).
+validate_-_cinemachine_-_2022_3_-_ubuntu1804:
+  name: Validate - cinemachine - 2022.3 - ubuntu1804
   agent:
-    image: package-ci/ubuntu-22.04:default
+    image: package-ci/ubuntu-18.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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 2022.3/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --filter "com.unity.cinemachine com.unity.cinemachine.tests" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -95,12 +106,15 @@ validate_-_cinemachine_-_2022_3_-_ubuntu:
   - 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-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
+  - command: UnifiedTestRunner --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Ubuntu_2022.3;flags:cinemachine_Ubuntu_2022.3" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
   artifacts:
+    Coverage:
+      paths:
+      - upm-ci~/CodeCoverage/**
     Crash Dumps:
       paths:
       - CrashDumps/**
@@ -125,30 +139,34 @@ validate_-_cinemachine_-_2022_3_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
   labels:
   - Packages:cinemachine
 
-# PVP Editor and Playmode tests for Validate - cinemachine - 2022.3 - windows (2022.3 - Windows).
-validate_-_cinemachine_-_2022_3_-_windows:
-  name: Validate - cinemachine - 2022.3 - windows
+# PVP Editor and Playmode tests for Validate - cinemachine - 2022.3 - win10 (2022.3 - Windows).
+validate_-_cinemachine_-_2022_3_-_win10:
+  name: Validate - cinemachine - 2022.3 - win10
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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 2022.3/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --filter "com.unity.cinemachine com.unity.cinemachine.tests" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -161,12 +179,15 @@ validate_-_cinemachine_-_2022_3_-_windows:
   - 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-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
+  - command: UnifiedTestRunner.exe --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Windows_2022.3;flags:cinemachine_Windows_2022.3" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
   - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
   artifacts:
+    Coverage:
+      paths:
+      - upm-ci~/CodeCoverage/**
     Crash Dumps:
       paths:
       - CrashDumps/**
@@ -191,30 +212,34 @@ validate_-_cinemachine_-_2022_3_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
   labels:
   - Packages:cinemachine
 
-# PVP Editor and Playmode tests for Validate - cinemachine - 6000.0 - macos (6000.0 - MacOS).
-validate_-_cinemachine_-_6000_0_-_macos:
-  name: Validate - cinemachine - 6000.0 - macos
+# PVP Editor and Playmode tests for Validate - cinemachine - 6000.0 - macos13 (6000.0 - MacOS).
+validate_-_cinemachine_-_6000_0_-_macos13:
+  name: Validate - cinemachine - 6000.0 - macos13
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --filter "com.unity.cinemachine com.unity.cinemachine.tests" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -227,12 +252,15 @@ validate_-_cinemachine_-_6000_0_-_macos:
   - 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-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
+  - command: UnifiedTestRunner --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_MacOS_6000.0;flags:cinemachine_MacOS_6000.0" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
+    Coverage:
+      paths:
+      - upm-ci~/CodeCoverage/**
     Crash Dumps:
       paths:
       - CrashDumps/**
@@ -257,30 +285,34 @@ validate_-_cinemachine_-_6000_0_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
   labels:
   - Packages:cinemachine
 
-# PVP Editor and Playmode tests for Validate - cinemachine - 6000.0 - ubuntu (6000.0 - Ubuntu).
-validate_-_cinemachine_-_6000_0_-_ubuntu:
-  name: Validate - cinemachine - 6000.0 - ubuntu
+# PVP Editor and Playmode tests for Validate - cinemachine - 6000.0 - ubuntu2204 (6000.0 - Ubuntu).
+validate_-_cinemachine_-_6000_0_-_ubuntu2204:
+  name: Validate - cinemachine - 6000.0 - ubuntu2204
   agent:
     image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --filter "com.unity.cinemachine com.unity.cinemachine.tests" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -293,12 +325,15 @@ validate_-_cinemachine_-_6000_0_-_ubuntu:
   - 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-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
+  - command: UnifiedTestRunner --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Ubuntu_6000.0;flags:cinemachine_Ubuntu_6000.0" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
   artifacts:
+    Coverage:
+      paths:
+      - upm-ci~/CodeCoverage/**
     Crash Dumps:
       paths:
       - CrashDumps/**
@@ -323,30 +358,34 @@ validate_-_cinemachine_-_6000_0_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
   labels:
   - Packages:cinemachine
 
-# PVP Editor and Playmode tests for Validate - cinemachine - 6000.0 - windows (6000.0 - Windows).
-validate_-_cinemachine_-_6000_0_-_windows:
-  name: Validate - cinemachine - 6000.0 - windows
+# PVP Editor and Playmode tests for Validate - cinemachine - 6000.0 - win10 (6000.0 - Windows).
+validate_-_cinemachine_-_6000_0_-_win10:
+  name: Validate - cinemachine - 6000.0 - win10
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --filter "com.unity.cinemachine com.unity.cinemachine.tests" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -359,12 +398,15 @@ validate_-_cinemachine_-_6000_0_-_windows:
   - 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-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
+  - command: UnifiedTestRunner.exe --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Windows_6000.0;flags:cinemachine_Windows_6000.0" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
   - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
   artifacts:
+    Coverage:
+      paths:
+      - upm-ci~/CodeCoverage/**
     Crash Dumps:
       paths:
       - CrashDumps/**
@@ -389,30 +431,34 @@ validate_-_cinemachine_-_6000_0_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
   labels:
   - Packages:cinemachine
 
-# PVP Editor and Playmode tests for Validate - cinemachine - 6000.3 - macos (6000.3 - MacOS).
-validate_-_cinemachine_-_6000_3_-_macos:
-  name: Validate - cinemachine - 6000.3 - macos
+# PVP Editor and Playmode tests for Validate - cinemachine - 6000.3 - macos13 (6000.3 - MacOS).
+validate_-_cinemachine_-_6000_3_-_macos13:
+  name: Validate - cinemachine - 6000.3 - macos13
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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.3/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --filter "com.unity.cinemachine com.unity.cinemachine.tests" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -425,12 +471,15 @@ validate_-_cinemachine_-_6000_3_-_macos:
   - 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-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
+  - command: UnifiedTestRunner --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_MacOS_6000.3;flags:cinemachine_MacOS_6000.3" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
+    Coverage:
+      paths:
+      - upm-ci~/CodeCoverage/**
     Crash Dumps:
       paths:
       - CrashDumps/**
@@ -455,30 +504,34 @@ validate_-_cinemachine_-_6000_3_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
   labels:
   - Packages:cinemachine
 
-# PVP Editor and Playmode tests for Validate - cinemachine - 6000.3 - ubuntu (6000.3 - Ubuntu).
-validate_-_cinemachine_-_6000_3_-_ubuntu:
-  name: Validate - cinemachine - 6000.3 - ubuntu
+# PVP Editor and Playmode tests for Validate - cinemachine - 6000.3 - ubuntu2204 (6000.3 - Ubuntu).
+validate_-_cinemachine_-_6000_3_-_ubuntu2204:
+  name: Validate - cinemachine - 6000.3 - ubuntu2204
   agent:
     image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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.3/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --filter "com.unity.cinemachine com.unity.cinemachine.tests" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -491,12 +544,15 @@ validate_-_cinemachine_-_6000_3_-_ubuntu:
   - 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-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
+  - command: UnifiedTestRunner --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Ubuntu_6000.3;flags:cinemachine_Ubuntu_6000.3" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
   artifacts:
+    Coverage:
+      paths:
+      - upm-ci~/CodeCoverage/**
     Crash Dumps:
       paths:
       - CrashDumps/**
@@ -521,30 +577,34 @@ validate_-_cinemachine_-_6000_3_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
   labels:
   - Packages:cinemachine
 
-# PVP Editor and Playmode tests for Validate - cinemachine - 6000.3 - windows (6000.3 - Windows).
-validate_-_cinemachine_-_6000_3_-_windows:
-  name: Validate - cinemachine - 6000.3 - windows
+# PVP Editor and Playmode tests for Validate - cinemachine - 6000.3 - win10 (6000.3 - Windows).
+validate_-_cinemachine_-_6000_3_-_win10:
+  name: Validate - cinemachine - 6000.3 - win10
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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.3/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --filter "com.unity.cinemachine com.unity.cinemachine.tests" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -557,12 +617,15 @@ validate_-_cinemachine_-_6000_3_-_windows:
   - 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-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
+  - command: UnifiedTestRunner.exe --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Windows_6000.3;flags:cinemachine_Windows_6000.3" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
   - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
   artifacts:
+    Coverage:
+      paths:
+      - upm-ci~/CodeCoverage/**
     Crash Dumps:
       paths:
       - CrashDumps/**
@@ -587,30 +650,34 @@ validate_-_cinemachine_-_6000_3_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
   labels:
   - Packages:cinemachine
 
-# PVP Editor and Playmode tests for Validate - cinemachine - 6000.4 - macos (6000.4 - MacOS).
-validate_-_cinemachine_-_6000_4_-_macos:
-  name: Validate - cinemachine - 6000.4 - macos
+# PVP Editor and Playmode tests for Validate - cinemachine - 6000.4 - macos13 (6000.4 - MacOS).
+validate_-_cinemachine_-_6000_4_-_macos13:
+  name: Validate - cinemachine - 6000.4 - macos13
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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.4/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --filter "com.unity.cinemachine com.unity.cinemachine.tests" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -623,12 +690,15 @@ validate_-_cinemachine_-_6000_4_-_macos:
   - 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-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
+  - command: UnifiedTestRunner --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_MacOS_6000.4;flags:cinemachine_MacOS_6000.4" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
+    Coverage:
+      paths:
+      - upm-ci~/CodeCoverage/**
     Crash Dumps:
       paths:
       - CrashDumps/**
@@ -653,30 +723,34 @@ validate_-_cinemachine_-_6000_4_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
   labels:
   - Packages:cinemachine
 
-# PVP Editor and Playmode tests for Validate - cinemachine - 6000.4 - ubuntu (6000.4 - Ubuntu).
-validate_-_cinemachine_-_6000_4_-_ubuntu:
-  name: Validate - cinemachine - 6000.4 - ubuntu
+# PVP Editor and Playmode tests for Validate - cinemachine - 6000.4 - ubuntu2204 (6000.4 - Ubuntu).
+validate_-_cinemachine_-_6000_4_-_ubuntu2204:
+  name: Validate - cinemachine - 6000.4 - ubuntu2204
   agent:
     image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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.4/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --filter "com.unity.cinemachine com.unity.cinemachine.tests" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -689,12 +763,15 @@ validate_-_cinemachine_-_6000_4_-_ubuntu:
   - 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-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
+  - command: UnifiedTestRunner --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Ubuntu_6000.4;flags:cinemachine_Ubuntu_6000.4" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
   artifacts:
+    Coverage:
+      paths:
+      - upm-ci~/CodeCoverage/**
     Crash Dumps:
       paths:
       - CrashDumps/**
@@ -719,30 +796,34 @@ validate_-_cinemachine_-_6000_4_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
   labels:
   - Packages:cinemachine
 
-# PVP Editor and Playmode tests for Validate - cinemachine - 6000.4 - windows (6000.4 - Windows).
-validate_-_cinemachine_-_6000_4_-_windows:
-  name: Validate - cinemachine - 6000.4 - windows
+# PVP Editor and Playmode tests for Validate - cinemachine - 6000.4 - win10 (6000.4 - Windows).
+validate_-_cinemachine_-_6000_4_-_win10:
+  name: Validate - cinemachine - 6000.4 - win10
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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.4/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --filter "com.unity.cinemachine com.unity.cinemachine.tests" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -755,12 +836,15 @@ validate_-_cinemachine_-_6000_4_-_windows:
   - 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-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
+  - command: UnifiedTestRunner.exe --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Windows_6000.4;flags:cinemachine_Windows_6000.4" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
   - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
   artifacts:
+    Coverage:
+      paths:
+      - upm-ci~/CodeCoverage/**
     Crash Dumps:
       paths:
       - CrashDumps/**
@@ -785,30 +869,34 @@ validate_-_cinemachine_-_6000_4_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
   labels:
   - Packages:cinemachine
 
-# PVP Editor and Playmode tests for Validate - cinemachine - 6000.5 - macos (6000.5 - MacOS).
-validate_-_cinemachine_-_6000_5_-_macos:
-  name: Validate - cinemachine - 6000.5 - macos
+# PVP Editor and Playmode tests for Validate - cinemachine - 6000.5 - macos13 (6000.5 - MacOS).
+validate_-_cinemachine_-_6000_5_-_macos13:
+  name: Validate - cinemachine - 6000.5 - macos13
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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.5/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --filter "com.unity.cinemachine com.unity.cinemachine.tests" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -821,12 +909,15 @@ validate_-_cinemachine_-_6000_5_-_macos:
   - 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-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
+  - command: UnifiedTestRunner --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_MacOS_6000.5;flags:cinemachine_MacOS_6000.5" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
+    Coverage:
+      paths:
+      - upm-ci~/CodeCoverage/**
     Crash Dumps:
       paths:
       - CrashDumps/**
@@ -851,30 +942,34 @@ validate_-_cinemachine_-_6000_5_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
   labels:
   - Packages:cinemachine
 
-# PVP Editor and Playmode tests for Validate - cinemachine - 6000.5 - ubuntu (6000.5 - Ubuntu).
-validate_-_cinemachine_-_6000_5_-_ubuntu:
-  name: Validate - cinemachine - 6000.5 - ubuntu
+# PVP Editor and Playmode tests for Validate - cinemachine - 6000.5 - ubuntu2204 (6000.5 - Ubuntu).
+validate_-_cinemachine_-_6000_5_-_ubuntu2204:
+  name: Validate - cinemachine - 6000.5 - ubuntu2204
   agent:
     image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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.5/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --filter "com.unity.cinemachine com.unity.cinemachine.tests" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -887,12 +982,15 @@ validate_-_cinemachine_-_6000_5_-_ubuntu:
   - 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-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
+  - command: UnifiedTestRunner --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Ubuntu_6000.5;flags:cinemachine_Ubuntu_6000.5" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
   artifacts:
+    Coverage:
+      paths:
+      - upm-ci~/CodeCoverage/**
     Crash Dumps:
       paths:
       - CrashDumps/**
@@ -917,30 +1015,34 @@ validate_-_cinemachine_-_6000_5_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
   labels:
   - Packages:cinemachine
 
-# PVP Editor and Playmode tests for Validate - cinemachine - 6000.5 - windows (6000.5 - Windows).
-validate_-_cinemachine_-_6000_5_-_windows:
-  name: Validate - cinemachine - 6000.5 - windows
+# PVP Editor and Playmode tests for Validate - cinemachine - 6000.5 - win10 (6000.5 - Windows).
+validate_-_cinemachine_-_6000_5_-_win10:
+  name: Validate - cinemachine - 6000.5 - win10
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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.5/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --filter "com.unity.cinemachine com.unity.cinemachine.tests" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -953,12 +1055,15 @@ validate_-_cinemachine_-_6000_5_-_windows:
   - 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-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
+  - command: UnifiedTestRunner.exe --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Windows_6000.5;flags:cinemachine_Windows_6000.5" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
   - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
   artifacts:
+    Coverage:
+      paths:
+      - upm-ci~/CodeCoverage/**
     Crash Dumps:
       paths:
       - CrashDumps/**
@@ -983,30 +1088,34 @@ validate_-_cinemachine_-_6000_5_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
   labels:
   - Packages:cinemachine
 
-# PVP Editor and Playmode tests for Validate - cinemachine - 6000.6 - macos (6000.6 - MacOS).
-validate_-_cinemachine_-_6000_6_-_macos:
-  name: Validate - cinemachine - 6000.6 - macos
+# PVP Editor and Playmode tests for Validate - cinemachine - 6000.6 - macos13 (6000.6 - MacOS).
+validate_-_cinemachine_-_6000_6_-_macos13:
+  name: Validate - cinemachine - 6000.6 - macos13
   agent:
-    image: package-ci/macos-13:default
+    image: package-ci/macos-13:v4
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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 trunk -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --filter "com.unity.cinemachine com.unity.cinemachine.tests" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -1019,12 +1128,15 @@ validate_-_cinemachine_-_6000_6_-_macos:
   - 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-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
+  - command: UnifiedTestRunner --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_MacOS_6000.6;flags:cinemachine_MacOS_6000.6" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
   artifacts:
+    Coverage:
+      paths:
+      - upm-ci~/CodeCoverage/**
     Crash Dumps:
       paths:
       - CrashDumps/**
@@ -1049,30 +1161,34 @@ validate_-_cinemachine_-_6000_6_-_macos:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
   labels:
   - Packages:cinemachine
 
-# PVP Editor and Playmode tests for Validate - cinemachine - 6000.6 - ubuntu (6000.6 - Ubuntu).
-validate_-_cinemachine_-_6000_6_-_ubuntu:
-  name: Validate - cinemachine - 6000.6 - ubuntu
+# PVP Editor and Playmode tests for Validate - cinemachine - 6000.6 - ubuntu2204 (6000.6 - Ubuntu).
+validate_-_cinemachine_-_6000_6_-_ubuntu2204:
+  name: Validate - cinemachine - 6000.6 - ubuntu2204
   agent:
     image: package-ci/ubuntu-22.04:v4
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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 trunk -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --filter "com.unity.cinemachine com.unity.cinemachine.tests" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -1085,12 +1201,15 @@ validate_-_cinemachine_-_6000_6_-_ubuntu:
   - 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-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
+  - command: UnifiedTestRunner --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Ubuntu_6000.6;flags:cinemachine_Ubuntu_6000.6" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
   artifacts:
+    Coverage:
+      paths:
+      - upm-ci~/CodeCoverage/**
     Crash Dumps:
       paths:
       - CrashDumps/**
@@ -1115,30 +1234,34 @@ validate_-_cinemachine_-_6000_6_-_ubuntu:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
   labels:
   - Packages:cinemachine
 
-# PVP Editor and Playmode tests for Validate - cinemachine - 6000.6 - windows (6000.6 - Windows).
-validate_-_cinemachine_-_6000_6_-_windows:
-  name: Validate - cinemachine - 6000.6 - windows
+# PVP Editor and Playmode tests for Validate - cinemachine - 6000.6 - win10 (6000.6 - Windows).
+validate_-_cinemachine_-_6000_6_-_win10:
+  name: Validate - cinemachine - 6000.6 - win10
   agent:
-    image: package-ci/win10:default
+    image: package-ci/win10:v4
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-68_53c92d3b34ce3f4b652c9785dd1530bdc5885f6523465d6969c3be91f9ccaaf1.zip -o wrench-localapv.zip
+  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.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 trunk -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --unity .Editor
+  - command: upm-pvp create-test-project test-cinemachine --packages "upm-ci~/packages/*.tgz" --filter "com.unity.cinemachine com.unity.cinemachine.tests" --unity .Editor
     timeout: 10
     retries: 1
   - command: echo No internal packages to add.
@@ -1151,12 +1274,15 @@ validate_-_cinemachine_-_6000_6_-_windows:
   - 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-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
+  - command: UnifiedTestRunner.exe --testproject=test-cinemachine --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:cinemachine_Windows_6000.6;flags:cinemachine_Windows_6000.6" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
   - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
   artifacts:
+    Coverage:
+      paths:
+      - upm-ci~/CodeCoverage/**
     Crash Dumps:
       paths:
       - CrashDumps/**
@@ -1181,11 +1307,15 @@ validate_-_cinemachine_-_6000_6_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_cinemachine
   variables:
+    UNITY_LICENSING_SERVER_BASE_URL: http://unity-ci-licenses.hq.unity3d.com:8080/
+    UNITY_LICENSING_SERVER_DELETE_NUL: 0
+    UNITY_LICENSING_SERVER_DELETE_ULF: 0
+    UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 1.1.2.0
+    UPMPVP_CONTEXT_WRENCH: 2.3.2.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 1.1.2.0
+    Wrench: 2.3.2.0
   labels:
   - Packages:cinemachine
 
diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json
index f4db447cf..6bb4946fc 100644
--- a/.yamato/wrench/wrench_config.json
+++ b/.yamato/wrench/wrench_config.json
@@ -5,18 +5,26 @@
       "directory": "com.unity.cinemachine/",
       "prePackCommands": [],
       "preTestCommands": {
-        "MacOS": [],
-        "Ubuntu": [],
-        "Windows": []
+        "MacOs13": [],
+        "MacOs13Arm": [],
+        "Ubuntu1804": [],
+        "Ubuntu2004": [],
+        "Ubuntu2204": [],
+        "Win10": [],
+        "Win10GPU": [],
+        "Win11": [],
+        "Win11Arm": [],
+        "Win11GPU": []
       },
       "InternalOnly": false,
       "NeverPublish": false,
       "MaxEditorVersion": "",
-      "coverageEnabled": false,
+      "coverageEnabled": true,
       "coverageCommands": [
-        "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:ASSEMBLY_NAME;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:YAMATO_SOURCE_DIR/Packages;"
+        "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:ASSEMBLY_NAME;"
       ],
-      "dependantsToIgnoreInPreviewApv": {}
+      "dependantsToIgnoreInPreviewApv": {},
+      "postPackCommands": []
     }
   },
   "releasing_packages": [
@@ -24,14 +32,14 @@
   ],
   "jobs_to_monitor": {
     "com.unity.cinemachine": [
-      ".yamato/wrench/api-validation-jobs.yml#api_validation_-_cinemachine_-_2022_3_-_windows",
+      ".yamato/wrench/api-validation-jobs.yml#api_validation_-_cinemachine_-_2022_3_-_win10",
       ".yamato/wrench/preview-a-p-v.yml#all_preview_apv_jobs",
       ".yamato/wrench/promotion-jobs.yml#publish_dry_run_cinemachine"
     ]
   },
   "publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_cinemachine",
   "branch_pattern": "ReleaseSlash",
-  "wrench_version": "1.1.2.0",
+  "wrench_version": "2.3.2.0",
   "pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json",
   "cs_project_path": "Tools/Cinemachine-Recipes/Cinemachine.Cookbook.csproj"
 }
\ No newline at end of file
diff --git a/Tools/Cinemachine-Recipes/Cinemachine.Cookbook.csproj b/Tools/Cinemachine-Recipes/Cinemachine.Cookbook.csproj
index 6b651b531..115a5d622 100644
--- a/Tools/Cinemachine-Recipes/Cinemachine.Cookbook.csproj
+++ b/Tools/Cinemachine-Recipes/Cinemachine.Cookbook.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="RecipeEngine.Modules.Wrench" Version="1.1.2" />
+      <PackageReference Include="RecipeEngine.Modules.Wrench" Version="2.3.2" />
     </ItemGroup>
 
 </Project>
diff --git a/Tools/Cinemachine-Recipes/Properties/launchSettings.json b/Tools/Cinemachine-Recipes/Properties/launchSettings.json
new file mode 100644
index 000000000..c9c994faf
--- /dev/null
+++ b/Tools/Cinemachine-Recipes/Properties/launchSettings.json
@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "Cinemachine.Cookbook": {
+      "commandName": "Project",
+      "workingDirectory": "$(ProjectDir)/../../"
+    }
+  }
+}
diff --git a/Tools/Cinemachine-Recipes/Recipes/BuildDocs.cs b/Tools/Cinemachine-Recipes/Recipes/BuildDocs.cs
index 6e68a253b..b6f62db09 100644
--- a/Tools/Cinemachine-Recipes/Recipes/BuildDocs.cs
+++ b/Tools/Cinemachine-Recipes/Recipes/BuildDocs.cs
@@ -5,6 +5,7 @@
 using RecipeEngine.Api.Platforms;
 using RecipeEngine.Api.Recipes;
 using RecipeEngine.Modules.UpmCi;
+using RecipeEngine.Modules.Wrench.Platforms;
 using RecipeEngine.Platforms;
 
 namespace Cinemachine.Cookbook.Recipes;
@@ -18,7 +19,7 @@ protected override ISet<Job> LoadJobs()
     private const string PackageName = "com.unity.cinemachine";
 
     private static readonly Platform
-        Platform = Settings.Wrench.Packages[PackageName].EditorPlatforms[SystemType.MacOS];
+        Platform = Settings.Wrench.Packages[PackageName].UnityEditors.First().AllEditorPlatforms[EditorPlatformType.MacOs13];
 
     private const string EditorVersion = "trunk";
     
@@ -30,14 +31,14 @@ public IEnumerable<Dependency> AsDependencies()
     private List<IJobBuilder> GetJobs()
     {
         List<IJobBuilder> builders = new();
-        IJobBuilder job = JobBuilder.Create($"Code coverage - {Platform.System}  - {EditorVersion}")
+        IJobBuilder job = JobBuilder.Create($"Build Documentation - {Platform.System}  - {EditorVersion}")
             .WithPlatform(Platform)
             .WithCommands(c => c
-                .AddBrick("git@github.cds.internal.unity3d.com:wind-xu/virtual_production_doc_generation.git@v0.3.0",
+                .AddBrick("git@github.cds.internal.unity3d.com:wind-xu/virtual_production_doc_generation.git@v0.5.3",
                     ("EDITOR_VERSION", "trunk"), ("PACKAGE_NAME", PackageName), ("PACKAGE_PATH", PackageName))
             )
             .WithDescription(
-                $"Generate codecov data for {Settings.Wrench.Packages[PackageName].DisplayName} on {Platform.System}");
+                $"Build documentation for {Settings.Wrench.Packages[PackageName].DisplayName} on {Platform.System}");
             
 
         builders.Add(job);
diff --git a/Tools/Cinemachine-Recipes/Recipes/CleanConsoleTests.cs b/Tools/Cinemachine-Recipes/Recipes/CleanConsoleTests.cs
new file mode 100644
index 000000000..16ffe17bd
--- /dev/null
+++ b/Tools/Cinemachine-Recipes/Recipes/CleanConsoleTests.cs
@@ -0,0 +1,57 @@
+using Cinemachine.Cookbook.Settings;
+using RecipeEngine.Api.Recipes;
+using RecipeEngine.Api.Dependencies;
+using RecipeEngine.Api.Extensions;
+using RecipeEngine.Api.Jobs;
+using RecipeEngine.Api.Platforms;
+using RecipeEngine.Modules.Wrench.Platforms;
+using RecipeEngine.Platforms;
+
+namespace Cinemachine.Cookbook.Recipes;
+
+public class CleanConsoleTests: RecipeBase
+{
+    CinemachineSettings settings = new();
+
+    protected override ISet<Job> LoadJobs()
+        => Combine.Collections(GetJobs()).SelectJobs();
+
+    public string GetJobName(UnityEditor editor, SystemType systemType)
+        => $"Clean console tests - {editor.Version} - {systemType}";
+
+    public IEnumerable<Dependency> AsDependencies()
+    {
+        return this.Jobs.ToDependencies(this);
+    }
+
+    private List<IJobBuilder> GetJobs()
+    {
+        var allSupportedEditors =
+            settings.Wrench.Packages[CinemachineSettings.packageName].UnityEditors;
+
+        List<IJobBuilder> builders = new();
+        foreach (var unityEditor in allSupportedEditors)
+        {
+            foreach (var platform in unityEditor.EditorPlatforms)
+            {
+                var jobName = GetJobName(unityEditor, platform.System);
+                IJobBuilder job = JobBuilder.Create(jobName)
+                    .WithDescription(
+                        $"Clean console tests for {settings.Wrench.Packages[CinemachineSettings.packageName].DisplayName} on {platform.System}")
+                    .WithPlatform(platform)
+                    .WithCommands(c => c
+                        .AddBrick("git@github.cds.internal.unity3d.com:wind-xu/clean_console_test_brick.git@v0.3.7",
+                            ("EDITOR_VERSION", settings.Wrench.EditorVersionToBranches[unityEditor.Version.ToString()]),
+                            ("CLEAN_CONSOLE_TEST_FOR", "package"),
+                            ("PACKAGE_PATH", CinemachineSettings.packageName),
+                            ("EXEMPTION_FILE_DIR", ".yamato"),
+                            ("WARNINGS_AS_ERRORS", false))
+                    )
+                    .WithArtifact("logs", "TestResults/**/*");
+                builders.Add(job);
+            }
+        }
+
+        return builders;
+    }
+}
diff --git a/Tools/Cinemachine-Recipes/Recipes/CodeCoverage.cs b/Tools/Cinemachine-Recipes/Recipes/CodeCoverage.cs
deleted file mode 100644
index 68f16a089..000000000
--- a/Tools/Cinemachine-Recipes/Recipes/CodeCoverage.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using Cinemachine.Cookbook.Settings;
-using RecipeEngine.Api.Dependencies;
-using RecipeEngine.Api.Extensions;
-using RecipeEngine.Api.Jobs;
-using RecipeEngine.Api.Platforms;
-using RecipeEngine.Api.Recipes;
-using RecipeEngine.Modules.UnifiedTestRunner;
-using RecipeEngine.Modules.UpmCi;
-using RecipeEngine.Modules.UpmPvp;
-using RecipeEngine.Modules.Wrench.Models;
-using RecipeEngine.Platforms;
-
-namespace Cinemachine.Cookbook.Recipes;
-
-public class CodeCoverage :RecipeBase
-{
-    protected override ISet<Job> LoadJobs()
-        => Combine.Collections(GetJobs()).SelectJobs();
-
-    private static readonly CinemachineSettings settings = new();
-    private const string PackageName = "com.unity.cinemachine";
-    private static readonly Platform Platform = settings.Wrench.Packages[PackageName].EditorPlatforms[SystemType.Ubuntu];
-    private const string EditorVersion = "trunk";
-
-
-    public IEnumerable<Dependency> AsDependencies()
-    {
-        return this.Jobs.ToDependencies(this);
-    }
-    
-    private List<IJobBuilder> GetJobs()
-    {
-        List<IJobBuilder> builders = new();
-        IJobBuilder job = JobBuilder.Create($"Code coverage - {Platform.System}  - {EditorVersion}")
-                .WithPlatform(Platform)
-                .WithCommands( c => c
-                    .Add("npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm")
-                    .Add("upm-ci package test -u trunk --package-path com.unity.cinemachine --type package-tests --enable-code-coverage --code-coverage-options \"generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.Cinemachine*\" --extra-utr-arg=--coverage-results-path=${YAMATO_SOURCE_DIR}/upm-ci~/test-results/CoverageResults")
-                    .Add("curl -Os https://uploader.codecov.io/latest/linux/codecov")
-                    .Add("chmod a+x ./codecov")
-                    .Add("./codecov -v -t \"${CODECOV_TOKEN}\" -B \"${GIT_BRANCH}\" -T \"${GIT_TAG}\" -P \"${YAMATO_PR_ID}\" -f \"upm-ci~/test-results/CoverageResults/**/*.xml\"")
-                    )
-                .WithUpmCiArtifacts()
-                .WithDescription($"Generate codecov data for {settings.Wrench.Packages[PackageName].DisplayName} on {Platform.System}")
-                .WithDependencies(settings.Wrench.WrenchJobs[PackageName][JobTypes.Pack]);
-                            
-        builders.Add(job);
-        return builders;
-    }
-}
\ No newline at end of file
diff --git a/Tools/Cinemachine-Recipes/Recipes/ProjectTest.cs b/Tools/Cinemachine-Recipes/Recipes/ProjectTest.cs
index 9b1edf3f8..24bfa9829 100644
--- a/Tools/Cinemachine-Recipes/Recipes/ProjectTest.cs
+++ b/Tools/Cinemachine-Recipes/Recipes/ProjectTest.cs
@@ -31,20 +31,21 @@ public IEnumerable<IJobBuilder> GetJobs()
         CinemachineSettings settings = new();
         foreach (var packageName in settings.Wrench.PackagesToRelease)
         {
-            var platforms = settings.Wrench.Packages[packageName].EditorPlatforms;
-            foreach (var platform in platforms)
+            var supportedEditors = settings.Wrench.Packages[packageName].UnityEditors;
+            foreach (var unityEditor in supportedEditors)
             {
-                var supportedVersions = settings.Wrench.Packages[packageName].SupportedEditorVersions;
-                foreach (var editorVersion in supportedVersions)
+                var version = unityEditor.Version.ToString();
+                foreach (var platform in unityEditor.EditorPlatforms)
                 {
-                    var branch = settings.Wrench.EditorVersionToBranches[editorVersion];
+                    var yamatoSourceDir = platform.System == SystemType.Windows ? "%YAMATO_SOURCE_DIR%" : "$YAMATO_SOURCE_DIR";
+                    var branch = settings.Wrench.EditorVersionToBranches[version];
                     foreach (var project in settings.ProjectNames)
                     {
-                        if (!settings.ProjectAndEditorAreCompatible(project, editorVersion))
+                        if (!settings.ProjectAndEditorAreCompatible(project, version))
                             continue;
 
-                        IJobBuilder job = JobBuilder.Create(GetJobName(settings.Wrench.Packages[packageName].ShortName, project, editorVersion, platform.Key))
-                            .WithPlatform(platform.Value)
+                        IJobBuilder job = JobBuilder.Create(GetJobName(settings.Wrench.Packages[packageName].ShortName, project, version, platform.System))
+                            .WithPlatform(platform)
                             //.WithOptionalCommands(
                             //    platform.Value.RunsOnLinux(), c => c
                             //        .Add("rm com.unity.cinemachine/Tests/.tests.json "))
@@ -52,17 +53,21 @@ public IEnumerable<IJobBuilder> GetJobs()
                                 .Add($"unity-downloader-cli -u {branch} -c Editor --fast")
                                 // Use the package tarball for testing.
                                 .Add($"upm-pvp create-test-project {settings.ProjectsDir}/{project} --packages \"{UpmPvpCommand.kDefaultPackagesGlob}\" --unity .Editor")
-                                .Add(UtrCommand.Run(platform.Value.System, b => b
+                                .Add(UtrCommand.Run(platform.System, b => b
                                     .WithTestProject($"{settings.ProjectsDir}/{project}")
                                     .WithEditor(".Editor")
                                     .WithRerun(1, true)
                                     .WithArtifacts("artifacts")
                                     .WithSuite(UtrTestSuiteType.Editor)
-                                    .WithExtraArgs("--suite=PlayMode"))))
-                            .WithDescription($"Run {project} project tests for {settings.Wrench.Packages[packageName].DisplayName} on {platform.Key}")
+                                    .WithExtraArgs("--suite=PlayMode")
+                                    .WithExtraArgs("--enable-code-coverage", 
+                                    "--coverage-options=\"generateAdditionalMetrics;generateHtmlReport;" + 
+                                    $"assemblyFilters:+Cinemachine,+com.unity.cinemachine.editor;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:{yamatoSourceDir}/Packages;\"",
+                                    $"--coverage-results-path={yamatoSourceDir}/upm-ci~/CodeCoverage",
+                                    $"--coverage-upload-options=\"reportsDir:upm-ci~/CodeCoverage;name:cinemachine_{platform.System.ToString()}_{version}_project;flags:cinemachine_{platform.System.ToString()}_{version}_project\""))))
+                            .WithDescription($"Run {project} project tests for {settings.Wrench.Packages[packageName].DisplayName} on {platform.System}")
                             .WithDependencies(settings.Wrench.WrenchJobs[packageName][JobTypes.Pack])
                             .WithArtifact(new Artifact("artifacts", "artifacts/*"));
-                            ;
                             
                         builders.Add(job);
                     }
diff --git a/Tools/Cinemachine-Recipes/Recipes/Triggers.cs b/Tools/Cinemachine-Recipes/Recipes/Triggers.cs
index 1ad4ee735..5c6c0bfb7 100644
--- a/Tools/Cinemachine-Recipes/Recipes/Triggers.cs
+++ b/Tools/Cinemachine-Recipes/Recipes/Triggers.cs
@@ -2,9 +2,9 @@
 using RecipeEngine.Api.Extensions;
 using RecipeEngine.Api.Jobs;
 using RecipeEngine.Api.Recipes;
+using RecipeEngine.Api.Triggers;
 using RecipeEngine.Modules.Wrench.Models;
-using Unity.Yamato.JobDefinition;
-using Dependency = RecipeEngine.Api.Dependencies.Dependency;
+using Schedule = RecipeEngine.Api.Triggers.Recurring.Schedule;
 
 namespace Cinemachine.Cookbook.Recipes;
 
@@ -12,6 +12,7 @@ public class Triggers : RecipeBase
 {
     private readonly CinemachineSettings config = new ();
     private const string packageName = "com.unity.cinemachine";
+    private const string branchName = "release/2.10";
     
     protected override ISet<Job> LoadJobs()
         => Combine.Collections(GetTriggers()).SelectJobs();
@@ -21,29 +22,34 @@ private ISet<IJobBuilder> GetTriggers()
         HashSet<IJobBuilder> builders = new();
         var validationTests = config.Wrench.WrenchJobs[packageName][JobTypes.Validation];
         var projectTests = new ProjectTest().AsDependencies();
-        var codeCoverage = new CodeCoverage().AsDependencies();
+        var cleanConsoleTests = new CleanConsoleTests().AsDependencies();
+
         builders.Add(JobBuilder.Create($"Nightly Trigger")
+            .WithDescription($"Nightly check on {branchName}")
             .WithDependencies(projectTests)
             .WithDependencies(validationTests)
-            .WithDescription("Nightly check on main")
-            
+            .WithDependencies(cleanConsoleTests)
+            .WithScheduleTrigger(Schedule.RunDaily(branchName))
         );
+        
         builders.Add(JobBuilder.Create($"All Trigger")
             .WithDependencies(projectTests)
             .WithDependencies(validationTests)
-            .WithDependencies(codeCoverage)
-            .WithPullRequestTrigger(pr => pr.ExcludeDraft())
-            .WithDescription("All tests defined in recipes.")
+            .WithBranchesTrigger(b => b.Only(branchName, "release[/]\\\\d+[.]\\\\d+)"))
+            .WithDescription("All tests defined in recipes. Run in changes to main and release branches.")
         );
         
-        var prsubset = config.Wrench.WrenchJobs[packageName][JobTypes.Validation].Where(job => job.JobId.Contains("windows") || job.JobId.Contains("6000"));
-        
-        builders.Add(JobBuilder.Create("Package CI")
-            .WithDependencies(prsubset)
-            .WithPullRequestTrigger(pr => pr.ExcludeDraft())
-            .WithBranchesTrigger(b => b.Only("main", "release[/]\\\\d+[.]\\\\d+)"))
-            .WithDescription("Tests to run on PRs and mainline branches.")
+        var prProjectTests = projectTests.Where(job => job.JobId.Contains("Windows"));
+        var prValidationTests = config.Wrench.WrenchJobs[packageName][JobTypes.Validation].Where(job => job.JobId.Contains("win"));
+
+        builders.Add(JobBuilder.Create("Pull Request Tests Trigger")
+            .WithDependencies(prProjectTests)
+            .WithDependencies(prValidationTests)
+            .WithPullRequestTrigger(pr => pr.ExcludeDraft(),
+                true, CancelLeftoverJobs.Always)
+            .WithDescription("Tests to run on PRs.")
         );
+
         return builders;
     }
 }
\ No newline at end of file
diff --git a/Tools/Cinemachine-Recipes/Settings/CinemachineSettings.cs b/Tools/Cinemachine-Recipes/Settings/CinemachineSettings.cs
index 9a4800dea..2285706ce 100644
--- a/Tools/Cinemachine-Recipes/Settings/CinemachineSettings.cs
+++ b/Tools/Cinemachine-Recipes/Settings/CinemachineSettings.cs
@@ -10,7 +10,7 @@ public class CinemachineSettings
     // Path from the root of the repository where packages are located.
     string[] PackagesRootPaths = { "." };
 
-    public static readonly string CinemachinePackageName = "com.unity.cinemachine";
+    public static readonly string packageName = "com.unity.cinemachine";
 
     // update this to list all packages in this repo that you want to release.
     Dictionary<string, PackageOptions> PackageOptions = new()
@@ -20,6 +20,10 @@ public class CinemachineSettings
             new PackageOptions()
             {
                 ReleaseOptions = new ReleaseOptions() { IsReleasing = true }, // Will generate jobs for this packages.
+                ValidationOptions = new ValidationOptions()
+                {
+                    AdditionalUtrArguments = ["--coverage-pkg-version=1.3.0"]
+                }
             }
         },
     };
@@ -39,12 +43,11 @@ public CinemachineSettings()
             PackageOptions
         );
 
-        Wrench.PvpProfilesToCheck = PvPprofilesToCheck;
+        Wrench.Packages[packageName].CoverageCommands.Enabled = true;
+        Wrench.Packages[packageName].CoverageCommands.AssemblyAllowList.Add("^Cinemachine$");
+        Wrench.Packages[packageName].CoverageCommands.AssemblyAllowList.Add("^com.unity.cinemachine.editor$");
 
-        var defaultUbuntuPlatform = WrenchPackage.DefaultEditorPlatforms[SystemType.Ubuntu];
-        // Use Ubuntu image package-ci/ubuntu-22.04 which is required by 6000.0+ versions.
-        Wrench.Packages[CinemachinePackageName].EditorPlatforms[SystemType.Ubuntu] = new Platform(new Agent("package-ci/ubuntu-22.04:default",
-            defaultUbuntuPlatform.Agent.Flavor, defaultUbuntuPlatform.Agent.Resource), defaultUbuntuPlatform.System);
+        Wrench.PvpProfilesToCheck = PvPprofilesToCheck;
     }
 
     public WrenchSettings Wrench { get; set; }
diff --git a/Tools/Cinemachine-Recipes/regenerate.bat b/Tools/Cinemachine-Recipes/regenerate.bat
index f35e32383..e4ce1c171 100644
--- a/Tools/Cinemachine-Recipes/regenerate.bat
+++ b/Tools/Cinemachine-Recipes/regenerate.bat
@@ -1,2 +1,2 @@
-cd ../../
-dotnet run --project Tools/CineMachine-Recipes/Cinemachine.Cookbook.csproj
\ No newline at end of file
+cd %~dp0../../
+dotnet run --project Tools/Cinemachine-Recipes/Cinemachine.Cookbook.csproj
\ No newline at end of file
diff --git a/Tools/Cinemachine-Recipes/regenerate.sh b/Tools/Cinemachine-Recipes/regenerate.sh
old mode 100644
new mode 100755
index f35e32383..1008f2cc1
--- a/Tools/Cinemachine-Recipes/regenerate.sh
+++ b/Tools/Cinemachine-Recipes/regenerate.sh
@@ -1,2 +1,2 @@
-cd ../../
-dotnet run --project Tools/CineMachine-Recipes/Cinemachine.Cookbook.csproj
\ No newline at end of file
+cd $(dirname "$0")/../../
+dotnet run --project Tools/Cinemachine-Recipes/Cinemachine.Cookbook.csproj
\ No newline at end of file