diff --git a/.Config/FslBuildGen/BuildExternal/Tasks.py b/.Config/FslBuildGen/BuildExternal/Tasks.py
index b0217974f..c807205a6 100644
--- a/.Config/FslBuildGen/BuildExternal/Tasks.py
+++ b/.Config/FslBuildGen/BuildExternal/Tasks.py
@@ -189,7 +189,7 @@ class GitApplyTask(GitBaseTask):
 
     def RunGitApply(self, sourcePatchFile: str, targetPath: str) -> None:
         self.LogPrint("Running git apply {0} in {1}".format(sourcePatchFile, targetPath))
-        buildCommand = [self.GitCommand, 'apply', sourcePatchFile, "--whitespace=fix"]
+        buildCommand = [self.GitCommand, 'apply', sourcePatchFile, "--whitespace=fix", "--ignore-space-change", "--ignore-whitespace"]
         if self.Log.Verbosity > 0:
             buildCommand.append("-v")
         result = subprocess.call(buildCommand, cwd=targetPath)
diff --git a/.Config/FslBuildGen/Tool/ToolAppMain.py b/.Config/FslBuildGen/Tool/ToolAppMain.py
index fffda6030..d98b7c67b 100644
--- a/.Config/FslBuildGen/Tool/ToolAppMain.py
+++ b/.Config/FslBuildGen/Tool/ToolAppMain.py
@@ -73,7 +73,7 @@
 from FslBuildGen.Xml.Project.XmlProjectRootConfigFile import XmlProjectRootConfigFile
 
 
-CurrentVersion = Version(3, 7, 1, 7)
+CurrentVersion = Version(3, 7, 1, 8)
 
 
 def __AddDefaultOptions(parser: argparse.ArgumentParser, allowStandaloneMode: bool) -> None: