diff --git a/.Tools/CI/ProBuilder.Cookbook.csproj b/.Tools/CI/ProBuilder.Cookbook.csproj
index 8e6b817c6..8c0d11eff 100644
--- a/.Tools/CI/ProBuilder.Cookbook.csproj
+++ b/.Tools/CI/ProBuilder.Cookbook.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="RecipeEngine.Modules.Wrench" Version="2.12.0" />
+      <PackageReference Include="RecipeEngine.Modules.Wrench" Version="3.11.5" />
     </ItemGroup>
 
 </Project>
diff --git a/.Tools/CI/Recipes/Triggers.cs b/.Tools/CI/Recipes/Triggers.cs
index c921188c1..aa405ea2d 100644
--- a/.Tools/CI/Recipes/Triggers.cs
+++ b/.Tools/CI/Recipes/Triggers.cs
@@ -22,7 +22,7 @@ private ISet<IJobBuilder> GetTriggers()
         HashSet<IJobBuilder> builders =
         [
             JobBuilder.Create("Pull Request Trigger")
-                .WithDependencies(allValidationJobs.Where(d => (d.JobId.Contains("macos") && !d.JobId.Contains("6000.6")) ))
+                .WithDependencies(allValidationJobs.Where(d => d.JobId.Contains("macos")))
                 .WithPullRequestTrigger(pr => pr.ExcludeDraft().And().WithTargetBranch("master"),
                     true, cancelLeftoverJobs: CancelLeftoverJobs.Always)
         ];
