@@ -182,4 +182,54 @@ Describe 'dsc config get tests' {
         $result.results[0].result.actualState.family | Should -BeIn @('Windows', 'Linux', 'macOS')
         $LASTEXITCODE | Should -Be 0
     }
+
+    It 'embedded schema should only be retrieved once for multiple instances of the same resource' {
+        $config_yaml = @"
+            `$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
+            resources:
+            - name: Echo 1
+              type: Microsoft.DSC.Debug/Echo
+              properties:
+                output: hello
+            - name: Echo 2
+              type: Microsoft.DSC.Debug/Echo
+              properties:
+                output: world
+"@
+        $result = dsc -l debug config get -i $config_yaml 2>$TestDrive/error.log | ConvertFrom-Json
+        $errorLog = Get-Content $TestDrive/error.log -Raw
+        $LASTEXITCODE | Should -Be 0 -Because $errorLog
+        $result.hadErrors | Should -BeFalse
+        $result.results.Count | Should -Be 2
+        $errorLog | Should -BeLike "*Retrieved schema for resource 'Microsoft.DSC.Debug/Echo' with version '1.0.0' from cache*"
+    }
+
+    It 'retrieves command resource schema from cache for multiple instances of the same resource' {
+        $config_yaml = @"
+            `$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
+            resources:
+            - name: one
+              type: Test/Version
+              requireVersion: =1.1.0
+              properties:
+                version: 1.1.0
+            - name: two
+              type: Test/Version
+              requireVersion: =1.1.0
+              properties:
+                version: 1.1.0
+            - name: three
+              type: Test/Version
+              requireVersion: =2.0.0
+              properties:
+                version: 2.0.0
+"@
+        $result = dsc -l debug config get -i $config_yaml 2>$TestDrive/error.log | ConvertFrom-Json
+        $errorLog = Get-Content $TestDrive/error.log -Raw
+        $LASTEXITCODE | Should -Be 0 -Because $errorLog
+        $result.hadErrors | Should -BeFalse
+        $result.results.Count | Should -Be 3
+        $errorLog | Should -BeLike "*Retrieved schema for resource 'Test/Version' with version '1.1.0' from cache*"
+        $errorLog | Should -BeLike "*Retrieved schema for resource 'Test/Version' with version '2.0.0' from cache*"
+    }
 }
@@ -213,3 +213,53 @@ resources:
       $out.resources[0].properties.id | Should -Be 1
     }
 }
