1 files changed, 3 insertions, 1 deletions

diff --git a/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs b/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs
index 5db878a1..3e680a98 100644
--- a/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs
+++ b/src/WixToolset.Core/Bind/ResolveFieldsCommand.cs
@@ -32,6 +32,8 @@ namespace WixToolset.Core.Bind
 
         public bool SupportDelayedResolution { private get; set; }
 
+        public bool AllowUnresolvedVariables { private get; set; }
+
         public IEnumerable<DelayedField> DelayedFields { get; private set; }
 
         public void Execute()
@@ -62,7 +64,7 @@ namespace WixToolset.Core.Bind
                                 var original = field.AsString();
                                 if (!String.IsNullOrEmpty(original))
                                 {
-                                    var resolution = this.VariableResolver.ResolveVariables(tuple.SourceLineNumbers, original);
+                                    var resolution = this.VariableResolver.ResolveVariables(tuple.SourceLineNumbers, original, !this.AllowUnresolvedVariables);
                                     if (resolution.UpdatedValue)
                                     {
                                         field.Set(resolution.Value);