diff --git a/.yamato/config.metadata b/.yamato/config.metadata
index a580843b4a..29d4131d95 100644
--- a/.yamato/config.metadata
+++ b/.yamato/config.metadata
@@ -1,5 +1,4 @@
 editors:
-  - version: 2022.3
   - version: 6000.0
   - version: 6000.3
   - version: 6000.4
diff --git a/.yamato/wrench/validation-jobs.yml b/.yamato/wrench/validation-jobs.yml
index 5fe86de124..c4786ff1c8 100644
--- a/.yamato/wrench/validation-jobs.yml
+++ b/.yamato/wrench/validation-jobs.yml
@@ -29,7 +29,7 @@ validate_-_inputsystem_-_2022_3_-_macos13:
   - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_2022.3;flags:inputsystem_MacOS_2022.3" --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_2022.3;flags:inputsystem_MacOS_2022.3" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -102,7 +102,7 @@ validate_-_inputsystem_-_2022_3_-_ubuntu1804:
   - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_2022.3;flags:inputsystem_Ubuntu_2022.3" --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_2022.3;flags:inputsystem_Ubuntu_2022.3" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -175,7 +175,7 @@ validate_-_inputsystem_-_2022_3_-_win10:
   - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner.exe --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_2022.3;flags:inputsystem_Windows_2022.3" --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner.exe --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_2022.3;flags:inputsystem_Windows_2022.3" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -248,7 +248,7 @@ validate_-_inputsystem_-_6000_0_-_macos13:
   - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.0;flags:inputsystem_MacOS_6000.0" --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.0;flags:inputsystem_MacOS_6000.0" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -321,7 +321,7 @@ validate_-_inputsystem_-_6000_0_-_ubuntu2204:
   - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.0;flags:inputsystem_Ubuntu_6000.0" --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.0;flags:inputsystem_Ubuntu_6000.0" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -394,7 +394,7 @@ validate_-_inputsystem_-_6000_0_-_win10:
   - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner.exe --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.0;flags:inputsystem_Windows_6000.0" --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner.exe --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.0;flags:inputsystem_Windows_6000.0" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -467,7 +467,7 @@ validate_-_inputsystem_-_6000_3_-_macos13:
   - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.3;flags:inputsystem_MacOS_6000.3" --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.3;flags:inputsystem_MacOS_6000.3" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -540,7 +540,7 @@ validate_-_inputsystem_-_6000_3_-_ubuntu2204:
   - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.3;flags:inputsystem_Ubuntu_6000.3" --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.3;flags:inputsystem_Ubuntu_6000.3" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -613,7 +613,7 @@ validate_-_inputsystem_-_6000_3_-_win10:
   - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner.exe --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.3;flags:inputsystem_Windows_6000.3" --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner.exe --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.3;flags:inputsystem_Windows_6000.3" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -686,7 +686,7 @@ validate_-_inputsystem_-_6000_4_-_macos13:
   - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.4;flags:inputsystem_MacOS_6000.4" --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.4;flags:inputsystem_MacOS_6000.4" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -759,7 +759,7 @@ validate_-_inputsystem_-_6000_4_-_ubuntu2204:
   - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.4;flags:inputsystem_Ubuntu_6000.4" --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.4;flags:inputsystem_Ubuntu_6000.4" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -832,7 +832,7 @@ validate_-_inputsystem_-_6000_4_-_win10:
   - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner.exe --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.4;flags:inputsystem_Windows_6000.4" --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner.exe --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.4;flags:inputsystem_Windows_6000.4" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -905,7 +905,7 @@ validate_-_inputsystem_-_6000_5_-_macos13:
   - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.5;flags:inputsystem_MacOS_6000.5" --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.5;flags:inputsystem_MacOS_6000.5" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -978,7 +978,7 @@ validate_-_inputsystem_-_6000_5_-_ubuntu2204:
   - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.5;flags:inputsystem_Ubuntu_6000.5" --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.5;flags:inputsystem_Ubuntu_6000.5" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -1051,7 +1051,7 @@ validate_-_inputsystem_-_6000_5_-_win10:
   - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner.exe --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.5;flags:inputsystem_Windows_6000.5" --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner.exe --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.5;flags:inputsystem_Windows_6000.5" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -1124,7 +1124,7 @@ validate_-_inputsystem_-_6000_6_-_macos13:
   - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.6;flags:inputsystem_MacOS_6000.6" --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.6;flags:inputsystem_MacOS_6000.6" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -1197,7 +1197,7 @@ validate_-_inputsystem_-_6000_6_-_ubuntu2204:
   - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.6;flags:inputsystem_Ubuntu_6000.6" --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.6;flags:inputsystem_Ubuntu_6000.6" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
@@ -1270,7 +1270,7 @@ validate_-_inputsystem_-_6000_6_-_win10:
   - command: upm-pvp require "rme PVP-160-1 supported .yamato/wrench/pvp-exemptions.json" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
     timeout: 10
     retries: 0
-  - command: UnifiedTestRunner.exe --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.6;flags:inputsystem_Windows_6000.6" --coverage-pkg-version=1.3.0
+  - command: UnifiedTestRunner.exe --testproject=test-inputsystem --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.InputSystem,+Unity.InputSystem.DocCodeSamples,+Unity.InputSystem.ForUI,+Unity.InputSystem.ForUI.Editor,+Unity.InputSystem.IntegrationTests,+Unity.InputSystem.TestFramework;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.6;flags:inputsystem_Windows_6000.6" --coverage-pkg-version=1.3.0
     timeout: 20
     retries: 1
   after:
diff --git a/Tools/CI/Recipes/Utilities/Utilities.cs b/Tools/CI/Recipes/Utilities/Utilities.cs
index 9274727357..7365da3d8e 100644
--- a/Tools/CI/Recipes/Utilities/Utilities.cs
+++ b/Tools/CI/Recipes/Utilities/Utilities.cs
@@ -30,7 +30,7 @@ public static string GetEditorDownloadCommand(string unityBranch, Platform platf
     public static string GetPlatformName(Platform platform)
     {
 #pragma warning disable CS8603 // Possible null reference return.
-        return switch (platform.System)
+        return platform.System switch
             {
                 SystemType.Ps4 => "ps4",
                 SystemType.Ps5 => "ps5",