+
+Describe 'engine export filtering tests' {
+    It 'engine filters properties for a resource that does not support filtering natively' {
+        $yaml = @'
+$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
+resources:
+- name: No Native Filtering
+  type: Test/ExportSchemaNoFiltering
+  properties:
+    name: '*e*'
+'@
+        $out = dsc --trace-level info config export -i $yaml 2>$TESTDRIVE/error.log | ConvertFrom-Json
+        $errorlog = Get-Content "$TESTDRIVE/error.log" -Raw
+        $LASTEXITCODE | Should -Be 0 -Because $errorlog
+        @($out.resources).Count | Should -Be 2
+        $out.resources.properties.name | Should -Be @('Steve', 'Tess')
+        $errorlog | Should -Match 'does not support export filtering, the engine will filter the exported instances'
+    }
+
+    It 'INFO message indicates engine export filtering is experimental' {
+        $yaml = @'
+$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
+resources:
+- name: No Native Filtering
+  type: Test/ExportSchemaNoFiltering
+  properties:
+    name: 'Gijs'
+'@
+        $out = dsc --trace-level info config export -i $yaml 2>$TESTDRIVE/error.log | ConvertFrom-Json
+        $errorlog = Get-Content "$TESTDRIVE/error.log" -Raw
+        $LASTEXITCODE | Should -Be 0 -Because $errorlog
+        @($out.resources).Count | Should -Be 1
+        $out.resources[0].properties.name | Should -BeExactly 'Gijs'
+        $errorlog | Should -BeLike "*INFO*Resource 'Test/ExportSchemaNoFiltering' does not support export filtering, the engine will filter the exported instances (experimental feature)*"
+    }
+
+    It 'no INFO message is emitted when no filter input is provided' {
+        $yaml = @'
+$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
+resources:
+- name: No Native Filtering
+  type: Test/ExportSchemaNoFiltering
+'@
+        $out = dsc --trace-level info config export -i $yaml 2>$TESTDRIVE/error.log | ConvertFrom-Json
+        $errorlog = Get-Content "$TESTDRIVE/error.log" -Raw
+        $LASTEXITCODE | Should -Be 0 -Because $errorlog
+        @($out.resources).Count | Should -Be 3
+        $errorlog | Should -Not -Match 'the engine will filter the exported instances'
+    }
+}
@@ -155,7 +155,7 @@ Describe 'metadata tests' {
           - name: return variable
             type: Microsoft.DSC.Transitional/PowerShellScript
             properties:
-              SetScript: |
+              setScript: |
                 if ($IsWindows) {
                   $env:myTestVariable
                 }
@@ -189,7 +189,7 @@ Describe 'metadata tests' {
           - name: return path
             type: Microsoft.DSC.Transitional/PowerShellScript
             properties:
-              SetScript: |
+              setScript: |
                 $env:PATH
 '@
         $oldUserPath = [System.Environment]::GetEnvironmentVariable('PATH', [System.EnvironmentVariableTarget]::User)
@@ -219,7 +219,7 @@ Describe 'metadata tests' {
           - name: return variable
             type: Microsoft.DSC.Transitional/PowerShellScript
             properties:
-              SetScript: |
+              setScript: |
                 if ($IsWindows) {
                   $env:myTestVariable
                 }
 
@@ -17,13 +17,29 @@ Describe 'Resource export tests' {
         $output.resources.properties.name | Should -Be $expected -Because ($output | ConvertTo-Json -Depth 4)
     }
 
-    It 'Resource not support export filtering will return error' {
+    It "Engine filters input '<json>' for a resource without native filtering support" -TestCases @(
+        @{ json = '{ "name": "Gijs" }'; expected = @('Gijs') }
+        @{ json = '{ "name": "*e*" }'; expected = @('Steve', 'Tess') }
+        @{ json = '[{ "name": "Gijs" }, { "name": "Steve" }]'; expected = @('Steve', 'Gijs') }
+    ){
+        param($json, $expected)
+
+        $resource = 'Test/ExportSchemaNoFiltering'
+        $output = dsc --trace-level info resource export -r $resource -i $json 2>$TESTDRIVE/error.log | ConvertFrom-Json
+        $errorlog = Get-Content "$TESTDRIVE/error.log" -Raw
+        $LASTEXITCODE | Should -Be 0 -Because $errorlog
+        $output.resources.count | Should -Be $expected.Count -Because ($output | ConvertTo-Json -Depth 4)
+        $output.resources.properties.name | Should -Be $expected -Because ($output | ConvertTo-Json -Depth 4)
+        $errorlog | Should -Match "Resource '$resource' does not support export filtering, the engine will filter the exported instances \(experimental feature\)"
+    }
+
+    It 'Engine filtering rejects input that is not an object or array of objects' {
         $resource = 'Test/ExportSchemaNoFiltering'
-        $json = '{ "name": "Gijs" }'
+        $json = '5'
 
-        $output = dsc resource export -r $resource -i $json  2>$TESTDRIVE/error.log | ConvertFrom-Json
+        dsc resource export -r $resource -i $json 2>$TESTDRIVE/error.log | Out-Null
         $errorlog = Get-Content "$TESTDRIVE/error.log" -Raw
         $LASTEXITCODE | Should -Be 2 -Because $errorlog
-        $errorlog | Should -Match "Resource '$resource' does not support export filtering"
+        $errorlog | Should -Match 'Export filter input must be a JSON object or an array of JSON objects'
     }
 }
@@ -2448,6 +2448,8 @@ function Get-CodeCoverageReport {
                     $currentLineNum++
                 } elseif ($diffLine.StartsWith('-') -and -not $diffLine.StartsWith('---')) {
                     # Deleted lines don't advance the new file line counter
+                } elseif ($diffLine.StartsWith('\')) {
+                    # "\ No newline at end of file" marker — not a real line
                 } else {
                     $currentLineNum++
                 }
@@ -2469,10 +2471,7 @@ function Get-CodeCoverageReport {
             }
 
             if (-not $fileCoverage) {
-                # File not in coverage report means LLVM found no instrumentable
-                # executable code in it (e.g., struct/enum definitions with derive
-                # macros). Skip it rather than penalizing as uncovered.
-                Write-Verbose -Verbose "No LCOV data for '$file' - file has no instrumentable code, skipping"
+                Write-Verbose -Verbose "Skipping '$file': not in LCOV data (possibly platform-specific or not instrumented)"
                 continue
             }
 
 
@@ -35,6 +35,9 @@ dependencyNotInOrder = "Dependency not found in order"
 circularDependency = "Circular dependency detected for resource named '%{resource}'"
 invocationOrder = "Resource invocation order"
 
+[configure.export_filter]
+filteredInstances = "Export filter reduced %{original} instances to %{retained}"
+
 [configure.mod]
 nestedArraysNotSupported = "Nested arrays not supported"
 arrayElementCouldNotTransformAsString = "Array element could not be transformed as string"
@@ -48,6 +51,9 @@ groupNotSupportedForDelete = "Group resources not supported for delete"
 deleteNotSupported = "Resource '%{resource}' does not support `delete` and does not handle `_exist` as false"
 expectedState = "Expected state: %{state}"
 exportInput = "Export input: %{input}"
+engineExportFiltering = "Resource '%{resource}' does not support export filtering, the engine will filter the exported instances (experimental feature)"
+invalidExportFilterInput = "Invalid export filter input: %{error}"
+exportFilterNotObject = "Export filter input must be a JSON object or an array of JSON objects"
 noParameters = "No parameters defined in configuration and no parameters input"
 noParametersDefined = "No parameters defined in configuration"
 processingParameter = "Processing parameter '%{name}'"
@@ -202,6 +208,7 @@ securityContextRequired = "Operation '%{operation}' for resource '%{resource}' r
 noAdaptedContent = "No adapted content available for resource '%{resource}'"
 invalidAdaptedContent = "Invalid adapted content for resource '%{resource}': %{error}"
 exportFilteringNotSupported = "Resource '%{resource}' does not support export filtering"
+retrievedSchemaFromCache = "Retrieved schema for resource '%{resource}' with version '%{version}' from cache"
 
 [dscresources.dscresource]
 invokeGet = "Invoking get for '%{resource}'"
@@ -241,6 +248,7 @@ adapterManifestNotFound = "Adapter manifest for '%{adapter}' not found"
 adapterDoesNotSupportDelete = "Adapter '%{adapter}' does not support delete operation"
 validatingAgainstSchema = "Validating against resource schema"
 deprecationMessage = "Resource '%{resource}' is deprecated: %{message}"
+retrievedSchemaFromCache = "Retrieved schema for resource '%{resource}' with version '%{version}' from cache"
 
 [dscresources.resource_manifest]
 resourceManifestSchemaTitle = "Resource manifest schema URI"
Original file line number	Diff line number	Diff line change
`@@ -2448,6 +2448,8 @@ function Get-CodeCoverageReport {`
`2448`	`2448`	`$currentLineNum++`
`2449`	`2449`	`} elseif ($diffLine.StartsWith('-') -and -not $diffLine.StartsWith('---')) {`
`2450`	`2450`	`# Deleted lines don't advance the new file line counter`
	`2451`	`+ } elseif ($diffLine.StartsWith('\')) {`
	`2452`	`+ # "\ No newline at end of file" marker — not a real line`
`2451`	`2453`	`} else {`
`2452`	`2454`	`$currentLineNum++`
`2453`	`2455`	`}`
`@@ -2469,10 +2471,7 @@ function Get-CodeCoverageReport {`
`2469`	`2471`	`}`
`2470`	`2472`
`2471`	`2473`	`if (-not $fileCoverage) {`
`2472`		`- # File not in coverage report means LLVM found no instrumentable`
`2473`		`- # executable code in it (e.g., struct/enum definitions with derive`
`2474`		`- # macros). Skip it rather than penalizing as uncovered.`
`2475`		`- Write-Verbose -Verbose "No LCOV data for '$file' - file has no instrumentable code, skipping"`
	`2474`	`+ Write-Verbose -Verbose "Skipping '$file': not in LCOV data (possibly platform-specific or not instrumented)"`
`2476`	`2475`	`continue`
`2477`	`2476`	`}`
`2478`	`2477`