diff --git a/.github/workflows/blazor-examples-ci.yml b/.github/workflows/blazor-examples-ci.yml
new file mode 100644
index 0000000000..a6a0e1e219
--- /dev/null
+++ b/.github/workflows/blazor-examples-ci.yml
@@ -0,0 +1,33 @@
+name: Build Blazor Examples CI
+
+on:
+  push:
+    branches: [ master, vnext ]
+  pull_request:
+    branches: [ master, vnext ]
+
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 16
+    
+    - uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: '6.0.x'
+
+    - name: Copy Samples to IgBlazorSamples.Client
+      working-directory: ./browser/IgBlazorSamples.Gulp
+      run: |
+        npm ci
+        gulp copySamplesToClient
+
+    - name: Build IgBlazorSamples.Client
+      run: dotnet build browser/IgBlazorSamples.Client
diff --git a/browser/IgBlazorSamples.Client/IgBlazorSamples.Client.csproj b/browser/IgBlazorSamples.Client/IgBlazorSamples.Client.csproj
index d839eaddce..cd135e974c 100644
--- a/browser/IgBlazorSamples.Client/IgBlazorSamples.Client.csproj
+++ b/browser/IgBlazorSamples.Client/IgBlazorSamples.Client.csproj
@@ -38,16 +38,15 @@
     <!-- End NPM Updates -->
 
   <ItemGroup>
-    <PackageReference Include="IgniteUI.Blazor.Documents.Core.Trial" Version="23.1.33" />
-    <PackageReference Include="IgniteUI.Blazor.Documents.Excel.Trial" Version="23.1.33" />
-    <PackageReference Include="IgniteUI.Blazor.Trial" Version="23.1.33" />
+    <PackageReference Include="IgniteUI.Blazor.Documents.Core.Trial" Version="23.1.37" />
+    <PackageReference Include="IgniteUI.Blazor.Documents.Excel.Trial" Version="23.1.37" />
+    <PackageReference Include="IgniteUI.Blazor.Trial" Version="23.1.37" />
     <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Cors" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
+	<PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/browser/IgBlazorSamples.Client/wwwroot/index.html b/browser/IgBlazorSamples.Client/wwwroot/index.html
index efececc33d..a1a039f8af 100644
--- a/browser/IgBlazorSamples.Client/wwwroot/index.html
+++ b/browser/IgBlazorSamples.Client/wwwroot/index.html
@@ -110,6 +110,7 @@
 <script src="sb/grid-excel-style-filtering-sample-2.js"></script>
 <script src="sb/grid-excel-style-filtering-sample-3.js"></script>
 <script src="sb/grid-filtering-strategy.js"></script>
+<script src="sb/grid-filtering-template.js"></script>
 <script src="sb/grid-groupby-expressions.js"></script>
 <script src="sb/grid-groupby-paging.js"></script>
 <script src="sb/grid-keyboard-mrl-navigation.js"></script>
diff --git a/browser/IgBlazorSamples.Gulp/tasks/Transformer.ts b/browser/IgBlazorSamples.Gulp/tasks/Transformer.ts
index 2b810f47fb..e3ef9be4dd 100644
--- a/browser/IgBlazorSamples.Gulp/tasks/Transformer.ts
+++ b/browser/IgBlazorSamples.Gulp/tasks/Transformer.ts
@@ -67,7 +67,7 @@ class SampleSourceFile extends SampleFile {
 
         // remove lines with old Register(IgniteUIBlazor)
         var oldLines = this.Content.split("\r\n");
-        var newLines = [];
+        var newLines: string [] = [];
         for (const line of oldLines) {
             if (line.indexOf(".Register(IgniteUIBlazor)") < 0){
                 newLines.push(line);
@@ -631,7 +631,7 @@ class Transformer {
     public static getRelative(path: string): string {
         // let path = filePath;
         if (path.indexOf(igConfig.RepositoryName) > -1) {
-            path = path.split(igConfig.RepositoryName)[1];
+            path = path.split(igConfig.RepositoryName).pop() as string;
             path = path.split("\\").join("/");
             // return "." + path;
             return "../.." + path;
diff --git a/browser/IgBlazorSamples.Gulp/tasks/gulp-samples.js b/browser/IgBlazorSamples.Gulp/tasks/gulp-samples.js
index 94588f65b1..5023bb054f 100644
--- a/browser/IgBlazorSamples.Gulp/tasks/gulp-samples.js
+++ b/browser/IgBlazorSamples.Gulp/tasks/gulp-samples.js
@@ -194,12 +194,16 @@ function getSamples(cb) {
     ];
 
     samples = [];
+    console.log(deferredSamples[0]);
 
     gulp.src(sampleSource)
     // .pipe(gSort( { asc: false } ))
     .pipe(es.map(function(sample, sampleCallback) {
+        // console.log('Sample: ' + sample.dirname);
         let sampleFolder = Transformer.getRelative(sample.dirname);
+        // console.log('SampleFolder: ' + sampleFolder);
         let samplePath = sampleFolder + '/' + sample.basename;
+        // console.log('SamplePath: ' + samplePath);
 
         // skip samples that were deferred
         if (deferredSamples.includes(samplePath)) {
@@ -231,6 +235,7 @@ function getSamples(cb) {
             .pipe(flatten({ "includeParents": -1 }))
             .pipe(es.map(function(file, fileCallback) {
                 let fileDir = Transformer.getRelative(file.dirname);
+                console.log('PipeFildir: ' + fileDir);
                 sampleFiles.push(fileDir + "/" + file.basename);
                 // console.log("get file " + fileDir + "/" + file.basename);
                 fileCallback(null, file);