diff --git a/docs/usage/msbuild-task.md b/docs/usage/msbuild-task.md
index bdb35c2502..18921d7ff7 100644
--- a/docs/usage/msbuild-task.md
+++ b/docs/usage/msbuild-task.md
@@ -88,6 +88,20 @@ Task Name: `GitVersionTask.WriteVersionInfoToBuildLog`
 
 If, at build time, it is detected that the build is occurring inside a Build Server server then the [variables](more-info/variables.md) will be written to the build log in a format that the current Build Server can consume. See [Build Server Support](build-server-support.md).
 
+## Conditional control tasks
+
+Properties `WriteVersionInfoToBuildLog`, `UpdateAssemblyInfo` and `GetVersion` are checked before running these tasks.
+
+If you, eg., want to disable `GitVersionTask.UpdateAssemblyInfo` just define `UpdateAssemblyInfo` to something other than `true` in your MSBuild script, like this:
+
+```
+  <PropertyGroup>
+	...
+    <UpdateAssemblyInfo>false</UpdateAssemblyInfo>
+	...
+  </PropertyGroup>
+```
+  
 ## My Git repository requires authentication. What do I do?
 
 Set the environmental variables `GITVERSION_REMOTE_USERNAME` and `GITVERSION_REMOTE_PASSWORD` before the build is initiated.
\ No newline at end of file
diff --git a/src/GitVersionCore.Tests/VersionCalculation/Strategies/VersionInBranchBaseVersionStrategyTests.cs b/src/GitVersionCore.Tests/VersionCalculation/Strategies/VersionInBranchBaseVersionStrategyTests.cs
index 4ccd31f861..7625e5f558 100644
--- a/src/GitVersionCore.Tests/VersionCalculation/Strategies/VersionInBranchBaseVersionStrategyTests.cs
+++ b/src/GitVersionCore.Tests/VersionCalculation/Strategies/VersionInBranchBaseVersionStrategyTests.cs
@@ -15,7 +15,6 @@ public class VersionInBranchBaseVersionStrategyTests
         [TestCase("release/2.0.0", "2.0.0")]
         [TestCase("hotfix-2.0.0", "2.0.0")]
         [TestCase("hotfix/2.0.0", "2.0.0")]
-        [TestCase("hotfix/2.0.0", "2.0.0")]
         [TestCase("custom/JIRA-123", null)]
         public void CanTakeVersionFromBranchName(string branchName, string expectedBaseVersion)
         {
diff --git a/src/GitVersionTask/NugetAssets/GitVersionTask.targets b/src/GitVersionTask/NugetAssets/GitVersionTask.targets
index fe61029dcd..f70d77f3ef 100644
--- a/src/GitVersionTask/NugetAssets/GitVersionTask.targets
+++ b/src/GitVersionTask/NugetAssets/GitVersionTask.targets
@@ -1,34 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)..\</SolutionDir>
-    <IntermediateOutputPath Condition="$(IntermediateOutputPath) == '' Or $(IntermediateOutputPath) == '*Undefined*'">$(MSBuildProjectDirectory)obj\$(Configuration)\</IntermediateOutputPath>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
+    <IntermediateOutputPath Condition="$(IntermediateOutputPath) == '' Or $(IntermediateOutputPath) == '*Undefined*'">$(MSBuildProjectDirectory)\obj\$(Configuration)\</IntermediateOutputPath>
     <GitVersion_NoFetchEnabled Condition="$(GitVersion_NoFetchEnabled) == ''">false</GitVersion_NoFetchEnabled>
+
+    <!-- Property that enables WriteVersionInfoToBuildLog -->
+    <WriteVersionInfoToBuildLog Condition=" '$(WriteVersionInfoToBuildLog)' == '' ">true</WriteVersionInfoToBuildLog>
+
+    <!-- Property that enables UpdateAssemblyInfo -->
+    <UpdateAssemblyInfo Condition=" '$(UpdateAssemblyInfo)' == '' ">true</UpdateAssemblyInfo>
+
+    <!-- Property that enables GetVersion -->
+    <GetVersion Condition=" '$(GetVersion)' == '' ">true</GetVersion>
+
   </PropertyGroup>
 
   <UsingTask
       TaskName="GitVersionTask.UpdateAssemblyInfo"
       AssemblyFile="$(MSBuildThisFileDirectory)..\..\GitVersionTask.dll" />
-  <UsingTask 
-    TaskName="GitVersionTask.GetVersion" 
+  <UsingTask
+    TaskName="GitVersionTask.GetVersion"
     AssemblyFile="$(MSBuildThisFileDirectory)..\..\GitVersionTask.dll"  />
   <UsingTask
       TaskName="GitVersionTask.WriteVersionInfoToBuildLog"
       AssemblyFile="$(MSBuildThisFileDirectory)..\..\GitVersionTask.dll" />
 
-  <Target Name="UpdateAssemblyInfo"
-          BeforeTargets="CoreCompile">
-    <WriteVersionInfoToBuildLog
-      SolutionDirectory="$(SolutionDir)"
-      NoFetch="$(GitVersion_NoFetchEnabled)"
-        />
+  <Target Name="WriteVersionInfoToBuildLog" BeforeTargets="CoreCompile" Condition="$(WriteVersionInfoToBuildLog) == 'true'">
+    <WriteVersionInfoToBuildLog SolutionDirectory="$(SolutionDir)" NoFetch="$(GitVersion_NoFetchEnabled)"/>
+  </Target>
+  
+  <Target Name="UpdateAssemblyInfo" BeforeTargets="CoreCompile" Condition="$(UpdateAssemblyInfo) == 'true'">
     <UpdateAssemblyInfo
-      SolutionDirectory="$(SolutionDir)"
-      NoFetch="$(GitVersion_NoFetchEnabled)"
-      ProjectFile="$(MSBuildProjectFullPath)"
-      IntermediateOutputPath="$(IntermediateOutputPath)"
-      RootNamespace="$(RootNamespace)"
-      CompileFiles ="@(Compile)">
+    SolutionDirectory="$(SolutionDir)"
+    NoFetch="$(GitVersion_NoFetchEnabled)"
+    ProjectFile="$(MSBuildProjectFullPath)"
+    IntermediateOutputPath="$(IntermediateOutputPath)"
+    RootNamespace="$(RootNamespace)"
+    CompileFiles ="@(Compile)">
       <Output
         TaskParameter="AssemblyInfoTempFilePath"
         PropertyName="AssemblyInfoTempFilePath" />
@@ -37,7 +46,9 @@
     <ItemGroup>
       <Compile Include="$(AssemblyInfoTempFilePath)" />
     </ItemGroup>
-
+  </Target>
+  
+  <Target Name="GetVersion" BeforeTargets="CoreCompile" Condition="$(GetVersion) == 'true'">
 
     <GetVersion SolutionDirectory="$(SolutionDir)" NoFetch="$(GitVersion_NoFetchEnabled)">
       <Output TaskParameter="Major" PropertyName="GitVersion_Major" />