diff --git a/Sharpmake.Application/Properties/AssemblyInfo.cs b/Sharpmake.Application/Properties/AssemblyInfo.cs
index d88bb638a..9fa4104d8 100644
--- a/Sharpmake.Application/Properties/AssemblyInfo.cs
+++ b/Sharpmake.Application/Properties/AssemblyInfo.cs
@@ -43,4 +43,4 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.17.3.0")]
+[assembly: AssemblyVersion("0.17.4.0")]
diff --git a/Sharpmake.Generators/FastBuild/Bff.cs b/Sharpmake.Generators/FastBuild/Bff.cs
index 2e2d3f3fb..92d314cf2 100644
--- a/Sharpmake.Generators/FastBuild/Bff.cs
+++ b/Sharpmake.Generators/FastBuild/Bff.cs
@@ -416,18 +416,17 @@ List<string> skipFiles
                                 if (isExport)
                                     continue;
 
+                                string shortProjectName = GetShortProjectName(depProjConfig.Project, depProjConfig);
+
                                 if (depProjConfig.Output != Project.Configuration.OutputType.Exe &&
                                     depProjConfig.Output != Project.Configuration.OutputType.Utility)
                                 {
-                                    string shortProjectName = GetShortProjectName(depProjConfig.Project, depProjConfig);
                                     if (!dependenciesInfo.IgnoredLibraryNames.Contains(depProjConfig.TargetFileFullNameWithExtension))
                                         fastBuildProjectDependencies.Add(shortProjectName + "_LibraryDependency");
-                                    fastBuildBuildOnlyDependencies.Add(shortProjectName);
-                                }
-                                else if (!depProjConfig.IsExcludedFromBuild)
-                                {
-                                    fastBuildProjectExeUtilityDependencyList.Add(GetShortProjectName(depProjConfig.Project, depProjConfig));
                                 }
+
+                                if (!depProjConfig.IsExcludedFromBuild)
+                                    fastBuildProjectExeUtilityDependencyList.Add(shortProjectName);
                             }
 
                             orderedProjectDeps = UtilityMethods.GetOrderedFlattenedBuildOnlyDependencies(conf);
@@ -440,15 +439,8 @@ List<string> skipFiles
                                 if (isExport)
                                     continue;
 
-                                if (depProjConfig.Output != Project.Configuration.OutputType.Exe &&
-                                    depProjConfig.Output != Project.Configuration.OutputType.Utility)
-                                {
-                                    fastBuildBuildOnlyDependencies.Add(GetShortProjectName(depProjConfig.Project, depProjConfig));
-                                }
-                                else
-                                {
-                                    fastBuildProjectExeUtilityDependencyList.Add(GetShortProjectName(depProjConfig.Project, depProjConfig));
-                                }
+                                string shortProjectName = GetShortProjectName(depProjConfig.Project, depProjConfig);
+                                fastBuildProjectExeUtilityDependencyList.Add(shortProjectName);
                             }
                         }
 
diff --git a/Sharpmake.Generators/Properties/AssemblyInfo.cs b/Sharpmake.Generators/Properties/AssemblyInfo.cs
index 95224fec5..0ced81b5c 100644
--- a/Sharpmake.Generators/Properties/AssemblyInfo.cs
+++ b/Sharpmake.Generators/Properties/AssemblyInfo.cs
@@ -44,6 +44,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.17.3.0")]
+[assembly: AssemblyVersion("0.17.4.0")]
 
 [assembly: InternalsVisibleTo("Sharpmake")]
diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Properties/AssemblyInfo.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Properties/AssemblyInfo.cs
index e1a8544da..06b4d25fc 100644
--- a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Properties/AssemblyInfo.cs
+++ b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Properties/AssemblyInfo.cs
@@ -44,6 +44,6 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.17.3.0")]
+[assembly: AssemblyVersion("0.17.4.0")]
 
 [assembly: SharpmakeExtension]
diff --git a/Sharpmake/GenerationOutput.cs b/Sharpmake/GenerationOutput.cs
index 153a901ac..15ae4aa53 100644
--- a/Sharpmake/GenerationOutput.cs
+++ b/Sharpmake/GenerationOutput.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 Ubisoft Entertainment
+// Copyright (c) 2017, 2021 Ubisoft Entertainment
 // 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -25,6 +25,8 @@ public class GenerationOutput
         public List<string> Generated = new List<string>();
         public List<string> Skipped = new List<string>();
 
+        private object _lock = new object();
+
         public Exception Exception
         {
             get
@@ -34,7 +36,7 @@ public Exception Exception
             set
             {
                 _exception = value;
-                Console.WriteLine(_exception.Message);
+                Util.LogWrite(_exception.Message);
             }
         }
 
@@ -47,10 +49,13 @@ public override string ToString()
 
         public void Merge(GenerationOutput other)
         {
-            Generated.AddRange(other.Generated);
-            Skipped.AddRange(other.Skipped);
-            if (_exception == null)
-                _exception = other._exception;
+            lock (_lock)
+            {
+                Generated.AddRange(other.Generated);
+                Skipped.AddRange(other.Skipped);
+                if (_exception == null)
+                    _exception = other._exception;
+            }
         }
     }
 }
diff --git a/Sharpmake/Properties/AssemblyInfo.cs b/Sharpmake/Properties/AssemblyInfo.cs
index 00d71b015..d908c5dca 100644
--- a/Sharpmake/Properties/AssemblyInfo.cs
+++ b/Sharpmake/Properties/AssemblyInfo.cs
@@ -44,9 +44,9 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.17.3.0")]
+[assembly: AssemblyVersion("0.17.4.0")]
 #pragma warning disable CS7035
-[assembly: AssemblyFileVersion("0.17.3.0 (LocalBuild)")]
+[assembly: AssemblyFileVersion("0.17.4.0 (LocalBuild)")]
 #pragma warning restore
 
 [assembly: InternalsVisibleTo("Sharpmake.Application")]