diff --git a/.Tools/CI/Settings/ProBuilderSettings.cs b/.Tools/CI/Settings/ProBuilderSettings.cs
index 781741af1..7f908320e 100644
--- a/.Tools/CI/Settings/ProBuilderSettings.cs
+++ b/.Tools/CI/Settings/ProBuilderSettings.cs
@@ -39,7 +39,6 @@ public static ProBuilderSettings Instance
             new PackageOptions()
             {
                 ReleaseOptions = new ReleaseOptions() { IsReleasing = true },
-                MaximumEditorVersion =  "6000.5",
                 ValidationOptions = new ValidationOptions()
                 {
                     AdditionalUtrArguments = ["--fail-on-assert --coverage-pkg-version=1.3.0"]
diff --git a/.yamato/generated-scripts/infrastructure-instability-detection-mac.sh b/.yamato/generated-scripts/infrastructure-instability-detection-mac.sh
index aef156dad..1f7b56619 100644
--- a/.yamato/generated-scripts/infrastructure-instability-detection-mac.sh
+++ b/.yamato/generated-scripts/infrastructure-instability-detection-mac.sh
@@ -2,6 +2,13 @@
 # This is an auto-generated script. Do not edit manually!
 set -x
 
+crashReportDir="${TMPDIR%/}/BugReporterCrashReportJson"
+if [ -d "$crashReportDir" ]; then
+  for f in "$crashReportDir"/CrashReport_*.json; do
+    [ -e "$f" ] || continue
+    curl -X POST --connect-timeout 5 --max-time 10 -H "Content-Type: application/json" -T "$f" "https://internal-crash-collector.prd.cds.internal.unity3d.com/api/crash" || echo "Failed to upload $f. Ignoring..."
+  done
+fi
 set -e
 if [ -f "infrastructure_instability_detection_standalone.zip" ]; then
   echo "removed existing archive infrastructure_instability_detection_standalone.zip"
diff --git a/.yamato/generated-scripts/infrastructure-instability-detection-win.cmd b/.yamato/generated-scripts/infrastructure-instability-detection-win.cmd
index b1cb27891..af85b00d4 100644
--- a/.yamato/generated-scripts/infrastructure-instability-detection-win.cmd
+++ b/.yamato/generated-scripts/infrastructure-instability-detection-win.cmd
@@ -1,7 +1,7 @@
 @echo on
 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...
+if exist "%TEMP%\BugReporterCrashReportJson"  for /f "delims=" %%i in ('dir /b /a-d "%TEMP%\BugReporterCrashReportJson\CrashReport_*.json"') do curl -X POST --connect-timeout 5 --max-time 10 -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.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"
diff --git a/.yamato/triggers.yml b/.yamato/triggers.yml
index 6d894570c..60ee4b864 100644
--- a/.yamato/triggers.yml
+++ b/.yamato/triggers.yml
@@ -9,8 +9,9 @@ pull_request_trigger:
   dependencies:
   - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_0_-_macos13
   - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_3_-_macos13
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_4_-_macos13
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_5_-_macos13
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_6_-_macos13arm
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_7_-_macos13arm
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_7000_0_-_macos13arm
   triggers:
     expression: |-
       NOT pull_request.draft AND
diff --git a/.yamato/wrench/api-validation-jobs.yml b/.yamato/wrench/api-validation-jobs.yml
index af9fe02df..159721870 100644
--- a/.yamato/wrench/api-validation-jobs.yml
+++ b/.yamato/wrench/api-validation-jobs.yml
@@ -18,7 +18,7 @@ api_validation_-_probuilder_-_6000_0_-_win10:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "%WRENCH_LOCALAPV_URL%" -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
@@ -60,8 +60,9 @@ api_validation_-_probuilder_-_6000_0_-_win10:
     UNITY_LICENSING_SERVER_DELETE_NUL: 0
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
 
diff --git a/.yamato/wrench/package-pack-jobs.yml b/.yamato/wrench/package-pack-jobs.yml
index d1743f7aa..8da4da09a 100644
--- a/.yamato/wrench/package-pack-jobs.yml
+++ b/.yamato/wrench/package-pack-jobs.yml
@@ -27,7 +27,8 @@ package_pack_-_probuilder:
       - upm-ci~/packages/**/*
   variables:
     UPMCI_ACK_LARGE_PACKAGE: 1
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
 
diff --git a/.yamato/wrench/preview-a-p-v.yml b/.yamato/wrench/preview-a-p-v.yml
index 28ba58b2f..126512b2b 100644
--- a/.yamato/wrench/preview-a-p-v.yml
+++ b/.yamato/wrench/preview-a-p-v.yml
@@ -16,15 +16,18 @@ all_preview_apv_jobs:
   - 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_-_macos13arm
+  - 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
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_7_-_macos13arm
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_7_-_ubuntu2204
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_7_-_win10
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_7000_0_-_macos13arm
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_7000_0_-_ubuntu2204
+  - path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_7000_0_-_win10
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
 
 # Functional tests for dependents found in the latest 6000.0 manifest (MacOS).
 preview_apv_-_6000_0_-_macos13:
@@ -34,7 +37,7 @@ preview_apv_-_6000_0_-_macos13:
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "$WRENCH_LOCALAPV_URL" -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
@@ -44,7 +47,7 @@ preview_apv_-_6000_0_-_macos13:
   - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --artifacts-path=PreviewApvArtifacts~
   - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
@@ -79,10 +82,11 @@ preview_apv_-_6000_0_-_macos13:
     UNITY_LICENSING_SERVER_DELETE_NUL: 0
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
 
 # Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu).
 preview_apv_-_6000_0_-_ubuntu2204:
@@ -92,7 +96,7 @@ preview_apv_-_6000_0_-_ubuntu2204:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "$WRENCH_LOCALAPV_URL" -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
@@ -102,7 +106,7 @@ preview_apv_-_6000_0_-_ubuntu2204:
   - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --artifacts-path=PreviewApvArtifacts~
   - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
@@ -137,10 +141,11 @@ preview_apv_-_6000_0_-_ubuntu2204:
     UNITY_LICENSING_SERVER_DELETE_NUL: 0
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
 
 # Functional tests for dependents found in the latest 6000.0 manifest (Windows).
 preview_apv_-_6000_0_-_win10:
@@ -151,7 +156,7 @@ preview_apv_-_6000_0_-_win10:
     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-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "%WRENCH_LOCALAPV_URL%" -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
@@ -161,7 +166,7 @@ preview_apv_-_6000_0_-_win10:
   - command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --artifacts-path=PreviewApvArtifacts~
   - command: python PythonScripts/editor_manifest_validator.py --version=6000.0 --wrench-config=.yamato/wrench/wrench_config.json
   after:
   - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
@@ -196,10 +201,11 @@ preview_apv_-_6000_0_-_win10:
     UNITY_LICENSING_SERVER_DELETE_NUL: 0
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
 
 # Functional tests for dependents found in the latest 6000.3 manifest (MacOS).
 preview_apv_-_6000_3_-_macos13:
@@ -209,7 +215,7 @@ preview_apv_-_6000_3_-_macos13:
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "$WRENCH_LOCALAPV_URL" -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
@@ -219,7 +225,7 @@ preview_apv_-_6000_3_-_macos13:
   - command: unity-downloader-cli -u 6000.3/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --artifacts-path=PreviewApvArtifacts~
   - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
@@ -254,10 +260,11 @@ preview_apv_-_6000_3_-_macos13:
     UNITY_LICENSING_SERVER_DELETE_NUL: 0
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
 
 # Functional tests for dependents found in the latest 6000.3 manifest (Ubuntu).
 preview_apv_-_6000_3_-_ubuntu2204:
@@ -267,7 +274,7 @@ preview_apv_-_6000_3_-_ubuntu2204:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "$WRENCH_LOCALAPV_URL" -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
@@ -277,7 +284,7 @@ preview_apv_-_6000_3_-_ubuntu2204:
   - command: unity-downloader-cli -u 6000.3/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --artifacts-path=PreviewApvArtifacts~
   - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
@@ -312,10 +319,11 @@ preview_apv_-_6000_3_-_ubuntu2204:
     UNITY_LICENSING_SERVER_DELETE_NUL: 0
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
 
 # Functional tests for dependents found in the latest 6000.3 manifest (Windows).
 preview_apv_-_6000_3_-_win10:
@@ -326,7 +334,7 @@ preview_apv_-_6000_3_-_win10:
     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-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "%WRENCH_LOCALAPV_URL%" -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
@@ -336,7 +344,7 @@ preview_apv_-_6000_3_-_win10:
   - command: unity-downloader-cli -u 6000.3/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --artifacts-path=PreviewApvArtifacts~
   - command: python PythonScripts/editor_manifest_validator.py --version=6000.3 --wrench-config=.yamato/wrench/wrench_config.json
   after:
   - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
@@ -371,30 +379,32 @@ preview_apv_-_6000_3_-_win10:
     UNITY_LICENSING_SERVER_DELETE_NUL: 0
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
 
-# Functional tests for dependents found in the latest 6000.4 manifest (MacOS).
-preview_apv_-_6000_4_-_macos13:
-  name: Preview APV - 6000.4 - macos13
+# Functional tests for dependents found in the latest 6000.6 manifest (MacOS).
+preview_apv_-_6000_6_-_macos13arm:
+  name: Preview APV - 6000.6 - macos13arm
   agent:
-    image: package-ci/macos-13:v4
+    image: package-ci/macos-13-arm64:v4
     type: Unity::VM::osx
-    flavor: b1.xlarge
+    flavor: m1.mac
+    model: M1
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "$WRENCH_LOCALAPV_URL" -o wrench-localapv.zip
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u 6000.4/staging -c editor --path .Editor --fast
+  - command: unity-downloader-cli -u 6000.6/staging -c editor --path .Editor --fast --arch arm64
     timeout: 10
     retries: 3
-  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.4 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.6 --artifacts-path=PreviewApvArtifacts~
   - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
@@ -429,30 +439,31 @@ preview_apv_-_6000_4_-_macos13:
     UNITY_LICENSING_SERVER_DELETE_NUL: 0
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
 
-# Functional tests for dependents found in the latest 6000.4 manifest (Ubuntu).
-preview_apv_-_6000_4_-_ubuntu2204:
-  name: Preview APV - 6000.4 - ubuntu2204
+# Functional tests for dependents found in the latest 6000.6 manifest (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-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "$WRENCH_LOCALAPV_URL" -o wrench-localapv.zip
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u 6000.4/staging -c editor --path .Editor --fast
+  - command: unity-downloader-cli -u 6000.6/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.4 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.6 --artifacts-path=PreviewApvArtifacts~
   - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
@@ -487,32 +498,33 @@ preview_apv_-_6000_4_-_ubuntu2204:
     UNITY_LICENSING_SERVER_DELETE_NUL: 0
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
 
-# Functional tests for dependents found in the latest 6000.4 manifest (Windows).
-preview_apv_-_6000_4_-_win10:
-  name: Preview APV - 6000.4 - win10
+# Functional tests for dependents found in the latest 6000.6 manifest (Windows).
+preview_apv_-_6000_6_-_win10:
+  name: Preview APV - 6000.6 - win10
   agent:
     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-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "%WRENCH_LOCALAPV_URL%" -o wrench-localapv.zip
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u 6000.4/staging -c editor --path .Editor --fast
+  - command: unity-downloader-cli -u 6000.6/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.4 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
-  - command: python PythonScripts/editor_manifest_validator.py --version=6000.4 --wrench-config=.yamato/wrench/wrench_config.json
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.6 --artifacts-path=PreviewApvArtifacts~
+  - command: python PythonScripts/editor_manifest_validator.py --version=6000.6 --wrench-config=.yamato/wrench/wrench_config.json
   after:
   - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
   artifacts:
@@ -546,30 +558,211 @@ preview_apv_-_6000_4_-_win10:
     UNITY_LICENSING_SERVER_DELETE_NUL: 0
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
 
-# Functional tests for dependents found in the latest 6000.5 manifest (MacOS).
-preview_apv_-_6000_5_-_macos13:
-  name: Preview APV - 6000.5 - macos13
+# Functional tests for dependents found in the latest 6000.7 manifest (MacOS).
+preview_apv_-_6000_7_-_macos13arm:
+  name: Preview APV - 6000.7 - macos13arm
   agent:
-    image: package-ci/macos-13:v4
+    image: package-ci/macos-13-arm64:v4
     type: Unity::VM::osx
-    flavor: b1.xlarge
+    flavor: m1.mac
+    model: M1
+  commands:
+  - command: curl "$WRENCH_LOCALAPV_URL" -o wrench-localapv.zip
+  - command: 7z x -aoa wrench-localapv.zip
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/print_machine_info.py
+  - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    timeout: 20
+    retries: 10
+  - command: unity-downloader-cli -u 6000.7/staging -c editor --path .Editor --fast --arch arm64
+    timeout: 10
+    retries: 3
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.7 --artifacts-path=PreviewApvArtifacts~ --shadow-branch=6000.7/staging
+  - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
+  after:
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
+  artifacts:
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    logs:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - upm-ci~/test-results/**/*
+      - upm-ci~/temp/*/Logs/**
+      - upm-ci~/temp/*/Library/*.log
+      - upm-ci~/temp/*/*.log
+      - upm-ci~/temp/Builds/*.log
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    PreviewAPVResults:
+      paths:
+      - PreviewApvArtifacts~/**
+      - APVTest/**/manifest.json
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_probuilder
+  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_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 3.11.5.0
+
+# Functional tests for dependents found in the latest 6000.7 manifest (Ubuntu).
+preview_apv_-_6000_7_-_ubuntu2204:
+  name: Preview APV - 6000.7 - ubuntu2204
+  agent:
+    image: package-ci/ubuntu-22.04:v4
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - command: curl "$WRENCH_LOCALAPV_URL" -o wrench-localapv.zip
+  - command: 7z x -aoa wrench-localapv.zip
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/print_machine_info.py
+  - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    timeout: 20
+    retries: 10
+  - command: unity-downloader-cli -u 6000.7/staging -c editor --path .Editor --fast
+    timeout: 10
+    retries: 3
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.7 --artifacts-path=PreviewApvArtifacts~ --shadow-branch=6000.7/staging
+  - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
+  after:
+  - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
+  artifacts:
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    logs:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - upm-ci~/test-results/**/*
+      - upm-ci~/temp/*/Logs/**
+      - upm-ci~/temp/*/Library/*.log
+      - upm-ci~/temp/*/*.log
+      - upm-ci~/temp/Builds/*.log
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    PreviewAPVResults:
+      paths:
+      - PreviewApvArtifacts~/**
+      - APVTest/**/manifest.json
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_probuilder
+  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_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 3.11.5.0
+
+# Functional tests for dependents found in the latest 6000.7 manifest (Windows).
+preview_apv_-_6000_7_-_win10:
+  name: Preview APV - 6000.7 - win10
+  agent:
+    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 "%WRENCH_LOCALAPV_URL%" -o wrench-localapv.zip
+  - command: 7z x -aoa wrench-localapv.zip
+  - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
+  - command: python PythonScripts/print_machine_info.py
+  - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    timeout: 20
+    retries: 10
+  - command: unity-downloader-cli -u 6000.7/staging -c editor --path .Editor --fast
+    timeout: 10
+    retries: 3
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.7 --artifacts-path=PreviewApvArtifacts~ --shadow-branch=6000.7/staging
+  - command: python PythonScripts/editor_manifest_validator.py --version=6000.7 --wrench-config=.yamato/wrench/wrench_config.json
+  after:
+  - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
+  artifacts:
+    Crash Dumps:
+      paths:
+      - CrashDumps/**
+    logs:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - upm-ci~/test-results/**/*
+      - upm-ci~/temp/*/Logs/**
+      - upm-ci~/temp/*/Library/*.log
+      - upm-ci~/temp/*/*.log
+      - upm-ci~/temp/Builds/*.log
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    PreviewAPVResults:
+      paths:
+      - PreviewApvArtifacts~/**
+      - APVTest/**/manifest.json
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_probuilder
+  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_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 3.11.5.0
+
+# Functional tests for dependents found in the latest 7000.0 manifest (MacOS).
+preview_apv_-_7000_0_-_macos13arm:
+  name: Preview APV - 7000.0 - macos13arm
+  agent:
+    image: package-ci/macos-13-arm64:v4
+    type: Unity::VM::osx
+    flavor: m1.mac
+    model: M1
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "$WRENCH_LOCALAPV_URL" -o wrench-localapv.zip
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast
+  - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast --arch arm64
     timeout: 10
     retries: 3
-  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=7000.0 --artifacts-path=PreviewApvArtifacts~ --shadow-branch=trunk
   - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
@@ -604,30 +797,31 @@ preview_apv_-_6000_5_-_macos13:
     UNITY_LICENSING_SERVER_DELETE_NUL: 0
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
 
-# Functional tests for dependents found in the latest 6000.5 manifest (Ubuntu).
-preview_apv_-_6000_5_-_ubuntu2204:
-  name: Preview APV - 6000.5 - ubuntu2204
+# Functional tests for dependents found in the latest 7000.0 manifest (Ubuntu).
+preview_apv_-_7000_0_-_ubuntu2204:
+  name: Preview APV - 7000.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-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "$WRENCH_LOCALAPV_URL" -o wrench-localapv.zip
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast
+  - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=7000.0 --artifacts-path=PreviewApvArtifacts~ --shadow-branch=trunk
   - command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
   after:
   - command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
@@ -662,32 +856,33 @@ preview_apv_-_6000_5_-_ubuntu2204:
     UNITY_LICENSING_SERVER_DELETE_NUL: 0
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
 
-# Functional tests for dependents found in the latest 6000.5 manifest (Windows).
-preview_apv_-_6000_5_-_win10:
-  name: Preview APV - 6000.5 - win10
+# Functional tests for dependents found in the latest 7000.0 manifest (Windows).
+preview_apv_-_7000_0_-_win10:
+  name: Preview APV - 7000.0 - win10
   agent:
     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-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "%WRENCH_LOCALAPV_URL%" -o wrench-localapv.zip
   - command: 7z x -aoa wrench-localapv.zip
   - command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
   - command: python PythonScripts/print_machine_info.py
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u 6000.5/staging -c editor --path .Editor --fast
+  - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast
     timeout: 10
     retries: 3
-  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
-  - command: python PythonScripts/editor_manifest_validator.py --version=6000.5 --wrench-config=.yamato/wrench/wrench_config.json
+  - command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=7000.0 --artifacts-path=PreviewApvArtifacts~ --shadow-branch=trunk
+  - command: python PythonScripts/editor_manifest_validator.py --version=7000.0 --wrench-config=.yamato/wrench/wrench_config.json
   after:
   - command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
   artifacts:
@@ -721,8 +916,9 @@ preview_apv_-_6000_5_-_win10:
     UNITY_LICENSING_SERVER_DELETE_NUL: 0
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
 
diff --git a/.yamato/wrench/promotion-jobs.yml b/.yamato/wrench/promotion-jobs.yml
index 789d19ba7..1f92df547 100644
--- a/.yamato/wrench/promotion-jobs.yml
+++ b/.yamato/wrench/promotion-jobs.yml
@@ -14,7 +14,7 @@ publish_dry_run_probuilder:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "$WRENCH_LOCALAPV_URL" -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
@@ -91,72 +91,103 @@ publish_dry_run_probuilder:
       UTR:
         location: results/UTR/validate-probuilder-6000.3-win10
         unzip: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_4_-_macos13
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_6_-_macos13arm
     specific_options:
       packages:
         ignore_artifact: true
       pvp-results:
-        location: results/pvp/validate-probuilder-6000.4-macos13
+        location: results/pvp/validate-probuilder-6000.6-macos13arm
         unzip: true
       UTR:
-        location: results/UTR/validate-probuilder-6000.4-macos13
+        location: results/UTR/validate-probuilder-6000.6-macos13arm
         unzip: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_4_-_ubuntu2204
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_6_-_ubuntu2204
     specific_options:
       packages:
         ignore_artifact: true
       pvp-results:
-        location: results/pvp/validate-probuilder-6000.4-ubuntu2204
+        location: results/pvp/validate-probuilder-6000.6-ubuntu2204
         unzip: true
       UTR:
-        location: results/UTR/validate-probuilder-6000.4-ubuntu2204
+        location: results/UTR/validate-probuilder-6000.6-ubuntu2204
         unzip: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_4_-_win10
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_6_-_win10
     specific_options:
       packages:
         ignore_artifact: true
       pvp-results:
-        location: results/pvp/validate-probuilder-6000.4-win10
+        location: results/pvp/validate-probuilder-6000.6-win10
         unzip: true
       UTR:
-        location: results/UTR/validate-probuilder-6000.4-win10
+        location: results/UTR/validate-probuilder-6000.6-win10
         unzip: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_5_-_macos13
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_7_-_macos13arm
     specific_options:
       packages:
         ignore_artifact: true
       pvp-results:
-        location: results/pvp/validate-probuilder-6000.5-macos13
+        location: results/pvp/validate-probuilder-6000.7-macos13arm
         unzip: true
       UTR:
-        location: results/UTR/validate-probuilder-6000.5-macos13
+        location: results/UTR/validate-probuilder-6000.7-macos13arm
         unzip: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_5_-_ubuntu2204
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_7_-_ubuntu2204
     specific_options:
       packages:
         ignore_artifact: true
       pvp-results:
-        location: results/pvp/validate-probuilder-6000.5-ubuntu2204
+        location: results/pvp/validate-probuilder-6000.7-ubuntu2204
         unzip: true
       UTR:
-        location: results/UTR/validate-probuilder-6000.5-ubuntu2204
+        location: results/UTR/validate-probuilder-6000.7-ubuntu2204
         unzip: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_5_-_win10
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_7_-_win10
     specific_options:
       packages:
         ignore_artifact: true
       pvp-results:
-        location: results/pvp/validate-probuilder-6000.5-win10
+        location: results/pvp/validate-probuilder-6000.7-win10
         unzip: true
       UTR:
-        location: results/UTR/validate-probuilder-6000.5-win10
+        location: results/UTR/validate-probuilder-6000.7-win10
+        unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_7000_0_-_macos13arm
+    specific_options:
+      packages:
+        ignore_artifact: true
+      pvp-results:
+        location: results/pvp/validate-probuilder-7000.0-macos13arm
+        unzip: true
+      UTR:
+        location: results/UTR/validate-probuilder-7000.0-macos13arm
+        unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_7000_0_-_ubuntu2204
+    specific_options:
+      packages:
+        ignore_artifact: true
+      pvp-results:
+        location: results/pvp/validate-probuilder-7000.0-ubuntu2204
+        unzip: true
+      UTR:
+        location: results/UTR/validate-probuilder-7000.0-ubuntu2204
+        unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_7000_0_-_win10
+    specific_options:
+      packages:
+        ignore_artifact: true
+      pvp-results:
+        location: results/pvp/validate-probuilder-7000.0-win10
+        unzip: true
+      UTR:
+        location: results/UTR/validate-probuilder-7000.0-win10
         unzip: true
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
 
 # Publish  for probuilder to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
 publish_probuilder:
@@ -166,7 +197,7 @@ publish_probuilder:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "$WRENCH_LOCALAPV_URL" -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
@@ -243,71 +274,102 @@ publish_probuilder:
       UTR:
         location: results/UTR/validate-probuilder-6000.3-win10
         unzip: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_4_-_macos13
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_6_-_macos13arm
+    specific_options:
+      packages:
+        ignore_artifact: true
+      pvp-results:
+        location: results/pvp/validate-probuilder-6000.6-macos13arm
+        unzip: true
+      UTR:
+        location: results/UTR/validate-probuilder-6000.6-macos13arm
+        unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_6_-_ubuntu2204
+    specific_options:
+      packages:
+        ignore_artifact: true
+      pvp-results:
+        location: results/pvp/validate-probuilder-6000.6-ubuntu2204
+        unzip: true
+      UTR:
+        location: results/UTR/validate-probuilder-6000.6-ubuntu2204
+        unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_6_-_win10
+    specific_options:
+      packages:
+        ignore_artifact: true
+      pvp-results:
+        location: results/pvp/validate-probuilder-6000.6-win10
+        unzip: true
+      UTR:
+        location: results/UTR/validate-probuilder-6000.6-win10
+        unzip: true
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_7_-_macos13arm
     specific_options:
       packages:
         ignore_artifact: true
       pvp-results:
-        location: results/pvp/validate-probuilder-6000.4-macos13
+        location: results/pvp/validate-probuilder-6000.7-macos13arm
         unzip: true
       UTR:
-        location: results/UTR/validate-probuilder-6000.4-macos13
+        location: results/UTR/validate-probuilder-6000.7-macos13arm
         unzip: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_4_-_ubuntu2204
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_7_-_ubuntu2204
     specific_options:
       packages:
         ignore_artifact: true
       pvp-results:
-        location: results/pvp/validate-probuilder-6000.4-ubuntu2204
+        location: results/pvp/validate-probuilder-6000.7-ubuntu2204
         unzip: true
       UTR:
-        location: results/UTR/validate-probuilder-6000.4-ubuntu2204
+        location: results/UTR/validate-probuilder-6000.7-ubuntu2204
         unzip: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_4_-_win10
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_7_-_win10
     specific_options:
       packages:
         ignore_artifact: true
       pvp-results:
-        location: results/pvp/validate-probuilder-6000.4-win10
+        location: results/pvp/validate-probuilder-6000.7-win10
         unzip: true
       UTR:
-        location: results/UTR/validate-probuilder-6000.4-win10
+        location: results/UTR/validate-probuilder-6000.7-win10
         unzip: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_5_-_macos13
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_7000_0_-_macos13arm
     specific_options:
       packages:
         ignore_artifact: true
       pvp-results:
-        location: results/pvp/validate-probuilder-6000.5-macos13
+        location: results/pvp/validate-probuilder-7000.0-macos13arm
         unzip: true
       UTR:
-        location: results/UTR/validate-probuilder-6000.5-macos13
+        location: results/UTR/validate-probuilder-7000.0-macos13arm
         unzip: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_5_-_ubuntu2204
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_7000_0_-_ubuntu2204
     specific_options:
       packages:
         ignore_artifact: true
       pvp-results:
-        location: results/pvp/validate-probuilder-6000.5-ubuntu2204
+        location: results/pvp/validate-probuilder-7000.0-ubuntu2204
         unzip: true
       UTR:
-        location: results/UTR/validate-probuilder-6000.5-ubuntu2204
+        location: results/UTR/validate-probuilder-7000.0-ubuntu2204
         unzip: true
-  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_6000_5_-_win10
+  - path: .yamato/wrench/validation-jobs.yml#validate_-_probuilder_-_7000_0_-_win10
     specific_options:
       packages:
         ignore_artifact: true
       pvp-results:
-        location: results/pvp/validate-probuilder-6000.5-win10
+        location: results/pvp/validate-probuilder-7000.0-win10
         unzip: true
       UTR:
-        location: results/UTR/validate-probuilder-6000.5-win10
+        location: results/UTR/validate-probuilder-7000.0-win10
         unzip: true
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   allow_on: branch match "^release/.*"
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
 
diff --git a/.yamato/wrench/recipe-regeneration.yml b/.yamato/wrench/recipe-regeneration.yml
index 04b1479ed..e07a6e28d 100644
--- a/.yamato/wrench/recipe-regeneration.yml
+++ b/.yamato/wrench/recipe-regeneration.yml
@@ -31,5 +31,5 @@ test_-_wrench_jobs_up_to_date:
     cancel_old_ci: true
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
 
diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml
index 918911d10..74ba29403 100644
--- a/.yamato/wrench/validation-jobs.yml
+++ b/.yamato/wrench/validation-jobs.yml
@@ -14,7 +14,7 @@ validate_-_probuilder_-_6000_0_-_macos13:
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "$WRENCH_LOCALAPV_URL" -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
@@ -28,11 +28,17 @@ validate_-_probuilder_-_6000_0_-_macos13:
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
     timeout: 20
     retries: 0
+  - command: python PythonScripts/ignore_clean_console_failures.py
+    timeout: 5
+    retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
     retries: 0
   - command: echo No additional PVP profiles to declared to check.
-  - command: UnifiedTestRunner --testproject=test-probuilder --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:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_MacOS_6000.0;flags:probuilder_MacOS_6000.0" --fail-on-assert --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/editor --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_MacOS_6000.0;flags:probuilder_MacOS_6000.0" --fail-on-assert --coverage-pkg-version=1.3.0
+    timeout: 20
+    retries: 1
+  - command: UnifiedTestRunner --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/playmode --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_MacOS_6000.0;flags:probuilder_MacOS_6000.0" --fail-on-assert --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -70,10 +76,11 @@ validate_-_probuilder_-_6000_0_-_macos13:
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
   labels:
   - Packages:probuilder
 
@@ -85,7 +92,7 @@ validate_-_probuilder_-_6000_0_-_ubuntu2204:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "$WRENCH_LOCALAPV_URL" -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
@@ -99,11 +106,17 @@ validate_-_probuilder_-_6000_0_-_ubuntu2204:
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
     timeout: 20
     retries: 0
+  - command: python PythonScripts/ignore_clean_console_failures.py
+    timeout: 5
+    retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
     retries: 0
   - command: echo No additional PVP profiles to declared to check.
-  - command: UnifiedTestRunner --testproject=test-probuilder --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:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Ubuntu_6000.0;flags:probuilder_Ubuntu_6000.0" --fail-on-assert --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/editor --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Ubuntu_6000.0;flags:probuilder_Ubuntu_6000.0" --fail-on-assert --coverage-pkg-version=1.3.0
+    timeout: 20
+    retries: 1
+  - command: UnifiedTestRunner --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/playmode --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Ubuntu_6000.0;flags:probuilder_Ubuntu_6000.0" --fail-on-assert --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -141,10 +154,11 @@ validate_-_probuilder_-_6000_0_-_ubuntu2204:
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
   labels:
   - Packages:probuilder
 
@@ -156,7 +170,7 @@ validate_-_probuilder_-_6000_0_-_win10:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "%WRENCH_LOCALAPV_URL%" -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
@@ -170,11 +184,17 @@ validate_-_probuilder_-_6000_0_-_win10:
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
     timeout: 20
     retries: 0
+  - command: python PythonScripts/ignore_clean_console_failures.py
+    timeout: 5
+    retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
     retries: 0
   - command: echo No additional PVP profiles to declared to check.
-  - command: UnifiedTestRunner.exe --testproject=test-probuilder --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:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Windows_6000.0;flags:probuilder_Windows_6000.0" --fail-on-assert --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner.exe --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage/editor --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Windows_6000.0;flags:probuilder_Windows_6000.0" --fail-on-assert --coverage-pkg-version=1.3.0
+    timeout: 20
+    retries: 1
+  - command: UnifiedTestRunner.exe --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage/playmode --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Windows_6000.0;flags:probuilder_Windows_6000.0" --fail-on-assert --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -212,10 +232,11 @@ validate_-_probuilder_-_6000_0_-_win10:
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
   labels:
   - Packages:probuilder
 
@@ -227,7 +248,7 @@ validate_-_probuilder_-_6000_3_-_macos13:
     type: Unity::VM::osx
     flavor: b1.xlarge
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "$WRENCH_LOCALAPV_URL" -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
@@ -241,11 +262,17 @@ validate_-_probuilder_-_6000_3_-_macos13:
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
     timeout: 20
     retries: 0
+  - command: python PythonScripts/ignore_clean_console_failures.py
+    timeout: 5
+    retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
     retries: 0
   - command: echo No additional PVP profiles to declared to check.
-  - command: UnifiedTestRunner --testproject=test-probuilder --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:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_MacOS_6000.3;flags:probuilder_MacOS_6000.3" --fail-on-assert --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/editor --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_MacOS_6000.3;flags:probuilder_MacOS_6000.3" --fail-on-assert --coverage-pkg-version=1.3.0
+    timeout: 20
+    retries: 1
+  - command: UnifiedTestRunner --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/playmode --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_MacOS_6000.3;flags:probuilder_MacOS_6000.3" --fail-on-assert --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -283,10 +310,11 @@ validate_-_probuilder_-_6000_3_-_macos13:
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
   labels:
   - Packages:probuilder
 
@@ -298,7 +326,7 @@ validate_-_probuilder_-_6000_3_-_ubuntu2204:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "$WRENCH_LOCALAPV_URL" -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
@@ -312,11 +340,17 @@ validate_-_probuilder_-_6000_3_-_ubuntu2204:
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
     timeout: 20
     retries: 0
+  - command: python PythonScripts/ignore_clean_console_failures.py
+    timeout: 5
+    retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
     retries: 0
   - command: echo No additional PVP profiles to declared to check.
-  - command: UnifiedTestRunner --testproject=test-probuilder --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:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Ubuntu_6000.3;flags:probuilder_Ubuntu_6000.3" --fail-on-assert --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/editor --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Ubuntu_6000.3;flags:probuilder_Ubuntu_6000.3" --fail-on-assert --coverage-pkg-version=1.3.0
+    timeout: 20
+    retries: 1
+  - command: UnifiedTestRunner --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/playmode --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Ubuntu_6000.3;flags:probuilder_Ubuntu_6000.3" --fail-on-assert --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -354,10 +388,11 @@ validate_-_probuilder_-_6000_3_-_ubuntu2204:
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
   labels:
   - Packages:probuilder
 
@@ -369,7 +404,7 @@ validate_-_probuilder_-_6000_3_-_win10:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "%WRENCH_LOCALAPV_URL%" -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
@@ -383,11 +418,17 @@ validate_-_probuilder_-_6000_3_-_win10:
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
     timeout: 20
     retries: 0
+  - command: python PythonScripts/ignore_clean_console_failures.py
+    timeout: 5
+    retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
     retries: 0
   - command: echo No additional PVP profiles to declared to check.
-  - command: UnifiedTestRunner.exe --testproject=test-probuilder --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:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Windows_6000.3;flags:probuilder_Windows_6000.3" --fail-on-assert --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner.exe --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage/editor --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Windows_6000.3;flags:probuilder_Windows_6000.3" --fail-on-assert --coverage-pkg-version=1.3.0
+    timeout: 20
+    retries: 1
+  - command: UnifiedTestRunner.exe --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage/playmode --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Windows_6000.3;flags:probuilder_Windows_6000.3" --fail-on-assert --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -425,26 +466,28 @@ validate_-_probuilder_-_6000_3_-_win10:
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
   labels:
   - Packages:probuilder
 
-# PVP Editor and Playmode tests for Validate - probuilder - 6000.4 - macos13 (6000.4 - MacOS).
-validate_-_probuilder_-_6000_4_-_macos13:
-  name: Validate - probuilder - 6000.4 - macos13
+# PVP Editor and Playmode tests for Validate - probuilder - 6000.6 - macos13arm (6000.6 - MacOS).
+validate_-_probuilder_-_6000_6_-_macos13arm:
+  name: Validate - probuilder - 6000.6 - macos13arm
   agent:
-    image: package-ci/macos-13:v4
+    image: package-ci/macos-13-arm64:v4
     type: Unity::VM::osx
-    flavor: b1.xlarge
+    flavor: m1.mac
+    model: M1
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "$WRENCH_LOCALAPV_URL" -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
+  - command: unity-downloader-cli -u 6000.6/staging -c editor --path .Editor --fast --arch arm64
     timeout: 20
     retries: 3
   - command: upm-pvp create-test-project test-probuilder --packages "upm-ci~/packages/*.tgz" --filter "com.unity.probuilder com.unity.probuilder.tests" --unity .Editor
@@ -454,11 +497,17 @@ validate_-_probuilder_-_6000_4_-_macos13:
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
     timeout: 20
     retries: 0
+  - command: python PythonScripts/ignore_clean_console_failures.py
+    timeout: 5
+    retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
     retries: 0
   - command: echo No additional PVP profiles to declared to check.
-  - command: UnifiedTestRunner --testproject=test-probuilder --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:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_MacOS_6000.4;flags:probuilder_MacOS_6000.4" --fail-on-assert --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/editor --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_MacOS_6000.6;flags:probuilder_MacOS_6000.6" --fail-on-assert --coverage-pkg-version=1.3.0
+    timeout: 20
+    retries: 1
+  - command: UnifiedTestRunner --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/playmode --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_MacOS_6000.6;flags:probuilder_MacOS_6000.6" --fail-on-assert --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -496,26 +545,27 @@ validate_-_probuilder_-_6000_4_-_macos13:
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
   labels:
   - Packages:probuilder
 
-# PVP Editor and Playmode tests for Validate - probuilder - 6000.4 - ubuntu2204 (6000.4 - Ubuntu).
-validate_-_probuilder_-_6000_4_-_ubuntu2204:
-  name: Validate - probuilder - 6000.4 - ubuntu2204
+# PVP Editor and Playmode tests for Validate - probuilder - 6000.6 - ubuntu2204 (6000.6 - Ubuntu).
+validate_-_probuilder_-_6000_6_-_ubuntu2204:
+  name: Validate - probuilder - 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-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "$WRENCH_LOCALAPV_URL" -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
+  - command: unity-downloader-cli -u 6000.6/staging -c editor --path .Editor --fast
     timeout: 20
     retries: 3
   - command: upm-pvp create-test-project test-probuilder --packages "upm-ci~/packages/*.tgz" --filter "com.unity.probuilder com.unity.probuilder.tests" --unity .Editor
@@ -525,11 +575,17 @@ validate_-_probuilder_-_6000_4_-_ubuntu2204:
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
     timeout: 20
     retries: 0
+  - command: python PythonScripts/ignore_clean_console_failures.py
+    timeout: 5
+    retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
     retries: 0
   - command: echo No additional PVP profiles to declared to check.
-  - command: UnifiedTestRunner --testproject=test-probuilder --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:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Ubuntu_6000.4;flags:probuilder_Ubuntu_6000.4" --fail-on-assert --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/editor --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Ubuntu_6000.6;flags:probuilder_Ubuntu_6000.6" --fail-on-assert --coverage-pkg-version=1.3.0
+    timeout: 20
+    retries: 1
+  - command: UnifiedTestRunner --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/playmode --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Ubuntu_6000.6;flags:probuilder_Ubuntu_6000.6" --fail-on-assert --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -567,26 +623,27 @@ validate_-_probuilder_-_6000_4_-_ubuntu2204:
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
   labels:
   - Packages:probuilder
 
-# PVP Editor and Playmode tests for Validate - probuilder - 6000.4 - win10 (6000.4 - Windows).
-validate_-_probuilder_-_6000_4_-_win10:
-  name: Validate - probuilder - 6000.4 - win10
+# PVP Editor and Playmode tests for Validate - probuilder - 6000.6 - win10 (6000.6 - Windows).
+validate_-_probuilder_-_6000_6_-_win10:
+  name: Validate - probuilder - 6000.6 - win10
   agent:
     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-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "%WRENCH_LOCALAPV_URL%" -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
+  - command: unity-downloader-cli -u 6000.6/staging -c editor --path .Editor --fast
     timeout: 20
     retries: 3
   - command: upm-pvp create-test-project test-probuilder --packages "upm-ci~/packages/*.tgz" --filter "com.unity.probuilder com.unity.probuilder.tests" --unity .Editor
@@ -596,11 +653,17 @@ validate_-_probuilder_-_6000_4_-_win10:
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
     timeout: 20
     retries: 0
+  - command: python PythonScripts/ignore_clean_console_failures.py
+    timeout: 5
+    retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
     retries: 0
   - command: echo No additional PVP profiles to declared to check.
-  - command: UnifiedTestRunner.exe --testproject=test-probuilder --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:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Windows_6000.4;flags:probuilder_Windows_6000.4" --fail-on-assert --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner.exe --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage/editor --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Windows_6000.6;flags:probuilder_Windows_6000.6" --fail-on-assert --coverage-pkg-version=1.3.0
+    timeout: 20
+    retries: 1
+  - command: UnifiedTestRunner.exe --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage/playmode --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Windows_6000.6;flags:probuilder_Windows_6000.6" --fail-on-assert --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -638,26 +701,28 @@ validate_-_probuilder_-_6000_4_-_win10:
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
   labels:
   - Packages:probuilder
 
-# PVP Editor and Playmode tests for Validate - probuilder - 6000.5 - macos13 (6000.5 - MacOS).
-validate_-_probuilder_-_6000_5_-_macos13:
-  name: Validate - probuilder - 6000.5 - macos13
+# PVP Editor and Playmode tests for Validate - probuilder - 6000.7 - macos13arm (6000.7 - MacOS).
+validate_-_probuilder_-_6000_7_-_macos13arm:
+  name: Validate - probuilder - 6000.7 - macos13arm
   agent:
-    image: package-ci/macos-13:v4
+    image: package-ci/macos-13-arm64:v4
     type: Unity::VM::osx
-    flavor: b1.xlarge
+    flavor: m1.mac
+    model: M1
   commands:
-  - command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "$WRENCH_LOCALAPV_URL" -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
+  - command: unity-downloader-cli -u 6000.7/staging -c editor --path .Editor --fast --arch arm64
     timeout: 20
     retries: 3
   - command: upm-pvp create-test-project test-probuilder --packages "upm-ci~/packages/*.tgz" --filter "com.unity.probuilder com.unity.probuilder.tests" --unity .Editor
@@ -667,11 +732,17 @@ validate_-_probuilder_-_6000_5_-_macos13:
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
     timeout: 20
     retries: 0
+  - command: python PythonScripts/ignore_clean_console_failures.py
+    timeout: 5
+    retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
     retries: 0
   - command: echo No additional PVP profiles to declared to check.
-  - command: UnifiedTestRunner --testproject=test-probuilder --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:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_MacOS_6000.5;flags:probuilder_MacOS_6000.5" --fail-on-assert --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/editor --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_MacOS_6000.7;flags:probuilder_MacOS_6000.7" --fail-on-assert --coverage-pkg-version=1.3.0
+    timeout: 20
+    retries: 1
+  - command: UnifiedTestRunner --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/playmode --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_MacOS_6000.7;flags:probuilder_MacOS_6000.7" --fail-on-assert --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -709,26 +780,27 @@ validate_-_probuilder_-_6000_5_-_macos13:
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
   labels:
   - Packages:probuilder
 
-# PVP Editor and Playmode tests for Validate - probuilder - 6000.5 - ubuntu2204 (6000.5 - Ubuntu).
-validate_-_probuilder_-_6000_5_-_ubuntu2204:
-  name: Validate - probuilder - 6000.5 - ubuntu2204
+# PVP Editor and Playmode tests for Validate - probuilder - 6000.7 - ubuntu2204 (6000.7 - Ubuntu).
+validate_-_probuilder_-_6000_7_-_ubuntu2204:
+  name: Validate - probuilder - 6000.7 - 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-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "$WRENCH_LOCALAPV_URL" -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
+  - command: unity-downloader-cli -u 6000.7/staging -c editor --path .Editor --fast
     timeout: 20
     retries: 3
   - command: upm-pvp create-test-project test-probuilder --packages "upm-ci~/packages/*.tgz" --filter "com.unity.probuilder com.unity.probuilder.tests" --unity .Editor
@@ -738,11 +810,17 @@ validate_-_probuilder_-_6000_5_-_ubuntu2204:
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
     timeout: 20
     retries: 0
+  - command: python PythonScripts/ignore_clean_console_failures.py
+    timeout: 5
+    retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
     retries: 0
   - command: echo No additional PVP profiles to declared to check.
-  - command: UnifiedTestRunner --testproject=test-probuilder --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:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Ubuntu_6000.5;flags:probuilder_Ubuntu_6000.5" --fail-on-assert --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/editor --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Ubuntu_6000.7;flags:probuilder_Ubuntu_6000.7" --fail-on-assert --coverage-pkg-version=1.3.0
+    timeout: 20
+    retries: 1
+  - command: UnifiedTestRunner --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/playmode --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Ubuntu_6000.7;flags:probuilder_Ubuntu_6000.7" --fail-on-assert --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -780,26 +858,106 @@ validate_-_probuilder_-_6000_5_-_ubuntu2204:
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
   labels:
   - Packages:probuilder
 
-# PVP Editor and Playmode tests for Validate - probuilder - 6000.5 - win10 (6000.5 - Windows).
-validate_-_probuilder_-_6000_5_-_win10:
-  name: Validate - probuilder - 6000.5 - win10
+# PVP Editor and Playmode tests for Validate - probuilder - 6000.7 - win10 (6000.7 - Windows).
+validate_-_probuilder_-_6000_7_-_win10:
+  name: Validate - probuilder - 6000.7 - win10
   agent:
     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-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
+  - command: curl "%WRENCH_LOCALAPV_URL%" -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.7/staging -c editor --path .Editor --fast
+    timeout: 20
+    retries: 3
+  - command: upm-pvp create-test-project test-probuilder --packages "upm-ci~/packages/*.tgz" --filter "com.unity.probuilder com.unity.probuilder.tests" --unity .Editor
+    timeout: 10
+    retries: 1
+  - command: echo No internal packages to add.
+  - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
+    timeout: 20
+    retries: 0
+  - command: python PythonScripts/ignore_clean_console_failures.py
+    timeout: 5
+    retries: 0
+  - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
+    timeout: 5
+    retries: 0
+  - command: echo No additional PVP profiles to declared to check.
+  - command: UnifiedTestRunner.exe --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage/editor --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Windows_6000.7;flags:probuilder_Windows_6000.7" --fail-on-assert --coverage-pkg-version=1.3.0
+    timeout: 20
+    retries: 1
+  - command: UnifiedTestRunner.exe --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage/playmode --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Windows_6000.7;flags:probuilder_Windows_6000.7" --fail-on-assert --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/**
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+    UTR:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - artifacts/**/*
+      - test-probuilder/Logs/**
+      - test-probuilder/Library/*.log
+      - test-probuilder/*.log
+      - test-probuilder/Builds/*.log
+      - build/test-results/**
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_probuilder
+  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: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 3.11.5.0
+  labels:
+  - Packages:probuilder
+
+# PVP Editor and Playmode tests for Validate - probuilder - 7000.0 - macos13arm (7000.0 - MacOS).
+validate_-_probuilder_-_7000_0_-_macos13arm:
+  name: Validate - probuilder - 7000.0 - macos13arm
+  agent:
+    image: package-ci/macos-13-arm64:v4
+    type: Unity::VM::osx
+    flavor: m1.mac
+    model: M1
+  commands:
+  - command: curl "$WRENCH_LOCALAPV_URL" -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
+  - command: unity-downloader-cli -u trunk -c editor --path .Editor --fast --arch arm64
     timeout: 20
     retries: 3
   - command: upm-pvp create-test-project test-probuilder --packages "upm-ci~/packages/*.tgz" --filter "com.unity.probuilder com.unity.probuilder.tests" --unity .Editor
@@ -809,11 +967,173 @@ validate_-_probuilder_-_6000_5_-_win10:
   - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
     timeout: 20
     retries: 0
+  - command: python PythonScripts/ignore_clean_console_failures.py
+    timeout: 5
+    retries: 0
   - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 5
     retries: 0
   - command: echo No additional PVP profiles to declared to check.
-  - command: UnifiedTestRunner.exe --testproject=test-probuilder --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:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Windows_6000.5;flags:probuilder_Windows_6000.5" --fail-on-assert --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/editor --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_MacOS_7000.0;flags:probuilder_MacOS_7000.0" --fail-on-assert --coverage-pkg-version=1.3.0
+    timeout: 20
+    retries: 1
+  - command: UnifiedTestRunner --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/playmode --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_MacOS_7000.0;flags:probuilder_MacOS_7000.0" --fail-on-assert --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/**
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+    UTR:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - artifacts/**/*
+      - test-probuilder/Logs/**
+      - test-probuilder/Library/*.log
+      - test-probuilder/*.log
+      - test-probuilder/Builds/*.log
+      - build/test-results/**
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_probuilder
+  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: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 3.11.5.0
+  labels:
+  - Packages:probuilder
+
+# PVP Editor and Playmode tests for Validate - probuilder - 7000.0 - ubuntu2204 (7000.0 - Ubuntu).
+validate_-_probuilder_-_7000_0_-_ubuntu2204:
+  name: Validate - probuilder - 7000.0 - ubuntu2204
+  agent:
+    image: package-ci/ubuntu-22.04:v4
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - command: curl "$WRENCH_LOCALAPV_URL" -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: 20
+    retries: 3
+  - command: upm-pvp create-test-project test-probuilder --packages "upm-ci~/packages/*.tgz" --filter "com.unity.probuilder com.unity.probuilder.tests" --unity .Editor
+    timeout: 10
+    retries: 1
+  - command: echo No internal packages to add.
+  - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
+    timeout: 20
+    retries: 0
+  - command: python PythonScripts/ignore_clean_console_failures.py
+    timeout: 5
+    retries: 0
+  - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
+    timeout: 5
+    retries: 0
+  - command: echo No additional PVP profiles to declared to check.
+  - command: UnifiedTestRunner --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/editor --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Ubuntu_7000.0;flags:probuilder_Ubuntu_7000.0" --fail-on-assert --coverage-pkg-version=1.3.0
+    timeout: 20
+    retries: 1
+  - command: UnifiedTestRunner --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage/playmode --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Ubuntu_7000.0;flags:probuilder_Ubuntu_7000.0" --fail-on-assert --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/**
+    packages:
+      paths:
+      - upm-ci~/packages/**/*
+    pvp-results:
+      paths:
+      - upm-ci~/pvp/**/*
+      browsable: onDemand
+    UTR:
+      paths:
+      - '*.log'
+      - '*.xml'
+      - artifacts/**/*
+      - test-probuilder/Logs/**
+      - test-probuilder/Library/*.log
+      - test-probuilder/*.log
+      - test-probuilder/Builds/*.log
+      - build/test-results/**
+      browsable: onDemand
+  dependencies:
+  - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_probuilder
+  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: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
+  metadata:
+    Job Maintainers: '#rm-packageworks'
+    Wrench: 3.11.5.0
+  labels:
+  - Packages:probuilder
+
+# PVP Editor and Playmode tests for Validate - probuilder - 7000.0 - win10 (7000.0 - Windows).
+validate_-_probuilder_-_7000_0_-_win10:
+  name: Validate - probuilder - 7000.0 - win10
+  agent:
+    image: package-ci/win10:v4
+    type: Unity::VM
+    flavor: b1.large
+  commands:
+  - command: curl "%WRENCH_LOCALAPV_URL%" -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: 20
+    retries: 3
+  - command: upm-pvp create-test-project test-probuilder --packages "upm-ci~/packages/*.tgz" --filter "com.unity.probuilder com.unity.probuilder.tests" --unity .Editor
+    timeout: 10
+    retries: 1
+  - command: echo No internal packages to add.
+  - command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
+    timeout: 20
+    retries: 0
+  - command: python PythonScripts/ignore_clean_console_failures.py
+    timeout: 5
+    retries: 0
+  - command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
+    timeout: 5
+    retries: 0
+  - command: echo No additional PVP profiles to declared to check.
+  - command: UnifiedTestRunner.exe --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/editor --suite=editor "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage/editor --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Windows_7000.0;flags:probuilder_Windows_7000.0" --fail-on-assert --coverage-pkg-version=1.3.0
+    timeout: 20
+    retries: 1
+  - command: UnifiedTestRunner.exe --testproject=test-probuilder --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts/playmode --suite=playmode "--ff={ops.upmpvpevidence.enable=true}" --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.ProBuilder,+Unity.ProBuilder.AddOns.Editor,+Unity.ProBuilder.AssetIdRemapUtility,+Unity.ProBuilder.Csg,+Unity.ProBuilder.Debug.Editor,+Unity.ProBuilder.Editor,+Unity.ProBuilder.Editor.Tests,+Unity.ProBuilder.Examples,+Unity.ProBuilder.Examples.Editor,+Unity.ProBuilder.KdTree,+Unity.ProBuilder.Poly2Tri,+Unity.ProBuilder.Stl,+Unity.ProBuilder.Tests,+Unity.ProBuilder.Tests.Framework,+UnityEngine.ProBuilder.Debug,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage/playmode --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:probuilder_Windows_7000.0;flags:probuilder_Windows_7000.0" --fail-on-assert --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -851,10 +1171,11 @@ validate_-_probuilder_-_6000_5_-_win10:
     UNITY_LICENSING_SERVER_DELETE_ULF: 0
     UNITY_LICENSING_SERVER_TOOLSET: pro
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 2.12.0.0
+    UPMPVP_CONTEXT_WRENCH: 3.11.5.0
+    WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-19_94a756eb601d84c127a989866172fdd530ec62aa5d9611a9c9898a625926ec62.zip
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 2.12.0.0
+    Wrench: 3.11.5.0
   labels:
   - Packages:probuilder
 
diff --git a/.yamato/wrench/wrench_config.json b/.yamato/wrench/wrench_config.json
index e477f53f1..b8edc741f 100644
--- a/.yamato/wrench/wrench_config.json
+++ b/.yamato/wrench/wrench_config.json
@@ -18,7 +18,7 @@
       },
       "InternalOnly": false,
       "NeverPublish": false,
-      "MaxEditorVersion": "6000.5",
+      "MaxEditorVersion": "",
       "coverageEnabled": true,
       "coverageCommands": [
         "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:ASSEMBLY_NAME,-*Tests*,-*Examples*,-*Debug*;pathFilters:-**External/**;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:YAMATO_SOURCE_DIR/Packages;"
@@ -39,7 +39,7 @@
   },
   "publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_probuilder",
   "branch_pattern": "ReleaseSlash",
-  "wrench_version": "2.12.0.0",
+  "wrench_version": "3.11.5.0",
   "pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json",
   "cs_project_path": ".Tools/CI/ProBuilder.Cookbook.csproj"
 }
\ No newline at end of file