diff --git a/.gitattributes b/.gitattributes
index 6313b56c57..45b7901070 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,75 @@
-* text=auto eol=lf
+*.anim eol=lf
+*.animset eol=lf
+*.asmdef eol=lf
+*.asmref eol=lf
+*.asset eol=lf
+*.blendtree eol=lf
+*.brush eol=lf
+*.buildreport eol=lf
+*.cginc eol=lf
+*.colors eol=lf
+*.compute eol=lf
+*.config eol=lf
+*.controller eol=lf
+*.cpp eol=lf
+*.cs eol=lf
+*.cubemap eol=lf
+*.curves eol=lf
+*.curvesNormalized eol=lf
+*.flare eol=lf
+*.fontsettings eol=lf
+*.giparams eol=lf
+*.gradients eol=lf
+*.guiskin eol=lf
+*.h eol=lf
+*.hlsl eol=lf
+*.ht eol=lf
+*.java eol=lf
+*.js eol=lf
+*.json eol=lf
+*.lighting eol=lf
+*.m eol=lf
+*.mask eol=lf
+*.mat eol=lf
+*.md eol=lf
+*.mesh eol=lf
+*.meta eol=lf
+*.mixer eol=lf
+*.mm eol=lf
+*.overrideController eol=lf
+*.particleCurves eol=lf
+*.particleCurvesSigned eol=lf
+*.particleDoubleCurves eol=lf
+*.particleDoubleCurvesSigned eol=lf
+*.physicMaterial eol=lf
+*.physicsMaterial2D eol=lf
+*.playable eol=lf
+*.plist eol=lf
+*.prefab eol=lf
+*.preset eol=lf
+*.py eol=lf
+*.renderTexture eol=lf
+*.scene eol=lf
+*.scenetemplate eol=lf
+*.shader eol=lf
+*.shadergraph eol=lf
+*.shadersubgraph eol=lf
+*.shadervariants eol=lf
+*.signal eol=lf
+*.spriteatlas eol=lf
+*.state eol=lf
+*.statemachine eol=lf
+*.svg eol=lf
+*.terrainlayer eol=lf
+*.texture2D eol=lf
+*.transition eol=lf
+*.txt eol=lf
+*.unity eol=lf
+*.uss eol=lf
+*.uxml eol=lf
+*.vfxoperator eol=lf
+*.webCamTexture eol=lf
+*.wlt eol=lf
+*.xml eol=lf
+*.yaml eol=lf
+*.yml eol=lf
\ No newline at end of file
diff --git a/.yamato/package-pack.yml b/.yamato/package-pack.yml
index bd0c3290e9..cb277a373f 100644
--- a/.yamato/package-pack.yml
+++ b/.yamato/package-pack.yml
@@ -37,6 +37,9 @@ package_pack_-_ngo_{{ platform.name }}:
   variables:
     XRAY_PROFILE: "supported ./pvpExceptions.json"
   commands:
+{% if platform.name == "win" %}
+    - powershell -Command "(Get-Content -Path 'CHANGELOG.md' -Raw) -replace \"`r`n\", \"`n\" | Set-Content -Path 'CHANGELOG.md' -NoNewline"
+{% endif %}
     - python Tools/scripts/release.py # Needed to ensure that CHANGELOG is properly formatted for this test due to the fact that we have bumped package version (to properly perform vetting tests)
     - upm-pvp pack "com.unity.netcode.gameobjects" --output upm-ci~/packages
     - upm-pvp xray --packages "upm-ci~/packages/com.unity.netcode.gameobjects*.tgz" --results pvp-results
diff --git a/testproject/Assets/Scenes/ZooSam.meta b/testproject/Assets/Scenes/ZooSam.meta
new file mode 100644
index 0000000000..716470bede
--- /dev/null
+++ b/testproject/Assets/Scenes/ZooSam.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4273cf127aa72354c95d8308984538f9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: