174 files changed, 3547 insertions, 649 deletions
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperCommand.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperCommand.cs
index 612e8ce9..795a40d4 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperCommand.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/BootstrapperCommand.cs
@@ -20,6 +20,7 @@ namespace WixToolset.BootstrapperApplicationApi
        [MarshalAs(UnmanagedType.I4)] internal int cbSize;
        [MarshalAs(UnmanagedType.U4)] private readonly LaunchAction action;
        [MarshalAs(UnmanagedType.U4)] private readonly Display display;
+        [MarshalAs(UnmanagedType.U4)] private readonly BundleScope scope;
        private readonly IntPtr wzCommandLine;
        [MarshalAs(UnmanagedType.I4)] private readonly int nCmdShow;
        [MarshalAs(UnmanagedType.U4)] private readonly ResumeType resume;
@@ -39,6 +40,7 @@ namespace WixToolset.BootstrapperApplicationApi
            return new BootstrapperCommand(
                this.action,
                this.display,
+                this.scope,
                Marshal.PtrToStringUni(this.wzCommandLine),
                this.nCmdShow,
                this.resume,
@@ -62,6 +64,7 @@ namespace WixToolset.BootstrapperApplicationApi
        public BootstrapperCommand(
            LaunchAction action,
            Display display,
+            BundleScope scope,
            string commandLine,
            int cmdShow,
            ResumeType resume,
@@ -74,6 +77,7 @@ namespace WixToolset.BootstrapperApplicationApi
        {
            this.Action = action;
            this.Display = display;
+            this.Scope = scope;
            this.CommandLine = commandLine;
            this.CmdShow = cmdShow;
            this.Resume = resume;
@@ -92,6 +96,9 @@ namespace WixToolset.BootstrapperApplicationApi
        public Display Display { get; }
        /// <inheritdoc/>
+        public BundleScope Scope { get; }
+        /// <inheritdoc/>
        public string CommandLine { get; }
        /// <inheritdoc/>
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/Engine.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/Engine.cs
index 25413790..82978b7d 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/Engine.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/Engine.cs
@@ -12,7 +12,7 @@ namespace WixToolset.BootstrapperApplicationApi
    /// </summary>
    public sealed class Engine : IEngine
    {
-        private IBootstrapperEngine engine;
+        private readonly IBootstrapperEngine engine;
        internal Engine(IBootstrapperEngine engine)
        {
@@ -24,8 +24,7 @@ namespace WixToolset.BootstrapperApplicationApi
        {
            get
            {
-                int count;
+                this.engine.GetPackageCount(out var count);
-                this.engine.GetPackageCount(out count);
                return count;
            }
@@ -110,8 +109,7 @@ namespace WixToolset.BootstrapperApplicationApi
        /// <inheritdoc/>
        public bool EvaluateCondition(string condition)
        {
-            bool value;
+            this.engine.EvaluateCondition(condition, out var value);
-            this.engine.EvaluateCondition(condition, out value);
            return value;
        }
@@ -247,9 +245,9 @@ namespace WixToolset.BootstrapperApplicationApi
        }
        /// <inheritdoc/>
-        public void Plan(LaunchAction action)
+        public void Plan(LaunchAction action, BundleScope plannedScope)
        {
-            this.engine.Plan(action);
+            this.engine.Plan(action, plannedScope);
        }
        /// <inheritdoc/>
@@ -327,16 +325,16 @@ namespace WixToolset.BootstrapperApplicationApi
        /// <inheritdoc/>
        public int SendEmbeddedError(int errorCode, string message, int uiHint)
        {
-            int result = 0;
+            this.engine.SendEmbeddedError(errorCode, message, uiHint, out var result);
-            this.engine.SendEmbeddedError(errorCode, message, uiHint, out result);
            return result;
        }
        /// <inheritdoc/>
        public int SendEmbeddedProgress(int progressPercentage, int overallPercentage)
        {
-            int result = 0;
+            this.engine.SendEmbeddedProgress(progressPercentage, overallPercentage, out var result);
-            this.engine.SendEmbeddedProgress(progressPercentage, overallPercentage, out result);
            return result;
        }
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperCommand.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperCommand.cs
index a1f8bfe0..7a5a4cfd 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperCommand.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperCommand.cs
@@ -20,6 +20,11 @@ namespace WixToolset.BootstrapperApplicationApi
        Display Display { get; }
        /// <summary>
+        /// Gets the bundle scope if set at the command line.
+        /// </summary>
+        BundleScope Scope { get; }
+        /// <summary>
        /// Gets the command line arguments.
        /// </summary>
        /// <returns>
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperEngine.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperEngine.cs
index 13702757..9df57cd3 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperEngine.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperEngine.cs
@@ -178,10 +178,11 @@ namespace WixToolset.BootstrapperApplicationApi
            );
        /// <summary>
-        /// See <see cref="IEngine.Plan(LaunchAction)"/>.
+        /// See <see cref="IEngine.Plan(LaunchAction, BundleScope)"/>.
        /// </summary>
        void Plan(
-            [MarshalAs(UnmanagedType.U4)] LaunchAction action
+            [MarshalAs(UnmanagedType.U4)] LaunchAction action,
+            [MarshalAs(UnmanagedType.U4)] BundleScope plannedScope
            );
        /// <summary>
@@ -344,6 +345,28 @@ namespace WixToolset.BootstrapperApplicationApi
    }
    /// <summary>
+    /// The scope of the bundle when the chain contains per-user-or-machine or per-machone-or-user packages.
+    /// </summary>
+    public enum BundleScope
+    {
+        /// <summary>
+        /// Let Burn choose the scope. Per-user-or-machine packages will be
+        /// planned as per-machine packages.
+        /// </summary>
+        Default,
+        /// <summary>
+        /// Set per-machine scope for per-user-or-machine packages.
+        /// </summary>
+        PerMachine,
+        /// <summary>
+        /// Set per-user scope for per-user-or-machine packages.
+        /// </summary>
+        PerUser,
+    }
+    /// <summary>
    /// The message log level.
    /// </summary>
    public enum LogLevel
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/IEngine.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/IEngine.cs
index 03ceed06..a763d741 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/IEngine.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/IEngine.cs
@@ -139,7 +139,8 @@ namespace WixToolset.BootstrapperApplicationApi
        /// Determine the installation sequencing and costing.
        /// </summary>
        /// <param name="action">The action to perform when planning.</param>
-        void Plan(LaunchAction action);
+        /// <param name="plannedScope">The bundle scope for per-user-or-machine packages.</param>
+        void Plan(LaunchAction action, BundleScope plannedScope);
        /// <summary>
        /// Set the update information for a bundle.
diff --git a/src/api/burn/balutil/BalBootstrapperEngine.cpp b/src/api/burn/balutil/BalBootstrapperEngine.cpp
index 61e7e31b..14aa5c25 100644
--- a/src/api/burn/balutil/BalBootstrapperEngine.cpp
+++ b/src/api/burn/balutil/BalBootstrapperEngine.cpp
@@ -1188,7 +1188,8 @@ public: // IBootstrapperEngine
    }
    virtual STDMETHODIMP Plan(
-        __in BOOTSTRAPPER_ACTION action
+        __in BOOTSTRAPPER_ACTION action,
+        __in BOOTSTRAPPER_SCOPE plannedScope
        )
    {
        HRESULT hr = S_OK;
@@ -1199,17 +1200,21 @@ public: // IBootstrapperEngine
        PIPE_RPC_RESULT rpc = { };
        // Init send structs.
-        args.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
+        args.dwApiVersion = WIX_7_BOOTSTRAPPER_APPLICATION_API_VERSION;
        args.action = action;
+        args.plannedScope = plannedScope;
-        results.dwApiVersion = WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION;
+        results.dwApiVersion = WIX_7_BOOTSTRAPPER_APPLICATION_API_VERSION;
        // Send args.
        hr = BuffWriteNumberToBuffer(&bufferArgs, args.dwApiVersion);
        ExitOnFailure(hr, "Failed to write API version of Plan args.");
        hr = BuffWriteNumberToBuffer(&bufferArgs, static_cast<DWORD>(args.action));
-        ExitOnFailure(hr, "Failed to write parent window of Plan args.");
+        ExitOnFailure(hr, "Failed to write action of Plan args.");
+        hr = BuffWriteNumberToBuffer(&bufferArgs, static_cast<DWORD>(args.plannedScope));
+        ExitOnFailure(hr, "Failed to write planned scope of Plan args.");
        // Send results.
        hr = BuffWriteNumberToBuffer(&bufferResults, results.dwApiVersion);
diff --git a/src/api/burn/balutil/inc/BootstrapperApplicationBase.h b/src/api/burn/balutil/inc/BootstrapperApplicationBase.h
index 80bfd361..41c151d9 100644
--- a/src/api/burn/balutil/inc/BootstrapperApplicationBase.h
+++ b/src/api/burn/balutil/inc/BootstrapperApplicationBase.h
@@ -16,7 +16,7 @@ class CBootstrapperApplicationBase : public IBootstrapperApplication
 public: // IUnknown
    virtual STDMETHODIMP QueryInterface(
        __in REFIID riid,
-        __out LPVOID *ppvObject
+        __out LPVOID* ppvObject
        )
    {
        if (!ppvObject)
@@ -478,12 +478,14 @@ public: // IBootstrapperApplication
        __in DWORD dwCode,
        __in_z LPCWSTR wzError,
        __in DWORD dwUIHint,
-        __in DWORD /*cData*/,
+        __in DWORD cData,
        __in_ecount_z_opt(cData) LPCWSTR* /*rgwzData*/,
        __in int /*nRecommendation*/,
        __inout int* pResult
        )
    {
+        UNREFERENCED_PARAMETER(cData);
        BalRetryErrorOccurred(wzPackageId, dwCode);
        if (BOOTSTRAPPER_DISPLAY_EMBEDDED == m_commandDisplay)
@@ -781,12 +783,14 @@ public: // IBootstrapperApplication
        __in INSTALLMESSAGE /*messageType*/,
        __in DWORD /*dwUIHint*/,
        __in_z LPCWSTR /*wzMessage*/,
-        __in DWORD /*cData*/,
+        __in DWORD cData,
        __in_ecount_z_opt(cData) LPCWSTR* /*rgwzData*/,
        __in int /*nRecommendation*/,
        __inout int* pResult
        )
    {
+        UNREFERENCED_PARAMETER(cData);
        if (CheckCanceled())
        {
            *pResult = IDCANCEL;
@@ -797,13 +801,15 @@ public: // IBootstrapperApplication
    virtual STDMETHODIMP OnExecuteFilesInUse(
        __in_z LPCWSTR /*wzPackageId*/,
-        __in DWORD /*cFiles*/,
+        __in DWORD cFiles,
        __in_ecount_z(cFiles) LPCWSTR* /*rgwzFiles*/,
        __in int /*nRecommendation*/,
        __in BOOTSTRAPPER_FILES_IN_USE_TYPE /*source*/,
        __inout int* pResult
        )
    {
+        UNREFERENCED_PARAMETER(cFiles);
        if (CheckCanceled())
        {
            *pResult = IDCANCEL;
diff --git a/src/api/burn/balutil/inc/IBootstrapperEngine.h b/src/api/burn/balutil/inc/IBootstrapperEngine.h
index 57fc9be9..ad6e6042 100644
--- a/src/api/burn/balutil/inc/IBootstrapperEngine.h
+++ b/src/api/burn/balutil/inc/IBootstrapperEngine.h
@@ -108,7 +108,8 @@ DECLARE_INTERFACE_IID_(IBootstrapperEngine, IUnknown, "6480D616-27A0-44D7-905B-8
        ) = 0;
    STDMETHOD(Plan)(
-        __in BOOTSTRAPPER_ACTION action
+        __in BOOTSTRAPPER_ACTION action,
+        __in BOOTSTRAPPER_SCOPE plannedScope
        ) = 0;
    STDMETHOD(Elevate)(
diff --git a/src/api/burn/inc/BootstrapperApplicationTypes.h b/src/api/burn/inc/BootstrapperApplicationTypes.h
index 2ece1b7b..b430e04a 100644
--- a/src/api/burn/inc/BootstrapperApplicationTypes.h
+++ b/src/api/burn/inc/BootstrapperApplicationTypes.h
@@ -10,6 +10,7 @@ extern "C" {
 const LPCWSTR BOOTSTRAPPER_APPLICATION_COMMANDLINE_SWITCH_API_VERSION = L"burn.ba.apiver";
 const LPCWSTR BOOTSTRAPPER_APPLICATION_COMMANDLINE_SWITCH_PIPE_NAME = L"burn.ba.pipe";
 const DWORD WIX_5_BOOTSTRAPPER_APPLICATION_API_VERSION = 5;
+const DWORD WIX_7_BOOTSTRAPPER_APPLICATION_API_VERSION = 7;
 enum BOOTSTRAPPER_DISPLAY
 {
@@ -27,6 +28,15 @@ enum BOOTSTRAPPER_REGISTRATION_TYPE
    BOOTSTRAPPER_REGISTRATION_TYPE_FULL,
 };
+enum BOOTSTRAPPER_PACKAGE_SCOPE
+{
+    BOOTSTRAPPER_PACKAGE_SCOPE_INVALID,
+    BOOTSTRAPPER_PACKAGE_SCOPE_PER_MACHINE,
+    BOOTSTRAPPER_PACKAGE_SCOPE_PER_MACHINE_OR_PER_USER,
+    BOOTSTRAPPER_PACKAGE_SCOPE_PER_USER_OR_PER_MACHINE,
+    BOOTSTRAPPER_PACKAGE_SCOPE_PER_USER,
+};
 enum BOOTSTRAPPER_RESUME_TYPE
 {
    BOOTSTRAPPER_RESUME_TYPE_NONE,
@@ -353,6 +363,7 @@ struct BOOTSTRAPPER_COMMAND
    DWORD cbSize;
    BOOTSTRAPPER_ACTION action;
    BOOTSTRAPPER_DISPLAY display;
+    BOOTSTRAPPER_SCOPE commandLineScope;
    LPWSTR wzCommandLine;
    INT32 nCmdShow;
diff --git a/src/api/burn/inc/BootstrapperEngineTypes.h b/src/api/burn/inc/BootstrapperEngineTypes.h
index f89238c0..6dced349 100644
--- a/src/api/burn/inc/BootstrapperEngineTypes.h
+++ b/src/api/burn/inc/BootstrapperEngineTypes.h
@@ -30,6 +30,13 @@ enum BOOTSTRAPPER_ACTION
    BOOTSTRAPPER_ACTION_UPDATE_REPLACE_EMBEDDED,
 };
+enum BOOTSTRAPPER_SCOPE
+{
+    BOOTSTRAPPER_SCOPE_DEFAULT,
+    BOOTSTRAPPER_SCOPE_PER_MACHINE,
+    BOOTSTRAPPER_SCOPE_PER_USER,
+};
 enum BOOTSTRAPPER_ACTION_STATE
 {
    BOOTSTRAPPER_ACTION_STATE_NONE,
@@ -183,7 +190,7 @@ typedef struct _BAENGINE_ESCAPESTRING_RESULTS
 {
    DWORD dwApiVersion;
    LPWSTR wzOut;
-    // Should be initialized to the size of wzOut.
+    // Should be initialized to the count of wzOut.
    DWORD cchOut;
 } BAENGINE_ESCAPESTRING_RESULTS;
@@ -306,6 +313,7 @@ typedef struct _BAENGINE_PLAN_ARGS
 {
    DWORD dwApiVersion;
    BOOTSTRAPPER_ACTION action;
+    BOOTSTRAPPER_SCOPE plannedScope;
 } BAENGINE_PLAN_ARGS;
 typedef struct _BAENGINE_PLAN_RESULTS
diff --git a/src/api/wix/WixToolset.Data/Symbols/WixBundleHarvestedBundlePackageSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixBundleHarvestedBundlePackageSymbol.cs
index 8c969e77..adec1d78 100644
--- a/src/api/wix/WixToolset.Data/Symbols/WixBundleHarvestedBundlePackageSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/WixBundleHarvestedBundlePackageSymbol.cs
@@ -18,6 +18,7 @@ namespace WixToolset.Data
                new IntermediateFieldDefinition(nameof(WixBundleHarvestedBundlePackageSymbolFields.Version), IntermediateFieldType.String),
                new IntermediateFieldDefinition(nameof(WixBundleHarvestedBundlePackageSymbolFields.DisplayName), IntermediateFieldType.String),
                new IntermediateFieldDefinition(nameof(WixBundleHarvestedBundlePackageSymbolFields.InstallSize), IntermediateFieldType.LargeNumber),
+                new IntermediateFieldDefinition(nameof(WixBundleHarvestedBundlePackageSymbolFields.Scope), IntermediateFieldType.Number),
            },
            typeof(WixBundleHarvestedBundlePackageSymbol));
    }
@@ -39,13 +40,13 @@ namespace WixToolset.Data.Symbols
        Version,
        DisplayName,
        InstallSize,
+        Scope,
    }
    [Flags]
    public enum WixBundleHarvestedBundlePackageAttributes
    {
        None = 0x0,
-        PerMachine = 0x1,
        Win64 = 0x2,
    }
@@ -116,20 +117,10 @@ namespace WixToolset.Data.Symbols
            set => this.Set((int)WixBundleHarvestedBundlePackageSymbolFields.InstallSize, value);
        }
-        public bool PerMachine
+        public WixBundleScopeType Scope
        {
-            get { return this.Attributes.HasFlag(WixBundleHarvestedBundlePackageAttributes.PerMachine); }
+            get => Enum.TryParse((string)this.Fields[(int)WixBundleHarvestedBundlePackageSymbolFields.Scope], true, out WixBundleScopeType value) ? value : WixBundleScopeType.PerMachine;
-            set
+            set => this.Set((int)WixBundleHarvestedBundlePackageSymbolFields.Scope, (int)value);
-            {
-                if (value)
-                {
-                    this.Attributes |= WixBundleHarvestedBundlePackageAttributes.PerMachine;
-                }
-                else
-                {
-                    this.Attributes &= ~WixBundleHarvestedBundlePackageAttributes.PerMachine;
-                }
-            }
        }
        public bool Win64
diff --git a/src/api/wix/WixToolset.Data/Symbols/WixBundleHarvestedMsiPackageSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixBundleHarvestedMsiPackageSymbol.cs
index 8a274720..02cbc4bc 100644
--- a/src/api/wix/WixToolset.Data/Symbols/WixBundleHarvestedMsiPackageSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/WixBundleHarvestedMsiPackageSymbol.cs
@@ -14,6 +14,7 @@ namespace WixToolset.Data
                new IntermediateFieldDefinition(nameof(WixBundleHarvestedMsiPackageSymbolFields.ProductName), IntermediateFieldType.String),
                new IntermediateFieldDefinition(nameof(WixBundleHarvestedMsiPackageSymbolFields.ArpComments), IntermediateFieldType.String),
                new IntermediateFieldDefinition(nameof(WixBundleHarvestedMsiPackageSymbolFields.AllUsers), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixBundleHarvestedMsiPackageSymbolFields.MsiInstallPerUser), IntermediateFieldType.String),
                new IntermediateFieldDefinition(nameof(WixBundleHarvestedMsiPackageSymbolFields.MsiFastInstall), IntermediateFieldType.String),
                new IntermediateFieldDefinition(nameof(WixBundleHarvestedMsiPackageSymbolFields.ArpSystemComponent), IntermediateFieldType.String),
                new IntermediateFieldDefinition(nameof(WixBundleHarvestedMsiPackageSymbolFields.ProductCode), IntermediateFieldType.String),
@@ -37,6 +38,7 @@ namespace WixToolset.Data.Symbols
        ProductName,
        ArpComments,
        AllUsers,
+        MsiInstallPerUser,
        MsiFastInstall,
        ArpSystemComponent,
        ProductCode,
@@ -91,6 +93,12 @@ namespace WixToolset.Data.Symbols
            set => this.Set((int)WixBundleHarvestedMsiPackageSymbolFields.AllUsers, value);
        }
+        public string MsiInstallPerUser
+        {
+            get => this.Fields[(int)WixBundleHarvestedMsiPackageSymbolFields.MsiInstallPerUser].AsString();
+            set => this.Set((int)WixBundleHarvestedMsiPackageSymbolFields.MsiInstallPerUser, value);
+        }
        public string MsiFastInstall
        {
            get => this.Fields[(int)WixBundleHarvestedMsiPackageSymbolFields.MsiFastInstall].AsString();
diff --git a/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageSymbol.cs
index 8d625664..e888856b 100644
--- a/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/WixBundlePackageSymbol.cs
@@ -17,7 +17,7 @@ namespace WixToolset.Data
                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.RepairCondition), IntermediateFieldType.String),
                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.Cache), IntermediateFieldType.String),
                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.CacheId), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.PerMachine), IntermediateFieldType.Bool),
+                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.Scope), IntermediateFieldType.Number),
                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.LogPathVariable), IntermediateFieldType.String),
                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.RollbackLogPathVariable), IntermediateFieldType.String),
                new IntermediateFieldDefinition(nameof(WixBundlePackageSymbolFields.Size), IntermediateFieldType.LargeNumber),
@@ -46,7 +46,7 @@ namespace WixToolset.Data.Symbols
        RepairCondition,
        Cache,
        CacheId,
-        PerMachine,
+        Scope,
        LogPathVariable,
        RollbackLogPathVariable,
        Size,
@@ -144,10 +144,32 @@ namespace WixToolset.Data.Symbols
            set => this.Set((int)WixBundlePackageSymbolFields.CacheId, value);
        }
-        public bool? PerMachine
+        public WixBundleScopeType? Scope
        {
-            get => (bool?)this.Fields[(int)WixBundlePackageSymbolFields.PerMachine];
+            get => (WixBundleScopeType?)this.Fields[(int)WixBundlePackageSymbolFields.Scope].AsNullableNumber();
-            set => this.Set((int)WixBundlePackageSymbolFields.PerMachine, value);
+            set => this.Set((int)WixBundlePackageSymbolFields.Scope, (int)value);
+        }
+        public string ScopeAsString
+        {
+            get
+            {
+                var value = (WixBundleScopeType?)this.Fields[(int)WixBundlePackageSymbolFields.Scope].AsNullableNumber();
+                switch (value)
+                {
+                    case WixBundleScopeType.PerMachine:
+                        return "perMachine";
+                    case WixBundleScopeType.PerUser:
+                        return "perUser";
+                    case WixBundleScopeType.PerUserOrMachine:
+                        return "perUserOrMachine";
+                    case WixBundleScopeType.PerMachineOrUser:
+                        return "perMachineOrUser";
+                    default:
+                        return null;
+                }
+            }
        }
        public string LogPathVariable
diff --git a/src/api/wix/WixToolset.Data/Symbols/WixBundleSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixBundleSymbol.cs
index f16cdbb8..a06a8610 100644
--- a/src/api/wix/WixToolset.Data/Symbols/WixBundleSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/WixBundleSymbol.cs
@@ -16,6 +16,7 @@ namespace WixToolset.Data
                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Name), IntermediateFieldType.String),
                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Manufacturer), IntermediateFieldType.String),
                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.Scope), IntermediateFieldType.Number),
                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.AboutUrl), IntermediateFieldType.String),
                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.HelpUrl), IntermediateFieldType.String),
                new IntermediateFieldDefinition(nameof(WixBundleSymbolFields.HelpTelephone), IntermediateFieldType.String),
@@ -42,6 +43,7 @@ namespace WixToolset.Data
 namespace WixToolset.Data.Symbols
 {
    using System;
+    using System.Xml.Linq;
    public enum WixBundleSymbolFields
    {
@@ -51,6 +53,7 @@ namespace WixToolset.Data.Symbols
        Name,
        Manufacturer,
        Attributes,
+        Scope,
        AboutUrl,
        HelpUrl,
        HelpTelephone,
@@ -78,7 +81,6 @@ namespace WixToolset.Data.Symbols
    {
        None = 0x0,
        DisableRemove = 0x1,
-        PerMachine = 0x2,
    }
    public enum WixBundleModifyType
@@ -88,6 +90,14 @@ namespace WixToolset.Data.Symbols
        SingleChangeUninstallButton = 2,
    }
+    public enum WixBundleScopeType
+    {
+        PerMachine,
+        PerMachineOrUser,
+        PerUserOrMachine,
+        PerUser,
+    }
    public class WixBundleSymbol : IntermediateSymbol
    {
        public WixBundleSymbol() : base(SymbolDefinitions.WixBundle, null, null)
@@ -136,6 +146,34 @@ namespace WixToolset.Data.Symbols
            set => this.Set((int)WixBundleSymbolFields.Attributes, (int)value);
        }
+        public WixBundleScopeType Scope
+        {
+            get => (WixBundleScopeType)this.Fields[(int)WixBundleSymbolFields.Scope].AsNumber();
+            set => this.Set((int)WixBundleSymbolFields.Scope, (int)value);
+        }
+        public string ScopeAsString
+        {
+            get
+            {
+                var value = (WixBundleScopeType)this.Fields[(int)WixBundleSymbolFields.Scope].AsNumber();
+                switch (value)
+                {
+                    case WixBundleScopeType.PerMachine:
+                        return "perMachine";
+                    case WixBundleScopeType.PerUser:
+                        return "perUser";
+                    case WixBundleScopeType.PerUserOrMachine:
+                        return "perUserOrMachine";
+                    case WixBundleScopeType.PerMachineOrUser:
+                        return "perMachineOrUser";
+                    default:
+                        return null;
+                }
+            }
+        }
        public string AboutUrl
        {
            get => (string)this.Fields[(int)WixBundleSymbolFields.AboutUrl];
@@ -276,21 +314,5 @@ namespace WixToolset.Data.Symbols
                }
            }
        }
-        public bool PerMachine
-        {
-            get { return this.Attributes.HasFlag(WixBundleAttributes.PerMachine); }
-            set
-            {
-                if (value)
-                {
-                    this.Attributes |= WixBundleAttributes.PerMachine;
-                }
-                else
-                {
-                    this.Attributes &= ~WixBundleAttributes.PerMachine;
-                }
-            }
-        }
    }
 }
diff --git a/src/burn/engine/apply.cpp b/src/burn/engine/apply.cpp
index e4e76a6c..68aded71 100644
--- a/src/burn/engine/apply.cpp
+++ b/src/burn/engine/apply.cpp
@@ -632,7 +632,7 @@ extern "C" HRESULT ApplyCache(
                {
                    hr = ElevationCachePreparePackage(hPipe, pPackage);
                }
-                LogExitOnFailure(hr, MSG_CACHE_PREPARE_PACKAGE_FAILED, "Cache prepare package failed: %ls", pPackage->sczId, NULL, NULL);
+                LogExitOnFailure(hr, MSG_CACHE_PREPARE_PACKAGE_FAILED, "Cache prepare package failed: %ls", pPackage->sczId);
            }
            hr = ApplyCachePackage(&cacheContext, pPackage);
diff --git a/src/burn/engine/baengine.cpp b/src/burn/engine/baengine.cpp
index d1704ad9..e48f71c0 100644
--- a/src/burn/engine/baengine.cpp
+++ b/src/burn/engine/baengine.cpp
@@ -1134,12 +1134,15 @@ static HRESULT BAEnginePlan(
    hr = BuffReaderReadNumber(pReaderArgs, reinterpret_cast<DWORD*>(&args.action));
    ExitOnFailure(hr, "Failed to read plan action of BAEnginePlan args.");
+    hr = BuffReaderReadNumber(pReaderArgs, reinterpret_cast<DWORD*>(&args.plannedScope));
+    ExitOnFailure(hr, "Failed to read plan scope of BAEnginePlan args.");
    // Read results.
    hr = BuffReaderReadNumber(pReaderResults, &results.dwApiVersion);
    ExitOnFailure(hr, "Failed to read API version of BAEnginePlan results.");
    // Execute.
-    hr = ExternalEnginePlan(pContext, args.action);
+    hr = ExternalEnginePlan(pContext, args.action, args.plannedScope);
    ExitOnFailure(hr, "Failed to plan in the engine.");
    // Pack result.
diff --git a/src/burn/engine/baengine.h b/src/burn/engine/baengine.h
index 97cfea9c..39e5ae0b 100644
--- a/src/burn/engine/baengine.h
+++ b/src/burn/engine/baengine.h
@@ -31,6 +31,7 @@ typedef struct _BAENGINE_ACTION
        struct
        {
            BOOTSTRAPPER_ACTION action;
+            BOOTSTRAPPER_SCOPE plannedScope;
        } plan;
        struct
        {
diff --git a/src/burn/engine/cache.cpp b/src/burn/engine/cache.cpp
index c85a1be4..21bd42be 100644
--- a/src/burn/engine/cache.cpp
+++ b/src/burn/engine/cache.cpp
@@ -36,8 +36,8 @@ static HRESULT SecurePerMachineCacheRoot(
 static HRESULT CreateCompletedPath(
    __in BURN_CACHE* pCache,
    __in BOOL fPerMachine,
-    __in LPCWSTR wzCacheId,
+    __in_z LPCWSTR wzId,
-    __in LPCWSTR wzFilePath,
+    __in_z_opt LPCWSTR wzFilePath,
    __out_z LPWSTR* psczCachePath
    );
 static HRESULT CreateUnverifiedPath(
@@ -1658,8 +1658,8 @@ LExit:
 static HRESULT CreateCompletedPath(
    __in BURN_CACHE* pCache,
    __in BOOL fPerMachine,
-    __in LPCWSTR wzId,
+    __in_z LPCWSTR wzId,
-    __in LPCWSTR wzFilePath,
+    __in_z_opt LPCWSTR wzFilePath,
    __out_z LPWSTR* psczCachePath
    )
 {
diff --git a/src/burn/engine/core.cpp b/src/burn/engine/core.cpp
index 2dfa4857..7937bd65 100644
--- a/src/burn/engine/core.cpp
+++ b/src/burn/engine/core.cpp
@@ -379,7 +379,7 @@ extern "C" HRESULT CoreDetect(
            pEngineState->registration.fEligibleForCleanup = FALSE;
        }
-        LogId(REPORT_STANDARD, MSG_DETECTED_PACKAGE, pPackage->sczId, LoggingPackageStateToString(pPackage->currentState), LoggingBoolToString(pPackage->fCached), LoggingPackageRegistrationStateToString(pPackage->fCanAffectRegistration, pPackage->installRegistrationState), LoggingPackageRegistrationStateToString(pPackage->fCanAffectRegistration, pPackage->cacheRegistrationState));
+        LogId(REPORT_STANDARD, MSG_DETECTED_PACKAGE, pPackage->sczId, LoggingPackageStateToString(pPackage->currentState), LoggingBoolToString(pPackage->fCached), LoggingPackageRegistrationStateToString(pPackage->fCanAffectRegistration, pPackage->installRegistrationState), LoggingPackageRegistrationStateToString(pPackage->fCanAffectRegistration, pPackage->cacheRegistrationState), LoggingPackageScopeToString(pPackage->scope));
        if (BURN_PACKAGE_TYPE_MSI == pPackage->type)
        {
@@ -424,8 +424,9 @@ LExit:
 extern "C" HRESULT CorePlan(
    __in BURN_ENGINE_STATE* pEngineState,
-    __in BOOTSTRAPPER_ACTION action
+    __in BOOTSTRAPPER_ACTION action,
-    )
+    __in BOOTSTRAPPER_SCOPE plannedScope
+)
 {
    HRESULT hr = S_OK;
    BOOL fPlanBegan = FALSE;
@@ -433,7 +434,7 @@ extern "C" HRESULT CorePlan(
    BURN_PACKAGE* pForwardCompatibleBundlePackage = NULL;
    BOOL fContinuePlanning = TRUE; // assume we won't skip planning due to dependencies.
-    LogId(REPORT_STANDARD, MSG_PLAN_BEGIN, pEngineState->packages.cPackages, LoggingBurnActionToString(action));
+    LogId(REPORT_STANDARD, MSG_PLAN_BEGIN, pEngineState->packages.cPackages, LoggingBurnActionToString(action), LoggingBundleScopeToString(plannedScope));
    fPlanBegan = TRUE;
    hr = BACallbackOnPlanBegin(&pEngineState->userExperience, pEngineState->packages.cPackages);
@@ -452,12 +453,13 @@ extern "C" HRESULT CorePlan(
    pEngineState->fPlanned = FALSE;
    PlanReset(&pEngineState->plan, &pEngineState->variables, &pEngineState->containers, &pEngineState->packages, &pEngineState->layoutPayloads);
-    hr = PlanSetVariables(action, &pEngineState->variables);
+    hr = PlanSetVariables(action, pEngineState->registration.scope, pEngineState->plan.plannedScope, &pEngineState->variables);
-    ExitOnFailure(hr, "Failed to update action.");
+    ExitOnFailure(hr, "Failed to update plan variables.");
    // Remember the overall action state in the plan since it shapes the changes
    // we make everywhere.
    pEngineState->plan.action = action;
+    pEngineState->plan.plannedScope = plannedScope;
    pEngineState->plan.pCache = &pEngineState->cache;
    pEngineState->plan.pCommand = &pEngineState->command;
    pEngineState->plan.pInternalCommand = &pEngineState->internalCommand;
@@ -467,6 +469,17 @@ extern "C" HRESULT CorePlan(
    pEngineState->plan.fDisableRollback = pEngineState->fDisableRollback || BOOTSTRAPPER_ACTION_UNSAFE_UNINSTALL == pEngineState->plan.action;
    pEngineState->plan.fPlanPackageCacheRollback = BOOTSTRAPPER_REGISTRATION_TYPE_NONE == pEngineState->registration.detectedRegistrationType;
+    hr = PlanPackagesAndBundleScope(pEngineState->packages.rgPackages, pEngineState->packages.cPackages, pEngineState->plan.plannedScope, pEngineState->registration.scope, pEngineState->command.commandLineScope, &pEngineState->plan.plannedScope, &pEngineState->registration.fPerMachine);
+    ExitOnFailure(hr, "Failed to determine packages and bundle scope.");
+    if (BOOTSTRAPPER_PACKAGE_SCOPE_PER_MACHINE_OR_PER_USER == pEngineState->registration.scope || BOOTSTRAPPER_PACKAGE_SCOPE_PER_USER_OR_PER_MACHINE == pEngineState->registration.scope)
+    {
+        LogId(REPORT_STANDARD, MSG_PLAN_CONFIGURED_SCOPE, LoggingInstallScopeToString(pEngineState->registration.fPerMachine));
+    }
+    hr = RegistrationSetPaths(&pEngineState->registration, &pEngineState->cache);
+    ExitOnFailure(hr, "Failed to set registration paths.");
    // Set resume commandline
    hr = PlanSetResumeCommand(&pEngineState->plan, &pEngineState->registration, &pEngineState->log);
    ExitOnFailure(hr, "Failed to set resume command");
@@ -475,7 +488,7 @@ extern "C" HRESULT CorePlan(
    ExitOnFailure(hr, "Failed to initialize the dependencies for the plan.");
    hr = RegistrationPlanInitialize(&pEngineState->registration);
-    ExitOnFailure(hr, "Failed to initialize registration for the plan.");
+    ExitOnFailure(hr, "Failed to initialize the plan for registration.");
    if (BOOTSTRAPPER_ACTION_LAYOUT == action)
    {
@@ -556,6 +569,9 @@ extern "C" HRESULT CorePlan(
        LogPackages(pUpgradeBundlePackage, pForwardCompatibleBundlePackage, &pEngineState->packages, &pEngineState->registration.relatedBundles, action);
    }
+    hr = PlanSetVariables(action, pEngineState->registration.scope, pEngineState->plan.plannedScope, &pEngineState->variables);
+    ExitOnFailure(hr, "Failed to update plan variables after planning.");
    PlanDump(&pEngineState->plan);
 LExit:
@@ -1331,7 +1347,7 @@ extern "C" void CoreCleanup(
        ExitFunction();
    }
-    hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNINSTALL);
+    hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNINSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
    ExitOnFailure(hr, "Plan during cleanup failed");
    hr = CoreApply(pEngineState, pEngineState->hMessageWindow);
@@ -1470,6 +1486,14 @@ extern "C" HRESULT CoreParseCommandLine(
            {
                pInternalCommand->fDisableSystemRestore = TRUE;
            }
+            else if (CSTR_EQUAL == ::CompareStringOrdinal(&argv[i][1], -1, L"peruser", -1, TRUE))
+            {
+                pCommand->commandLineScope = BOOTSTRAPPER_SCOPE_PER_USER;
+            }
+            else if (CSTR_EQUAL == ::CompareStringOrdinal(&argv[i][1], -1, L"permachine", -1, TRUE))
+            {
+                pCommand->commandLineScope = BOOTSTRAPPER_SCOPE_PER_MACHINE;
+            }
            else if (CSTR_EQUAL == ::CompareStringOrdinal(&argv[i][1], -1, L"originalsource", -1, TRUE))
            {
                if (i + 1 >= argc)
@@ -2346,7 +2370,7 @@ static void LogPackages(
                LogRollbackBoundary(pPackage->pRollbackBoundaryBackward);
            }
-            LogId(REPORT_STANDARD, MSG_PLANNED_PACKAGE, pPackage->sczId, LoggingPackageStateToString(pPackage->currentState), LoggingRequestStateToString(pPackage->defaultRequested), LoggingRequestStateToString(pPackage->requested), LoggingActionStateToString(pPackage->execute), LoggingActionStateToString(pPackage->rollback), LoggingCacheTypeToString(pPackage->authoredCacheType), LoggingCacheTypeToString(pPackage->cacheType), LoggingPlannedCacheToString(pPackage), LoggingBoolToString(pPackage->fPlannedUncache), LoggingDependencyActionToString(pPackage->dependencyExecute), LoggingPackageRegistrationStateToString(pPackage->fCanAffectRegistration, pPackage->expectedInstallRegistrationState), LoggingPackageRegistrationStateToString(pPackage->fCanAffectRegistration, pPackage->expectedCacheRegistrationState));
+            LogId(REPORT_STANDARD, MSG_PLANNED_PACKAGE, pPackage->sczId, LoggingPackageStateToString(pPackage->currentState), LoggingRequestStateToString(pPackage->defaultRequested), LoggingRequestStateToString(pPackage->requested), LoggingActionStateToString(pPackage->execute), LoggingActionStateToString(pPackage->rollback), LoggingCacheTypeToString(pPackage->authoredCacheType), LoggingCacheTypeToString(pPackage->cacheType), LoggingPlannedCacheToString(pPackage), LoggingBoolToString(pPackage->fPlannedUncache), LoggingDependencyActionToString(pPackage->dependencyExecute), LoggingPackageRegistrationStateToString(pPackage->fCanAffectRegistration, pPackage->expectedInstallRegistrationState), LoggingPackageRegistrationStateToString(pPackage->fCanAffectRegistration, pPackage->expectedCacheRegistrationState), LoggingInstallScopeToString(pPackage->fPerMachine));
            if (BURN_PACKAGE_TYPE_MSI == pPackage->type)
            {
diff --git a/src/burn/engine/core.h b/src/burn/engine/core.h
index cf615e35..75c0c941 100644
--- a/src/burn/engine/core.h
+++ b/src/burn/engine/core.h
@@ -45,7 +45,9 @@ const LPCWSTR BURN_BUNDLE_EXECUTE_PACKAGE_ACTION = L"WixBundleExecutePackageActi
 const LPCWSTR BURN_BUNDLE_FORCED_RESTART_PACKAGE = L"WixBundleForcedRestartPackage";
 const LPCWSTR BURN_BUNDLE_INSTALLED = L"WixBundleInstalled";
 const LPCWSTR BURN_BUNDLE_ELEVATED = L"WixBundleElevated";
+const LPCWSTR BURN_BUNDLE_PLANNED_SCOPE = L"WixBundlePlannedScope";
 const LPCWSTR BURN_BUNDLE_PROVIDER_KEY = L"WixBundleProviderKey";
+const LPCWSTR BURN_BUNDLE_SCOPE = L"WixBundleScope";
 const LPCWSTR BURN_BUNDLE_SOURCE_PROCESS_PATH = L"WixBundleSourceProcessPath";
 const LPCWSTR BURN_BUNDLE_SOURCE_PROCESS_FOLDER = L"WixBundleSourceProcessFolder";
 const LPCWSTR BURN_BUNDLE_TAG = L"WixBundleTag";
@@ -243,7 +245,8 @@ HRESULT CoreDetect(
    );
 HRESULT CorePlan(
    __in BURN_ENGINE_STATE* pEngineState,
-    __in BOOTSTRAPPER_ACTION action
+    __in BOOTSTRAPPER_ACTION action,
+    __in BOOTSTRAPPER_SCOPE scope
    );
 HRESULT CoreElevate(
    __in BURN_ENGINE_STATE* pEngineState,
diff --git a/src/burn/engine/dependency.cpp b/src/burn/engine/dependency.cpp
index 94a8a1e4..7cd0db9f 100644
--- a/src/burn/engine/dependency.cpp
+++ b/src/burn/engine/dependency.cpp
@@ -12,6 +12,7 @@ const LPCWSTR vcszIgnoreDependenciesDelim = L";";
 static HRESULT DetectPackageDependents(
    __in BURN_PACKAGE* pPackage,
+    __in BOOL fPackagePerMachine,
    __in const BURN_REGISTRATION* pRegistration
    );
@@ -249,7 +250,22 @@ extern "C" HRESULT DependencyDetectProviderKeyBundleCode(
 {
    HRESULT hr = S_OK;
-    hr = DepGetProviderInformation(pRegistration->hkRoot, pRegistration->sczProviderKey, &pRegistration->sczDetectedProviderKeyBundleCode, NULL, NULL);
+    // For configurable packages, check both scopes because until planning,
+    // we can't know their planned scope.
+    if (pRegistration->hkRoot)
+    {
+        hr = DepGetProviderInformation(pRegistration->hkRoot, pRegistration->sczProviderKey, &pRegistration->sczDetectedProviderKeyBundleCode, NULL, NULL);
+    }
+    else
+    {
+        hr = DepGetProviderInformation(HKEY_LOCAL_MACHINE, pRegistration->sczProviderKey, &pRegistration->sczDetectedProviderKeyBundleCode, NULL, NULL);
+        if (E_NOTFOUND == hr)
+        {
+            hr = DepGetProviderInformation(HKEY_CURRENT_USER, pRegistration->sczProviderKey, &pRegistration->sczDetectedProviderKeyBundleCode, NULL, NULL);
+        }
+    }
    if (E_NOTFOUND == hr)
    {
        ReleaseNullStr(pRegistration->sczDetectedProviderKeyBundleCode);
@@ -284,7 +300,21 @@ extern "C" HRESULT DependencyDetectBundle(
    hr = DependencyDetectProviderKeyBundleCode(pRegistration);
    ExitOnFailure(hr, "Failed to detect provider key bundle code.");
-    hr = DepCheckDependents(pRegistration->hkRoot, pRegistration->sczProviderKey, 0, NULL, &pRegistration->rgDependents, &pRegistration->cDependents);
+    // For configurable packages, check both scopes because until planning,
+    // we can't know their planned scope.
+    if (pRegistration->hkRoot)
+    {
+        hr = DepCheckDependents(pRegistration->hkRoot, pRegistration->sczProviderKey, 0, NULL, &pRegistration->rgDependents, &pRegistration->cDependents);
+    }
+    else
+    {
+        hr = DepCheckDependents(HKEY_LOCAL_MACHINE, pRegistration->sczProviderKey, 0, NULL, &pRegistration->rgDependents, &pRegistration->cDependents);
+        if (E_NOTFOUND == hr)
+        {
+            hr = DepCheckDependents(HKEY_CURRENT_USER, pRegistration->sczProviderKey, 0, NULL, &pRegistration->rgDependents, &pRegistration->cDependents);
+        }
+    }
    ExitOnPathFailure(hr, fExists, "Failed dependents check on bundle.");
    if (pDependencies->fSelfDependent || pDependencies->fActiveParent)
@@ -292,13 +322,13 @@ extern "C" HRESULT DependencyDetectBundle(
        for (DWORD i = 0; i < pRegistration->cDependents; ++i)
        {
            DEPENDENCY* pDependent = pRegistration->rgDependents + i;
+            
-            if (pDependencies->fActiveParent && CSTR_EQUAL == ::CompareStringOrdinal(pDependencies->wzActiveParent, -1, pDependent->sczKey, -1, TRUE))
+            if (pDependent && pDependencies->fActiveParent && CSTR_EQUAL == ::CompareStringOrdinal(pDependencies->wzActiveParent, -1, pDependent->sczKey, -1, TRUE))
            {
                pRegistration->fParentRegisteredAsDependent = TRUE;
            }
-            if (pDependencies->fSelfDependent && CSTR_EQUAL == ::CompareStringOrdinal(pDependencies->wzSelfDependent, -1, pDependent->sczKey, -1, TRUE))
+            if (pDependent && pDependencies->fSelfDependent && CSTR_EQUAL == ::CompareStringOrdinal(pDependencies->wzSelfDependent, -1, pDependent->sczKey, -1, TRUE))
            {
                pRegistration->fSelfRegisteredAsDependent = TRUE;
            }
@@ -316,11 +346,24 @@ extern "C" HRESULT DependencyDetectChainPackage(
 {
    HRESULT hr = S_OK;
-    hr = DetectPackageDependents(pPackage, pRegistration);
+    if (BOOTSTRAPPER_PACKAGE_SCOPE_PER_USER_OR_PER_MACHINE == pPackage->scope || BOOTSTRAPPER_PACKAGE_SCOPE_PER_MACHINE_OR_PER_USER == pPackage->scope)
-    ExitOnFailure(hr, "Failed to detect dependents for package '%ls'", pPackage->sczId);
+    {
+        // For configurable packages, check both scopes because until planning,
+        // we can't know their planned scope.
+        hr = DetectPackageDependents(pPackage, /*fPerMachine*/TRUE, pRegistration);
+        ExitOnFailure(hr, "Failed to detect per-machine dependents for configurable package '%ls'", pPackage->sczId);
+        hr = DetectPackageDependents(pPackage, /*fPerMachine*/FALSE, pRegistration);
+        ExitOnFailure(hr, "Failed to detect per-user dependents for configurable package '%ls'", pPackage->sczId);
+    }
+    else
+    {
+        hr = DetectPackageDependents(pPackage, pPackage->fPerMachine, pRegistration);
+        ExitOnFailure(hr, "Failed to detect dependents for %hs package '%ls'", LoggingInstallScopeToString(pPackage->fPerMachine), pPackage->sczId);
+    }
    hr = DependencyDetectCompatibleEntry(pPackage, pRegistration);
-    ExitOnFailure(hr, "Failed to detect compatible package for package '%ls'", pPackage->sczId);
+    ExitOnFailure(hr, "Failed to detect compatible package for %hs package '%ls'", LoggingInstallScopeToString(pPackage->fPerMachine), pPackage->sczId);
 LExit:
    return hr;
@@ -336,7 +379,7 @@ extern "C" HRESULT DependencyDetectRelatedBundle(
    if (pRelatedBundle->fPlannable)
    {
-        hr = DetectPackageDependents(pPackage, pRegistration);
+        hr = DetectPackageDependents(pPackage, pPackage->fPerMachine, pRegistration);
        ExitOnFailure(hr, "Failed to detect dependents for related bundle '%ls'", pPackage->sczId);
    }
@@ -626,7 +669,7 @@ LExit:
 }
 extern "C" HRESULT DependencyPlanPackage(
-    __in_opt DWORD *pdwInsertSequence,
+    __in_opt DWORD* pdwInsertSequence,
    __in const BURN_PACKAGE* pPackage,
    __in BURN_PLAN* pPlan
    )
@@ -946,18 +989,19 @@ LExit:
 static HRESULT DetectPackageDependents(
    __in BURN_PACKAGE* pPackage,
+    __in BOOL fPackagePerMachine,
    __in const BURN_REGISTRATION* pRegistration
    )
 {
    HRESULT hr = S_OK;
-    HKEY hkHive = pPackage->fPerMachine ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
+    HKEY hkHive = fPackagePerMachine ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
    BOOL fCanIgnorePresence = pPackage->fCanAffectRegistration && 0 < pPackage->cDependencyProviders &&
                              (BURN_PACKAGE_REGISTRATION_STATE_PRESENT == pPackage->cacheRegistrationState || BURN_PACKAGE_REGISTRATION_STATE_PRESENT == pPackage->installRegistrationState);
    BOOL fBundleRegisteredAsDependent = FALSE;
    // There's currently no point in getting the dependents if the scope doesn't match,
    // because they will just get ignored.
-    if (pRegistration->fPerMachine != pPackage->fPerMachine)
+    if (pRegistration->fPerMachine != fPackagePerMachine)
    {
        ExitFunction();
    }
@@ -979,7 +1023,7 @@ static HRESULT DetectPackageDependents(
        {
            DEPENDENCY* pDependent = pProvider->rgDependents + iDependent;
-            if (CSTR_EQUAL == ::CompareStringOrdinal(pRegistration->sczCode, -1, pDependent->sczKey, -1, TRUE))
+            if (pDependent && CSTR_EQUAL == ::CompareStringOrdinal(pRegistration->sczCode, -1, pDependent->sczKey, -1, TRUE))
            {
                pProvider->fBundleRegisteredAsDependent = TRUE;
                fBundleRegisteredAsDependent = TRUE;
@@ -994,10 +1038,12 @@ static HRESULT DetectPackageDependents(
        {
            pPackage->cacheRegistrationState = BURN_PACKAGE_REGISTRATION_STATE_IGNORED;
        }
        if (BURN_PACKAGE_REGISTRATION_STATE_PRESENT == pPackage->installRegistrationState)
        {
            pPackage->installRegistrationState = BURN_PACKAGE_REGISTRATION_STATE_IGNORED;
        }
        if (BURN_PACKAGE_TYPE_MSP == pPackage->type)
        {
            for (DWORD i = 0; i < pPackage->Msp.cTargetProductCodes; ++i)
diff --git a/src/burn/engine/elevation.cpp b/src/burn/engine/elevation.cpp
index ef87841f..711ce4af 100644
--- a/src/burn/engine/elevation.cpp
+++ b/src/burn/engine/elevation.cpp
@@ -1191,7 +1191,6 @@ extern "C" HRESULT ElevationExecuteMsiPackage(
    hr = VariableSerialize(pVariables, FALSE, &pbData, &cbData);
    ExitOnFailure(hr, "Failed to write variables.");
    // send message
    context.pfnMessageHandler = pfnMessageHandler;
    context.pvContext = pvContext;
@@ -2572,6 +2571,11 @@ static HRESULT OnSessionBegin(
    ExitOnFailure(hr, "Failed to read variables.");
    // Begin session in per-machine process.
+    pRegistration->fPerMachine = TRUE;
+    hr = RegistrationSetPaths(pRegistration, pCache);
+    ExitOnFailure(hr, "Failed to set elevated registration paths.");
    hr = RegistrationSessionBegin(sczEngineWorkingPath, pRegistration, pCache, pVariables, dwRegistrationOperations, qwEstimatedSize, (BOOTSTRAPPER_REGISTRATION_TYPE)dwRegistrationType);
    ExitOnFailure(hr, "Failed to begin registration session.");
@@ -2657,6 +2661,8 @@ static HRESULT OnCachePreparePackage(
    {
        hr = PackageFindById(pPackages, scz, &pPackage);
        ExitOnFailure(hr, "Failed to find package: %ls", scz);
+        pPackage->fPerMachine = TRUE;
    }
    else
    {
@@ -2698,6 +2704,8 @@ static HRESULT OnCacheCompletePayload(
    {
        hr = PackageFindById(pPackages, scz, &pPackage);
        ExitOnFailure(hr, "Failed to find package: %ls", scz);
+        pPackage->fPerMachine = TRUE;
    }
    hr = BuffReadString(pbData, cbData, &iData, &scz);
@@ -2717,8 +2725,8 @@ static HRESULT OnCacheCompletePayload(
    if (pPackage && pPayload) // complete payload.
    {
-        hr = CacheCompletePayload(pCache, pPackage->fPerMachine, pPayload, pPackage->sczCacheId, sczUnverifiedPath, fMove, BurnCacheMessageHandler, ElevatedProgressRoutine, hPipe);
+        hr = CacheCompletePayload(pCache, TRUE/*fPerMachine*/, pPayload, pPackage->sczCacheId, sczUnverifiedPath, fMove, BurnCacheMessageHandler, ElevatedProgressRoutine, hPipe);
-        ExitOnFailure(hr, "Failed to cache payload: %ls", pPayload->sczKey);
+        ExitOnFailure(hr, "Failed to cache per-machine payload: %ls", pPayload->sczKey);
    }
    else
    {
@@ -2755,6 +2763,8 @@ static HRESULT OnCacheVerifyPayload(
    {
        hr = PackageFindById(pPackages, scz, &pPackage);
        ExitOnFailure(hr, "Failed to find package: %ls", scz);
+        pPackage->fPerMachine = TRUE;
    }
    hr = BuffReadString(pbData, cbData, &iData, &scz);
@@ -2970,6 +2980,8 @@ static HRESULT OnExecuteBundlePackage(
    hr = PackageFindById(pPackages, sczPackage, &executeAction.bundlePackage.pPackage);
    ExitOnFailure(hr, "Failed to find package: %ls", sczPackage);
+    executeAction.bundlePackage.pPackage->fPerMachine = TRUE;
    if (BURN_PACKAGE_TYPE_BUNDLE != executeAction.bundlePackage.pPackage->type)
    {
        ExitWithRootFailure(hr, E_INVALIDARG, "Package is not a BUNDLE package: %ls", sczPackage);
@@ -3052,6 +3064,8 @@ static HRESULT OnExecuteExePackage(
    hr = PackageFindById(pPackages, sczPackage, &executeAction.exePackage.pPackage);
    ExitOnFailure(hr, "Failed to find package: %ls", sczPackage);
+    executeAction.exePackage.pPackage->fPerMachine = TRUE;
    if (BURN_PACKAGE_TYPE_EXE != executeAction.exePackage.pPackage->type)
    {
        ExitWithRootFailure(hr, E_INVALIDARG, "Package is not an EXE package: %ls", sczPackage);
@@ -3113,6 +3127,8 @@ static HRESULT OnExecuteMsiPackage(
    hr = PackageFindById(pPackages, sczPackage, &executeAction.msiPackage.pPackage);
    ExitOnFailure(hr, "Failed to find package: %ls", sczPackage);
+    executeAction.msiPackage.pPackage->fPerMachine = TRUE;
    hr = BuffReadPointer(pbData, cbData, &iData, (DWORD_PTR*)&hwndParent);
    ExitOnFailure(hr, "Failed to read parent hwnd.");
@@ -3205,6 +3221,8 @@ static HRESULT OnExecuteMspPackage(
    hr = PackageFindById(pPackages, sczPackage, &executeAction.mspTarget.pPackage);
    ExitOnFailure(hr, "Failed to find package: %ls", sczPackage);
+    executeAction.mspTarget.pPackage->fPerMachine = TRUE;
    hr = BuffReadPointer(pbData, cbData, &iData, (DWORD_PTR*)&hwndParent);
    ExitOnFailure(hr, "Failed to read parent hwnd.");
@@ -3246,6 +3264,8 @@ static HRESULT OnExecuteMspPackage(
            hr = PackageFindById(pPackages, sczPackage, &executeAction.mspTarget.rgOrderedPatches[i].pPackage);
            ExitOnFailure(hr, "Failed to find ordered patch package: %ls", sczPackage);
+            executeAction.mspTarget.rgOrderedPatches[i].pPackage->fPerMachine = TRUE;
        }
    }
@@ -3310,6 +3330,8 @@ static HRESULT OnExecuteMsuPackage(
    hr = PackageFindById(pPackages, sczPackage, &executeAction.msuPackage.pPackage);
    ExitOnFailure(hr, "Failed to find package: %ls", sczPackage);
+    executeAction.msuPackage.pPackage->fPerMachine = TRUE;
    if (BURN_PACKAGE_TYPE_MSU != executeAction.msuPackage.pPackage->type)
    {
        ExitWithRootFailure(hr, E_INVALIDARG, "Package is not an MSU package: %ls", sczPackage);
@@ -3371,6 +3393,8 @@ static HRESULT OnUninstallMsiCompatiblePackage(
    hr = PackageFindById(pPackages, sczPackageId, &pPackage);
    ExitOnFailure(hr, "Failed to find package: %ls", sczPackageId);
+    pPackage->fPerMachine = TRUE;
    executeAction.uninstallMsiCompatiblePackage.pParentPackage = pPackage;
    pCompatiblePackage = &pPackage->compatiblePackage;
@@ -3424,6 +3448,8 @@ static HRESULT OnExecutePackageProviderAction(
    }
    ExitOnFailure(hr, "Failed to find package: %ls", sczPackage);
+    executeAction.packageProvider.pPackage->fPerMachine;
    hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)&fRollback);
    ExitOnFailure(hr, "Failed to read rollback flag.");
@@ -3436,11 +3462,6 @@ static HRESULT OnExecutePackageProviderAction(
        ExitOnFailure(hr, "Failed to read provider action.");
    }
-    if (!executeAction.packageProvider.pPackage->fPerMachine)
-    {
-        ExitWithRootFailure(hr, E_INVALIDARG, "ExecutePackageProviderAction called for per-user package.");
-    }
    // Execute the package provider action.
    hr = DependencyExecutePackageProviderAction(&executeAction, fRollback);
    ExitOnFailure(hr, "Failed to execute package provider action.");
@@ -3479,6 +3500,8 @@ static HRESULT OnExecutePackageDependencyAction(
    }
    ExitOnFailure(hr, "Failed to find package: %ls", sczPackage);
+    executeAction.packageDependency.pPackage->fPerMachine = TRUE;
    hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)&fRollback);
    ExitOnFailure(hr, "Failed to read rollback flag.");
@@ -3784,6 +3807,8 @@ static HRESULT OnCleanCompatiblePackage(
    hr = PackageFindById(pPackages, sczPackageId, &pPackage);
    ExitOnFailure(hr, "Failed to find package: %ls", sczPackageId);
+    pPackage->fPerMachine = TRUE;
    pCompatiblePackage = &pPackage->compatiblePackage;
    if (!pCompatiblePackage->fDetected || !pCompatiblePackage->compatibleEntry.sczId || !pCompatiblePackage->sczCacheId || !*pCompatiblePackage->sczCacheId)
@@ -3826,6 +3851,8 @@ static HRESULT OnCleanPackage(
    hr = PackageFindById(pPackages, sczPackage, &pPackage);
    ExitOnFailure(hr, "Failed to find package: %ls", sczPackage);
+    pPackage->fPerMachine = TRUE;
    // Remove the package from the cache.
    hr = CacheRemovePackage(pCache, TRUE, pPackage->sczId, pPackage->sczCacheId);
    ExitOnFailure(hr, "Failed to remove from cache package: %ls", pPackage->sczId);
diff --git a/src/burn/engine/engine.cpp b/src/burn/engine/engine.cpp
index d432f732..8423da41 100644
--- a/src/burn/engine/engine.cpp
+++ b/src/burn/engine/engine.cpp
@@ -16,11 +16,6 @@ static HRESULT InitializeEngineState(
 static void UninitializeEngineState(
    __in BURN_ENGINE_STATE* pEngineState
    );
-#if 0
-static HRESULT RunUntrusted(
-    __in BURN_ENGINE_STATE* pEngineState
-    );
-#endif
 static HRESULT RunNormal(
    __in HINSTANCE hInstance,
    __in BURN_ENGINE_STATE* pEngineState
@@ -812,7 +807,7 @@ static HRESULT ProcessMessage(
        break;
    case WM_BURN_PLAN:
-        hr = CorePlan(pEngineState, pAction->plan.action);
+        hr = CorePlan(pEngineState, pAction->plan.action, pAction->plan.plannedScope);
        break;
    case WM_BURN_ELEVATE:
diff --git a/src/burn/engine/engine.mc b/src/burn/engine/engine.mc
index 776f7832..8e2f1a2e 100644
--- a/src/burn/engine/engine.mc
+++ b/src/burn/engine/engine.mc
@@ -271,7 +271,7 @@ MessageId=101
 Severity=Success
 SymbolicName=MSG_DETECTED_PACKAGE
 Language=English
-Detected package: %1!ls!, state: %2!hs!, cached: %3!hs!, install registration state: %4!hs!, cache registration state: %5!hs!
+Detected package: %1!ls!, state: %2!hs!, authored scope: %6!hs!, cached: %3!hs!, install registration state: %4!hs!, cache registration state: %5!hs!
 .
 MessageId=102
@@ -404,14 +404,21 @@ MessageId=200
 Severity=Success
 SymbolicName=MSG_PLAN_BEGIN
 Language=English
-Plan begin, %1!u! packages, action: %2!hs!
+Plan begin, %1!u! packages, action: %2!hs!, planned scope: %3!hs!
+.
+MessageId=226
+Severity=Success
+SymbolicName=MSG_PLAN_CONFIGURED_SCOPE
+Language=English
+Planned configurable scope: %1!hs!
 .
 MessageId=201
 Severity=Success
 SymbolicName=MSG_PLANNED_PACKAGE
 Language=English
-Planned package: %1!ls!, state: %2!hs!, default requested: %3!hs!, ba requested: %4!hs!, execute: %5!hs!, rollback: %6!hs!, default cache strategy: %7!hs!, ba requested strategy: %8!hs!, cache: %9!hs!, uncache: %10!hs!, dependency: %11!hs!, expected install registration state: %12!hs!, expected cache registration state: %13!hs!
+Planned package: %1!ls!, state: %2!hs!, default requested: %3!hs!, ba requested: %4!hs!, execute: %5!hs!, rollback: %6!hs!, scope: %14!hs!, default cache strategy: %7!hs!, ba requested strategy: %8!hs!, cache: %9!hs!, uncache: %10!hs!, dependency: %11!hs!, expected install registration state: %12!hs!, expected cache registration state: %13!hs!
 .
 MessageId=203
@@ -782,7 +789,7 @@ MessageId=328
 Severity=Warning
 SymbolicName=MSG_DEPENDENCY_PACKAGE_DEPENDENT
 Language=English
-Found dependent: %1!ls!, name: %2!ls!
+  Found dependent: %1!ls!, name: %2!ls!
 .
 MessageId=329
@@ -1288,3 +1295,17 @@ SymbolicName=MSG_DEPENDENCY_PACKAGE_DEPENDENTS_OVERRIDDEN
 Language=English
 BA requested to uninstall package: %1!ls!, despite dependents:
 .
+MessageId=702
+Severity=Warning
+SymbolicName=MSG_SCOPE_IGNORED_BA_SCOPE
+Language=English
+Scope command-line switch ignored because the bootstrapper application already specified a scope.
+.
+MessageId=703
+Severity=Warning
+SymbolicName=MSG_SCOPE_IGNORED_UNCONFIGURABLE
+Language=English
+Scope command-line switch ignored because the bundle doesn't have any packages with configurable scope.
+.
diff --git a/src/burn/engine/engine.vcxproj b/src/burn/engine/engine.vcxproj
index 98556ea6..5ab9f1ce 100644
--- a/src/burn/engine/engine.vcxproj
+++ b/src/burn/engine/engine.vcxproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
@@ -28,7 +27,6 @@
      <Platform>ARM64</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{8119537D-E1D9-6591-D51A-49768A2F9C37}</ProjectGuid>
    <ConfigurationType>StaticLibrary</ConfigurationType>
@@ -37,20 +35,15 @@
    <Description>Native component of WixToolset.Burn</Description>
    <CustomBuildBeforeTargets>ClCompile</CustomBuildBeforeTargets>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <PropertyGroup>
    <ProjectAdditionalIncludeDirectories>..\..\api\burn\inc;$(BurnGeneratedHeaderDirectory);$(ProjectAdditionalIncludeDirectories)</ProjectAdditionalIncludeDirectories>
  </PropertyGroup>
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="Shared">
  </ImportGroup>
  <ItemGroup>
    <ClCompile Include="apply.cpp" />
    <ClCompile Include="approvedexe.cpp" />
@@ -97,7 +90,6 @@
    <ClCompile Include="variable.cpp" />
    <ClCompile Include="variant.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="apply.h" />
    <ClInclude Include="approvedexe.h" />
@@ -147,7 +139,6 @@
    <ClInclude Include="variable.h" />
    <ClInclude Include="variant.h" />
  </ItemGroup>
  <ItemDefinitionGroup>
    <CustomBuildStep>
      <Message>Compiling message file...</Message>
@@ -157,7 +148,6 @@ rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc"</Command>
      <Outputs>$(IntDir)engine.messages.h;$(IntDir)engine.messages.rc</Outputs>
    </CustomBuildStep>
  </ItemDefinitionGroup>
  <Target Name="SetWixVersion" BeforeTargets="ClCompile">
    <PropertyGroup>
      <rmj>$(SomeVerInfoMajor)</rmj>
@@ -172,11 +162,12 @@ rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc"</Command>
    </ItemGroup>
    <WriteLinesToFile Overwrite="true" File="$(BurnGeneratedHeaderDirectory)engine.version.h" Lines="@(BurnVersionLines)" />
  </Target>
  <ItemGroup>
    <PackageReference Include="WixToolset.DUtil" />
    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
  </ItemGroup>
+  <ItemGroup>
+    <None Include="engine.mc" />
+  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
+\ No newline at end of file
diff --git a/src/burn/engine/externalengine.cpp b/src/burn/engine/externalengine.cpp
index 352d184c..d4814dc1 100644
--- a/src/burn/engine/externalengine.cpp
+++ b/src/burn/engine/externalengine.cpp
@@ -633,8 +633,9 @@ LExit:
 HRESULT ExternalEnginePlan(
    __in BAENGINE_CONTEXT* pEngineContext,
-    __in const BOOTSTRAPPER_ACTION action
+    __in const BOOTSTRAPPER_ACTION action,
-    )
+    __in const BOOTSTRAPPER_SCOPE plannedScope
+)
 {
    HRESULT hr = S_OK;
    BAENGINE_ACTION* pAction = NULL;
@@ -649,6 +650,7 @@ HRESULT ExternalEnginePlan(
    pAction->dwMessage = WM_BURN_PLAN;
    pAction->plan.action = action;
+    pAction->plan.plannedScope = plannedScope;
    hr = EnqueueAction(pEngineContext, &pAction);
    ExitOnFailure(hr, "Failed to enqueue plan action.");
diff --git a/src/burn/engine/externalengine.h b/src/burn/engine/externalengine.h
index 9b95e645..1053d0c0 100644
--- a/src/burn/engine/externalengine.h
+++ b/src/burn/engine/externalengine.h
@@ -146,8 +146,9 @@ HRESULT ExternalEngineDetect(
 HRESULT ExternalEnginePlan(
    __in BAENGINE_CONTEXT* pEngineContext,
-    __in const BOOTSTRAPPER_ACTION action
+    __in const BOOTSTRAPPER_ACTION action,
-    );
+    __in const BOOTSTRAPPER_SCOPE plannedScope
+);
 HRESULT ExternalEngineElevate(
    __in BAENGINE_CONTEXT* pEngineContext,
diff --git a/src/burn/engine/logging.cpp b/src/burn/engine/logging.cpp
index 52123499..47f52d27 100644
--- a/src/burn/engine/logging.cpp
+++ b/src/burn/engine/logging.cpp
@@ -968,6 +968,42 @@ extern "C" LPCSTR LoggingInstallScopeToString(
    return fPerMachine ? "PerMachine" : "PerUser";
 }
+extern "C" LPCSTR LoggingPackageScopeToString(
+    __in BOOTSTRAPPER_PACKAGE_SCOPE scope
+    )
+{
+    switch (scope)
+    {
+    case BOOTSTRAPPER_PACKAGE_SCOPE_PER_MACHINE:
+        return "PerMachine";
+    case BOOTSTRAPPER_PACKAGE_SCOPE_PER_MACHINE_OR_PER_USER:
+        return "PerMachineOrUser";
+    case BOOTSTRAPPER_PACKAGE_SCOPE_PER_USER_OR_PER_MACHINE:
+        return "PerUserOrMachine";
+    case BOOTSTRAPPER_PACKAGE_SCOPE_PER_USER:
+        return "PerUser";
+    default:
+        return "Invalid";
+    }
+}
+extern "C" LPCSTR LoggingBundleScopeToString(
+    __in BOOTSTRAPPER_SCOPE scope
+    )
+{
+    switch (scope)
+    {
+    case BOOTSTRAPPER_SCOPE_DEFAULT:
+        return "Default";
+    case BOOTSTRAPPER_SCOPE_PER_MACHINE:
+        return "PerMachine";
+    case BOOTSTRAPPER_SCOPE_PER_USER:
+        return "PerUser";
+    default:
+        return "Invalid";
+    }
+}
 // internal function declarations
diff --git a/src/burn/engine/logging.h b/src/burn/engine/logging.h
index b28a53d4..76103732 100644
--- a/src/burn/engine/logging.h
+++ b/src/burn/engine/logging.h
@@ -202,6 +202,13 @@ LPCSTR LoggingInstallScopeToString(
    __in BOOL fPerMachine
    );
+LPCSTR LoggingPackageScopeToString(
+    __in BOOTSTRAPPER_PACKAGE_SCOPE scope
+    );
+LPCSTR LoggingBundleScopeToString(
+    __in BOOTSTRAPPER_SCOPE scope
+    );
 #if defined(__cplusplus)
 }
diff --git a/src/burn/engine/msiengine.cpp b/src/burn/engine/msiengine.cpp
index a1379054..11bb8a0e 100644
--- a/src/burn/engine/msiengine.cpp
+++ b/src/burn/engine/msiengine.cpp
@@ -454,7 +454,18 @@ extern "C" HRESULT MsiEngineDetectPackage(
    // detect self by product code
    // TODO: what to do about MSIINSTALLCONTEXT_USERMANAGED?
-    hr = WiuGetProductInfoEx(pPackage->Msi.sczProductCode, NULL, pPackage->fPerMachine ? MSIINSTALLCONTEXT_MACHINE : MSIINSTALLCONTEXT_USERUNMANAGED, INSTALLPROPERTY_VERSIONSTRING, &sczInstalledVersion);
+    if (BOOTSTRAPPER_PACKAGE_SCOPE_PER_MACHINE_OR_PER_USER == pPackage->scope || BOOTSTRAPPER_PACKAGE_SCOPE_PER_USER_OR_PER_MACHINE == pPackage->scope)
+    {
+        hr = WiuGetProductInfoEx(pPackage->Msi.sczProductCode, NULL, MSIINSTALLCONTEXT_MACHINE, INSTALLPROPERTY_VERSIONSTRING, &sczInstalledVersion);
+        if (FAILED(hr))
+        {
+            hr = WiuGetProductInfoEx(pPackage->Msi.sczProductCode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, INSTALLPROPERTY_VERSIONSTRING, &sczInstalledVersion);
+        }
+    }
+    else
+    {
+        hr = WiuGetProductInfoEx(pPackage->Msi.sczProductCode, NULL, pPackage->scope == BOOTSTRAPPER_PACKAGE_SCOPE_PER_MACHINE ? MSIINSTALLCONTEXT_MACHINE : MSIINSTALLCONTEXT_USERUNMANAGED, INSTALLPROPERTY_VERSIONSTRING, &sczInstalledVersion);
+    }
    if (SUCCEEDED(hr))
    {
        fDetectFeatures = TRUE;
@@ -777,7 +788,18 @@ extern "C" HRESULT MsiEngineDetectCompatiblePackage(
        ExitFunction();
    }
-    hr = WiuGetProductInfoEx(wzCompatibleProductCode, NULL, pPackage->fPerMachine ? MSIINSTALLCONTEXT_MACHINE : MSIINSTALLCONTEXT_USERUNMANAGED, INSTALLPROPERTY_VERSIONSTRING, &sczVersion);
+    if (BOOTSTRAPPER_PACKAGE_SCOPE_PER_MACHINE_OR_PER_USER == pPackage->scope || BOOTSTRAPPER_PACKAGE_SCOPE_PER_USER_OR_PER_MACHINE == pPackage->scope)
+    {
+        hr = WiuGetProductInfoEx(wzCompatibleProductCode, NULL, MSIINSTALLCONTEXT_MACHINE, INSTALLPROPERTY_VERSIONSTRING, &sczVersion);
+        if (FAILED(hr))
+        {
+            hr = WiuGetProductInfoEx(wzCompatibleProductCode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, INSTALLPROPERTY_VERSIONSTRING, &sczVersion);
+        }
+    }
+    else
+    {
+        hr = WiuGetProductInfoEx(wzCompatibleProductCode, NULL, pPackage->scope == BOOTSTRAPPER_PACKAGE_SCOPE_PER_MACHINE ? MSIINSTALLCONTEXT_MACHINE : MSIINSTALLCONTEXT_USERUNMANAGED, INSTALLPROPERTY_VERSIONSTRING, &sczVersion);
+    }
    if (HRESULT_FROM_WIN32(ERROR_UNKNOWN_PRODUCT) == hr || HRESULT_FROM_WIN32(ERROR_UNKNOWN_PROPERTY) == hr || E_INVALIDARG == hr)
    {
        ExitFunction1(hr = S_OK);
@@ -1336,10 +1358,10 @@ extern "C" HRESULT MsiEngineExecutePackage(
    hr = ConcatPatchProperty(pCache, pPackage, fRollback, &sczObfuscatedProperties);
    ExitOnFailure(hr, "Failed to add patch properties to obfuscated argument string.");
-    hr = MsiEngineConcatBurnProperties(pExecuteAction->msiPackage.action, pExecuteAction->msiPackage.actionMsiProperty, pExecuteAction->msiPackage.fileVersioning, TRUE, 0 != pPackage->Msi.cFeatures, &sczProperties);
+    hr = MsiEngineConcatBurnProperties(pExecuteAction->msiPackage.action, pExecuteAction->msiPackage.actionMsiProperty, pExecuteAction->msiPackage.fileVersioning, TRUE, 0 != pPackage->Msi.cFeatures, pExecuteAction->msiPackage.pPackage->scope, pExecuteAction->msiPackage.pPackage->fPerMachine, &sczProperties);
    ExitOnFailure(hr, "Failed to add action property to argument string.");
-    hr = MsiEngineConcatBurnProperties(pExecuteAction->msiPackage.action, pExecuteAction->msiPackage.actionMsiProperty, pExecuteAction->msiPackage.fileVersioning, TRUE, 0 != pPackage->Msi.cFeatures, &sczObfuscatedProperties);
+    hr = MsiEngineConcatBurnProperties(pExecuteAction->msiPackage.action, pExecuteAction->msiPackage.actionMsiProperty, pExecuteAction->msiPackage.fileVersioning, TRUE, 0 != pPackage->Msi.cFeatures, pPackage->scope, pPackage->fPerMachine, &sczObfuscatedProperties);
    ExitOnFailure(hr, "Failed to add action property to obfuscated argument string.");
    LogId(REPORT_STANDARD, MSG_APPLYING_PACKAGE, LoggingRollbackOrExecute(fRollback), pPackage->sczId, LoggingActionStateToString(pExecuteAction->msiPackage.action), sczMsiPath, sczObfuscatedProperties ? sczObfuscatedProperties : L"");
@@ -1449,7 +1471,7 @@ extern "C" HRESULT MsiEngineUninstallCompatiblePackage(
        ExitOnFailure(hr, "Failed to enable logging for compatible package: %ls to: %ls", pCompatibleEntry->sczId, pExecuteAction->uninstallMsiCompatiblePackage.sczLogPath);
    }
-    hr = MsiEngineConcatBurnProperties(action, burnMsiProperty, fileVersioning, TRUE, FALSE, &sczProperties);
+    hr = MsiEngineConcatBurnProperties(action, burnMsiProperty, fileVersioning, TRUE, FALSE, pParentPackage->scope, pParentPackage->fPerMachine, &sczProperties);
    ExitOnFailure(hr, "Failed to add action property to argument string.");
    LogId(REPORT_STANDARD, MSG_APPLYING_ORPHAN_COMPATIBLE_PACKAGE, LoggingRollbackOrExecute(fRollback), pCompatibleEntry->sczId, pParentPackage->sczId, LoggingActionStateToString(action), sczProperties ? sczProperties : L"");
@@ -1491,6 +1513,8 @@ extern "C" HRESULT MsiEngineConcatBurnProperties(
    __in BOOTSTRAPPER_MSI_FILE_VERSIONING fileVersioning,
    __in BOOL fMsiPackage,
    __in BOOL fFeatureSelectionEnabled,
+    __in BOOTSTRAPPER_PACKAGE_SCOPE scope,
+    __in BOOL fPlannedPerMachineScope,
    __deref_out_z LPWSTR* psczProperties
    )
 {
@@ -1534,6 +1558,7 @@ extern "C" HRESULT MsiEngineConcatBurnProperties(
        break;
    }
+    // Append properties used by WixUI (and usable otherwise) to adjust internal UI behavior.
    switch (actionMsiProperty)
    {
    case BURN_MSI_PROPERTY_INSTALL:
@@ -1581,6 +1606,20 @@ extern "C" HRESULT MsiEngineConcatBurnProperties(
        ExitOnFailure(hr, "Failed to add reinstall mode.");
    }
+    if (BOOTSTRAPPER_PACKAGE_SCOPE_PER_USER_OR_PER_MACHINE == scope || BOOTSTRAPPER_PACKAGE_SCOPE_PER_MACHINE_OR_PER_USER == scope)
+    {
+        if (fPlannedPerMachineScope)
+        {
+            hr = StrAllocConcatFormattedSecure(psczProperties, L" MSIINSTALLPERUSER=\"\"");
+            ExitOnFailure(hr, "Failed to add per-machine scope properties.");
+        }
+        else
+        {
+            hr = StrAllocConcatFormattedSecure(psczProperties, L" MSIINSTALLPERUSER=\"1\"");
+            ExitOnFailure(hr, "Failed to add per-user scope properties.");
+        }
+    }
    hr = StrAllocConcatSecure(psczProperties, L" REBOOT=ReallySuppress", 0);
    ExitOnFailure(hr, "Failed to add reboot suppression property.");
diff --git a/src/burn/engine/msiengine.h b/src/burn/engine/msiengine.h
index 862c4f6a..d4660dc8 100644
--- a/src/burn/engine/msiengine.h
+++ b/src/burn/engine/msiengine.h
@@ -93,6 +93,8 @@ HRESULT MsiEngineConcatBurnProperties(
    __in BOOTSTRAPPER_MSI_FILE_VERSIONING fileVersioning,
    __in BOOL fMsiPackage,
    __in BOOL fFeatureSelectionEnabled,
+    __in BOOTSTRAPPER_PACKAGE_SCOPE scope,
+    __in BOOL fPlannedPerMachineScope,
    __deref_out_z LPWSTR* psczProperties
    );
 HRESULT MsiEngineConcatPackageProperties(
diff --git a/src/burn/engine/mspengine.cpp b/src/burn/engine/mspengine.cpp
index e8ef7fcb..18be3cc6 100644
--- a/src/burn/engine/mspengine.cpp
+++ b/src/burn/engine/mspengine.cpp
@@ -676,10 +676,10 @@ extern "C" HRESULT MspEngineExecutePackage(
    }
    // Always add Burn properties last.
-    hr = MsiEngineConcatBurnProperties(pExecuteAction->mspTarget.action, pExecuteAction->mspTarget.actionMsiProperty, pExecuteAction->mspTarget.fileVersioning, FALSE, FALSE, &sczProperties);
+    hr = MsiEngineConcatBurnProperties(pExecuteAction->mspTarget.action, pExecuteAction->mspTarget.actionMsiProperty, pExecuteAction->mspTarget.fileVersioning, FALSE, FALSE, pExecuteAction->mspTarget.pPackage->scope, pExecuteAction->mspTarget.pPackage->fPerMachine, &sczProperties);
    ExitOnFailure(hr, "Failed to add action property to argument string.");
-    hr = MsiEngineConcatBurnProperties(pExecuteAction->mspTarget.action, pExecuteAction->mspTarget.actionMsiProperty, pExecuteAction->mspTarget.fileVersioning, FALSE, FALSE, &sczObfuscatedProperties);
+    hr = MsiEngineConcatBurnProperties(pExecuteAction->mspTarget.action, pExecuteAction->mspTarget.actionMsiProperty, pExecuteAction->mspTarget.fileVersioning, FALSE, FALSE, pExecuteAction->mspTarget.pPackage->scope, pExecuteAction->mspTarget.pPackage->fPerMachine, &sczObfuscatedProperties);
    ExitOnFailure(hr, "Failed to add action property to obfuscated argument string.");
    LogId(REPORT_STANDARD, MSG_APPLYING_PATCH_PACKAGE, pExecuteAction->mspTarget.pPackage->sczId, LoggingActionStateToString(pExecuteAction->mspTarget.action), sczPatches, sczObfuscatedProperties, pExecuteAction->mspTarget.sczTargetProductCode);
diff --git a/src/burn/engine/package.cpp b/src/burn/engine/package.cpp
index 3bf676ba..61b73dc6 100644
--- a/src/burn/engine/package.cpp
+++ b/src/burn/engine/package.cpp
@@ -154,9 +154,12 @@ extern "C" HRESULT PackagesParseFromXml(
        hr = XmlGetAttributeUInt64(pixnNode, L"InstallSize", &pPackage->qwInstallSize);
        ExitOnOptionalXmlQueryFailure(hr, fFoundXml, "Failed to get @InstallSize.");
-        // @PerMachine
+        // @Scope
-        hr = XmlGetYesNoAttribute(pixnNode, L"PerMachine", &pPackage->fPerMachine);
+        hr = PackageParseScopeFromXml(pixnNode, &pPackage->scope);
-        ExitOnRequiredXmlQueryFailure(hr, "Failed to get @PerMachine.");
+        ExitOnRequiredXmlQueryFailure(hr, "Failed to get @Scope.");
+        // Shortcut for static per-machine or per-user packages.
+        pPackage->fPerMachine = BOOTSTRAPPER_PACKAGE_SCOPE_PER_MACHINE == pPackage->scope;
        // @Permanent
        hr = XmlGetYesNoAttribute(pixnNode, L"Permanent", &pPackage->fPermanent);
@@ -593,6 +596,45 @@ LExit:
    return hr;
 }
+extern "C" HRESULT PackageParseScopeFromXml(
+    __in IXMLDOMNode* pixn,
+    __in BOOTSTRAPPER_PACKAGE_SCOPE* pScope
+)
+{
+    HRESULT hr = S_OK;
+    LPWSTR scz = NULL;
+    hr = XmlGetAttributeEx(pixn, L"Scope", &scz);
+    ExitOnRequiredXmlQueryFailure(hr, "Failed to get @Scope.");
+    if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, scz, -1, L"perMachine", -1))
+    {
+        *pScope = BOOTSTRAPPER_PACKAGE_SCOPE_PER_MACHINE;
+    }
+    else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, scz, -1, L"perUser", -1))
+    {
+        *pScope = BOOTSTRAPPER_PACKAGE_SCOPE_PER_USER;
+    }
+    else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, scz, -1, L"perUserOrMachine", -1))
+    {
+        *pScope = BOOTSTRAPPER_PACKAGE_SCOPE_PER_USER_OR_PER_MACHINE;
+    }
+    else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, scz, -1, L"perMachineOrUser", -1))
+    {
+        *pScope = BOOTSTRAPPER_PACKAGE_SCOPE_PER_MACHINE_OR_PER_USER;
+    }
+    else
+    {
+        hr = E_UNEXPECTED;
+        ExitOnRootFailure(hr, "Invalid scope: %ls", scz);
+    }
+LExit:
+    ReleaseStr(scz);
+    return hr;
+}
 // internal function declarations
diff --git a/src/burn/engine/package.h b/src/burn/engine/package.h
index d596d7c0..5397e9cc 100644
--- a/src/burn/engine/package.h
+++ b/src/burn/engine/package.h
@@ -268,7 +268,8 @@ typedef struct _BURN_PACKAGE
    LPWSTR sczInstallCondition;
    LPWSTR sczRepairCondition;
-    BOOL fPerMachine;
+    BOOTSTRAPPER_PACKAGE_SCOPE scope;
+    BOOL fPerMachine;                   // only valid after Plan (for PUOM/PMOU packages).
    BOOL fPermanent;
    BOOL fVital;
    BOOL fCanAffectRegistration;
@@ -483,6 +484,10 @@ HRESULT PackageFindRollbackBoundaryById(
    __in_z LPCWSTR wzId,
    __out BURN_ROLLBACK_BOUNDARY** ppRollbackBoundary
    );
+HRESULT PackageParseScopeFromXml(
+    __in IXMLDOMNode* pixn,
+    __in BOOTSTRAPPER_PACKAGE_SCOPE* pScope
+    );
 #if defined(__cplusplus)
diff --git a/src/burn/engine/plan.cpp b/src/burn/engine/plan.cpp
index edc09033..6c46269b 100644
--- a/src/burn/engine/plan.cpp
+++ b/src/burn/engine/plan.cpp
@@ -278,7 +278,7 @@ extern "C" void PlanReset(
        }
    }
-    PlanSetVariables(BOOTSTRAPPER_ACTION_UNKNOWN, pVariables);
+    PlanSetVariables(BOOTSTRAPPER_ACTION_UNKNOWN, BOOTSTRAPPER_PACKAGE_SCOPE_INVALID, BOOTSTRAPPER_SCOPE_DEFAULT, pVariables);
 }
 extern "C" void PlanUninitializeExecuteAction(
@@ -332,6 +332,8 @@ extern "C" void PlanUninitializeExecuteAction(
 extern "C" HRESULT PlanSetVariables(
    __in BOOTSTRAPPER_ACTION action,
+    __in BOOTSTRAPPER_PACKAGE_SCOPE authoredScope,
+    __in BOOTSTRAPPER_SCOPE plannedScope,
    __in BURN_VARIABLES* pVariables
    )
 {
@@ -340,6 +342,12 @@ extern "C" HRESULT PlanSetVariables(
    hr = VariableSetNumeric(pVariables, BURN_BUNDLE_ACTION, action, TRUE);
    ExitOnFailure(hr, "Failed to set the bundle action built-in variable.");
+    hr = VariableSetNumeric(pVariables, BURN_BUNDLE_SCOPE, authoredScope, TRUE);
+    ExitOnFailure(hr, "Failed to set the bundle authored scope built-in variable.");
+    hr = VariableSetNumeric(pVariables, BURN_BUNDLE_PLANNED_SCOPE, plannedScope, TRUE);
+    ExitOnFailure(hr, "Failed to set the bundle planned scope built-in variable.");
 LExit:
    return hr;
 }
@@ -812,6 +820,66 @@ LExit:
    return hr;
 }
+extern "C" HRESULT PlanPackagesAndBundleScope(
+    __in BURN_PACKAGE* rgPackages,
+    __in DWORD cPackages,
+    __in BOOTSTRAPPER_SCOPE scope,
+    __in BOOTSTRAPPER_PACKAGE_SCOPE authoredScope,
+    __in BOOTSTRAPPER_SCOPE commandLineScope,
+    __out BOOTSTRAPPER_SCOPE* pResultingScope,
+    __out BOOL* pfRegistrationPerMachine
+)
+{
+    HRESULT hr = S_OK;
+    BOOL fRegistrationPerMachine = TRUE;
+    // If a scope was specified on the command line and the BA didn't set a scope,
+    // let the command-line switch override.
+    if (BOOTSTRAPPER_SCOPE_DEFAULT != commandLineScope)
+    {
+        if (BOOTSTRAPPER_PACKAGE_SCOPE_PER_MACHINE_OR_PER_USER == authoredScope || BOOTSTRAPPER_PACKAGE_SCOPE_PER_USER_OR_PER_MACHINE == authoredScope)
+        {
+            if (BOOTSTRAPPER_SCOPE_DEFAULT == scope)
+            {
+                scope = commandLineScope;
+            }
+            else
+            {
+                LogId(REPORT_STANDARD, MSG_SCOPE_IGNORED_BA_SCOPE);
+            }
+        }
+        else
+        {
+            LogId(REPORT_STANDARD, MSG_SCOPE_IGNORED_UNCONFIGURABLE);
+        }
+    }
+    for (DWORD i = 0; i < cPackages; ++i)
+    {
+        BURN_PACKAGE* pPackage = rgPackages + i;
+        pPackage->fPerMachine =
+            (BOOTSTRAPPER_PACKAGE_SCOPE_PER_MACHINE == pPackage->scope)
+            || (BOOTSTRAPPER_PACKAGE_SCOPE_PER_MACHINE_OR_PER_USER == pPackage->scope &&
+                (BOOTSTRAPPER_SCOPE_DEFAULT == scope || BOOTSTRAPPER_SCOPE_PER_MACHINE == scope))
+            || (BOOTSTRAPPER_PACKAGE_SCOPE_PER_USER_OR_PER_MACHINE == pPackage->scope &&
+                BOOTSTRAPPER_SCOPE_PER_MACHINE == scope);
+        // Any per-user package makes the registration per-user as well.
+        if (!pPackage->fPerMachine)
+        {
+            fRegistrationPerMachine = FALSE;
+        }
+    }
+    *pResultingScope = scope;
+    *pfRegistrationPerMachine = fRegistrationPerMachine;
+//LExit:
+    return hr;
+}
 static HRESULT PlanPackagesHelper(
    __in BURN_PACKAGE* rgPackages,
    __in DWORD cPackages,
@@ -2971,7 +3039,7 @@ static void ExecuteActionLog(
        break;
    case BURN_EXECUTE_ACTION_TYPE_MSI_PACKAGE:
-        LogStringLine(PlanDumpLevel, "%ls action[%u]: MSI_PACKAGE package id: %ls, action: %hs, action msi property: %ls, ui level: %u, disable externaluihandler: %hs, file versioning: %hs, log path: %ls, logging attrib: %u", wzBase, iAction, pAction->msiPackage.pPackage->sczId, LoggingActionStateToString(pAction->msiPackage.action), LoggingBurnMsiPropertyToString(pAction->msiPackage.actionMsiProperty), pAction->msiPackage.uiLevel, LoggingBoolToString(pAction->msiPackage.fDisableExternalUiHandler), LoggingMsiFileVersioningToString(pAction->msiPackage.fileVersioning), pAction->msiPackage.sczLogPath, pAction->msiPackage.dwLoggingAttributes);
+        LogStringLine(PlanDumpLevel, "%ls action[%u]: MSI_PACKAGE package id: %ls, scope: %hs, action: %hs, action msi property: %ls, ui level: %u, disable externaluihandler: %hs, file versioning: %hs, log path: %ls, logging attrib: %u", wzBase, iAction, pAction->msiPackage.pPackage->sczId, LoggingPackageScopeToString(pAction->msiPackage.pPackage->scope), LoggingActionStateToString(pAction->msiPackage.action), LoggingBurnMsiPropertyToString(pAction->msiPackage.actionMsiProperty), pAction->msiPackage.uiLevel, LoggingBoolToString(pAction->msiPackage.fDisableExternalUiHandler), LoggingMsiFileVersioningToString(pAction->msiPackage.fileVersioning), pAction->msiPackage.sczLogPath, pAction->msiPackage.dwLoggingAttributes);
        for (DWORD j = 0; j < pAction->msiPackage.pPackage->Msi.cSlipstreamMspPackages; ++j)
        {
            const BURN_SLIPSTREAM_MSP* pSlipstreamMsp = pAction->msiPackage.pPackage->Msi.rgSlipstreamMsps + j;
@@ -3083,6 +3151,7 @@ extern "C" void PlanDump(
    LogStringLine(PlanDumpLevel, "     bundle code: %ls", pPlan->wzBundleCode);
    LogStringLine(PlanDumpLevel, "     bundle provider key: %ls", pPlan->wzBundleProviderKey);
    LogStringLine(PlanDumpLevel, "     use-forward-compatible: %hs", LoggingTrueFalseToString(pPlan->fEnabledForwardCompatibleBundle));
+    LogStringLine(PlanDumpLevel, "     planned scope: %hs", LoggingBundleScopeToString(pPlan->plannedScope));
    LogStringLine(PlanDumpLevel, "     per-machine: %hs", LoggingTrueFalseToString(pPlan->fPerMachine));
    LogStringLine(PlanDumpLevel, "     can affect machine state: %hs", LoggingTrueFalseToString(pPlan->fCanAffectMachineState));
    LogStringLine(PlanDumpLevel, "     disable-rollback: %hs", LoggingTrueFalseToString(pPlan->fDisableRollback));
diff --git a/src/burn/engine/plan.h b/src/burn/engine/plan.h
index 03b1423d..a20d7c76 100644
--- a/src/burn/engine/plan.h
+++ b/src/burn/engine/plan.h
@@ -249,6 +249,7 @@ typedef struct _BURN_CLEAN_ACTION
 typedef struct _BURN_PLAN
 {
    BOOTSTRAPPER_ACTION action;
+    BOOTSTRAPPER_SCOPE plannedScope;
    BURN_CACHE* pCache;
    BOOTSTRAPPER_COMMAND* pCommand;
    BURN_ENGINE_COMMAND* pInternalCommand;
@@ -328,6 +329,8 @@ void PlanUninitializeExecuteAction(
    );
 HRESULT PlanSetVariables(
    __in BOOTSTRAPPER_ACTION action,
+    __in BOOTSTRAPPER_PACKAGE_SCOPE authoredScope,
+    __in BOOTSTRAPPER_SCOPE plannedScope,
    __in BURN_VARIABLES* pVariables
    );
 HRESULT PlanDefaultRelatedBundlePlanType(
@@ -479,6 +482,15 @@ HRESULT PlanSetResumeCommand(
 void PlanDump(
    __in BURN_PLAN* pPlan
    );
+HRESULT PlanPackagesAndBundleScope(
+    __in BURN_PACKAGE* rgPackages,
+    __in DWORD cPackages,
+    __in BOOTSTRAPPER_SCOPE scope,
+    __in BOOTSTRAPPER_PACKAGE_SCOPE authoredScope,
+    __in BOOTSTRAPPER_SCOPE commandLineScope,
+    __out BOOTSTRAPPER_SCOPE* pResultingScope,
+    __out BOOL* pfPerMachine
+);
 #if defined(__cplusplus)
 }
diff --git a/src/burn/engine/registration.cpp b/src/burn/engine/registration.cpp
index 9733e92c..fa1b024a 100644
--- a/src/burn/engine/registration.cpp
+++ b/src/burn/engine/registration.cpp
@@ -39,10 +39,6 @@ static HRESULT ParseSoftwareTagsFromXml(
    __out BURN_SOFTWARE_TAG** prgSoftwareTags,
    __out DWORD* pcSoftwareTags
    );
-static HRESULT SetPaths(
-    __in BURN_REGISTRATION* pRegistration,
-    __in BURN_CACHE* pCache
-    );
 static HRESULT GetBundleManufacturer(
    __in BURN_REGISTRATION* pRegistration,
    __in BURN_VARIABLES* pVariables,
@@ -108,6 +104,15 @@ static HRESULT UpdateEstimatedSize(
    );
 static BOOL IsWuRebootPending();
 static BOOL IsRegistryRebootPending();
+static HRESULT RegistrationDetectResumeTypeByHive(
+    __in HKEY hkRegistrationRoot,
+    __in BURN_REGISTRATION* pRegistration,
+    __out BOOTSTRAPPER_RESUME_TYPE* pResumeType
+);
+static HRESULT DetectInstalled(
+    __in BURN_REGISTRATION* pRegistration,
+    __in HKEY hkRoot
+);
 // function definitions
@@ -163,9 +168,9 @@ extern "C" HRESULT RegistrationParseFromXml(
    hr = XmlGetAttributeEx(pixnRegistrationNode, L"ExecutableName", &pRegistration->sczExecutableName);
    ExitOnRequiredXmlQueryFailure(hr, "Failed to get @ExecutableName.");
-    // @PerMachine
+    // @Scope
-    hr = XmlGetYesNoAttribute(pixnRegistrationNode, L"PerMachine", &pRegistration->fPerMachine);
+    hr = PackageParseScopeFromXml(pixnRegistrationNode, &pRegistration->scope);
-    ExitOnRequiredXmlQueryFailure(hr, "Failed to get @PerMachine.");
+    ExitOnOptionalXmlQueryFailure(hr, fFoundXml, "Failed to get @Scope.");
    // select ARP node
    hr = XmlSelectSingleNode(pixnRegistrationNode, L"Arp", &pixnArpNode);
@@ -285,8 +290,18 @@ extern "C" HRESULT RegistrationParseFromXml(
        ExitOnRequiredXmlQueryFailure(hr, "Failed to get @Classification.");
    }
-    hr = SetPaths(pRegistration, pCache);
+    // Handle the easy case of build-time bundle scope early.
-    ExitOnFailure(hr, "Failed to set registration paths.");
+    if (BOOTSTRAPPER_PACKAGE_SCOPE_PER_MACHINE == pRegistration->scope || BOOTSTRAPPER_PACKAGE_SCOPE_PER_USER == pRegistration->scope)
+    {
+        pRegistration->fPerMachine = BOOTSTRAPPER_PACKAGE_SCOPE_PER_MACHINE == pRegistration->scope;
+        hr = RegistrationSetPaths(pRegistration, pCache);
+        ExitOnFailure(hr, "Failed to set registration paths for fixed scope.");
+    }
+    else
+    {
+        pRegistration->hkRoot = reinterpret_cast<HKEY>(0ull);
+    }
 LExit:
    ReleaseObject(pixnRegistrationNode);
@@ -452,31 +467,28 @@ LExit:
 extern "C" HRESULT RegistrationDetectInstalled(
    __in BURN_REGISTRATION* pRegistration
-    )
+)
 {
    HRESULT hr = S_OK;
-    HKEY hkRegistration = NULL;
-    DWORD dwInstalled = 0;
-    pRegistration->fCached = FileExistsEx(pRegistration->sczCacheExecutablePath, NULL);
+    if (pRegistration->hkRoot)
-    pRegistration->detectedRegistrationType = BOOTSTRAPPER_REGISTRATION_TYPE_NONE;
-    // open registration key
-    hr = RegOpen(pRegistration->hkRoot, pRegistration->sczRegistrationKey, KEY_QUERY_VALUE, &hkRegistration);
-    if (SUCCEEDED(hr))
    {
-        hr = RegReadNumber(hkRegistration, REGISTRY_BUNDLE_INSTALLED, &dwInstalled);
+        hr = DetectInstalled(pRegistration, pRegistration->hkRoot);
-        pRegistration->detectedRegistrationType = (1 == dwInstalled) ? BOOTSTRAPPER_REGISTRATION_TYPE_FULL : BOOTSTRAPPER_REGISTRATION_TYPE_INPROGRESS;
    }
+    else
-    // Not finding the key or value is okay.
-    if (E_FILENOTFOUND == hr || E_PATHNOTFOUND == hr)
    {
-        hr = S_OK;
+        // For PUOM/PMOU bundles, check per-machine then fall back to per-user.
+        hr = DetectInstalled(pRegistration, HKEY_LOCAL_MACHINE);
+        ExitOnFailure(hr, "Failed to detect HKEY_LOCAL_MACHINE bundle registration install state.");
+        if (BOOTSTRAPPER_REGISTRATION_TYPE_NONE == pRegistration->detectedRegistrationType)
+        {
+            hr = DetectInstalled(pRegistration, HKEY_CURRENT_USER);
+            ExitOnFailure(hr, "Failed to detect HKEY_CURRENT_USER bundle registration install state.");
+        }
    }
-    ReleaseRegKey(hkRegistration);
+LExit:
    return hr;
 }
@@ -488,63 +500,26 @@ extern "C" HRESULT RegistrationDetectInstalled(
 extern "C" HRESULT RegistrationDetectResumeType(
    __in BURN_REGISTRATION* pRegistration,
    __out BOOTSTRAPPER_RESUME_TYPE* pResumeType
-    )
+)
 {
    HRESULT hr = S_OK;
-    HKEY hkRegistration = NULL;
-    BOOL fExists = FALSE;
-    DWORD dwResume = 0;
-    // open registration key
+    if (pRegistration->hkRoot)
-    hr = RegOpen(pRegistration->hkRoot, pRegistration->sczRegistrationKey, KEY_QUERY_VALUE, &hkRegistration);
-    ExitOnPathFailure(hr, fExists, "Failed to open registration key.");
-    if (!fExists)
    {
-        *pResumeType = BOOTSTRAPPER_RESUME_TYPE_NONE;
+        hr = RegistrationDetectResumeTypeByHive(pRegistration->hkRoot, pRegistration, pResumeType);
-        ExitFunction();
    }
+    else
-    // read Resume value
-    hr = RegReadNumber(hkRegistration, L"Resume", &dwResume);
-    ExitOnPathFailure(hr, fExists, "Failed to read Resume value.");
-    if (!fExists)
-    {
-        *pResumeType = BOOTSTRAPPER_RESUME_TYPE_INVALID;
-        ExitFunction();
-    }
-    switch (dwResume)
    {
-    case BURN_RESUME_MODE_ACTIVE:
+        hr = RegistrationDetectResumeTypeByHive(HKEY_LOCAL_MACHINE, pRegistration, pResumeType);
-        // a previous run was interrupted
-        *pResumeType = BOOTSTRAPPER_RESUME_TYPE_INTERRUPTED;
-        break;
-    case BURN_RESUME_MODE_SUSPEND:
-        *pResumeType = BOOTSTRAPPER_RESUME_TYPE_SUSPEND;
-        break;
-    case BURN_RESUME_MODE_ARP:
-        *pResumeType = BOOTSTRAPPER_RESUME_TYPE_ARP;
-        break;
-    case BURN_RESUME_MODE_REBOOT_PENDING:
-        // The volatile pending registry doesn't exist (checked above) which means
-        // the system was successfully restarted.
-        *pResumeType = BOOTSTRAPPER_RESUME_TYPE_REBOOT;
-        break;
-    default:
+        if (BOOTSTRAPPER_RESUME_TYPE_NONE == *pResumeType)
-        // the value stored in the registry is not valid
+        {
-        *pResumeType = BOOTSTRAPPER_RESUME_TYPE_INVALID;
+            hr = RegistrationDetectResumeTypeByHive(HKEY_CURRENT_USER, pRegistration, pResumeType);
-        break;
+        }
    }
+    ExitOnFailure(hr, "Failed to find bundle registration: %ls", pRegistration->sczRegistrationKey);
 LExit:
-    ReleaseRegKey(hkRegistration);
    return hr;
 }
@@ -889,7 +864,7 @@ extern "C" HRESULT RegistrationSessionEnd(
        // Open registration key.
        hr = RegOpen(pRegistration->hkRoot, pRegistration->sczRegistrationKey, KEY_WRITE, &hkRegistration);
-        ExitOnFailure(hr, "Failed to open registration key.");
+        ExitOnFailure(hr, "Failed to open registration key for ending session.");
        // update display name
        hr = UpdateBundleNameRegistration(pRegistration, pVariables, hkRegistration, BOOTSTRAPPER_REGISTRATION_TYPE_INPROGRESS == registrationType);
@@ -1068,6 +1043,39 @@ extern "C" HRESULT RegistrationGetResumeCommandLine(
    return hr;
 }
+extern "C" HRESULT RegistrationSetPaths(
+    __in BURN_REGISTRATION* pRegistration,
+    __in BURN_CACHE* pCache
+    )
+{
+    HRESULT hr = S_OK;
+    LPWSTR sczCacheDirectory = NULL;
+    // save registration key root
+    pRegistration->hkRoot = pRegistration->fPerMachine ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
+    // build uninstall registry key path
+    hr = StrAllocFormatted(&pRegistration->sczRegistrationKey, L"%ls\\%ls", BURN_REGISTRATION_REGISTRY_UNINSTALL_KEY, pRegistration->sczCode);
+    ExitOnFailure(hr, "Failed to build uninstall registry key path.");
+    // build cache directory
+    hr = CacheGetCompletedPath(pCache, pRegistration->fPerMachine, pRegistration->sczCode, &sczCacheDirectory);
+    ExitOnFailure(hr, "Failed to build cache directory.");
+    // build cached executable path
+    hr = PathConcatRelativeToFullyQualifiedBase(sczCacheDirectory, pRegistration->sczExecutableName, &pRegistration->sczCacheExecutablePath);
+    ExitOnFailure(hr, "Failed to build cached executable path.");
+    // build state file path
+    hr = StrAllocFormatted(&pRegistration->sczStateFile, L"%ls\\state.rsm", sczCacheDirectory);
+    ExitOnFailure(hr, "Failed to build state file path.");
+LExit:
+    ReleaseStr(sczCacheDirectory);
+    return hr;
+}
 // internal helper functions
@@ -1141,38 +1149,6 @@ LExit:
    return hr;
 }
-static HRESULT SetPaths(
-    __in BURN_REGISTRATION* pRegistration,
-    __in BURN_CACHE* pCache
-    )
-{
-    HRESULT hr = S_OK;
-    LPWSTR sczCacheDirectory = NULL;
-    // save registration key root
-    pRegistration->hkRoot = pRegistration->fPerMachine ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
-    // build uninstall registry key path
-    hr = StrAllocFormatted(&pRegistration->sczRegistrationKey, L"%ls\\%ls", BURN_REGISTRATION_REGISTRY_UNINSTALL_KEY, pRegistration->sczCode);
-    ExitOnFailure(hr, "Failed to build uninstall registry key path.");
-    // build cache directory
-    hr = CacheGetCompletedPath(pCache, pRegistration->fPerMachine, pRegistration->sczCode, &sczCacheDirectory);
-    ExitOnFailure(hr, "Failed to build cache directory.");
-    // build cached executable path
-    hr = PathConcatRelativeToFullyQualifiedBase(sczCacheDirectory, pRegistration->sczExecutableName, &pRegistration->sczCacheExecutablePath);
-    ExitOnFailure(hr, "Failed to build cached executable path.");
-    // build state file path
-    hr = StrAllocFormatted(&pRegistration->sczStateFile, L"%ls\\state.rsm", sczCacheDirectory);
-    ExitOnFailure(hr, "Failed to build state file path.");
-LExit:
-    ReleaseStr(sczCacheDirectory);
-    return hr;
-}
 static HRESULT GetBundleManufacturer(
    __in BURN_REGISTRATION* pRegistration,
    __in BURN_VARIABLES* pVariables,
@@ -1703,3 +1679,102 @@ static BOOL IsRegistryRebootPending()
    return fRebootPending;
 }
+static HRESULT RegistrationDetectResumeTypeByHive(
+    __in HKEY hkRegistrationRoot,
+    __in BURN_REGISTRATION* pRegistration,
+    __out BOOTSTRAPPER_RESUME_TYPE* pResumeType
+)
+{
+    HRESULT hr = S_OK;
+    HKEY hkRegistration = NULL;
+    BOOL fExists = FALSE;
+    DWORD dwResume = 0;
+    *pResumeType = BOOTSTRAPPER_RESUME_TYPE_NONE;
+    // open registration key
+    hr = RegOpen(hkRegistrationRoot, pRegistration->sczRegistrationKey, KEY_QUERY_VALUE, &hkRegistration);
+    ExitOnPathFailure(hr, fExists, "Failed to open registration key.");
+    if (!fExists)
+    {
+        *pResumeType = BOOTSTRAPPER_RESUME_TYPE_NONE;
+        ExitFunction();
+    }
+    // read Resume value
+    hr = RegReadNumber(hkRegistration, L"Resume", &dwResume);
+    ExitOnPathFailure(hr, fExists, "Failed to read Resume value.");
+    if (!fExists)
+    {
+        *pResumeType = BOOTSTRAPPER_RESUME_TYPE_INVALID;
+        ExitFunction();
+    }
+    switch (dwResume)
+    {
+    case BURN_RESUME_MODE_ACTIVE:
+        // a previous run was interrupted
+        *pResumeType = BOOTSTRAPPER_RESUME_TYPE_INTERRUPTED;
+        break;
+    case BURN_RESUME_MODE_SUSPEND:
+        *pResumeType = BOOTSTRAPPER_RESUME_TYPE_SUSPEND;
+        break;
+    case BURN_RESUME_MODE_ARP:
+        *pResumeType = BOOTSTRAPPER_RESUME_TYPE_ARP;
+        break;
+    case BURN_RESUME_MODE_REBOOT_PENDING:
+        // The volatile pending registry doesn't exist (checked above) which means
+        // the system was successfully restarted.
+        *pResumeType = BOOTSTRAPPER_RESUME_TYPE_REBOOT;
+        break;
+    default:
+        // the value stored in the registry is not valid
+        *pResumeType = BOOTSTRAPPER_RESUME_TYPE_INVALID;
+        break;
+    }
+LExit:
+    ReleaseRegKey(hkRegistration);
+    return hr;
+}
+static HRESULT DetectInstalled(
+    __in BURN_REGISTRATION* pRegistration,
+    __in HKEY hkRoot
+)
+{
+    HRESULT hr = S_OK;
+    HKEY hkRegistration = NULL;
+    DWORD dwInstalled = 0;
+    pRegistration->fCached = pRegistration->sczCacheExecutablePath && FileExistsEx(pRegistration->sczCacheExecutablePath, NULL);
+    pRegistration->detectedRegistrationType = BOOTSTRAPPER_REGISTRATION_TYPE_NONE;
+    // open registration key
+    hr = RegOpen(hkRoot, pRegistration->sczRegistrationKey, KEY_QUERY_VALUE, &hkRegistration);
+    if (SUCCEEDED(hr))
+    {
+        hr = RegReadNumber(hkRegistration, REGISTRY_BUNDLE_INSTALLED, &dwInstalled);
+        pRegistration->detectedRegistrationType = (1 == dwInstalled) ? BOOTSTRAPPER_REGISTRATION_TYPE_FULL : BOOTSTRAPPER_REGISTRATION_TYPE_INPROGRESS;
+    }
+    // Not finding the key or value is okay.
+    if (E_FILENOTFOUND == hr || E_PATHNOTFOUND == hr)
+    {
+        hr = S_OK;
+    }
+    ReleaseRegKey(hkRegistration);
+    return hr;
+}
diff --git a/src/burn/engine/registration.h b/src/burn/engine/registration.h
index 326f21c6..e83b75b6 100644
--- a/src/burn/engine/registration.h
+++ b/src/burn/engine/registration.h
@@ -94,11 +94,12 @@ typedef struct _BURN_SOFTWARE_TAGS
 typedef struct _BURN_REGISTRATION
 {
-    BOOL fPerMachine;
+    BOOL fPerMachine; // For PUOM/PMOU bundles, only valid after planning.
    BOOL fForceSystemComponent;
    BOOL fDisableResume;
    BOOL fCached;
    BOOTSTRAPPER_REGISTRATION_TYPE detectedRegistrationType;
+    BOOTSTRAPPER_PACKAGE_SCOPE scope;
    LPWSTR sczCode;
    LPWSTR sczTag;
@@ -167,7 +168,7 @@ HRESULT RegistrationParseFromXml(
    __in BURN_REGISTRATION* pRegistration,
    __in BURN_CACHE* pCache,
    __in IXMLDOMNode* pixnBundle
-    );
+);
 void RegistrationUninitialize(
    __in BURN_REGISTRATION* pRegistration
    );
@@ -191,7 +192,7 @@ HRESULT RegistrationDetectRelatedBundles(
    );
 HRESULT RegistrationPlanInitialize(
    __in BURN_REGISTRATION* pRegistration
-    );
+);
 HRESULT RegistrationSessionBegin(
    __in_z LPCWSTR wzEngineWorkingPath,
    __in BURN_REGISTRATION* pRegistration,
@@ -225,6 +226,10 @@ HRESULT RegistrationGetResumeCommandLine(
    __in const BURN_REGISTRATION* pRegistration,
    __deref_out_z LPWSTR* psczResumeCommandLine
    );
+HRESULT RegistrationSetPaths(
+    __in BURN_REGISTRATION* pRegistration,
+    __in BURN_CACHE* pCache
+    );
 #if defined(__cplusplus)
diff --git a/src/burn/engine/relatedbundle.cpp b/src/burn/engine/relatedbundle.cpp
index c9aa7170..d0b97af0 100644
--- a/src/burn/engine/relatedbundle.cpp
+++ b/src/burn/engine/relatedbundle.cpp
@@ -22,7 +22,7 @@ static __callback int __cdecl CompareRelatedBundlesPlan(
    );
 static BUNDLE_QUERY_CALLBACK_RESULT CALLBACK QueryRelatedBundlesCallback(
    __in const BUNDLE_QUERY_RELATED_BUNDLE_RESULT* pBundle,
-    __in_opt LPVOID pvContext
+    __in LPVOID pvContext
    );
 static HRESULT LoadIfRelatedBundle(
    __in const BUNDLE_QUERY_RELATED_BUNDLE_RESULT* pBundle,
@@ -258,7 +258,7 @@ static __callback int __cdecl CompareRelatedBundlesPlan(
 static BUNDLE_QUERY_CALLBACK_RESULT CALLBACK QueryRelatedBundlesCallback(
    __in const BUNDLE_QUERY_RELATED_BUNDLE_RESULT* pBundle,
-    __in_opt LPVOID pvContext
+    __in LPVOID pvContext
    )
 {
    HRESULT hr = S_OK;
diff --git a/src/burn/engine/uithread.cpp b/src/burn/engine/uithread.cpp
index 9beb9f80..1f7db965 100644
--- a/src/burn/engine/uithread.cpp
+++ b/src/burn/engine/uithread.cpp
@@ -123,7 +123,7 @@ static DWORD WINAPI ThreadProc(
    info.pEngineState = pEngineState;
    // Create the window to handle reboots without activating it.
-    hWnd = ::CreateWindowExW(WS_EX_NOACTIVATE, wc.lpszClassName, NULL, WS_POPUP, 0, 0, 0, 0, HWND_DESKTOP, NULL, pContext->hInstance, &info);
+    hWnd = ::CreateWindowExW(WS_EX_NOACTIVATE, wc.lpszClassName, BURN_UITHREAD_CLASS_WINDOW, WS_POPUP, 0, 0, 0, 0, HWND_DESKTOP, NULL, pContext->hInstance, &info);
    ExitOnNullWithLastError(hWnd, hr, "Failed to create Burn UI thread window.");
    ::ShowWindow(hWnd, SW_SHOWNA);
diff --git a/src/burn/engine/variable.cpp b/src/burn/engine/variable.cpp
index a795d76c..1b7dc4d1 100644
--- a/src/burn/engine/variable.cpp
+++ b/src/burn/engine/variable.cpp
@@ -305,6 +305,8 @@ extern "C" HRESULT VariableInitialize(
        {BURN_BUNDLE_TAG, InitializeVariableString, (DWORD_PTR)L"", FALSE, TRUE},
        {BURN_BUNDLE_UILEVEL, InitializeVariableNumeric, 0, FALSE, TRUE},
        {BURN_BUNDLE_VERSION, InitializeVariableVersion, (DWORD_PTR)L"0", FALSE, TRUE},
+        {BURN_BUNDLE_SCOPE, InitializeVariableNumeric, 0, FALSE, TRUE},
+        {BURN_BUNDLE_PLANNED_SCOPE, InitializeVariableNumeric, 0, FALSE, TRUE},
    };
    const WELL_KNOWN_VARIABLE_DECLARATION vrgWellKnownVariableNames[] =
diff --git a/src/burn/test/BurnUnitTest/ApprovedExeTest.cpp b/src/burn/test/BurnUnitTest/ApprovedExeTest.cpp
index da51f1f8..6798d3cb 100644
--- a/src/burn/test/BurnUnitTest/ApprovedExeTest.cpp
+++ b/src/burn/test/BurnUnitTest/ApprovedExeTest.cpp
@@ -2,11 +2,7 @@
 #include "precomp.h"
-namespace Microsoft
+namespace WixToolset
-{
-namespace Tools
-{
-namespace WindowsInstallerXml
 {
 namespace Test
 {
@@ -308,5 +304,3 @@ namespace Bootstrapper
 }
 }
 }
-}
-}
diff --git a/src/burn/test/BurnUnitTest/BurnTestException.h b/src/burn/test/BurnUnitTest/BurnTestException.h
index b9467926..b6055041 100644
--- a/src/burn/test/BurnUnitTest/BurnTestException.h
+++ b/src/burn/test/BurnUnitTest/BurnTestException.h
@@ -2,11 +2,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-namespace Microsoft
+namespace WixToolset
-{
-namespace Tools
-{
-namespace WindowsInstallerXml
 {
 namespace Test
 {
@@ -35,8 +31,6 @@ namespace Bootstrapper
 }
 }
 }
-}
-}
 // this class is used by __TestThrowOnFailure_Format() below to deallocate
 // the string created after the function call has returned
@@ -83,6 +77,6 @@ LExit:
 }
 #pragma warning (pop)
-#define TestThrowOnFailure(hr, s) if (FAILED(hr)) { throw gcnew Microsoft::Tools::WindowsInstallerXml::Test::Bootstrapper::BurnTestException(hr, gcnew System::String(s)); }
+#define TestThrowOnFailure(hr, s) if (FAILED(hr)) { throw gcnew WixToolset::Test::Bootstrapper::BurnTestException(hr, gcnew System::String(s)); }
-#define TestThrowOnFailure1(hr, s, p) if (FAILED(hr)) { throw gcnew Microsoft::Tools::WindowsInstallerXml::Test::Bootstrapper::BurnTestException(hr, gcnew System::String(__TestThrowOnFailure_Format(s, p))); }
+#define TestThrowOnFailure1(hr, s, p) if (FAILED(hr)) { throw gcnew WixToolset::Test::Bootstrapper::BurnTestException(hr, gcnew System::String(__TestThrowOnFailure_Format(s, p))); }
-#define TestThrowOnFailure2(hr, s, p1, p2) if (FAILED(hr)) { throw gcnew Microsoft::Tools::WindowsInstallerXml::Test::Bootstrapper::BurnTestException(hr, gcnew System::String(__TestThrowOnFailure_Format(s, p1, p2))); }
+#define TestThrowOnFailure2(hr, s, p1, p2) if (FAILED(hr)) { throw gcnew WixToolset::Test::Bootstrapper::BurnTestException(hr, gcnew System::String(__TestThrowOnFailure_Format(s, p1, p2))); }
diff --git a/src/burn/test/BurnUnitTest/BurnTestFixture.h b/src/burn/test/BurnUnitTest/BurnTestFixture.h
index 35acba67..95fd6fe5 100644
--- a/src/burn/test/BurnUnitTest/BurnTestFixture.h
+++ b/src/burn/test/BurnUnitTest/BurnTestFixture.h
@@ -2,11 +2,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-namespace Microsoft
+namespace WixToolset
-{
-namespace Tools
-{
-namespace WindowsInstallerXml
 {
 namespace Test
 {
@@ -71,5 +67,3 @@ namespace Bootstrapper
 }
 }
 }
-}
-}
diff --git a/src/burn/test/BurnUnitTest/BurnUnitTest.h b/src/burn/test/BurnUnitTest/BurnUnitTest.h
index ed1d2956..33cfe46d 100644
--- a/src/burn/test/BurnUnitTest/BurnUnitTest.h
+++ b/src/burn/test/BurnUnitTest/BurnUnitTest.h
@@ -2,11 +2,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-namespace Microsoft
+namespace WixToolset
-{
-namespace Tools
-{
-namespace WindowsInstallerXml
 {
 namespace Test
 {
@@ -44,5 +40,3 @@ namespace Bootstrapper
 }
 }
 }
-}
-}
diff --git a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj
index 9704efa5..c741789e 100644
--- a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj
+++ b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj
@@ -22,7 +22,6 @@
      <Platform>x64</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectTypes>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}</ProjectTypes>
    <ProjectGuid>{9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}</ProjectGuid>
@@ -34,15 +33,12 @@
    <SignOutput>false</SignOutput>
    <IsWixTestProject>true</IsWixTestProject>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <PropertyGroup>
    <ProjectAdditionalIncludeDirectories>$(ProjectAdditionalIncludeDirectories);$(BurnGeneratedHeaderDirectory);..\..\engine;..\..\..\api\burn\inc;..\..\..\libs\dutil\WixToolset.Dutil\inc</ProjectAdditionalIncludeDirectories>
    <ProjectAdditionalLinkLibraries>cabinet.lib;crypt32.lib;msi.lib;rpcrt4.lib;shlwapi.lib;userenv.lib;wininet.lib;wintrust.lib;$(RootBuildFolder)libs\$(Configuration)\$(WixNativeSdkLibraryToolset)\$(PlatformTarget)\dutil.lib;engine.res</ProjectAdditionalLinkLibraries>
  </PropertyGroup>
  <ItemGroup>
    <ClCompile Include="AssemblyInfo.cpp" />
    <ClCompile Include="ApprovedExeTest.cpp" />
@@ -76,11 +72,9 @@
    <ClInclude Include="TestRegistryFixture.h" />
    <ClInclude Include="VariableHelpers.h" />
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="BurnUnitTest.rc" />
  </ItemGroup>
  <ItemGroup>
    <None Include="TestData\CacheTest\CacheSignatureTest.File" CopyToOutputDirectory="PreserveNewest" />
    <None Include="TestData\PlanTest\BasicFunctionality_BundleA_manifest.xml" CopyToOutputDirectory="PreserveNewest" />
@@ -91,14 +85,23 @@
    <None Include="TestData\PlanTest\MsuPackageFixture_manifest.xml" CopyToOutputDirectory="PreserveNewest" />
    <None Include="TestData\PlanTest\Slipstream_BundleA_manifest.xml" CopyToOutputDirectory="PreserveNewest" />
    <None Include="TestData\PlanTest\Slipstream_BundleA_modified_manifest.xml" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="TestData\PlanTest\AllPmouBundle_manifest.xml" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="TestData\PlanTest\AllPuomBundle_manifest.xml" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="TestData\PlanTest\PerUserBundle_manifest.xml" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="TestData\PlanTest\PerMachineBundle_manifest.xml" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="TestData\PlanTest\PuPmouBundle_manifest.xml" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="TestData\PlanTest\PuPuomBundle_manifest.xml" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="TestData\PlanTest\PmPuomBundle_manifest.xml" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="TestData\PlanTest\PmPmouBundle_manifest.xml" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="TestData\PlanTest\PmPuPmouBundle_manifest.xml" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="TestData\PlanTest\PmPuPuomBundle_manifest.xml" CopyToOutputDirectory="PreserveNewest" />
+    <None Include="TestData\PlanTest\PuomBundlePackage_manifest.xml" CopyToOutputDirectory="PreserveNewest" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\engine\engine.vcxproj">
      <Project>{8119537D-E1D9-6591-D51A-49770A2F9C37}</Project>
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <Import Project="..\..\..\internal\WixInternal.TestSupport.Native\build\WixInternal.TestSupport.Native.targets" />
 </Project>
diff --git a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj.filters b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj.filters
index aac5ab8b..0c458f48 100644
--- a/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj.filters
+++ b/src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj.filters
@@ -98,4 +98,20 @@
      <Filter>Resource Files</Filter>
    </ResourceCompile>
  </ItemGroup>
-</Project>
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)xunit.runner.visualstudio.testadapter.dll" />
+    <None Include="$(MSBuildThisFileDirectory)xunit.abstractions.dll" />
+    <None Include="$(MSBuildThisFileDirectory)xunit.runner.reporters.net452.dll" />
+    <None Include="$(MSBuildThisFileDirectory)xunit.runner.utility.net452.dll" />
+    <None Include="TestData\CacheTest\CacheSignatureTest.File" />
+    <None Include="TestData\PlanTest\BasicFunctionality_BundleA_manifest.xml" />
+    <None Include="TestData\PlanTest\BundlePackage_Multiple_manifest.xml" />
+    <None Include="TestData\PlanTest\ExePackage_PerUserArpEntry_manifest.xml" />
+    <None Include="TestData\PlanTest\Failure_BundleD_manifest.xml" />
+    <None Include="TestData\PlanTest\PuomWithPerMachineBundle_manifest.xml" />
+    <None Include="TestData\PlanTest\MsiTransaction_BundleAv1_manifest.xml" />
+    <None Include="TestData\PlanTest\MsuPackageFixture_manifest.xml" />
+    <None Include="TestData\PlanTest\Slipstream_BundleA_manifest.xml" />
+    <None Include="TestData\PlanTest\Slipstream_BundleA_modified_manifest.xml" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/src/burn/test/BurnUnitTest/CacheTest.cpp b/src/burn/test/BurnUnitTest/CacheTest.cpp
index 8e3660b2..c142e673 100644
--- a/src/burn/test/BurnUnitTest/CacheTest.cpp
+++ b/src/burn/test/BurnUnitTest/CacheTest.cpp
@@ -23,11 +23,7 @@ typedef struct _CACHE_TEST_CONTEXT
 {
 } CACHE_TEST_CONTEXT;
-namespace Microsoft
+namespace WixToolset
-{
-namespace Tools
-{
-namespace WindowsInstallerXml
 {
 namespace Test
 {
@@ -158,7 +154,7 @@ namespace Bootstrapper
                hr = StrAllocHexDecode(L"25e61cd83485062b70713aebddd3fe4992826cb121466fddc8de3eacb1e42f39d4bdd8455d95eec8c9529ced4c0296ab861931fe2c86df2f2b4e8d259a6d9223", &pb, &cb);
                Assert::Equal(S_OK, hr);
-                package.fPerMachine = FALSE;
+                package.scope = BOOTSTRAPPER_PACKAGE_SCOPE_PER_USER;
                package.sczCacheId = L"Bootstrapper.CacheTest.CacheSignatureTest";
                payload.sczKey = L"CacheSignatureTest.PayloadKey";
                payload.sczFilePath = L"CacheSignatureTest.File";
@@ -192,8 +188,6 @@ namespace Bootstrapper
 }
 }
 }
-}
-}
 static HRESULT CALLBACK CacheTestEventRoutine(
    __in BURN_CACHE_MESSAGE* /*pMessage*/,
diff --git a/src/burn/test/BurnUnitTest/ElevationTest.cpp b/src/burn/test/BurnUnitTest/ElevationTest.cpp
index 81e9f93e..feacdb7c 100644
--- a/src/burn/test/BurnUnitTest/ElevationTest.cpp
+++ b/src/burn/test/BurnUnitTest/ElevationTest.cpp
@@ -25,11 +25,7 @@ static HRESULT ProcessChildMessages(
    __out DWORD* pdwResult
    );
-namespace Microsoft
+namespace WixToolset
-{
-namespace Tools
-{
-namespace WindowsInstallerXml
 {
 namespace Test
 {
@@ -92,8 +88,6 @@ namespace Bootstrapper
 }
 }
 }
-}
-}
 static BOOL STDAPICALLTYPE ElevateTest_ShellExecuteExW(
diff --git a/src/burn/test/BurnUnitTest/EmbeddedTest.cpp b/src/burn/test/BurnUnitTest/EmbeddedTest.cpp
index a19790ad..33f03282 100644
--- a/src/burn/test/BurnUnitTest/EmbeddedTest.cpp
+++ b/src/burn/test/BurnUnitTest/EmbeddedTest.cpp
@@ -33,11 +33,7 @@ static int EmbeddedTest_GenericMessageHandler(
    __in LPVOID pvContext
    );
-namespace Microsoft
+namespace WixToolset
-{
-namespace Tools
-{
-namespace WindowsInstallerXml
 {
 namespace Test
 {
@@ -84,8 +80,6 @@ namespace Bootstrapper
 }
 }
 }
-}
-}
 static BOOL STDAPICALLTYPE EmbeddedTest_CreateProcessW(
diff --git a/src/burn/test/BurnUnitTest/ExitCodeTest.cpp b/src/burn/test/BurnUnitTest/ExitCodeTest.cpp
index 9b66f4c0..0529fa45 100644
--- a/src/burn/test/BurnUnitTest/ExitCodeTest.cpp
+++ b/src/burn/test/BurnUnitTest/ExitCodeTest.cpp
@@ -2,11 +2,7 @@
 #include "precomp.h"
-namespace Microsoft
+namespace WixToolset
-{
-namespace Tools
-{
-namespace WindowsInstallerXml
 {
 namespace Test
 {
@@ -328,7 +324,7 @@ static void LoadEngineState(
        L"<BurnManifest>"
        L"    <Payload Id='test.exe' FilePath='test.exe' Packaging='external' SourcePath='test.exe' Hash='000000000000' FileSize='1' />"
        L"    <Chain>"
-        L"        <ExePackage Id='Custom' Cache='remove' CacheId='test.exe' InstallSize='1' Size='1' PerMachine='no' Permanent='yes' Vital='yes' DetectCondition='' InstallArguments='[ExeExitCode]' UninstallArguments='' Uninstallable='no' RepairArguments='' Repairable='no' Protocol='none' DetectionType='condition'>"
+        L"        <ExePackage Id='Custom' Cache='remove' CacheId='test.exe' InstallSize='1' Size='1' Scope='peruser' Permanent='yes' Vital='yes' DetectCondition='' InstallArguments='[ExeExitCode]' UninstallArguments='' Uninstallable='no' RepairArguments='' Repairable='no' Protocol='none' DetectionType='condition'>"
        L"            <ExitCode Code='0' Type='2' />"
        L"            <ExitCode Code='3' Type='3' />"
        L"            <ExitCode Code='4' Type='4' />"
@@ -349,7 +345,7 @@ static void LoadEngineState(
        L"            <ExitCode Code='*' Type='1' />"
        L"            <PayloadRef Id='test.exe' />"
        L"        </ExePackage>"
-        L"        <ExePackage Id='Standard' Cache='remove' CacheId='test.exe' InstallSize='1' Size='1' PerMachine='no' Permanent='yes' Vital='yes' DetectCondition='' InstallArguments='[ExeExitCode]' UninstallArguments='' Uninstallable='no' RepairArguments='' Repairable='no' Protocol='none' DetectionType='condition'>"
+        L"        <ExePackage Id='Standard' Cache='remove' CacheId='test.exe' InstallSize='1' Size='1' Scope='peruser' Permanent='yes' Vital='yes' DetectCondition='' InstallArguments='[ExeExitCode]' UninstallArguments='' Uninstallable='no' RepairArguments='' Repairable='no' Protocol='none' DetectionType='condition'>"
        L"            <PayloadRef Id='test.exe' />"
        L"        </ExePackage>"
        L"    </Chain>"
@@ -376,5 +372,3 @@ static void LoadEngineState(
 }
 }
 }
-}
-}
diff --git a/src/burn/test/BurnUnitTest/LoggingTest.cpp b/src/burn/test/BurnUnitTest/LoggingTest.cpp
index ed74c875..7619b913 100644
--- a/src/burn/test/BurnUnitTest/LoggingTest.cpp
+++ b/src/burn/test/BurnUnitTest/LoggingTest.cpp
@@ -2,11 +2,7 @@
 #include "precomp.h"
-namespace Microsoft
+namespace WixToolset
-{
-namespace Tools
-{
-namespace WindowsInstallerXml
 {
 namespace Test
 {
@@ -64,5 +60,3 @@ namespace Bootstrapper
 }
 }
 }
-}
-}
diff --git a/src/burn/test/BurnUnitTest/ManifestHelpers.cpp b/src/burn/test/BurnUnitTest/ManifestHelpers.cpp
index 96d5fab4..b68504aa 100644
--- a/src/burn/test/BurnUnitTest/ManifestHelpers.cpp
+++ b/src/burn/test/BurnUnitTest/ManifestHelpers.cpp
@@ -7,11 +7,7 @@ using namespace System;
 using namespace Xunit;
-namespace Microsoft
+namespace WixToolset
-{
-namespace Tools
-{
-namespace WindowsInstallerXml
 {
 namespace Test
 {
@@ -37,5 +33,3 @@ namespace Bootstrapper
 }
 }
 }
-}
-}
diff --git a/src/burn/test/BurnUnitTest/ManifestHelpers.h b/src/burn/test/BurnUnitTest/ManifestHelpers.h
index e3e57555..e3c97c64 100644
--- a/src/burn/test/BurnUnitTest/ManifestHelpers.h
+++ b/src/burn/test/BurnUnitTest/ManifestHelpers.h
@@ -2,11 +2,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-namespace Microsoft
+namespace WixToolset
-{
-namespace Tools
-{
-namespace WindowsInstallerXml
 {
 namespace Test
 {
@@ -20,5 +16,3 @@ void LoadBundleXmlHelper(LPCWSTR wzDocument, IXMLDOMElement** ppixeBundle);
 }
 }
 }
-}
-}
diff --git a/src/burn/test/BurnUnitTest/ManifestTest.cpp b/src/burn/test/BurnUnitTest/ManifestTest.cpp
index 4959cee0..4e6bac24 100644
--- a/src/burn/test/BurnUnitTest/ManifestTest.cpp
+++ b/src/burn/test/BurnUnitTest/ManifestTest.cpp
@@ -2,11 +2,7 @@
 #include "precomp.h"
-namespace Microsoft
+namespace WixToolset
-{
-namespace Tools
-{
-namespace WindowsInstallerXml
 {
 namespace Test
 {
@@ -40,7 +36,7 @@ namespace Bootstrapper
                    "    <UX PrimaryPayloadId='ux.exe'>"
                    "        <Payload Id='ux.exe' FilePath='ux.exe' Packaging='embedded' SourcePath='u0' />"
                    "    </UX>"
-                    "    <Registration Code='{D54F896D-1952-43e6-9C67-B5652240618C}' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='no' />"
+                    "    <Registration Code='{D54F896D-1952-43e6-9C67-B5652240618C}' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe' Scope='peruser' />"
                    "    <Variable Id='Variable1' Type='numeric' Value='1' Hidden='no' Persisted='no' />"
                    "    <RegistrySearch Id='Search1' Type='exists' Root='HKLM' Key='SOFTWARE\\Microsoft' Variable='Variable1' Condition='0' />"
                    "</BurnManifest>";
@@ -67,5 +63,3 @@ namespace Bootstrapper
 }
 }
 }
-}
-}
diff --git a/src/burn/test/BurnUnitTest/PlanTest.cpp b/src/burn/test/BurnUnitTest/PlanTest.cpp
index e2850a62..7e7d84cc 100644
--- a/src/burn/test/BurnUnitTest/PlanTest.cpp
+++ b/src/burn/test/BurnUnitTest/PlanTest.cpp
@@ -2,12 +2,20 @@
 #include "precomp.h"
+#if TODO_REIMPLEMENT
 static HRESULT WINAPI PlanTestBAProc(
    __in BOOTSTRAPPER_APPLICATION_MESSAGE message,
    __in const LPVOID pvArgs,
    __inout LPVOID pvResults,
    __in_opt LPVOID pvContext
    );
+#endif
+struct REDIRECTED_LOGGING_CONTEXT
+{
+    LPSTR pszBuffer;
+};
 static LPCWSTR wzArpEntryExeManifestFileName = L"ExePackage_PerUserArpEntry_manifest.xml";
 static LPCWSTR wzMsiTransactionManifestFileName = L"MsiTransaction_BundleAv1_manifest.xml";
@@ -28,11 +36,7 @@ static BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE vRelatedBundlePlanType = BOOTSTRAPP
 static BURN_DEPENDENCY_ACTION registerActions1[] = { BURN_DEPENDENCY_ACTION_REGISTER };
 static BURN_DEPENDENCY_ACTION unregisterActions1[] = { BURN_DEPENDENCY_ACTION_UNREGISTER };
-namespace Microsoft
+namespace WixToolset
-{
-namespace Tools
-{
-namespace WindowsInstallerXml
 {
 namespace Test
 {
@@ -43,12 +47,314 @@ namespace Bootstrapper
    public ref class PlanTest : BurnUnitTest
    {
+    private:
+        void ScopeTest(
+            LPCWSTR wzManifestFileName,
+            BOOL fDefaultPlanPerMachine,
+            BOOL fDefaultRegistrationPerMachine,
+            BOOL fPerUserPlanPerMachine,
+            BOOL fPerUserRegistrationPerMachine,
+            BOOL fPerMachinePlanPerMachine,
+            BOOL fPerMachineRegistrationPerMachine
+        )
+        {
+            HRESULT hr = S_OK;
+            BURN_ENGINE_STATE engineState = { };
+            BURN_ENGINE_STATE* pEngineState = &engineState;
+            BURN_PLAN* pPlan = &engineState.plan;
+            InitializeEngineStateForCorePlan(wzManifestFileName, pEngineState);
+            DetectAttachedContainerAsAttached(pEngineState);
+            DetectPermanentPackagesAsPresentAndCached(pEngineState);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
+            NativeAssert::Succeeded(hr, "CorePlan default failed");
+            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
+            Assert::Equal<DWORD>(BOOTSTRAPPER_SCOPE_DEFAULT, pPlan->plannedScope);
+            Assert::Equal<DWORD>(fDefaultPlanPerMachine, pPlan->fPerMachine);
+            Assert::Equal<DWORD>(fDefaultRegistrationPerMachine, engineState.registration.fPerMachine);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL, BOOTSTRAPPER_SCOPE_PER_USER);
+            NativeAssert::Succeeded(hr, "CorePlan per-user failed");
+            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
+            Assert::Equal<DWORD>(BOOTSTRAPPER_SCOPE_PER_USER, pPlan->plannedScope);
+            Assert::Equal<DWORD>(fPerUserPlanPerMachine, pPlan->fPerMachine);
+            Assert::Equal<DWORD>(fPerUserRegistrationPerMachine, engineState.registration.fPerMachine);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL, BOOTSTRAPPER_SCOPE_PER_MACHINE);
+            NativeAssert::Succeeded(hr, "CorePlan per-machine failed");
+            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
+            Assert::Equal<DWORD>(BOOTSTRAPPER_SCOPE_PER_MACHINE, pPlan->plannedScope);
+            Assert::Equal<DWORD>(fPerMachinePlanPerMachine, pPlan->fPerMachine);
+            Assert::Equal<DWORD>(fPerMachineRegistrationPerMachine, engineState.registration.fPerMachine);
+        }
    public:
        PlanTest(BurnTestFixture^ fixture) : BurnUnitTest(fixture)
        {
        }
        [Fact]
+        void CommandLineScopeTestNoop()
+        {
+            HRESULT hr = S_OK;
+            BURN_ENGINE_STATE engineState = { };
+            BURN_ENGINE_STATE* pEngineState = &engineState;
+            BURN_PLAN* pPlan = &engineState.plan;
+            engineState.command.commandLineScope = BOOTSTRAPPER_SCOPE_PER_MACHINE;
+            InitializeEngineStateForCorePlan(L"AllPmouBundle_manifest.xml", pEngineState);
+            DetectAttachedContainerAsAttached(pEngineState);
+            DetectPermanentPackagesAsPresentAndCached(pEngineState);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL, BOOTSTRAPPER_SCOPE_PER_USER);
+            NativeAssert::Succeeded(hr, "CorePlan default failed");
+            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
+            Assert::Equal<DWORD>(BOOTSTRAPPER_SCOPE_PER_USER, pPlan->plannedScope);
+            Assert::Equal<DWORD>(FALSE, pPlan->fPerMachine);
+            Assert::Equal<DWORD>(FALSE, engineState.registration.fPerMachine);
+        }
+        [Fact]
+        void CommandLineScopePerUserTest()
+        {
+            HRESULT hr = S_OK;
+            BURN_ENGINE_STATE engineState = { };
+            BURN_ENGINE_STATE* pEngineState = &engineState;
+            BURN_PLAN* pPlan = &engineState.plan;
+            engineState.command.commandLineScope = BOOTSTRAPPER_SCOPE_PER_USER;
+            InitializeEngineStateForCorePlan(L"AllPmouBundle_manifest.xml", pEngineState);
+            DetectAttachedContainerAsAttached(pEngineState);
+            DetectPermanentPackagesAsPresentAndCached(pEngineState);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
+            NativeAssert::Succeeded(hr, "CorePlan default failed");
+            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
+            Assert::Equal<DWORD>(BOOTSTRAPPER_SCOPE_PER_USER, pPlan->plannedScope);
+            Assert::Equal<DWORD>(FALSE, pPlan->fPerMachine);
+            Assert::Equal<DWORD>(FALSE, engineState.registration.fPerMachine);
+        }
+        [Fact]
+        void CommandLineScopePerMachineTest()
+        {
+            HRESULT hr = S_OK;
+            BURN_ENGINE_STATE engineState = { };
+            BURN_ENGINE_STATE* pEngineState = &engineState;
+            BURN_PLAN* pPlan = &engineState.plan;
+            engineState.command.commandLineScope = BOOTSTRAPPER_SCOPE_PER_MACHINE;
+            InitializeEngineStateForCorePlan(L"AllPmouBundle_manifest.xml", pEngineState);
+            DetectAttachedContainerAsAttached(pEngineState);
+            DetectPermanentPackagesAsPresentAndCached(pEngineState);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
+            NativeAssert::Succeeded(hr, "CorePlan default failed");
+            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
+            Assert::Equal<DWORD>(BOOTSTRAPPER_SCOPE_PER_MACHINE, pPlan->plannedScope);
+            Assert::Equal<DWORD>(TRUE, pPlan->fPerMachine);
+            Assert::Equal<DWORD>(TRUE, engineState.registration.fPerMachine);
+        }
+        [Fact]
+        void BundlePackageScopeTestNoop()
+        {
+            HRESULT hr = S_OK;
+            BURN_ENGINE_STATE engineState = { };
+            BURN_ENGINE_STATE* pEngineState = &engineState;
+            BURN_PLAN* pPlan = &engineState.plan;
+            engineState.command.commandLineScope = BOOTSTRAPPER_SCOPE_PER_MACHINE;
+            InitializeEngineStateForCorePlan(L"PuomBundlePackage_manifest.xml", pEngineState);
+            DetectAttachedContainerAsAttached(pEngineState);
+            DetectPermanentPackagesAsPresentAndCached(pEngineState);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL, BOOTSTRAPPER_SCOPE_PER_USER);
+            NativeAssert::Succeeded(hr, "CorePlan default failed");
+            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
+            Assert::Equal<DWORD>(BOOTSTRAPPER_SCOPE_PER_USER, pPlan->plannedScope);
+            Assert::Equal<DWORD>(BOOTSTRAPPER_SCOPE_DEFAULT, engineState.packages.rgPackages[0].fPerMachine);
+            Assert::Equal<DWORD>(FALSE, pPlan->fPerMachine);
+            Assert::Equal<DWORD>(FALSE, engineState.registration.fPerMachine);
+        }
+        [Fact]
+        void BundlePackageScopeTestSucceeds()
+        {
+            HRESULT hr = S_OK;
+            BURN_ENGINE_STATE engineState = { };
+            BURN_ENGINE_STATE* pEngineState = &engineState;
+            BURN_PLAN* pPlan = &engineState.plan;
+            engineState.command.commandLineScope = BOOTSTRAPPER_SCOPE_PER_MACHINE;
+            InitializeEngineStateForCorePlan(L"PuomBundlePackage_manifest.xml", pEngineState);
+            DetectAttachedContainerAsAttached(pEngineState);
+            DetectPermanentPackagesAsPresentAndCached(pEngineState);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
+            NativeAssert::Succeeded(hr, "CorePlan default failed");
+            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
+            Assert::Equal<DWORD>(BOOTSTRAPPER_SCOPE_PER_MACHINE, pPlan->plannedScope);
+            Assert::Equal<DWORD>(BOOTSTRAPPER_SCOPE_PER_MACHINE, engineState.packages.rgPackages[0].fPerMachine);
+            Assert::Equal<DWORD>(TRUE, pPlan->fPerMachine);
+            Assert::Equal<DWORD>(TRUE, engineState.registration.fPerMachine);
+        }
+        [Fact]
+        void AllPerUserScopeTest()
+        {
+            ScopeTest(
+                L"PerUserBundle_manifest.xml",
+                FALSE /*fDefaultPlanPerMachine*/,
+                FALSE /*fDefaultRegistrationPerMachine*/,
+                FALSE /*fPerUserPlanPerMachine*/,
+                FALSE /*fPerUserRegistrationPerMachine*/,
+                FALSE /*fPerMachinePlanPerMachine*/,
+                FALSE /*fPerMachineRegistrationPerMachine*/
+            );
+        }
+        [Fact]
+        void AllPerMachineScopeTest()
+        {
+            ScopeTest(
+                L"PerMachineBundle_manifest.xml",
+                TRUE  /*fDefaultPlanPerMachine*/,
+                TRUE  /*fDefaultRegistrationPerMachine*/,
+                TRUE  /*fPerUserPlanPerMachine*/,
+                TRUE  /*fPerUserRegistrationPerMachine*/,
+                TRUE  /*fPerMachinePlanPerMachine*/,
+                TRUE  /*fPerMachineRegistrationPerMachine*/
+            );
+        }
+        [Fact]
+        void AllPerMachineOrUserPackagesScopeTest()
+        {
+            ScopeTest(
+                L"AllPmouBundle_manifest.xml",
+                TRUE  /*fDefaultPlanPerMachine*/,
+                TRUE  /*fDefaultRegistrationPerMachine*/,
+                FALSE /*fPerUserPlanPerMachine*/,
+                FALSE /*fPerUserRegistrationPerMachine*/,
+                TRUE  /*fPerMachinePlanPerMachine*/,
+                TRUE  /*fPerMachineRegistrationPerMachine*/
+            );
+        }
+        [Fact]
+        void AllPerUserOrMachinePackagesScopeTest()
+        {
+            ScopeTest(
+                L"AllPuomBundle_manifest.xml",
+                FALSE /*fDefaultPlanPerMachine*/,
+                FALSE /*fDefaultRegistrationPerMachine*/,
+                FALSE /*fPerUserPlanPerMachine*/,
+                FALSE /*fPerUserRegistrationPerMachine*/,
+                TRUE  /*fPerMachinePlanPerMachine*/,
+                TRUE  /*fPerMachineRegistrationPerMachine*/
+            );
+        }
+        [Fact]
+        void PerMachineAndPerMachineOrUserScopeTest()
+        {
+            ScopeTest(
+                L"PmPmouBundle_manifest.xml",
+                TRUE  /*fDefaultPlanPerMachine*/,
+                TRUE  /*fDefaultRegistrationPerMachine*/,
+                TRUE  /*fPerUserPlanPerMachine*/,
+                FALSE /*fPerUserRegistrationPerMachine*/,
+                TRUE  /*fPerMachinePlanPerMachine*/,
+                TRUE  /*fPerMachineRegistrationPerMachine*/
+            );
+        }
+        [Fact]
+        void PerMachineAndPerUserOrMachineScopeTest()
+        {
+            ScopeTest(
+                L"PmPuomBundle_manifest.xml",
+                TRUE  /*fDefaultPlanPerMachine*/,
+                FALSE  /*fDefaultRegistrationPerMachine*/,
+                TRUE  /*fPerUserPlanPerMachine*/,
+                FALSE /*fPerUserRegistrationPerMachine*/,
+                TRUE  /*fPerMachinePlanPerMachine*/,
+                TRUE  /*fPerMachineRegistrationPerMachine*/
+            );
+        }
+        [Fact]
+        void PerMachineAndPerUserAndPerMachineOrUserScopeTest()
+        {
+            ScopeTest(
+                L"PmPuPmouBundle_manifest.xml",
+                TRUE  /*fDefaultPlanPerMachine*/,
+                FALSE /*fDefaultRegistrationPerMachine*/,
+                TRUE  /*fPerUserPlanPerMachine*/,
+                FALSE /*fPerUserRegistrationPerMachine*/,
+                TRUE  /*fPerMachinePlanPerMachine*/,
+                FALSE /*fPerMachineRegistrationPerMachine*/
+            );
+        }
+        [Fact]
+        void PerMachineAndPerUserAndPerUserOrMachineScopeTest()
+        {
+            ScopeTest(
+                L"PmPuPuomBundle_manifest.xml",
+                TRUE  /*fDefaultPlanPerMachine*/,
+                FALSE /*fDefaultRegistrationPerMachine*/,
+                TRUE  /*fPerUserPlanPerMachine*/,
+                FALSE /*fPerUserRegistrationPerMachine*/,
+                TRUE  /*fPerMachinePlanPerMachine*/,
+                FALSE /*fPerMachineRegistrationPerMachine*/
+            );
+        }
+        [Fact]
+        void PerUserAndPerMachineOrUserScopeTest()
+        {
+            ScopeTest(
+                L"PuPmouBundle_manifest.xml",
+                TRUE  /*fDefaultPlanPerMachine*/,
+                FALSE /*fDefaultRegistrationPerMachine*/,
+                FALSE /*fPerUserPlanPerMachine*/,
+                FALSE /*fPerUserRegistrationPerMachine*/,
+                TRUE  /*fPerMachinePlanPerMachine*/,
+                FALSE  /*fPerMachineRegistrationPerMachine*/
+            );
+        }
+        [Fact]
+        void PerUserAndPerUserOrMachineScopeTest()
+        {
+            ScopeTest(
+                L"PuPuomBundle_manifest.xml",
+                FALSE /*fDefaultPlanPerMachine*/,
+                FALSE /*fDefaultRegistrationPerMachine*/,
+                FALSE /*fPerUserPlanPerMachine*/,
+                FALSE /*fPerUserRegistrationPerMachine*/,
+                TRUE  /*fPerMachinePlanPerMachine*/,
+                FALSE /*fPerMachineRegistrationPerMachine*/
+            );
+        }
+        [Fact]
        void ArpEntryExeInstallTest()
        {
            HRESULT hr = S_OK;
@@ -60,7 +366,7 @@ namespace Bootstrapper
            DetectAttachedContainerAsAttached(pEngineState);
            DetectPermanentPackagesAsPresentAndCached(pEngineState);
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
@@ -154,12 +460,13 @@ namespace Bootstrapper
            pEngineState->packages.rgPackages[1].currentState = BOOTSTRAPPER_PACKAGE_STATE_OBSOLETE;
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
            NativeAssert::StringEqual(L"{9C459DAD-0E64-40C8-8C9F-4F68E46AB223}", pPlan->wzBundleCode);
            NativeAssert::StringEqual(L"{9C459DAD-0E64-40C8-8C9F-4F68E46AB223}", pPlan->wzBundleProviderKey);
            Assert::Equal<BOOL>(FALSE, pPlan->fEnabledForwardCompatibleBundle);
            Assert::Equal<BOOL>(FALSE, pPlan->fPerMachine);
            Assert::Equal<BOOL>(TRUE, pPlan->fCanAffectMachineState);
@@ -233,7 +540,7 @@ namespace Bootstrapper
            InitializeEngineStateForCorePlan(wzArpEntryExeManifestFileName, pEngineState);
            DetectPackagesAsPresentAndCached(pEngineState);
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNINSTALL);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNINSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_UNINSTALL, pPlan->action);
@@ -326,9 +633,11 @@ namespace Bootstrapper
            DetectPackagesAsAbsent(pEngineState);
            DetectRelatedBundle(pEngineState, L"{FD9920AD-DBCA-4C6C-8CD5-B47431CE8D21}", L"1.0.0.0", BOOTSTRAPPER_RELATION_UPGRADE);
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
+            PlanDump(pPlan);
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
            NativeAssert::StringEqual(L"{E6469F05-BDC8-4EB8-B218-67412543EFAA}", pPlan->wzBundleCode);
            NativeAssert::StringEqual(L"{E6469F05-BDC8-4EB8-B218-67412543EFAA}", pPlan->wzBundleProviderKey);
@@ -486,7 +795,7 @@ namespace Bootstrapper
            InitializeEngineStateForCorePlan(wzMsiTransactionManifestFileName, pEngineState);
            DetectPackagesAsPresentAndCached(pEngineState);
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNINSTALL);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNINSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_UNINSTALL, pPlan->action);
@@ -627,7 +936,7 @@ namespace Bootstrapper
            DetectAttachedContainerAsAttached(pEngineState);
            DetectPermanentPackagesAsPresentAndCached(pEngineState);
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
@@ -742,7 +1051,7 @@ namespace Bootstrapper
            DetectAttachedContainerAsAttached(pEngineState);
            DetectPackagesAsPresentAndCached(pEngineState);
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_REPAIR);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_REPAIR, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_REPAIR, pPlan->action);
@@ -836,7 +1145,7 @@ namespace Bootstrapper
            DetectAttachedContainerAsAttached(pEngineState);
            DetectPackagesAsPresentAndCached(pEngineState);
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNINSTALL);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNINSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_UNINSTALL, pPlan->action);
@@ -955,7 +1264,7 @@ namespace Bootstrapper
            DetectPackagesAsAbsent(pEngineState);
            DetectCompatibleMsiPackage(pEngineState, pEngineState->packages.rgPackages, L"{C24F3903-38E7-4D44-8037-D9856B3C5046}", L"2.0.0.0");
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNINSTALL);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNINSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_UNINSTALL, pPlan->action);
@@ -1055,7 +1364,7 @@ namespace Bootstrapper
            vfUseRelatedBundlePlanType = TRUE;
            vRelatedBundlePlanType = BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE_UPGRADE;
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
@@ -1174,7 +1483,7 @@ namespace Bootstrapper
            BURN_RELATED_BUNDLE* pRelatedBundle = DetectRelatedBundle(pEngineState, L"{FD9920AD-DBCA-4C6C-8CD5-B47431CE8D21}", L"0.9.0.0", BOOTSTRAPPER_RELATION_UPGRADE);
            pRelatedBundle->fPlannable = FALSE;
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
@@ -1276,7 +1585,7 @@ namespace Bootstrapper
            DetectAttachedContainerAsAttached(pEngineState);
            DetectPermanentPackagesAsPresentAndCached(pEngineState);
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
@@ -1369,7 +1678,7 @@ namespace Bootstrapper
            DetectAttachedContainerAsAttached(pEngineState);
            DetectPermanentPackagesAsPresentAndCached(pEngineState);
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_LAYOUT);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_LAYOUT, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_LAYOUT, pPlan->action);
@@ -1452,7 +1761,7 @@ namespace Bootstrapper
            DetectPackagesAsAbsent(pEngineState);
            DetectRelatedBundle(pEngineState, L"{FD9920AD-DBCA-4C6C-8CD5-B47431CE8D21}", L"0.9.0.0", BOOTSTRAPPER_RELATION_UPGRADE);
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_CACHE);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_CACHE, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_CACHE, pPlan->action);
@@ -1541,7 +1850,7 @@ namespace Bootstrapper
            DetectPackagesAsAbsent(pEngineState);
            DetectRelatedBundle(pEngineState, L"{AF8355C9-CCDD-4D61-BF5F-EA5F948D8F01}", L"1.1.0.0", BOOTSTRAPPER_RELATION_UPGRADE);
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
@@ -1616,7 +1925,7 @@ namespace Bootstrapper
            vfUseRelatedBundleRequestState = TRUE;
            vRelatedBundleRequestState = BOOTSTRAPPER_REQUEST_STATE_FORCE_ABSENT;
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNINSTALL);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNINSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_UNINSTALL, pPlan->action);
@@ -1705,7 +2014,7 @@ namespace Bootstrapper
            vfUseRelatedBundleRequestState = TRUE;
            vRelatedBundleRequestState = BOOTSTRAPPER_REQUEST_STATE_FORCE_PRESENT;
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
@@ -1798,7 +2107,7 @@ namespace Bootstrapper
            DetectPackagesAsAbsent(pEngineState);
            DetectRelatedBundle(pEngineState, L"{FD9920AD-DBCA-4C6C-8CD5-B47431CE8D21}", L"0.9.0.0", BOOTSTRAPPER_RELATION_UPGRADE);
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
@@ -1904,7 +2213,7 @@ namespace Bootstrapper
            pEngineState->registration.detectedRegistrationType = BOOTSTRAPPER_REGISTRATION_TYPE_FULL;
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_MODIFY);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_MODIFY, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_MODIFY, pPlan->action);
@@ -1983,7 +2292,7 @@ namespace Bootstrapper
            InitializeEngineStateForCorePlan(wzSingleMsiManifestFileName, pEngineState);
            DetectPackagesAsPresentAndCached(pEngineState);
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNINSTALL);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNINSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_UNINSTALL, pPlan->action);
@@ -2084,7 +2393,7 @@ namespace Bootstrapper
            DetectPackagesAsPresentAndCached(pEngineState);
            DetectBundleDependent(pEngineState, L"{29855EB1-724D-4285-A89C-5D37D8549DCD}");
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNINSTALL);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNINSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_UNINSTALL, pPlan->action);
@@ -2154,7 +2463,7 @@ namespace Bootstrapper
            InitializeEngineStateForCorePlan(wzSingleMsiManifestFileName, pEngineState);
            DetectAsRelatedUpgradeBundle(&engineState, L"{02940F3E-C83E-452D-BFCF-C943777ACEAE}", L"2.0.0.0");
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNINSTALL);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNINSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_UNINSTALL, pPlan->action);
@@ -2240,7 +2549,7 @@ namespace Bootstrapper
            pEngineState->packages.rgPackages[0].currentState = BOOTSTRAPPER_PACKAGE_STATE_SUPERSEDED;
            pEngineState->packages.rgPackages[0].Msi.operation = BOOTSTRAPPER_RELATED_OPERATION_DOWNGRADE;
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNINSTALL);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNINSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_UNINSTALL, pPlan->action);
@@ -2328,7 +2637,7 @@ namespace Bootstrapper
            InitializeEngineStateForCorePlan(wzSingleMsiManifestFileName, pEngineState);
            DetectPackagesAsPresentAndCached(pEngineState);
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNSAFE_UNINSTALL);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNSAFE_UNINSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_UNSAFE_UNINSTALL, pPlan->action);
@@ -2430,7 +2739,7 @@ namespace Bootstrapper
            DetectAttachedContainerAsAttached(pEngineState);
            DetectPackagesAsAbsent(pEngineState);
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            llPlannedAction = VariableGetNumericHelper(&engineState.variables, BURN_BUNDLE_ACTION);
@@ -2523,7 +2832,7 @@ namespace Bootstrapper
            DetectPermanentPackagesAsPresentAndCached(pEngineState);
            PlanTestDetectPatchInitialize(pEngineState);
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
@@ -2587,8 +2896,14 @@ namespace Bootstrapper
            ValidateExecutePackageDependency(pPlan, fRollback, dwIndex++, L"PackageA", L"{22D1DDBA-284D-40A7-BD14-95EA07906F21}", registerActions1, 1);
            ValidateExecuteCheckpoint(pPlan, fRollback, dwIndex++, dwExecuteCheckpointId++);
            ValidateExecuteCheckpoint(pPlan, fRollback, dwIndex++, dwExecuteCheckpointId++);
            ValidateExecutePackageProvider(pPlan, fRollback, dwIndex++, L"PatchA", registerActions1, 1);
            pExecuteAction = ValidateDeletedExecuteMspTarget(pPlan, fRollback, dwIndex++, L"PatchA", BOOTSTRAPPER_ACTION_STATE_INSTALL, L"{5FF7F534-3FFC-41E0-80CD-E6361E5E7B7B}", TRUE, BURN_MSI_PROPERTY_INSTALL, INSTALLUILEVEL_NONE, FALSE, BOOTSTRAPPER_MSI_FILE_VERSIONING_MISSING_OR_OLDER, TRUE);
            ValidateExecuteMspTargetPatch(pExecuteAction, 0, L"PatchA");
            ValidateExecuteCheckpoint(pPlan, fRollback, dwIndex++, dwExecuteCheckpointId++);
            ValidateExecutePackageDependency(pPlan, fRollback, dwIndex++, L"PatchA", L"{22D1DDBA-284D-40A7-BD14-95EA07906F21}", registerActions1, 1);
@@ -2654,7 +2969,7 @@ namespace Bootstrapper
            InitializeEngineStateForCorePlan(wzSlipstreamManifestFileName, pEngineState);
            DetectPackagesAsPresentAndCached(pEngineState);
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNINSTALL);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNINSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_UNINSTALL, pPlan->action);
@@ -2784,7 +3099,7 @@ namespace Bootstrapper
            vfUsePackageRequestState = TRUE;
            vPackageRequestState = BOOTSTRAPPER_REQUEST_STATE_FORCE_ABSENT;
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNINSTALL);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_UNINSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_UNINSTALL, pPlan->action);
@@ -2885,7 +3200,7 @@ namespace Bootstrapper
            InitializeEngineStateForCorePlan(wzSlipstreamModifiedManifestFileName, pEngineState);
            DetectPackagesAsAbsent(pEngineState);
-            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL);
+            hr = CorePlan(pEngineState, BOOTSTRAPPER_ACTION_INSTALL, BOOTSTRAPPER_SCOPE_DEFAULT);
            NativeAssert::Succeeded(hr, "CorePlan failed");
            Assert::Equal<DWORD>(BOOTSTRAPPER_ACTION_INSTALL, pPlan->action);
@@ -3031,7 +3346,7 @@ namespace Bootstrapper
                Assert::True(FileExistsEx(sczFilePath, NULL), "Test file does not exist.");
                hr = ManifestLoadXmlFromFile(sczFilePath, pEngineState);
-                NativeAssert::Succeeded(hr, "Failed to load manifest.");
+                NativeAssert::Succeeded(hr, "Failed to load test manifest.");
            }
            finally
            {
@@ -3222,7 +3537,7 @@ namespace Bootstrapper
                    for (DWORD j = 0; j < pPackage->Msi.cSlipstreamMspPackages; ++j)
                    {
                        BURN_PACKAGE* pMspPackage = pPackage->Msi.rgSlipstreamMsps[j].pMspPackage;
-                        MspEngineAddDetectedTargetProduct(&pEngineState->packages, pMspPackage, j, pPackage->Msi.sczProductCode, pPackage->fPerMachine ? MSIINSTALLCONTEXT_MACHINE : MSIINSTALLCONTEXT_USERUNMANAGED);
+                        MspEngineAddDetectedTargetProduct(&pEngineState->packages, pMspPackage, j, pPackage->Msi.sczProductCode, pPackage->scope == BOOTSTRAPPER_PACKAGE_SCOPE_PER_MACHINE ? MSIINSTALLCONTEXT_MACHINE : MSIINSTALLCONTEXT_USERUNMANAGED);
                        BURN_MSPTARGETPRODUCT* pTargetProduct = pMspPackage->Msp.rgTargetProducts + (pMspPackage->Msp.cTargetProductCodes - 1);
                        pTargetProduct->patchPackageState = BOOTSTRAPPER_PACKAGE_STATE_PRESENT;
@@ -3759,8 +4074,8 @@ namespace Bootstrapper
        void ValidatePlannedProvider(
            __in BURN_PLAN* pPlan,
            __in UINT uIndex,
-            __in LPCWSTR wzKey,
+            __in_z LPCWSTR wzKey,
-            __in LPCWSTR wzName
+            __in_z_opt LPCWSTR wzName
            )
        {
            Assert::InRange(uIndex + 1u, 1u, pPlan->cPlannedProviders);
@@ -3811,8 +4126,6 @@ namespace Bootstrapper
 }
 }
 }
-}
-}
 #if TODO_REIMPLEMENT
diff --git a/src/burn/test/BurnUnitTest/RegistrationTest.cpp b/src/burn/test/BurnUnitTest/RegistrationTest.cpp
index 3068eb6a..1c43c442 100644
--- a/src/burn/test/BurnUnitTest/RegistrationTest.cpp
+++ b/src/burn/test/BurnUnitTest/RegistrationTest.cpp
@@ -9,11 +9,7 @@
 #define TEST_BUNDLE_UPGRADE_CODE L"{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}"
-namespace Microsoft
+namespace WixToolset
-{
-namespace Tools
-{
-namespace WindowsInstallerXml
 {
 namespace Test
 {
@@ -73,7 +69,7 @@ namespace Bootstrapper
                    L"    <UX PrimaryPayloadId='ux.exe'>"
                    L"        <Payload Id='ux.exe' FilePath='ux.exe' Packaging='embedded' SourcePath='ux.exe' Hash='000000000000' />"
                    L"    </UX>"
-                    L"    <Registration Code='{D54F896D-1952-43E6-9C67-B5652240618C}' UpgradeCode='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='no'>"
+                    L"    <Registration Code='{D54F896D-1952-43E6-9C67-B5652240618C}' UpgradeCode='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Scope='peruser' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe'>"
                    L"        <Arp Register='yes' Publisher='WiX Toolset' DisplayName='RegisterBasicTest' DisplayVersion='1.0.0.0' />"
                    L"    </Registration>"
                    L"</Bundle>";
@@ -93,6 +89,12 @@ namespace Bootstrapper
                hr = RegistrationParseFromXml(&registration, &cache, pixeBundle);
                TestThrowOnFailure(hr, L"Failed to parse registration from XML.");
+                hr = RegistrationSetPaths(&registration, &cache);
+                TestThrowOnFailure(hr, "Failed to set registration paths.");
+                hr = RegistrationPlanInitialize(&registration);
+                TestThrowOnFailure(hr, "Failed to initialize registration for the plan.");
                plan.action = BOOTSTRAPPER_ACTION_INSTALL;
                plan.pCommand = &command;
                plan.pInternalCommand = &internalCommand;
@@ -173,7 +175,7 @@ namespace Bootstrapper
                    L"    <UX PrimaryPayloadId='ux.exe'>"
                    L"        <Payload Id='ux.exe' FilePath='ux.exe' Packaging='embedded' SourcePath='ux.exe' Hash='000000000000' />"
                    L"    </UX>"
-                    L"    <Registration Code='{D54F896D-1952-43E6-9C67-B5652240618C}' UpgradeCode='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='no'>"
+                    L"    <Registration Code='{D54F896D-1952-43E6-9C67-B5652240618C}' UpgradeCode='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Scope='peruser' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe'>"
                    L"        <Arp Register='yes' Publisher='WiX Toolset' DisplayName='Product1' InProgressDisplayName='Product1 Installation' DisplayVersion='1.0.0.0' />"
                    L"    </Registration>"
                    L"</Bundle>";
@@ -193,6 +195,12 @@ namespace Bootstrapper
                hr = RegistrationParseFromXml(&registration, &cache, pixeBundle);
                TestThrowOnFailure(hr, L"Failed to parse registration from XML.");
+                hr = RegistrationSetPaths(&registration, &cache);
+                TestThrowOnFailure(hr, "Failed to set registration paths.");
+                hr = RegistrationPlanInitialize(&registration);
+                TestThrowOnFailure(hr, "Failed to initialize registration for the plan.");
                plan.action = BOOTSTRAPPER_ACTION_INSTALL;
                plan.pCommand = &command;
                plan.pInternalCommand = &internalCommand;
@@ -294,7 +302,7 @@ namespace Bootstrapper
                    L"    <UX PrimaryPayloadId='ux.exe'>"
                    L"        <Payload Id='ux.exe' FilePath='ux.exe' Packaging='embedded' SourcePath='ux.exe' Hash='000000000000' />"
                    L"    </UX>"
-                    L"    <Registration Code='{D54F896D-1952-43E6-9C67-B5652240618C}' UpgradeCode='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Tag='foo' ProviderKey='bar' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='no'>"
+                    L"    <Registration Code='{D54F896D-1952-43E6-9C67-B5652240618C}' UpgradeCode='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Scope='peruser' Tag='foo' ProviderKey='bar' Version='1.0.0.0' ExecutableName='setup.exe'>"
                    L"        <Arp Register='yes' Publisher='WiX Toolset' DisplayName='Product1' DisplayVersion='1.0.0.0' />"
                    L"    </Registration>"
                    L"</Bundle>";
@@ -314,6 +322,12 @@ namespace Bootstrapper
                hr = RegistrationParseFromXml(&registration, &cache, pixeBundle);
                TestThrowOnFailure(hr, L"Failed to parse registration from XML.");
+                hr = RegistrationSetPaths(&registration, &cache);
+                TestThrowOnFailure(hr, "Failed to set registration paths.");
+                hr = RegistrationPlanInitialize(&registration);
+                TestThrowOnFailure(hr, "Failed to initialize registration for the plan.");
                plan.action = BOOTSTRAPPER_ACTION_INSTALL;
                plan.pCommand = &command;
                plan.pInternalCommand = &internalCommand;
@@ -415,7 +429,7 @@ namespace Bootstrapper
                    L"    <UX PrimaryPayloadId='ux.exe'>"
                    L"        <Payload Id='ux.exe' FilePath='ux.exe' Packaging='embedded' SourcePath='ux.exe' Hash='000000000000' />"
                    L"    </UX>"
-                    L"    <Registration Code='{D54F896D-1952-43E6-9C67-B5652240618C}' UpgradeCode='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='no'>"
+                    L"    <Registration Code='{D54F896D-1952-43E6-9C67-B5652240618C}' UpgradeCode='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Scope='peruser' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe'>"
                    L"        <Arp Register='yes' DisplayName='DisplayName1' DisplayVersion='1.2.3.4' Publisher='Publisher1' HelpLink='http://www.microsoft.com/help'"
                    L"             HelpTelephone='555-555-5555' AboutUrl='http://www.microsoft.com/about' UpdateUrl='http://www.microsoft.com/update'"
                    L"             Comments='Comments1' Contact='Contact1' DisableModify='yes' DisableRemove='yes' />"
@@ -437,6 +451,12 @@ namespace Bootstrapper
                hr = RegistrationParseFromXml(&registration, &cache, pixeBundle);
                TestThrowOnFailure(hr, L"Failed to parse registration from XML.");
+                hr = RegistrationSetPaths(&registration, &cache);
+                TestThrowOnFailure(hr, "Failed to set registration paths.");
+                hr = RegistrationPlanInitialize(&registration);
+                TestThrowOnFailure(hr, "Failed to initialize registration for the plan.");
                plan.action = BOOTSTRAPPER_ACTION_INSTALL;
                plan.pCommand = &command;
                plan.pInternalCommand = &internalCommand;
@@ -554,7 +574,7 @@ namespace Bootstrapper
                    L"        <Payload Id='ux.exe' FilePath='ux.exe' Packaging='embedded' SourcePath='ux.exe' Hash='000000000000' />"
                    L"    </UX>"
                    L"    <RelatedBundle Code='" TEST_BUNDLE_UPGRADE_CODE L"' Action='Upgrade' />"
-                    L"    <Registration Code='" TEST_BUNDLE_ID L"' Tag='foo' ProviderKey='" TEST_BUNDLE_ID L"' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='no'>"
+                    L"    <Registration Code='" TEST_BUNDLE_ID L"' Scope='peruser' Tag='foo' ProviderKey='" TEST_BUNDLE_ID L"' Version='1.0.0.0' ExecutableName='setup.exe'>"
                    L"        <Arp Register='yes' Publisher='WiX Toolset' DisplayName='RegisterBasicTest' DisplayVersion='1.0.0.0' />"
                    L"    </Registration>"
                    L"    <Variable Id='MyBurnVariable1' Type='numeric' Value='0' Hidden='no' Persisted='yes' />"
@@ -582,6 +602,12 @@ namespace Bootstrapper
                hr = RegistrationParseFromXml(&registration, &cache, pixeBundle);
                TestThrowOnFailure(hr, L"Failed to parse registration from XML.");
+                hr = RegistrationSetPaths(&registration, &cache);
+                TestThrowOnFailure(hr, "Failed to set registration paths.");
+                hr = RegistrationPlanInitialize(&registration);
+                TestThrowOnFailure(hr, "Failed to initialize registration for the plan.");
                plan.action = BOOTSTRAPPER_ACTION_INSTALL;
                plan.pCommand = &command;
                plan.pInternalCommand = &internalCommand;
@@ -694,7 +720,7 @@ namespace Bootstrapper
                    L"    <UX PrimaryPayloadId='ux.exe'>"
                    L"        <Payload Id='ux.exe' FilePath='ux.exe' Packaging='embedded' SourcePath='ux.exe' Hash='000000000000' />"
                    L"    </UX>"
-                    L"    <Registration Code='{D54F896D-1952-43E6-9C67-B5652240618C}' UpgradeCode='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='no'>"
+                    L"    <Registration Code='{D54F896D-1952-43E6-9C67-B5652240618C}' UpgradeCode='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Scope='peruser' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe'>"
                    L"        <Arp Register='yes' Publisher='WiX Toolset' DisplayName='RegisterBasicTest' DisplayVersion='1.0.0.0' />"
                    L"    </Registration>"
                    L"    <Variable Id='MyBurnVariable1' Type='numeric' Value='0' Hidden='no' Persisted='yes' />"
@@ -720,6 +746,12 @@ namespace Bootstrapper
                hr = RegistrationParseFromXml(&registration, &cache, pixeBundle);
                TestThrowOnFailure(hr, L"Failed to parse registration from XML.");
+                hr = RegistrationSetPaths(&registration, &cache);
+                TestThrowOnFailure(hr, "Failed to set registration paths.");
+                hr = RegistrationPlanInitialize(&registration);
+                TestThrowOnFailure(hr, "Failed to initialize registration for the plan.");
                plan.action = BOOTSTRAPPER_ACTION_INSTALL;
                plan.pCommand = &command;
                plan.pInternalCommand = &internalCommand;
@@ -882,5 +914,3 @@ namespace Bootstrapper
 }
 }
 }
-}
-}
diff --git a/src/burn/test/BurnUnitTest/RelatedBundleTest.cpp b/src/burn/test/BurnUnitTest/RelatedBundleTest.cpp
index 9feb85d6..dcccc589 100644
--- a/src/burn/test/BurnUnitTest/RelatedBundleTest.cpp
+++ b/src/burn/test/BurnUnitTest/RelatedBundleTest.cpp
@@ -3,11 +3,7 @@
 #include "precomp.h"
-namespace Microsoft
+namespace WixToolset
-{
-namespace Tools
-{
-namespace WindowsInstallerXml
 {
 namespace Test
 {
@@ -49,7 +45,7 @@ namespace Bootstrapper
                    L"        <Payload Id='ux.exe' FilePath='ux.exe' Packaging='embedded' SourcePath='ux.exe' />"
                    L"    </UX>"
                    L"    <RelatedBundle Code='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Action='Upgrade' />"
-                    L"    <Registration Code='{D54F896D-1952-43E6-9C67-B5652240618C}' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe' PerMachine='yes'>"
+                    L"    <Registration Code='{D54F896D-1952-43E6-9C67-B5652240618C}' Tag='foo' ProviderKey='foo' Version='1.0.0.0' ExecutableName='setup.exe'>"
                    L"        <Arp Register='yes' Publisher='WiX Toolset' DisplayName='RegisterBasicTest' DisplayVersion='1.0.0.0' />"
                    L"    </Registration>"
                    L"</Bundle>";
@@ -63,7 +59,7 @@ namespace Bootstrapper
                hr = RegistrationParseFromXml(&registration, &cache, pixeBundle);
                TestThrowOnFailure(hr, L"Failed to parse registration from XML.");
-                RelatedBundlesInitializeForScope(registration.fPerMachine, &registration, &relatedBundles);
+                RelatedBundlesInitializeForScope(/*registration.fPlannedPerMachineScope*/TRUE, &registration, &relatedBundles);
                Assert::Equal(1lu, relatedBundles.cRelatedBundles);
@@ -101,7 +97,7 @@ namespace Bootstrapper
                    L"        <Payload Id='ux.exe' FilePath='ux.exe' Packaging='embedded' SourcePath='ux.exe' />"
                    L"    </UX>"
                    L"    <RelatedBundle Code='{89FDAE1F-8CC1-48B9-B930-3945E0D3E7F0}' Action='Upgrade' />"
-                    L"    <Registration Code='{3DB49D3D-1FB8-4147-A465-BBE8BFD0DAD0}' Tag='foo' ProviderKey='foo' Version='4.0.0.0' ExecutableName='setup.exe' PerMachine='no'>"
+                    L"    <Registration Code='{3DB49D3D-1FB8-4147-A465-BBE8BFD0DAD0}' Tag='foo' ProviderKey='foo' Version='4.0.0.0' ExecutableName='setup.exe'>"
                    L"        <Arp Register='yes' Publisher='WiX Toolset' DisplayName='RegisterBasicTest' DisplayVersion='4.0.0.0' />"
                    L"    </Registration>"
                    L"</Bundle>";
@@ -195,5 +191,3 @@ namespace Bootstrapper
 }
 }
 }
-}
-}
diff --git a/src/burn/test/BurnUnitTest/SearchTest.cpp b/src/burn/test/BurnUnitTest/SearchTest.cpp
index e3c714cb..ac6119de 100644
--- a/src/burn/test/BurnUnitTest/SearchTest.cpp
+++ b/src/burn/test/BurnUnitTest/SearchTest.cpp
@@ -33,11 +33,7 @@ using namespace System;
 using namespace Xunit;
 using namespace Microsoft::Win32;
-namespace Microsoft
+namespace WixToolset
-{
-namespace Tools
-{
-namespace WindowsInstallerXml
 {
 namespace Test
 {
@@ -595,8 +591,6 @@ namespace Bootstrapper
 }
 }
 }
-}
-}
 static INSTALLSTATE WINAPI MsiComponentSearchTest_MsiGetComponentPathW(
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/AllPmouBundle_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/AllPmouBundle_manifest.xml
new file mode 100644
index 00000000..8be9f5b9
--- /dev/null
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/AllPmouBundle_manifest.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<BurnManifest EngineVersion="7.0.0.54" ProtocolVersion="1" Win64="no" xmlns="http://wixtoolset.org/schemas/v4/2008/Burn">
+  <Log PathVariable="WixBundleLog" Prefix="AllPmouBundle" Extension="log" />
+  <RelatedBundle Code="{F5172FB5-DC8E-5671-A533-A6C4ED8B226A}" Action="Upgrade" />
+  <UX PrimaryPayloadId="WixStandardBootstrapperApplication_X86">
+    <Payload Id="payberKyKpNVb0s10isnONgjD92jYc" FilePath="thm.xml" SourcePath="u0" />
+    <Payload Id="payXE.1bvyKgymWAWeJwB8BL4ifPGo" FilePath="thm.wxl" SourcePath="u1" />
+    <Payload Id="pay8cUoxSucOqsVErqhu1LEW8wSG1s" FilePath="logo.png" SourcePath="u2" />
+    <Payload Id="WixStandardBootstrapperApplication_X86" FilePath="wixstdba.exe" SourcePath="u3" />
+    <Payload Id="uxTxMXPVMXwQrPTMIGa5WGt93w0Ns" FilePath="BootstrapperApplicationData.xml" SourcePath="u4" />
+    <Payload Id="uxmKgAFS4cS31ZH_Myfqo5J4kHixQ" FilePath="BootstrapperExtensionData.xml" SourcePath="u5" />
+  </UX>
+  <Container Id="WixAttachedContainer" FileSize="65634" Hash="142E90105EC2705DA169B29ED252A7829AA9EF3CC9B55EB5CD47DFC93035B57E7C1C1E64D1D92C9B54BA4653A5D0B18CFD675E4B7A5AEA7B833D643D84DF8B96" FilePath="AllPmouBundle.exe" AttachedIndex="1" Attached="yes" Primary="yes" />
+  <Payload Id="PmouPkg1.msi" FilePath="PmouPkg1.msi" FileSize="32768" Hash="BCBB4F1C48953D23BE56CD7D5005BB38CB02C7BAC4AF30F87B7ADF7715EA721D28A3FCFC025D26FD5DC069BAB69F462577C3212C1BFE3707FCCE60FF3F3ED12C" Packaging="embedded" SourcePath="a0" Container="WixAttachedContainer" />
+  <Payload Id="PmouPkg2.msi" FilePath="PmouPkg2.msi" FileSize="32768" Hash="C3BABBCCC0FDA4ACE44D28C60FAB2CA76C00655A405CF6F7A3593F9130FCF47AD18C4DAE1A32D5C0177F58DBAE00CBF7EDCA027BEE19B96E0145A3FA00811B51" Packaging="embedded" SourcePath="a1" Container="WixAttachedContainer" />
+  <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
+  <Registration BundleId="AllPmouBundle" Code="{CA3BE971-4A75-46D1-BA74-005F9C7B8F6F}" ExecutableName="AllPmouBundle.exe" Scope="perMachineOrUser" Tag="" Version="1.0.0.0" ProviderKey="{CA3BE971-4A75-46D1-BA74-005F9C7B8F6F}">
+    <Arp DisplayName="AllPmouBundle" DisplayVersion="1.0.0.0" Publisher="Acme" />
+  </Registration>
+  <Chain>
+    <MsiPackage Id="PmouPkg1.msi" Cache="keep" CacheId="{E46705B9-D2F9-4BE8-8270-F1A11196A9D4}v1.0.0.0" InstallSize="279" Size="32768" Scope="perMachineOrUser" Permanent="no" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PmouPkg1.msi" RollbackLogPathVariable="WixBundleRollbackLog_PmouPkg1.msi" ProductCode="{E46705B9-D2F9-4BE8-8270-F1A11196A9D4}" Language="1033" Version="1.0.0.0" UpgradeCode="{B0DA1185-5CF5-55A3-8351-01F1AD3E50CE}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{E46705B9-D2F9-4BE8-8270-F1A11196A9D4}_v1.0.0.0" Version="1.0.0.0" DisplayName="PmouPkg1" />
+      <RelatedPackage Id="{B0DA1185-5CF5-55A3-8351-01F1AD3E50CE}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{B0DA1185-5CF5-55A3-8351-01F1AD3E50CE}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PmouPkg1.msi" />
+    </MsiPackage>
+    <MsiPackage Id="PmouPkg2.msi" Cache="keep" CacheId="{1B1D793E-4026-48CA-B088-F919E70440AC}v1.0.0.0" InstallSize="279" Size="32768" Scope="perMachineOrUser" Permanent="no" Vital="yes" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PmouPkg2.msi" RollbackLogPathVariable="WixBundleRollbackLog_PmouPkg2.msi" ProductCode="{1B1D793E-4026-48CA-B088-F919E70440AC}" Language="1033" Version="1.0.0.0" UpgradeCode="{98F763B3-EA17-5AE5-AD47-21004FB34B24}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{1B1D793E-4026-48CA-B088-F919E70440AC}_v1.0.0.0" Version="1.0.0.0" DisplayName="PmouPkg2" />
+      <RelatedPackage Id="{98F763B3-EA17-5AE5-AD47-21004FB34B24}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{98F763B3-EA17-5AE5-AD47-21004FB34B24}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PmouPkg2.msi" />
+    </MsiPackage>
+  </Chain>
+</BurnManifest>
+\ No newline at end of file
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/AllPuomBundle_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/AllPuomBundle_manifest.xml
new file mode 100644
index 00000000..a3cbd183
--- /dev/null
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/AllPuomBundle_manifest.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<BurnManifest EngineVersion="7.0.0.54" ProtocolVersion="1" Win64="no" xmlns="http://wixtoolset.org/schemas/v4/2008/Burn">
+  <Log PathVariable="WixBundleLog" Prefix="AllPuomBundle" Extension="log" />
+  <RelatedBundle Code="{689DDFCE-6492-596F-92DC-341CCDF59ABB}" Action="Upgrade" />
+  <UX PrimaryPayloadId="WixStandardBootstrapperApplication_X86">
+    <Payload Id="payberKyKpNVb0s10isnONgjD92jYc" FilePath="thm.xml" SourcePath="u0" />
+    <Payload Id="payXE.1bvyKgymWAWeJwB8BL4ifPGo" FilePath="thm.wxl" SourcePath="u1" />
+    <Payload Id="pay8cUoxSucOqsVErqhu1LEW8wSG1s" FilePath="logo.png" SourcePath="u2" />
+    <Payload Id="WixStandardBootstrapperApplication_X86" FilePath="wixstdba.exe" SourcePath="u3" />
+    <Payload Id="uxTxMXPVMXwQrPTMIGa5WGt93w0Ns" FilePath="BootstrapperApplicationData.xml" SourcePath="u4" />
+    <Payload Id="uxmKgAFS4cS31ZH_Myfqo5J4kHixQ" FilePath="BootstrapperExtensionData.xml" SourcePath="u5" />
+  </UX>
+  <Container Id="WixAttachedContainer" FileSize="65634" Hash="541AB7BED551A38137C7C965D46FF4817DE6E22C89AF98EC9461939024D6B39E7ACF9C3F526F4B567E73364289E7CE24FD84973F7B2151514F09E165FABE6234" FilePath="AllPuomBundle.exe" AttachedIndex="1" Attached="yes" Primary="yes" />
+  <Payload Id="PuomPkg1.msi" FilePath="PuomPkg1.msi" FileSize="32768" Hash="EF19E061C2647AD42E39A1721299D5D970F1E42CE6636ACA53009DC0D0D1F8B6F2FD516B7D3EEDAAF1EEDA364D54DA6C18FB929C385EC1BDDA08AEA50370B357" Packaging="embedded" SourcePath="a0" Container="WixAttachedContainer" />
+  <Payload Id="PuomPkg2.msi" FilePath="PuomPkg2.msi" FileSize="32768" Hash="F927CE9CD3272AF6571E39C72A68E6BD6808D944B6893B09253887B1942E1C043EC5E1E1E758D3C261FF8B566121EE809C4CBCB931D00EBF14CC6CFE24001292" Packaging="embedded" SourcePath="a1" Container="WixAttachedContainer" />
+  <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
+  <Registration BundleId="AllPuomBundle" Code="{37A6F602-178E-4A32-B766-EDC2CB81274B}" ExecutableName="AllPuomBundle.exe" Scope="perUserOrMachine" Tag="" Version="1.0.0.0" ProviderKey="{37A6F602-178E-4A32-B766-EDC2CB81274B}">
+    <Arp DisplayName="AllPuomBundle" DisplayVersion="1.0.0.0" Publisher="Acme" />
+  </Registration>
+  <Chain>
+    <MsiPackage Id="PuomPkg1.msi" Cache="keep" CacheId="{167C572B-D847-4BCF-9693-C8B5EB6350CD}v1.0.0.0" InstallSize="279" Size="32768" Scope="perUserOrMachine" Permanent="no" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PuomPkg1.msi" RollbackLogPathVariable="WixBundleRollbackLog_PuomPkg1.msi" ProductCode="{167C572B-D847-4BCF-9693-C8B5EB6350CD}" Language="1033" Version="1.0.0.0" UpgradeCode="{AC3A2D0C-CB37-5F8B-8CE1-9233B963E5BB}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{167C572B-D847-4BCF-9693-C8B5EB6350CD}_v1.0.0.0" Version="1.0.0.0" DisplayName="PuomPkg1" />
+      <RelatedPackage Id="{AC3A2D0C-CB37-5F8B-8CE1-9233B963E5BB}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{AC3A2D0C-CB37-5F8B-8CE1-9233B963E5BB}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PuomPkg1.msi" />
+    </MsiPackage>
+    <MsiPackage Id="PuomPkg2.msi" Cache="keep" CacheId="{07617017-CE68-4F88-981A-4629835C9BD2}v1.0.0.0" InstallSize="279" Size="32768" Scope="perUserOrMachine" Permanent="no" Vital="yes" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PuomPkg2.msi" RollbackLogPathVariable="WixBundleRollbackLog_PuomPkg2.msi" ProductCode="{07617017-CE68-4F88-981A-4629835C9BD2}" Language="1033" Version="1.0.0.0" UpgradeCode="{C977A922-168B-59F0-84FD-CAB89DB314E0}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{07617017-CE68-4F88-981A-4629835C9BD2}_v1.0.0.0" Version="1.0.0.0" DisplayName="PuomPkg2" />
+      <RelatedPackage Id="{C977A922-168B-59F0-84FD-CAB89DB314E0}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{C977A922-168B-59F0-84FD-CAB89DB314E0}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PuomPkg2.msi" />
+    </MsiPackage>
+  </Chain>
+</BurnManifest>
+\ No newline at end of file
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/BasicFunctionality_BundleA_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/BasicFunctionality_BundleA_manifest.xml
index f3848eda..b19b911f 100644
--- a/src/burn/test/BurnUnitTest/TestData/PlanTest/BasicFunctionality_BundleA_manifest.xml
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/BasicFunctionality_BundleA_manifest.xml
@@ -15,11 +15,11 @@
    <Payload Id="PackageA" FilePath="PackageA.msi" FileSize="32768" Hash="89C61F8A105A81B08036401152A1FDE67CDC0158" Packaging="embedded" SourcePath="a0" Container="WixAttachedContainer" />
    <Payload Id="cab9Ins_fTP3wNwq5Gxo41ch5VUPaQ" FilePath="1a.cab" FileSize="975" Hash="11DE5863C4B2A8762D0EE23FE25B7774CA07676B" Packaging="embedded" SourcePath="a1" Container="WixAttachedContainer" />
    <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
-    <Registration Code="{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}" ExecutableName="BundleA.exe" PerMachine="yes" Tag="" Version="1.0.0.0" ProviderKey="{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}">
+    <Registration Code="{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}" ExecutableName="BundleA.exe" Scope="permachine" Tag="" Version="1.0.0.0" ProviderKey="{A6F0CBF7-1578-450C-B9D7-9CF2EEC40002}">
        <Arp Register="yes" DisplayName="~BasicFunctionalityTests - BundleA" DisplayVersion="1.0.0.0" />
    </Registration>
    <Chain>
-        <MsiPackage Id="PackageA" Cache="keep" CacheId="{64633047-D172-4BBB-B202-64337D15C952}v1.0.0.0" InstallSize="1951" Size="33743" PerMachine="yes" Permanent="no" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PackageA" RollbackLogPathVariable="WixBundleRollbackLog_PackageA" ProductCode="{64633047-D172-4BBB-B202-64337D15C952}" Language="1033" Version="1.0.0.0" UpgradeCode="{7FD50F1B-D134-4365-923C-DFA160F74738}">
+        <MsiPackage Id="PackageA" Cache="keep" CacheId="{64633047-D172-4BBB-B202-64337D15C952}v1.0.0.0" InstallSize="1951" Size="33743" Scope="permachine" Permanent="no" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PackageA" RollbackLogPathVariable="WixBundleRollbackLog_PackageA" ProductCode="{64633047-D172-4BBB-B202-64337D15C952}" Language="1033" Version="1.0.0.0" UpgradeCode="{7FD50F1B-D134-4365-923C-DFA160F74738}">
            <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
            <MsiProperty Id="MSIFASTINSTALL" Value="7" />
            <Provides Key="{64633047-D172-4BBB-B202-64337D15C952}" Version="1.0.0.0" DisplayName="~BasicFunctionalityTests - PackageA" />
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/BundlePackage_Multiple_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/BundlePackage_Multiple_manifest.xml
index 988bbfe0..651b491d 100644
--- a/src/burn/test/BurnUnitTest/TestData/PlanTest/BundlePackage_Multiple_manifest.xml
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/BundlePackage_Multiple_manifest.xml
@@ -46,19 +46,19 @@
    <Payload Id="PackageA" FilePath="BundleA.exe" FileSize="5241635" Hash="20E1AFF76DE4693CB2876DC6BCCA0152DB16BE49AEDE2CD581C03FC39AB89DEA12BC25CB435F06E4D7D2B4443CE8A8935D5E92E2E49A4981B60A273980E4B29B" Packaging="embedded" SourcePath="a0" Container="WixAttachedContainer" />
    <Payload Id="PackageB" FilePath="BundleB_x64.exe" FileSize="10450821" Hash="43A58873D61D6E0FA83F6C5266F2F05FEA9BC85D11C195493B7FD9F0B4AA799C1EFCB78D76DCED32124D2EC62A4E7114B62CDE6F0B87E42A7E28CDBB0DA0FF8E" Packaging="embedded" SourcePath="a1" Container="WixAttachedContainer" />
    <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
-    <Registration Code="{35192ED0-C70A-49B2-9D12-3B1FA39B5E6F}" ExecutableName="MultipleBundlePackagesBundle.exe" PerMachine="yes" Tag="" Version="1.0.0.0" ProviderKey="{35192ED0-C70A-49B2-9D12-3B1FA39B5E6F}">
+    <Registration Code="{35192ED0-C70A-49B2-9D12-3B1FA39B5E6F}" ExecutableName="MultipleBundlePackagesBundle.exe" Scope="permachine" Tag="" Version="1.0.0.0" ProviderKey="{35192ED0-C70A-49B2-9D12-3B1FA39B5E6F}">
        <Arp Register="yes" DisplayName="~BundlePackageTests - MultipleBundlePackagesBundle" DisplayVersion="1.0.0.0" />
    </Registration>
    <Chain>
-        <ExePackage Id="NetFx48Web" Cache="remove" CacheId="642721C60D52051C7F3434D8710FE3406A7CFE10B2B39E90EA847719ED1697D7C614F2DF44AD50412B1DF8C98DD78FDC57CA1D047D28C81AC158092E5FB18040" InstallSize="1439328" Size="1439328" PerMachine="yes" Permanent="yes" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" LogPathVariable="NetFx48WebLog" RollbackLogPathVariable="WixBundleRollbackLog_NetFx48Web" DetectCondition="NETFRAMEWORK45 &gt;= 528040" InstallArguments="/q /norestart /log &quot;[NetFx48WebLog].html&quot;" UninstallArguments="" Uninstallable="no" RepairArguments="" Repairable="no" Protocol="netfx4" DetectionType="condition">
+        <ExePackage Id="NetFx48Web" Cache="remove" CacheId="642721C60D52051C7F3434D8710FE3406A7CFE10B2B39E90EA847719ED1697D7C614F2DF44AD50412B1DF8C98DD78FDC57CA1D047D28C81AC158092E5FB18040" InstallSize="1439328" Size="1439328" Scope="permachine" Permanent="yes" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" LogPathVariable="NetFx48WebLog" RollbackLogPathVariable="WixBundleRollbackLog_NetFx48Web" DetectCondition="NETFRAMEWORK45 &gt;= 528040" InstallArguments="/q /norestart /log &quot;[NetFx48WebLog].html&quot;" UninstallArguments="" Uninstallable="no" RepairArguments="" Repairable="no" Protocol="netfx4" DetectionType="condition">
            <PayloadRef Id="NetFx48Web" />
        </ExePackage>
-        <BundlePackage Id="PackageA" Cache="keep" CacheId="{B39CEE4D-CCD7-4797-BE3A-6613BD1DC4BE}v1.0.0.0" InstallSize="2169" Size="5241635" Version="1.0.0.0" PerMachine="yes" Permanent="no" Vital="yes" RepairCondition="0" LogPathVariable="WixBundleLog_PackageA" RollbackLogPathVariable="WixBundleRollbackLog_PackageA" BundleCode="{B39CEE4D-CCD7-4797-BE3A-6613BD1DC4BE}" InstallArguments="" UninstallArguments="" RepairArguments="" SupportsBurnProtocol="yes" Win64="no">
+        <BundlePackage Id="PackageA" Cache="keep" CacheId="{B39CEE4D-CCD7-4797-BE3A-6613BD1DC4BE}v1.0.0.0" InstallSize="2169" Size="5241635" Version="1.0.0.0" Scope="permachine" Permanent="no" Vital="yes" RepairCondition="0" LogPathVariable="WixBundleLog_PackageA" RollbackLogPathVariable="WixBundleRollbackLog_PackageA" BundleCode="{B39CEE4D-CCD7-4797-BE3A-6613BD1DC4BE}" InstallArguments="" UninstallArguments="" RepairArguments="" SupportsBurnProtocol="yes" Win64="no">
            <Provides Key="{B39CEE4D-CCD7-4797-BE3A-6613BD1DC4BE}" Version="1.0.0.0" DisplayName="~BasicFunctionalityTests - BundleA" Imported="yes" />
            <RelatedBundle Code="{8C7E2C47-1EE7-4BBE-99A2-EAB7F3693F48}" Action="Upgrade" />
            <PayloadRef Id="PackageA" />
        </BundlePackage>
-        <BundlePackage Id="PackageB" Cache="keep" CacheId="{7506235A-7C59-4750-82C7-EB460A87ED3A}v1.0.0.0" InstallSize="1441497" Size="10450821" Version="1.0.0.0" PerMachine="yes" Permanent="no" Vital="yes" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PackageB" RollbackLogPathVariable="WixBundleRollbackLog_PackageB" BundleCode="{7506235A-7C59-4750-82C7-EB460A87ED3A}" InstallArguments="" UninstallArguments="" RepairArguments="" SupportsBurnProtocol="yes" Win64="yes">
+        <BundlePackage Id="PackageB" Cache="keep" CacheId="{7506235A-7C59-4750-82C7-EB460A87ED3A}v1.0.0.0" InstallSize="1441497" Size="10450821" Version="1.0.0.0" Scope="permachine" Permanent="no" Vital="yes" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PackageB" RollbackLogPathVariable="WixBundleRollbackLog_PackageB" BundleCode="{7506235A-7C59-4750-82C7-EB460A87ED3A}" InstallArguments="" UninstallArguments="" RepairArguments="" SupportsBurnProtocol="yes" Win64="yes">
            <Provides Key="{7506235A-7C59-4750-82C7-EB460A87ED3A}" Version="1.0.0.0" DisplayName="~BasicFunctionalityTests - BundleB_x64" Imported="yes" />
            <RelatedBundle Code="{79F45B7A-D990-46E4-819B-078D87C3321A}" Action="Upgrade" />
            <PayloadRef Id="PackageB" />
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/ExePackage_PerUserArpEntry_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/ExePackage_PerUserArpEntry_manifest.xml
index a5dfc188..51d86d4a 100644
--- a/src/burn/test/BurnUnitTest/TestData/PlanTest/ExePackage_PerUserArpEntry_manifest.xml
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/ExePackage_PerUserArpEntry_manifest.xml
@@ -46,14 +46,14 @@
    <Payload Id="TestExe.exe" FilePath="TestExe.exe" FileSize="23552" Hash="8A3CAD62E7C15EE88B3B78A5F61EFA6D4C9AED67049075688A641EE65E1526589797B0C52398DEB520A7911E41F2A6F73C178D19C9FFBC03ECF964A822E6438E" Packaging="embedded" SourcePath="a0" Container="WixAttachedContainer" />
    <Payload Id="paygJp32KbpyjbVEQFNbl5_izmhdZw" FilePath="TestExe.exe.config" FileSize="387" Hash="8C819A9E835F3921FA80C5C783AB0C42DDAADF0C0F2BEF8630EA122ABCB9DC8EAF0B14E061C46B37C92F55114BB09A8D5B1B613947A76A648953F2C63C0ACA63" Packaging="embedded" SourcePath="a1" Container="WixAttachedContainer" />
    <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
-    <Registration Code="{9C459DAD-0E64-40C8-8C9F-4F68E46AB223}" ExecutableName="PerUserArpEntryExePackage.exe" PerMachine="no" Tag="" Version="1.0.0.0" ProviderKey="{9C459DAD-0E64-40C8-8C9F-4F68E46AB223}">
+    <Registration Code="{9C459DAD-0E64-40C8-8C9F-4F68E46AB223}" ExecutableName="PerUserArpEntryExePackage.exe" Scope="peruser" Tag="" Version="1.0.0.0" ProviderKey="{9C459DAD-0E64-40C8-8C9F-4F68E46AB223}">
        <Arp DisplayName="~ExePackageTests - PerUserArpEntryExePackage" DisplayVersion="1.0.0.0" />
    </Registration>
    <Chain>
-        <ExePackage Id="NetFx48Web" Cache="remove" CacheId="642721C60D52051C7F3434D8710FE3406A7CFE10B2B39E90EA847719ED1697D7C614F2DF44AD50412B1DF8C98DD78FDC57CA1D047D28C81AC158092E5FB18040" InstallSize="1439328" Size="1439328" PerMachine="yes" Permanent="yes" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" LogPathVariable="NetFx48WebLog" RollbackLogPathVariable="WixBundleRollbackLog_NetFx48Web" InstallArguments="/q /norestart /log &quot;[NetFx48WebLog].html&quot;" RepairArguments="" Repairable="no" DetectionType="condition" DetectCondition="NETFRAMEWORK45 &gt;= 528040" Protocol="netfx4">
+        <ExePackage Id="NetFx48Web" Cache="remove" CacheId="642721C60D52051C7F3434D8710FE3406A7CFE10B2B39E90EA847719ED1697D7C614F2DF44AD50412B1DF8C98DD78FDC57CA1D047D28C81AC158092E5FB18040" InstallSize="1439328" Size="1439328" Scope="permachine" Permanent="yes" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" LogPathVariable="NetFx48WebLog" RollbackLogPathVariable="WixBundleRollbackLog_NetFx48Web" InstallArguments="/q /norestart /log &quot;[NetFx48WebLog].html&quot;" RepairArguments="" Repairable="no" DetectionType="condition" DetectCondition="NETFRAMEWORK45 &gt;= 528040" Protocol="netfx4">
            <PayloadRef Id="NetFx48Web" />
        </ExePackage>
-        <ExePackage Id="TestExe" Cache="keep" CacheId="8A3CAD62E7C15EE88B3B78A5F61EFA6D4C9AED67049075688A641EE65E1526589797B0C52398DEB520A7911E41F2A6F73C178D19C9FFBC03ECF964A822E6438E" InstallSize="23939" Size="23939" PerMachine="no" Permanent="no" Vital="yes" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_TestExe" RollbackLogPathVariable="WixBundleRollbackLog_TestExe" InstallArguments="/regw &quot;HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9B5300C7-9B34-4670-9614-185B02AB87EF},DisplayVersion,String,1.0.0.0&quot; /regw &quot;HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9B5300C7-9B34-4670-9614-185B02AB87EF},QuietUninstallString,String,\&quot;[WixBundleExecutePackageCacheFolder]testexe.exe\&quot; /regd \&quot;HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9B5300C7-9B34-4670-9614-185B02AB87EF}\&quot;&quot;" RepairArguments="" Repairable="no" DetectionType="arp" ArpId="{9B5300C7-9B34-4670-9614-185B02AB87EF}" ArpDisplayVersion="1.0.0.0">
+        <ExePackage Id="TestExe" Cache="keep" CacheId="8A3CAD62E7C15EE88B3B78A5F61EFA6D4C9AED67049075688A641EE65E1526589797B0C52398DEB520A7911E41F2A6F73C178D19C9FFBC03ECF964A822E6438E" InstallSize="23939" Size="23939" Scope="peruser" Permanent="no" Vital="yes" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_TestExe" RollbackLogPathVariable="WixBundleRollbackLog_TestExe" InstallArguments="/regw &quot;HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9B5300C7-9B34-4670-9614-185B02AB87EF},DisplayVersion,String,1.0.0.0&quot; /regw &quot;HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9B5300C7-9B34-4670-9614-185B02AB87EF},QuietUninstallString,String,\&quot;[WixBundleExecutePackageCacheFolder]testexe.exe\&quot; /regd \&quot;HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9B5300C7-9B34-4670-9614-185B02AB87EF}\&quot;&quot;" RepairArguments="" Repairable="no" DetectionType="arp" ArpId="{9B5300C7-9B34-4670-9614-185B02AB87EF}" ArpDisplayVersion="1.0.0.0">
            <PayloadRef Id="TestExe.exe" />
            <PayloadRef Id="paygJp32KbpyjbVEQFNbl5_izmhdZw" />
        </ExePackage>
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/Failure_BundleD_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/Failure_BundleD_manifest.xml
index f3cfb179..84370c44 100644
--- a/src/burn/test/BurnUnitTest/TestData/PlanTest/Failure_BundleD_manifest.xml
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/Failure_BundleD_manifest.xml
@@ -47,14 +47,14 @@
    <Payload Id="TestExe.exe" FilePath="TestExe.exe" FileSize="23552" Hash="4344604ECBA4DFE5DE7C680CB1AA5BD6FAA29BF95CE07740F02878C2BB1EF6DE6432944A0DB79B034D1C6F68CF80842EEE442EA8A551816E52D3F68901C50AB9" Packaging="embedded" SourcePath="a0" Container="WixAttachedContainer" />
    <Payload Id="paygJp32KbpyjbVEQFNbl5_izmhdZw" FilePath="TestExe.exe.config" FileSize="387" Hash="8C819A9E835F3921FA80C5C783AB0C42DDAADF0C0F2BEF8630EA122ABCB9DC8EAF0B14E061C46B37C92F55114BB09A8D5B1B613947A76A648953F2C63C0ACA63" Packaging="embedded" SourcePath="a1" Container="WixAttachedContainer" />
    <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
-    <Registration Code="{9C184683-04FB-49AD-9D79-65101BDC3EE3}" ExecutableName="BundleD.exe" PerMachine="yes" Tag="" Version="1.0.0.0" ProviderKey="{9C184683-04FB-49AD-9D79-65101BDC3EE3}">
+    <Registration Code="{9C184683-04FB-49AD-9D79-65101BDC3EE3}" ExecutableName="BundleD.exe" Scope="permachine" Tag="" Version="1.0.0.0" ProviderKey="{9C184683-04FB-49AD-9D79-65101BDC3EE3}">
        <Arp Register="yes" DisplayName="~FailureTests - BundleD" DisplayVersion="1.0.0.0" />
    </Registration>
    <Chain>
-        <ExePackage Id="NetFx48Web" Cache="remove" CacheId="642721C60D52051C7F3434D8710FE3406A7CFE10B2B39E90EA847719ED1697D7C614F2DF44AD50412B1DF8C98DD78FDC57CA1D047D28C81AC158092E5FB18040" InstallSize="1439328" Size="1439328" PerMachine="yes" Permanent="yes" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" LogPathVariable="NetFx48WebLog" RollbackLogPathVariable="WixBundleRollbackLog_NetFx48Web" DetectCondition="NETFRAMEWORK45 &gt;= 528040" InstallArguments="/q /norestart /log &quot;[NetFx48WebLog].html&quot;" UninstallArguments="" Uninstallable="no" RepairArguments="" Repairable="no" Protocol="netfx4" DetectionType="condition">
+        <ExePackage Id="NetFx48Web" Cache="remove" CacheId="642721C60D52051C7F3434D8710FE3406A7CFE10B2B39E90EA847719ED1697D7C614F2DF44AD50412B1DF8C98DD78FDC57CA1D047D28C81AC158092E5FB18040" InstallSize="1439328" Size="1439328" Scope="permachine" Permanent="yes" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" LogPathVariable="NetFx48WebLog" RollbackLogPathVariable="WixBundleRollbackLog_NetFx48Web" DetectCondition="NETFRAMEWORK45 &gt;= 528040" InstallArguments="/q /norestart /log &quot;[NetFx48WebLog].html&quot;" UninstallArguments="" Uninstallable="no" RepairArguments="" Repairable="no" Protocol="netfx4" DetectionType="condition">
            <PayloadRef Id="NetFx48Web" />
        </ExePackage>
-        <ExePackage Id="ExeA" Cache="remove" CacheId="4344604ECBA4DFE5DE7C680CB1AA5BD6FAA29BF95CE07740F02878C2BB1EF6DE6432944A0DB79B034D1C6F68CF80842EEE442EA8A551816E52D3F68901C50AB9" InstallSize="23939" Size="23939" PerMachine="yes" Permanent="no" Vital="yes" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_ExeA" RollbackLogPathVariable="WixBundleRollbackLog_ExeA" DetectCondition="ExeA_Version AND ExeA_Version &gt;= v1.0.0.0" InstallArguments="/s 5000 /regw &quot;HKLM\Software\WiX\Tests\FailureTests\ExeA,Version,String,1.0.0.0&quot;" UninstallArguments="/regd &quot;HKLM\Software\WiX\Tests\FailureTests\ExeA,Version&quot;" Uninstallable="yes" RepairArguments="/regw &quot;HKLM\Software\WiX\Tests\FailureTests\ExeA,Version,String,1.0.0.0&quot;" Repairable="yes" DetectionType="condition">
+        <ExePackage Id="ExeA" Cache="remove" CacheId="4344604ECBA4DFE5DE7C680CB1AA5BD6FAA29BF95CE07740F02878C2BB1EF6DE6432944A0DB79B034D1C6F68CF80842EEE442EA8A551816E52D3F68901C50AB9" InstallSize="23939" Size="23939" Scope="permachine" Permanent="no" Vital="yes" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_ExeA" RollbackLogPathVariable="WixBundleRollbackLog_ExeA" DetectCondition="ExeA_Version AND ExeA_Version &gt;= v1.0.0.0" InstallArguments="/s 5000 /regw &quot;HKLM\Software\WiX\Tests\FailureTests\ExeA,Version,String,1.0.0.0&quot;" UninstallArguments="/regd &quot;HKLM\Software\WiX\Tests\FailureTests\ExeA,Version&quot;" Uninstallable="yes" RepairArguments="/regw &quot;HKLM\Software\WiX\Tests\FailureTests\ExeA,Version,String,1.0.0.0&quot;" Repairable="yes" DetectionType="condition">
            <PayloadRef Id="TestExe.exe" />
            <PayloadRef Id="paygJp32KbpyjbVEQFNbl5_izmhdZw" />
        </ExePackage>
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/MsiTransaction_BundleAv1_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/MsiTransaction_BundleAv1_manifest.xml
index 2047f495..c6f7a6eb 100644
--- a/src/burn/test/BurnUnitTest/TestData/PlanTest/MsiTransaction_BundleAv1_manifest.xml
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/MsiTransaction_BundleAv1_manifest.xml
@@ -20,11 +20,11 @@
    <Payload Id="cab3wekki1le1R8RPDV2B8_g8jcjZc" FilePath="1cv1.cab" FileSize="975" Hash="11DE5863C4B2A8762D0EE23FE25B7774CA07676B" Packaging="embedded" SourcePath="a5" Container="WixAttachedContainer" />
    <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
    <RollbackBoundary Id="rbaOCA08D8ky7uBOK71_6FWz1K3TuQ" Vital="yes" Transaction="yes" />
-    <Registration Code="{E6469F05-BDC8-4EB8-B218-67412543EFAA}" ExecutableName="BundleAv1.exe" PerMachine="yes" Tag="" Version="1.0.0.0" ProviderKey="{E6469F05-BDC8-4EB8-B218-67412543EFAA}">
+    <Registration Code="{E6469F05-BDC8-4EB8-B218-67412543EFAA}" ExecutableName="BundleAv1.exe" Scope="permachine" Tag="" Version="1.0.0.0" ProviderKey="{E6469F05-BDC8-4EB8-B218-67412543EFAA}">
        <Arp Register="yes" DisplayName="~MsiTransactionTests - BundleAv1" DisplayVersion="1.0.0.0" />
    </Registration>
    <Chain>
-        <MsiPackage Id="PackageA" Cache="keep" CacheId="{01E6B748-7B95-4BA9-976D-B6F35076CEF4}v1.0.0.0" InstallSize="1951" Size="33743" PerMachine="yes" Permanent="no" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PackageA" RollbackLogPathVariable="WixBundleRollbackLog_PackageA" ProductCode="{01E6B748-7B95-4BA9-976D-B6F35076CEF4}" Language="1033" Version="1.0.0.0" UpgradeCode="{7772FCDF-5FDB-497D-B5DF-C6D17D667976}">
+        <MsiPackage Id="PackageA" Cache="keep" CacheId="{01E6B748-7B95-4BA9-976D-B6F35076CEF4}v1.0.0.0" InstallSize="1951" Size="33743" Scope="permachine" Permanent="no" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PackageA" RollbackLogPathVariable="WixBundleRollbackLog_PackageA" ProductCode="{01E6B748-7B95-4BA9-976D-B6F35076CEF4}" Language="1033" Version="1.0.0.0" UpgradeCode="{7772FCDF-5FDB-497D-B5DF-C6D17D667976}">
            <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
            <MsiProperty Id="MSIFASTINSTALL" Value="7" />
            <Provides Key="{01E6B748-7B95-4BA9-976D-B6F35076CEF4}" Version="1.0.0.0" DisplayName="~MsiTransactionTests - PackageA" />
@@ -37,7 +37,7 @@
            <PayloadRef Id="PackageA" />
            <PayloadRef Id="cab9Ins_fTP3wNwq5Gxo41ch5VUPaQ" />
        </MsiPackage>
-        <MsiPackage Id="PackageB" Cache="keep" CacheId="{D1D01094-23CE-4AF0-84B6-4A1A133F21D3}v1.0.0.0" InstallSize="1951" Size="33743" PerMachine="yes" Permanent="no" Vital="yes" RollbackBoundaryForward="rbaOCA08D8ky7uBOK71_6FWz1K3TuQ" LogPathVariable="WixBundleLog_PackageB" RollbackLogPathVariable="WixBundleRollbackLog_PackageB" ProductCode="{D1D01094-23CE-4AF0-84B6-4A1A133F21D3}" Language="1033" Version="1.0.0.0" UpgradeCode="{EAFC0C6B-626E-415C-8132-536FBD19F49B}">
+        <MsiPackage Id="PackageB" Cache="keep" CacheId="{D1D01094-23CE-4AF0-84B6-4A1A133F21D3}v1.0.0.0" InstallSize="1951" Size="33743" Scope="permachine" Permanent="no" Vital="yes" RollbackBoundaryForward="rbaOCA08D8ky7uBOK71_6FWz1K3TuQ" LogPathVariable="WixBundleLog_PackageB" RollbackLogPathVariable="WixBundleRollbackLog_PackageB" ProductCode="{D1D01094-23CE-4AF0-84B6-4A1A133F21D3}" Language="1033" Version="1.0.0.0" UpgradeCode="{EAFC0C6B-626E-415C-8132-536FBD19F49B}">
            <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
            <MsiProperty Id="MSIFASTINSTALL" Value="7" />
            <Provides Key="{D1D01094-23CE-4AF0-84B6-4A1A133F21D3}" Version="1.0.0.0" DisplayName="~MsiTransactionTests - PackageBv1" />
@@ -50,7 +50,7 @@
            <PayloadRef Id="PackageB" />
            <PayloadRef Id="cablKtJUKxAbhSMIBwQU6vJ_CDsIkE" />
        </MsiPackage>
-        <MsiPackage Id="PackageC" Cache="keep" CacheId="{A497C5E5-C78B-4F0B-BF72-B33E1DB1C4B8}v1.0.0.0" InstallSize="1951" Size="33743" PerMachine="yes" Permanent="no" Vital="yes" RollbackBoundaryBackward="rbaOCA08D8ky7uBOK71_6FWz1K3TuQ" LogPathVariable="WixBundleLog_PackageC" RollbackLogPathVariable="WixBundleRollbackLog_PackageC" ProductCode="{A497C5E5-C78B-4F0B-BF72-B33E1DB1C4B8}" Language="1033" Version="1.0.0.0" UpgradeCode="{A18BDC12-DAEC-43EE-87D1-31B2C2BC6269}">
+        <MsiPackage Id="PackageC" Cache="keep" CacheId="{A497C5E5-C78B-4F0B-BF72-B33E1DB1C4B8}v1.0.0.0" InstallSize="1951" Size="33743" Scope="permachine" Permanent="no" Vital="yes" RollbackBoundaryBackward="rbaOCA08D8ky7uBOK71_6FWz1K3TuQ" LogPathVariable="WixBundleLog_PackageC" RollbackLogPathVariable="WixBundleRollbackLog_PackageC" ProductCode="{A497C5E5-C78B-4F0B-BF72-B33E1DB1C4B8}" Language="1033" Version="1.0.0.0" UpgradeCode="{A18BDC12-DAEC-43EE-87D1-31B2C2BC6269}">
            <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
            <MsiProperty Id="MSIFASTINSTALL" Value="7" />
            <Provides Key="{A497C5E5-C78B-4F0B-BF72-B33E1DB1C4B8}" Version="1.0.0.0" DisplayName="~MsiTransactionTests - PackageCv1" />
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/MsuPackageFixture_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/MsuPackageFixture_manifest.xml
index 4fd1d75a..6e678d12 100644
--- a/src/burn/test/BurnUnitTest/TestData/PlanTest/MsuPackageFixture_manifest.xml
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/MsuPackageFixture_manifest.xml
@@ -10,11 +10,11 @@
    <Container Id="WixAttachedContainer" FileSize="119" Hash="06D28293FD57CD231E125EF9C82418A488928A98832A6937A77A3283A17A5C37F8D619C51759319A57E8F8A948FA73E8C5814185A0114130F3213AB268073555" FilePath="test.exe" AttachedIndex="1" Attached="yes" Primary="yes" />
    <Payload Id="test.msu" FilePath="test.msu" FileSize="28" Hash="B040F02D2F90E04E9AFBDC91C00CEB5DF97D48E205D96DC0A44E10AF8870794DAE62CA70224F12BE9112AA730BBE470CA81FB5617AAC690E832F3F84510E92BA" Packaging="embedded" SourcePath="a0" Container="WixAttachedContainer" />
    <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
-    <Registration Code="{06077C60-DC46-4F4A-8D3C-05F869187191}" ExecutableName="test.exe" PerMachine="yes" Tag="" Version="1.0.0.0" ProviderKey="{06077C60-DC46-4F4A-8D3C-05F869187191}">
+    <Registration Code="{06077C60-DC46-4F4A-8D3C-05F869187191}" ExecutableName="test.exe" Scope="permachine" Tag="" Version="1.0.0.0" ProviderKey="{06077C60-DC46-4F4A-8D3C-05F869187191}">
        <Arp Register="yes" DisplayName="BurnBundle" DisplayVersion="1.0.0.0" Publisher="Example Corporation" />
    </Registration>
    <Chain>
-        <MsuPackage Id="test.msu" Cache="keep" CacheId="B040F02D2F90E04E9AFBDC91C00CEB5DF97D48E205D96DC0A44E10AF8870794DAE62CA70224F12BE9112AA730BBE470CA81FB5617AAC690E832F3F84510E92BA" InstallSize="28" Size="28" PerMachine="yes" Permanent="yes" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" RollbackBoundaryBackward="WixDefaultBoundary" DetectCondition="DetectedTheMsu">
+        <MsuPackage Id="test.msu" Cache="keep" CacheId="B040F02D2F90E04E9AFBDC91C00CEB5DF97D48E205D96DC0A44E10AF8870794DAE62CA70224F12BE9112AA730BBE470CA81FB5617AAC690E832F3F84510E92BA" InstallSize="28" Size="28" Scope="permachine" Permanent="yes" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" RollbackBoundaryBackward="WixDefaultBoundary" DetectCondition="DetectedTheMsu">
            <PayloadRef Id="test.msu" />
        </MsuPackage>
    </Chain>
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/PerMachineBundle_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/PerMachineBundle_manifest.xml
new file mode 100644
index 00000000..66864c70
--- /dev/null
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/PerMachineBundle_manifest.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<BurnManifest EngineVersion="7.0.0.54" ProtocolVersion="1" Win64="no" xmlns="http://wixtoolset.org/schemas/v4/2008/Burn">
+  <Log PathVariable="WixBundleLog" Prefix="PerMachineBundle" Extension="log" />
+  <RelatedBundle Code="{650EDC96-0BDF-512A-A544-4E5D7DD5D11E}" Action="Upgrade" />
+  <UX PrimaryPayloadId="WixStandardBootstrapperApplication_X86">
+    <Payload Id="payberKyKpNVb0s10isnONgjD92jYc" FilePath="thm.xml" SourcePath="u0" />
+    <Payload Id="payXE.1bvyKgymWAWeJwB8BL4ifPGo" FilePath="thm.wxl" SourcePath="u1" />
+    <Payload Id="pay8cUoxSucOqsVErqhu1LEW8wSG1s" FilePath="logo.png" SourcePath="u2" />
+    <Payload Id="WixStandardBootstrapperApplication_X86" FilePath="wixstdba.exe" SourcePath="u3" />
+    <Payload Id="uxTxMXPVMXwQrPTMIGa5WGt93w0Ns" FilePath="BootstrapperApplicationData.xml" SourcePath="u4" />
+    <Payload Id="uxmKgAFS4cS31ZH_Myfqo5J4kHixQ" FilePath="BootstrapperExtensionData.xml" SourcePath="u5" />
+  </UX>
+  <Container Id="WixAttachedContainer" FileSize="32839" Hash="5BE3F4AAE711DB99A43B248F380EFB9F069C7D85F2C6D20D2B25033AABEDA09BCCF5203C2A99A7DB02D040168785EBB0260DC4073FEF2677F3760821B0948202" FilePath="PerMachineBundle.exe" AttachedIndex="1" Attached="yes" Primary="yes" />
+  <Payload Id="PerMachinePkg.msi" FilePath="PerMachinePkg.msi" FileSize="32768" Hash="4458C6B56290B207657AFB52DC20729FEDDA76799F21C14A7095E08CFB68CF382C5487CD53535CF24C16610066203ADFC29F25489BDE54290D1E480B7DED8FA6" Packaging="embedded" SourcePath="a0" Container="WixAttachedContainer" />
+  <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
+  <Registration BundleId="PerMachineBundle" Code="{3B58FF9C-2B33-417F-8240-10DA7FD7A6C4}" ExecutableName="PerMachineBundle.exe" Scope="perMachine" Tag="" Version="1.0.0.0" ProviderKey="{3B58FF9C-2B33-417F-8240-10DA7FD7A6C4}">
+    <Arp DisplayName="PerMachineBundle" DisplayVersion="1.0.0.0" Publisher="Acme" />
+  </Registration>
+  <Chain>
+    <MsiPackage Id="PerMachinePkg.msi" Cache="keep" CacheId="{DD544949-52BA-432B-925E-9BF0C4DB4B83}v1.0.0.0" InstallSize="283" Size="32768" Scope="perMachine" Permanent="no" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PerMachinePkg.msi" RollbackLogPathVariable="WixBundleRollbackLog_PerMachinePkg.msi" ProductCode="{DD544949-52BA-432B-925E-9BF0C4DB4B83}" Language="1033" Version="1.0.0.0" UpgradeCode="{40B2312E-4395-5299-A08F-5B2744AA5A39}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{DD544949-52BA-432B-925E-9BF0C4DB4B83}_v1.0.0.0" Version="1.0.0.0" DisplayName="PerMachinePkg" />
+      <RelatedPackage Id="{40B2312E-4395-5299-A08F-5B2744AA5A39}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{40B2312E-4395-5299-A08F-5B2744AA5A39}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PerMachinePkg.msi" />
+    </MsiPackage>
+  </Chain>
+</BurnManifest>
+\ No newline at end of file
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/PerUserBundle_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/PerUserBundle_manifest.xml
new file mode 100644
index 00000000..6c26f708
--- /dev/null
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/PerUserBundle_manifest.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<BurnManifest EngineVersion="7.0.0.54" ProtocolVersion="1" Win64="no" xmlns="http://wixtoolset.org/schemas/v4/2008/Burn">
+  <Log PathVariable="WixBundleLog" Prefix="PerUserBundle" Extension="log" />
+  <RelatedBundle Code="{DEB06D62-A48E-5455-920C-DC8E2DD660F9}" Action="Upgrade" />
+  <UX PrimaryPayloadId="WixStandardBootstrapperApplication_X86">
+    <Payload Id="payberKyKpNVb0s10isnONgjD92jYc" FilePath="thm.xml" SourcePath="u0" />
+    <Payload Id="payXE.1bvyKgymWAWeJwB8BL4ifPGo" FilePath="thm.wxl" SourcePath="u1" />
+    <Payload Id="pay8cUoxSucOqsVErqhu1LEW8wSG1s" FilePath="logo.png" SourcePath="u2" />
+    <Payload Id="WixStandardBootstrapperApplication_X86" FilePath="wixstdba.exe" SourcePath="u3" />
+    <Payload Id="uxTxMXPVMXwQrPTMIGa5WGt93w0Ns" FilePath="BootstrapperApplicationData.xml" SourcePath="u4" />
+    <Payload Id="uxmKgAFS4cS31ZH_Myfqo5J4kHixQ" FilePath="BootstrapperExtensionData.xml" SourcePath="u5" />
+  </UX>
+  <Container Id="WixAttachedContainer" FileSize="32839" Hash="CF67D7D05B0449D5221DE5FB08E93DC85A8ECB4AC8E3614DCB63B9FE9010F08FE71A29FC55D6E4383CE73ED5420A5E73628B314932F229E7E0FBBC262522F68C" FilePath="PerUserBundle.exe" AttachedIndex="1" Attached="yes" Primary="yes" />
+  <Payload Id="PerUserPkg.msi" FilePath="PerUserPkg.msi" FileSize="32768" Hash="26CA1B74EFC52FA969279450110B6A9472E629004EF5655A661D8609A7E4DDB76CA220E5DB6FC2AE554415D9A4E28567014F48EF978EFDEE0B4431E81498572F" Packaging="embedded" SourcePath="a0" Container="WixAttachedContainer" />
+  <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
+  <Registration BundleId="PerUserBundle" Code="{7786E965-CCB4-42B2-AA90-F2652EE3B5C5}" ExecutableName="PerUserBundle.exe" Scope="perUser" Tag="" Version="1.0.0.0" ProviderKey="{7786E965-CCB4-42B2-AA90-F2652EE3B5C5}">
+    <Arp DisplayName="PerUserBundle" DisplayVersion="1.0.0.0" Publisher="Acme" />
+  </Registration>
+  <Chain>
+    <MsiPackage Id="PerUserPkg.msi" Cache="keep" CacheId="{7DA760D5-30A8-4A32-A2E0-1563E0C99CEB}v1.0.0.0" InstallSize="274" Size="32768" Scope="perUser" Permanent="no" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PerUserPkg.msi" RollbackLogPathVariable="WixBundleRollbackLog_PerUserPkg.msi" ProductCode="{7DA760D5-30A8-4A32-A2E0-1563E0C99CEB}" Language="1033" Version="1.0.0.0" UpgradeCode="{0D1FCBA3-488C-5309-B67C-E00C8B3FCADD}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{7DA760D5-30A8-4A32-A2E0-1563E0C99CEB}_v1.0.0.0" Version="1.0.0.0" DisplayName="PerUserPkg" />
+      <RelatedPackage Id="{0D1FCBA3-488C-5309-B67C-E00C8B3FCADD}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{0D1FCBA3-488C-5309-B67C-E00C8B3FCADD}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PerUserPkg.msi" />
+    </MsiPackage>
+  </Chain>
+</BurnManifest>
+\ No newline at end of file
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/PmPmouBundle_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/PmPmouBundle_manifest.xml
new file mode 100644
index 00000000..47ce485a
--- /dev/null
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/PmPmouBundle_manifest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<BurnManifest EngineVersion="7.0.0.54" ProtocolVersion="1" Win64="no" xmlns="http://wixtoolset.org/schemas/v4/2008/Burn">
+  <Log PathVariable="WixBundleLog" Prefix="PmPmouBundle" Extension="log" />
+  <RelatedBundle Code="{62D1B851-3DC9-58B7-B923-71A0F75703E0}" Action="Upgrade" />
+  <UX PrimaryPayloadId="WixStandardBootstrapperApplication_X86">
+    <Payload Id="payberKyKpNVb0s10isnONgjD92jYc" FilePath="thm.xml" SourcePath="u0" />
+    <Payload Id="payXE.1bvyKgymWAWeJwB8BL4ifPGo" FilePath="thm.wxl" SourcePath="u1" />
+    <Payload Id="pay8cUoxSucOqsVErqhu1LEW8wSG1s" FilePath="logo.png" SourcePath="u2" />
+    <Payload Id="WixStandardBootstrapperApplication_X86" FilePath="wixstdba.exe" SourcePath="u3" />
+    <Payload Id="uxTxMXPVMXwQrPTMIGa5WGt93w0Ns" FilePath="BootstrapperApplicationData.xml" SourcePath="u4" />
+    <Payload Id="uxmKgAFS4cS31ZH_Myfqo5J4kHixQ" FilePath="BootstrapperExtensionData.xml" SourcePath="u5" />
+  </UX>
+  <Container Id="WixAttachedContainer" FileSize="98429" Hash="27A597EF7C5C69BDFE548E655FB4ACE548F379EBCC24EF56401BD22D3EECC0A904A68595FE5D3F448B7137A9B03A5EA2C0B422E3003DD293C7E73E2E4FE9D43B" FilePath="PmPmouBundle.exe" AttachedIndex="1" Attached="yes" Primary="yes" />
+  <Payload Id="PerMachinePkg.msi" FilePath="PerMachinePkg.msi" FileSize="32768" Hash="4458C6B56290B207657AFB52DC20729FEDDA76799F21C14A7095E08CFB68CF382C5487CD53535CF24C16610066203ADFC29F25489BDE54290D1E480B7DED8FA6" Packaging="embedded" SourcePath="a0" Container="WixAttachedContainer" />
+  <Payload Id="PmouPkg1.msi" FilePath="PmouPkg1.msi" FileSize="32768" Hash="BCBB4F1C48953D23BE56CD7D5005BB38CB02C7BAC4AF30F87B7ADF7715EA721D28A3FCFC025D26FD5DC069BAB69F462577C3212C1BFE3707FCCE60FF3F3ED12C" Packaging="embedded" SourcePath="a1" Container="WixAttachedContainer" />
+  <Payload Id="PmouPkg2.msi" FilePath="PmouPkg2.msi" FileSize="32768" Hash="C3BABBCCC0FDA4ACE44D28C60FAB2CA76C00655A405CF6F7A3593F9130FCF47AD18C4DAE1A32D5C0177F58DBAE00CBF7EDCA027BEE19B96E0145A3FA00811B51" Packaging="embedded" SourcePath="a2" Container="WixAttachedContainer" />
+  <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
+  <Registration BundleId="PmPmouBundle" Code="{91B17F62-3EC0-4BDB-9094-A00B3B575E5B}" ExecutableName="PmPmouBundle.exe" Scope="perMachineOrUser" Tag="" Version="1.0.0.0" ProviderKey="{91B17F62-3EC0-4BDB-9094-A00B3B575E5B}">
+    <Arp DisplayName="PmPmouBundle" DisplayVersion="1.0.0.0" Publisher="Acme" />
+  </Registration>
+  <Chain>
+    <MsiPackage Id="PerMachinePkg.msi" Cache="keep" CacheId="{DD544949-52BA-432B-925E-9BF0C4DB4B83}v1.0.0.0" InstallSize="283" Size="32768" Scope="perMachine" Permanent="no" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PerMachinePkg.msi" RollbackLogPathVariable="WixBundleRollbackLog_PerMachinePkg.msi" ProductCode="{DD544949-52BA-432B-925E-9BF0C4DB4B83}" Language="1033" Version="1.0.0.0" UpgradeCode="{40B2312E-4395-5299-A08F-5B2744AA5A39}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{DD544949-52BA-432B-925E-9BF0C4DB4B83}_v1.0.0.0" Version="1.0.0.0" DisplayName="PerMachinePkg" />
+      <RelatedPackage Id="{40B2312E-4395-5299-A08F-5B2744AA5A39}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{40B2312E-4395-5299-A08F-5B2744AA5A39}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PerMachinePkg.msi" />
+    </MsiPackage>
+    <MsiPackage Id="PmouPkg1.msi" Cache="keep" CacheId="{E46705B9-D2F9-4BE8-8270-F1A11196A9D4}v1.0.0.0" InstallSize="279" Size="32768" Scope="perMachineOrUser" Permanent="no" Vital="yes" LogPathVariable="WixBundleLog_PmouPkg1.msi" RollbackLogPathVariable="WixBundleRollbackLog_PmouPkg1.msi" ProductCode="{E46705B9-D2F9-4BE8-8270-F1A11196A9D4}" Language="1033" Version="1.0.0.0" UpgradeCode="{B0DA1185-5CF5-55A3-8351-01F1AD3E50CE}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{E46705B9-D2F9-4BE8-8270-F1A11196A9D4}_v1.0.0.0" Version="1.0.0.0" DisplayName="PmouPkg1" />
+      <RelatedPackage Id="{B0DA1185-5CF5-55A3-8351-01F1AD3E50CE}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{B0DA1185-5CF5-55A3-8351-01F1AD3E50CE}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PmouPkg1.msi" />
+    </MsiPackage>
+    <MsiPackage Id="PmouPkg2.msi" Cache="keep" CacheId="{1B1D793E-4026-48CA-B088-F919E70440AC}v1.0.0.0" InstallSize="279" Size="32768" Scope="perMachineOrUser" Permanent="no" Vital="yes" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PmouPkg2.msi" RollbackLogPathVariable="WixBundleRollbackLog_PmouPkg2.msi" ProductCode="{1B1D793E-4026-48CA-B088-F919E70440AC}" Language="1033" Version="1.0.0.0" UpgradeCode="{98F763B3-EA17-5AE5-AD47-21004FB34B24}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{1B1D793E-4026-48CA-B088-F919E70440AC}_v1.0.0.0" Version="1.0.0.0" DisplayName="PmouPkg2" />
+      <RelatedPackage Id="{98F763B3-EA17-5AE5-AD47-21004FB34B24}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{98F763B3-EA17-5AE5-AD47-21004FB34B24}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PmouPkg2.msi" />
+    </MsiPackage>
+  </Chain>
+</BurnManifest>
+\ No newline at end of file
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/PmPuPmouBundle_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/PmPuPmouBundle_manifest.xml
new file mode 100644
index 00000000..86c1b1b0
--- /dev/null
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/PmPuPmouBundle_manifest.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<BurnManifest EngineVersion="7.0.0.54" ProtocolVersion="1" Win64="no" xmlns="http://wixtoolset.org/schemas/v4/2008/Burn">
+  <Log PathVariable="WixBundleLog" Prefix="PmPuPmouBundle" Extension="log" />
+  <RelatedBundle Code="{F04C3701-1AC4-5C1D-8B26-400FB0C9F52A}" Action="Upgrade" />
+  <UX PrimaryPayloadId="WixStandardBootstrapperApplication_X86">
+    <Payload Id="payberKyKpNVb0s10isnONgjD92jYc" FilePath="thm.xml" SourcePath="u0" />
+    <Payload Id="payXE.1bvyKgymWAWeJwB8BL4ifPGo" FilePath="thm.wxl" SourcePath="u1" />
+    <Payload Id="pay8cUoxSucOqsVErqhu1LEW8wSG1s" FilePath="logo.png" SourcePath="u2" />
+    <Payload Id="WixStandardBootstrapperApplication_X86" FilePath="wixstdba.exe" SourcePath="u3" />
+    <Payload Id="uxTxMXPVMXwQrPTMIGa5WGt93w0Ns" FilePath="BootstrapperApplicationData.xml" SourcePath="u4" />
+    <Payload Id="uxmKgAFS4cS31ZH_Myfqo5J4kHixQ" FilePath="BootstrapperExtensionData.xml" SourcePath="u5" />
+  </UX>
+  <Container Id="WixAttachedContainer" FileSize="131224" Hash="4F6D2A7D5A20E974F7708B50FF149D18B2739FC2CC9AF779D291FD1A4BFA7CC523E4D1DC2D7C372E519AE9FD1253329FE3182C172F2B43ED91E167AE2A9C5343" FilePath="PmPuPmouBundle.exe" AttachedIndex="1" Attached="yes" Primary="yes" />
+  <Payload Id="PerMachinePkg.msi" FilePath="PerMachinePkg.msi" FileSize="32768" Hash="4458C6B56290B207657AFB52DC20729FEDDA76799F21C14A7095E08CFB68CF382C5487CD53535CF24C16610066203ADFC29F25489BDE54290D1E480B7DED8FA6" Packaging="embedded" SourcePath="a0" Container="WixAttachedContainer" />
+  <Payload Id="PmouPkg1.msi" FilePath="PmouPkg1.msi" FileSize="32768" Hash="BCBB4F1C48953D23BE56CD7D5005BB38CB02C7BAC4AF30F87B7ADF7715EA721D28A3FCFC025D26FD5DC069BAB69F462577C3212C1BFE3707FCCE60FF3F3ED12C" Packaging="embedded" SourcePath="a1" Container="WixAttachedContainer" />
+  <Payload Id="PmouPkg2.msi" FilePath="PmouPkg2.msi" FileSize="32768" Hash="C3BABBCCC0FDA4ACE44D28C60FAB2CA76C00655A405CF6F7A3593F9130FCF47AD18C4DAE1A32D5C0177F58DBAE00CBF7EDCA027BEE19B96E0145A3FA00811B51" Packaging="embedded" SourcePath="a2" Container="WixAttachedContainer" />
+  <Payload Id="PerUserPkg.msi" FilePath="PerUserPkg.msi" FileSize="32768" Hash="26CA1B74EFC52FA969279450110B6A9472E629004EF5655A661D8609A7E4DDB76CA220E5DB6FC2AE554415D9A4E28567014F48EF978EFDEE0B4431E81498572F" Packaging="embedded" SourcePath="a3" Container="WixAttachedContainer" />
+  <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
+  <Registration BundleId="PmPuPmouBundle" Code="{6D7831C5-3A3B-481E-B048-E150DB402C74}" ExecutableName="PmPuPmouBundle.exe" Scope="perUser" Tag="" Version="1.0.0.0" ProviderKey="{6D7831C5-3A3B-481E-B048-E150DB402C74}">
+    <Arp DisplayName="PmPuPmouBundle" DisplayVersion="1.0.0.0" Publisher="Acme" />
+  </Registration>
+  <Chain>
+    <MsiPackage Id="PerMachinePkg.msi" Cache="keep" CacheId="{DD544949-52BA-432B-925E-9BF0C4DB4B83}v1.0.0.0" InstallSize="283" Size="32768" Scope="perMachine" Permanent="no" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PerMachinePkg.msi" RollbackLogPathVariable="WixBundleRollbackLog_PerMachinePkg.msi" ProductCode="{DD544949-52BA-432B-925E-9BF0C4DB4B83}" Language="1033" Version="1.0.0.0" UpgradeCode="{40B2312E-4395-5299-A08F-5B2744AA5A39}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{DD544949-52BA-432B-925E-9BF0C4DB4B83}_v1.0.0.0" Version="1.0.0.0" DisplayName="PerMachinePkg" />
+      <RelatedPackage Id="{40B2312E-4395-5299-A08F-5B2744AA5A39}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{40B2312E-4395-5299-A08F-5B2744AA5A39}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PerMachinePkg.msi" />
+    </MsiPackage>
+    <MsiPackage Id="PmouPkg1.msi" Cache="keep" CacheId="{E46705B9-D2F9-4BE8-8270-F1A11196A9D4}v1.0.0.0" InstallSize="279" Size="32768" Scope="perMachineOrUser" Permanent="no" Vital="yes" LogPathVariable="WixBundleLog_PmouPkg1.msi" RollbackLogPathVariable="WixBundleRollbackLog_PmouPkg1.msi" ProductCode="{E46705B9-D2F9-4BE8-8270-F1A11196A9D4}" Language="1033" Version="1.0.0.0" UpgradeCode="{B0DA1185-5CF5-55A3-8351-01F1AD3E50CE}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{E46705B9-D2F9-4BE8-8270-F1A11196A9D4}_v1.0.0.0" Version="1.0.0.0" DisplayName="PmouPkg1" />
+      <RelatedPackage Id="{B0DA1185-5CF5-55A3-8351-01F1AD3E50CE}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{B0DA1185-5CF5-55A3-8351-01F1AD3E50CE}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PmouPkg1.msi" />
+    </MsiPackage>
+    <MsiPackage Id="PmouPkg2.msi" Cache="keep" CacheId="{1B1D793E-4026-48CA-B088-F919E70440AC}v1.0.0.0" InstallSize="279" Size="32768" Scope="perMachineOrUser" Permanent="no" Vital="yes" LogPathVariable="WixBundleLog_PmouPkg2.msi" RollbackLogPathVariable="WixBundleRollbackLog_PmouPkg2.msi" ProductCode="{1B1D793E-4026-48CA-B088-F919E70440AC}" Language="1033" Version="1.0.0.0" UpgradeCode="{98F763B3-EA17-5AE5-AD47-21004FB34B24}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{1B1D793E-4026-48CA-B088-F919E70440AC}_v1.0.0.0" Version="1.0.0.0" DisplayName="PmouPkg2" />
+      <RelatedPackage Id="{98F763B3-EA17-5AE5-AD47-21004FB34B24}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{98F763B3-EA17-5AE5-AD47-21004FB34B24}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PmouPkg2.msi" />
+    </MsiPackage>
+    <MsiPackage Id="PerUserPkg.msi" Cache="keep" CacheId="{7DA760D5-30A8-4A32-A2E0-1563E0C99CEB}v1.0.0.0" InstallSize="274" Size="32768" Scope="perUser" Permanent="no" Vital="yes" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PerUserPkg.msi" RollbackLogPathVariable="WixBundleRollbackLog_PerUserPkg.msi" ProductCode="{7DA760D5-30A8-4A32-A2E0-1563E0C99CEB}" Language="1033" Version="1.0.0.0" UpgradeCode="{0D1FCBA3-488C-5309-B67C-E00C8B3FCADD}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{7DA760D5-30A8-4A32-A2E0-1563E0C99CEB}_v1.0.0.0" Version="1.0.0.0" DisplayName="PerUserPkg" />
+      <RelatedPackage Id="{0D1FCBA3-488C-5309-B67C-E00C8B3FCADD}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{0D1FCBA3-488C-5309-B67C-E00C8B3FCADD}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PerUserPkg.msi" />
+    </MsiPackage>
+  </Chain>
+</BurnManifest>
+\ No newline at end of file
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/PmPuPuomBundle_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/PmPuPuomBundle_manifest.xml
new file mode 100644
index 00000000..4bbd5307
--- /dev/null
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/PmPuPuomBundle_manifest.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<BurnManifest EngineVersion="7.0.0.54" ProtocolVersion="1" Win64="no" xmlns="http://wixtoolset.org/schemas/v4/2008/Burn">
+  <Log PathVariable="WixBundleLog" Prefix="PmPuPuomBundle" Extension="log" />
+  <RelatedBundle Code="{24F67952-8FCC-58B6-8A79-76F35525AAC4}" Action="Upgrade" />
+  <UX PrimaryPayloadId="WixStandardBootstrapperApplication_X86">
+    <Payload Id="payberKyKpNVb0s10isnONgjD92jYc" FilePath="thm.xml" SourcePath="u0" />
+    <Payload Id="payXE.1bvyKgymWAWeJwB8BL4ifPGo" FilePath="thm.wxl" SourcePath="u1" />
+    <Payload Id="pay8cUoxSucOqsVErqhu1LEW8wSG1s" FilePath="logo.png" SourcePath="u2" />
+    <Payload Id="WixStandardBootstrapperApplication_X86" FilePath="wixstdba.exe" SourcePath="u3" />
+    <Payload Id="uxTxMXPVMXwQrPTMIGa5WGt93w0Ns" FilePath="BootstrapperApplicationData.xml" SourcePath="u4" />
+    <Payload Id="uxmKgAFS4cS31ZH_Myfqo5J4kHixQ" FilePath="BootstrapperExtensionData.xml" SourcePath="u5" />
+  </UX>
+  <Container Id="WixAttachedContainer" FileSize="131224" Hash="5A33E8012AC2E16CBD94668E8F871F023044CB37BE65C62A483C1896DC262C0F7D16C374405C28AE0F3AD000BEF8CED1858B9A7DBDEC9CDB2E01B7B67C506D1B" FilePath="PmPuPuomBundle.exe" AttachedIndex="1" Attached="yes" Primary="yes" />
+  <Payload Id="PerMachinePkg.msi" FilePath="PerMachinePkg.msi" FileSize="32768" Hash="4458C6B56290B207657AFB52DC20729FEDDA76799F21C14A7095E08CFB68CF382C5487CD53535CF24C16610066203ADFC29F25489BDE54290D1E480B7DED8FA6" Packaging="embedded" SourcePath="a0" Container="WixAttachedContainer" />
+  <Payload Id="PuomPkg1.msi" FilePath="PuomPkg1.msi" FileSize="32768" Hash="EF19E061C2647AD42E39A1721299D5D970F1E42CE6636ACA53009DC0D0D1F8B6F2FD516B7D3EEDAAF1EEDA364D54DA6C18FB929C385EC1BDDA08AEA50370B357" Packaging="embedded" SourcePath="a1" Container="WixAttachedContainer" />
+  <Payload Id="PuomPkg2.msi" FilePath="PuomPkg2.msi" FileSize="32768" Hash="F927CE9CD3272AF6571E39C72A68E6BD6808D944B6893B09253887B1942E1C043EC5E1E1E758D3C261FF8B566121EE809C4CBCB931D00EBF14CC6CFE24001292" Packaging="embedded" SourcePath="a2" Container="WixAttachedContainer" />
+  <Payload Id="PerUserPkg.msi" FilePath="PerUserPkg.msi" FileSize="32768" Hash="26CA1B74EFC52FA969279450110B6A9472E629004EF5655A661D8609A7E4DDB76CA220E5DB6FC2AE554415D9A4E28567014F48EF978EFDEE0B4431E81498572F" Packaging="embedded" SourcePath="a3" Container="WixAttachedContainer" />
+  <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
+  <Registration BundleId="PmPuPuomBundle" Code="{37290F81-A99C-4FBE-84F2-9A2E4742453C}" ExecutableName="PmPuPuomBundle.exe" Scope="perUser" Tag="" Version="1.0.0.0" ProviderKey="{37290F81-A99C-4FBE-84F2-9A2E4742453C}">
+    <Arp DisplayName="PmPuPuomBundle" DisplayVersion="1.0.0.0" Publisher="Acme" />
+  </Registration>
+  <Chain>
+    <MsiPackage Id="PerMachinePkg.msi" Cache="keep" CacheId="{DD544949-52BA-432B-925E-9BF0C4DB4B83}v1.0.0.0" InstallSize="283" Size="32768" Scope="perMachine" Permanent="no" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PerMachinePkg.msi" RollbackLogPathVariable="WixBundleRollbackLog_PerMachinePkg.msi" ProductCode="{DD544949-52BA-432B-925E-9BF0C4DB4B83}" Language="1033" Version="1.0.0.0" UpgradeCode="{40B2312E-4395-5299-A08F-5B2744AA5A39}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{DD544949-52BA-432B-925E-9BF0C4DB4B83}_v1.0.0.0" Version="1.0.0.0" DisplayName="PerMachinePkg" />
+      <RelatedPackage Id="{40B2312E-4395-5299-A08F-5B2744AA5A39}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{40B2312E-4395-5299-A08F-5B2744AA5A39}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PerMachinePkg.msi" />
+    </MsiPackage>
+    <MsiPackage Id="PuomPkg1.msi" Cache="keep" CacheId="{167C572B-D847-4BCF-9693-C8B5EB6350CD}v1.0.0.0" InstallSize="279" Size="32768" Scope="perUserOrMachine" Permanent="no" Vital="yes" LogPathVariable="WixBundleLog_PuomPkg1.msi" RollbackLogPathVariable="WixBundleRollbackLog_PuomPkg1.msi" ProductCode="{167C572B-D847-4BCF-9693-C8B5EB6350CD}" Language="1033" Version="1.0.0.0" UpgradeCode="{AC3A2D0C-CB37-5F8B-8CE1-9233B963E5BB}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{167C572B-D847-4BCF-9693-C8B5EB6350CD}_v1.0.0.0" Version="1.0.0.0" DisplayName="PuomPkg1" />
+      <RelatedPackage Id="{AC3A2D0C-CB37-5F8B-8CE1-9233B963E5BB}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{AC3A2D0C-CB37-5F8B-8CE1-9233B963E5BB}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PuomPkg1.msi" />
+    </MsiPackage>
+    <MsiPackage Id="PuomPkg2.msi" Cache="keep" CacheId="{07617017-CE68-4F88-981A-4629835C9BD2}v1.0.0.0" InstallSize="279" Size="32768" Scope="perUserOrMachine" Permanent="no" Vital="yes" LogPathVariable="WixBundleLog_PuomPkg2.msi" RollbackLogPathVariable="WixBundleRollbackLog_PuomPkg2.msi" ProductCode="{07617017-CE68-4F88-981A-4629835C9BD2}" Language="1033" Version="1.0.0.0" UpgradeCode="{C977A922-168B-59F0-84FD-CAB89DB314E0}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{07617017-CE68-4F88-981A-4629835C9BD2}_v1.0.0.0" Version="1.0.0.0" DisplayName="PuomPkg2" />
+      <RelatedPackage Id="{C977A922-168B-59F0-84FD-CAB89DB314E0}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{C977A922-168B-59F0-84FD-CAB89DB314E0}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PuomPkg2.msi" />
+    </MsiPackage>
+    <MsiPackage Id="PerUserPkg.msi" Cache="keep" CacheId="{7DA760D5-30A8-4A32-A2E0-1563E0C99CEB}v1.0.0.0" InstallSize="274" Size="32768" Scope="perUser" Permanent="no" Vital="yes" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PerUserPkg.msi" RollbackLogPathVariable="WixBundleRollbackLog_PerUserPkg.msi" ProductCode="{7DA760D5-30A8-4A32-A2E0-1563E0C99CEB}" Language="1033" Version="1.0.0.0" UpgradeCode="{0D1FCBA3-488C-5309-B67C-E00C8B3FCADD}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{7DA760D5-30A8-4A32-A2E0-1563E0C99CEB}_v1.0.0.0" Version="1.0.0.0" DisplayName="PerUserPkg" />
+      <RelatedPackage Id="{0D1FCBA3-488C-5309-B67C-E00C8B3FCADD}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{0D1FCBA3-488C-5309-B67C-E00C8B3FCADD}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PerUserPkg.msi" />
+    </MsiPackage>
+  </Chain>
+</BurnManifest>
+\ No newline at end of file
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/PmPuomBundle_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/PmPuomBundle_manifest.xml
new file mode 100644
index 00000000..6ea9e9bd
--- /dev/null
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/PmPuomBundle_manifest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<BurnManifest EngineVersion="7.0.0.54" ProtocolVersion="1" Win64="no" xmlns="http://wixtoolset.org/schemas/v4/2008/Burn">
+  <Log PathVariable="WixBundleLog" Prefix="PmPuomBundle" Extension="log" />
+  <RelatedBundle Code="{24038F27-3104-5E4E-987B-1C1F81A88D56}" Action="Upgrade" />
+  <UX PrimaryPayloadId="WixStandardBootstrapperApplication_X86">
+    <Payload Id="payberKyKpNVb0s10isnONgjD92jYc" FilePath="thm.xml" SourcePath="u0" />
+    <Payload Id="payXE.1bvyKgymWAWeJwB8BL4ifPGo" FilePath="thm.wxl" SourcePath="u1" />
+    <Payload Id="pay8cUoxSucOqsVErqhu1LEW8wSG1s" FilePath="logo.png" SourcePath="u2" />
+    <Payload Id="WixStandardBootstrapperApplication_X86" FilePath="wixstdba.exe" SourcePath="u3" />
+    <Payload Id="uxTxMXPVMXwQrPTMIGa5WGt93w0Ns" FilePath="BootstrapperApplicationData.xml" SourcePath="u4" />
+    <Payload Id="uxmKgAFS4cS31ZH_Myfqo5J4kHixQ" FilePath="BootstrapperExtensionData.xml" SourcePath="u5" />
+  </UX>
+  <Container Id="WixAttachedContainer" FileSize="98429" Hash="5AF2416362232E3DED34FDBAA37EBA07FAA96526A87DDA64609762CC95B85DD95D4CB3F907A0D331C9A19D89121737C8A54E78DD65A4979189B040A4521F2115" FilePath="PmPuomBundle.exe" AttachedIndex="1" Attached="yes" Primary="yes" />
+  <Payload Id="PerMachinePkg.msi" FilePath="PerMachinePkg.msi" FileSize="32768" Hash="4458C6B56290B207657AFB52DC20729FEDDA76799F21C14A7095E08CFB68CF382C5487CD53535CF24C16610066203ADFC29F25489BDE54290D1E480B7DED8FA6" Packaging="embedded" SourcePath="a0" Container="WixAttachedContainer" />
+  <Payload Id="PuomPkg1.msi" FilePath="PuomPkg1.msi" FileSize="32768" Hash="EF19E061C2647AD42E39A1721299D5D970F1E42CE6636ACA53009DC0D0D1F8B6F2FD516B7D3EEDAAF1EEDA364D54DA6C18FB929C385EC1BDDA08AEA50370B357" Packaging="embedded" SourcePath="a1" Container="WixAttachedContainer" />
+  <Payload Id="PuomPkg2.msi" FilePath="PuomPkg2.msi" FileSize="32768" Hash="F927CE9CD3272AF6571E39C72A68E6BD6808D944B6893B09253887B1942E1C043EC5E1E1E758D3C261FF8B566121EE809C4CBCB931D00EBF14CC6CFE24001292" Packaging="embedded" SourcePath="a2" Container="WixAttachedContainer" />
+  <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
+  <Registration BundleId="PmPuomBundle" Code="{8D5DB5A9-22B1-475E-AC99-CA7E9179B94F}" ExecutableName="PmPuomBundle.exe" Scope="perUserOrMachine" Tag="" Version="1.0.0.0" ProviderKey="{8D5DB5A9-22B1-475E-AC99-CA7E9179B94F}">
+    <Arp DisplayName="PmPuomBundle" DisplayVersion="1.0.0.0" Publisher="Acme" />
+  </Registration>
+  <Chain>
+    <MsiPackage Id="PerMachinePkg.msi" Cache="keep" CacheId="{DD544949-52BA-432B-925E-9BF0C4DB4B83}v1.0.0.0" InstallSize="283" Size="32768" Scope="perMachine" Permanent="no" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PerMachinePkg.msi" RollbackLogPathVariable="WixBundleRollbackLog_PerMachinePkg.msi" ProductCode="{DD544949-52BA-432B-925E-9BF0C4DB4B83}" Language="1033" Version="1.0.0.0" UpgradeCode="{40B2312E-4395-5299-A08F-5B2744AA5A39}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{DD544949-52BA-432B-925E-9BF0C4DB4B83}_v1.0.0.0" Version="1.0.0.0" DisplayName="PerMachinePkg" />
+      <RelatedPackage Id="{40B2312E-4395-5299-A08F-5B2744AA5A39}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{40B2312E-4395-5299-A08F-5B2744AA5A39}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PerMachinePkg.msi" />
+    </MsiPackage>
+    <MsiPackage Id="PuomPkg1.msi" Cache="keep" CacheId="{167C572B-D847-4BCF-9693-C8B5EB6350CD}v1.0.0.0" InstallSize="279" Size="32768" Scope="perUserOrMachine" Permanent="no" Vital="yes" LogPathVariable="WixBundleLog_PuomPkg1.msi" RollbackLogPathVariable="WixBundleRollbackLog_PuomPkg1.msi" ProductCode="{167C572B-D847-4BCF-9693-C8B5EB6350CD}" Language="1033" Version="1.0.0.0" UpgradeCode="{AC3A2D0C-CB37-5F8B-8CE1-9233B963E5BB}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{167C572B-D847-4BCF-9693-C8B5EB6350CD}_v1.0.0.0" Version="1.0.0.0" DisplayName="PuomPkg1" />
+      <RelatedPackage Id="{AC3A2D0C-CB37-5F8B-8CE1-9233B963E5BB}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{AC3A2D0C-CB37-5F8B-8CE1-9233B963E5BB}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PuomPkg1.msi" />
+    </MsiPackage>
+    <MsiPackage Id="PuomPkg2.msi" Cache="keep" CacheId="{07617017-CE68-4F88-981A-4629835C9BD2}v1.0.0.0" InstallSize="279" Size="32768" Scope="perUserOrMachine" Permanent="no" Vital="yes" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PuomPkg2.msi" RollbackLogPathVariable="WixBundleRollbackLog_PuomPkg2.msi" ProductCode="{07617017-CE68-4F88-981A-4629835C9BD2}" Language="1033" Version="1.0.0.0" UpgradeCode="{C977A922-168B-59F0-84FD-CAB89DB314E0}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{07617017-CE68-4F88-981A-4629835C9BD2}_v1.0.0.0" Version="1.0.0.0" DisplayName="PuomPkg2" />
+      <RelatedPackage Id="{C977A922-168B-59F0-84FD-CAB89DB314E0}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{C977A922-168B-59F0-84FD-CAB89DB314E0}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PuomPkg2.msi" />
+    </MsiPackage>
+  </Chain>
+</BurnManifest>
+\ No newline at end of file
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/PuPmouBundle_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/PuPmouBundle_manifest.xml
new file mode 100644
index 00000000..79bb2500
--- /dev/null
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/PuPmouBundle_manifest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<BurnManifest EngineVersion="7.0.0.54" ProtocolVersion="1" Win64="no" xmlns="http://wixtoolset.org/schemas/v4/2008/Burn">
+  <Log PathVariable="WixBundleLog" Prefix="PuPmouBundle" Extension="log" />
+  <RelatedBundle Code="{92C1B57B-1972-5EB7-BB59-B4D230D806C7}" Action="Upgrade" />
+  <UX PrimaryPayloadId="WixStandardBootstrapperApplication_X86">
+    <Payload Id="payberKyKpNVb0s10isnONgjD92jYc" FilePath="thm.xml" SourcePath="u0" />
+    <Payload Id="payXE.1bvyKgymWAWeJwB8BL4ifPGo" FilePath="thm.wxl" SourcePath="u1" />
+    <Payload Id="pay8cUoxSucOqsVErqhu1LEW8wSG1s" FilePath="logo.png" SourcePath="u2" />
+    <Payload Id="WixStandardBootstrapperApplication_X86" FilePath="wixstdba.exe" SourcePath="u3" />
+    <Payload Id="uxTxMXPVMXwQrPTMIGa5WGt93w0Ns" FilePath="BootstrapperApplicationData.xml" SourcePath="u4" />
+    <Payload Id="uxmKgAFS4cS31ZH_Myfqo5J4kHixQ" FilePath="BootstrapperExtensionData.xml" SourcePath="u5" />
+  </UX>
+  <Container Id="WixAttachedContainer" FileSize="98429" Hash="787872CCF9B905BE17725AD6F4DA2C8ACE196AA7BB90B54421E5029D85FF1F70BB51A91FAD81D2F7E09A956430866E208EF2A51681822501A39B791B88703F20" FilePath="PuPmouBundle.exe" AttachedIndex="1" Attached="yes" Primary="yes" />
+  <Payload Id="PmouPkg1.msi" FilePath="PmouPkg1.msi" FileSize="32768" Hash="BCBB4F1C48953D23BE56CD7D5005BB38CB02C7BAC4AF30F87B7ADF7715EA721D28A3FCFC025D26FD5DC069BAB69F462577C3212C1BFE3707FCCE60FF3F3ED12C" Packaging="embedded" SourcePath="a0" Container="WixAttachedContainer" />
+  <Payload Id="PmouPkg2.msi" FilePath="PmouPkg2.msi" FileSize="32768" Hash="C3BABBCCC0FDA4ACE44D28C60FAB2CA76C00655A405CF6F7A3593F9130FCF47AD18C4DAE1A32D5C0177F58DBAE00CBF7EDCA027BEE19B96E0145A3FA00811B51" Packaging="embedded" SourcePath="a1" Container="WixAttachedContainer" />
+  <Payload Id="PerUserPkg.msi" FilePath="PerUserPkg.msi" FileSize="32768" Hash="26CA1B74EFC52FA969279450110B6A9472E629004EF5655A661D8609A7E4DDB76CA220E5DB6FC2AE554415D9A4E28567014F48EF978EFDEE0B4431E81498572F" Packaging="embedded" SourcePath="a2" Container="WixAttachedContainer" />
+  <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
+  <Registration BundleId="PuPmouBundle" Code="{E974001C-97B1-4FF7-B1E3-B2CAACF1FF4A}" ExecutableName="PuPmouBundle.exe" Scope="perUser" Tag="" Version="1.0.0.0" ProviderKey="{E974001C-97B1-4FF7-B1E3-B2CAACF1FF4A}">
+    <Arp DisplayName="PuPmouBundle" DisplayVersion="1.0.0.0" Publisher="Acme" />
+  </Registration>
+  <Chain>
+    <MsiPackage Id="PmouPkg1.msi" Cache="keep" CacheId="{E46705B9-D2F9-4BE8-8270-F1A11196A9D4}v1.0.0.0" InstallSize="279" Size="32768" Scope="perMachineOrUser" Permanent="no" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PmouPkg1.msi" RollbackLogPathVariable="WixBundleRollbackLog_PmouPkg1.msi" ProductCode="{E46705B9-D2F9-4BE8-8270-F1A11196A9D4}" Language="1033" Version="1.0.0.0" UpgradeCode="{B0DA1185-5CF5-55A3-8351-01F1AD3E50CE}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{E46705B9-D2F9-4BE8-8270-F1A11196A9D4}_v1.0.0.0" Version="1.0.0.0" DisplayName="PmouPkg1" />
+      <RelatedPackage Id="{B0DA1185-5CF5-55A3-8351-01F1AD3E50CE}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{B0DA1185-5CF5-55A3-8351-01F1AD3E50CE}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PmouPkg1.msi" />
+    </MsiPackage>
+    <MsiPackage Id="PmouPkg2.msi" Cache="keep" CacheId="{1B1D793E-4026-48CA-B088-F919E70440AC}v1.0.0.0" InstallSize="279" Size="32768" Scope="perMachineOrUser" Permanent="no" Vital="yes" LogPathVariable="WixBundleLog_PmouPkg2.msi" RollbackLogPathVariable="WixBundleRollbackLog_PmouPkg2.msi" ProductCode="{1B1D793E-4026-48CA-B088-F919E70440AC}" Language="1033" Version="1.0.0.0" UpgradeCode="{98F763B3-EA17-5AE5-AD47-21004FB34B24}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{1B1D793E-4026-48CA-B088-F919E70440AC}_v1.0.0.0" Version="1.0.0.0" DisplayName="PmouPkg2" />
+      <RelatedPackage Id="{98F763B3-EA17-5AE5-AD47-21004FB34B24}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{98F763B3-EA17-5AE5-AD47-21004FB34B24}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PmouPkg2.msi" />
+    </MsiPackage>
+    <MsiPackage Id="PerUserPkg.msi" Cache="keep" CacheId="{7DA760D5-30A8-4A32-A2E0-1563E0C99CEB}v1.0.0.0" InstallSize="274" Size="32768" Scope="perUser" Permanent="no" Vital="yes" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PerUserPkg.msi" RollbackLogPathVariable="WixBundleRollbackLog_PerUserPkg.msi" ProductCode="{7DA760D5-30A8-4A32-A2E0-1563E0C99CEB}" Language="1033" Version="1.0.0.0" UpgradeCode="{0D1FCBA3-488C-5309-B67C-E00C8B3FCADD}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{7DA760D5-30A8-4A32-A2E0-1563E0C99CEB}_v1.0.0.0" Version="1.0.0.0" DisplayName="PerUserPkg" />
+      <RelatedPackage Id="{0D1FCBA3-488C-5309-B67C-E00C8B3FCADD}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{0D1FCBA3-488C-5309-B67C-E00C8B3FCADD}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PerUserPkg.msi" />
+    </MsiPackage>
+  </Chain>
+</BurnManifest>
+\ No newline at end of file
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/PuPuomBundle_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/PuPuomBundle_manifest.xml
new file mode 100644
index 00000000..20dc0102
--- /dev/null
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/PuPuomBundle_manifest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<BurnManifest EngineVersion="7.0.0.54" ProtocolVersion="1" Win64="no" xmlns="http://wixtoolset.org/schemas/v4/2008/Burn">
+  <Log PathVariable="WixBundleLog" Prefix="PuPuomBundle" Extension="log" />
+  <RelatedBundle Code="{B0E91543-B4AC-5229-A871-3310CC2C32DF}" Action="Upgrade" />
+  <UX PrimaryPayloadId="WixStandardBootstrapperApplication_X86">
+    <Payload Id="payberKyKpNVb0s10isnONgjD92jYc" FilePath="thm.xml" SourcePath="u0" />
+    <Payload Id="payXE.1bvyKgymWAWeJwB8BL4ifPGo" FilePath="thm.wxl" SourcePath="u1" />
+    <Payload Id="pay8cUoxSucOqsVErqhu1LEW8wSG1s" FilePath="logo.png" SourcePath="u2" />
+    <Payload Id="WixStandardBootstrapperApplication_X86" FilePath="wixstdba.exe" SourcePath="u3" />
+    <Payload Id="uxTxMXPVMXwQrPTMIGa5WGt93w0Ns" FilePath="BootstrapperApplicationData.xml" SourcePath="u4" />
+    <Payload Id="uxmKgAFS4cS31ZH_Myfqo5J4kHixQ" FilePath="BootstrapperExtensionData.xml" SourcePath="u5" />
+  </UX>
+  <Container Id="WixAttachedContainer" FileSize="98429" Hash="29DF486489C9075258FB216672D76A4BB5BEC498157964F641EA360DB2C80EE37B737654A54B6F1FBB2E96E727A80B2B708AD69534EE9CE0E29ACEF09704896D" FilePath="PuPuomBundle.exe" AttachedIndex="1" Attached="yes" Primary="yes" />
+  <Payload Id="PuomPkg1.msi" FilePath="PuomPkg1.msi" FileSize="32768" Hash="EF19E061C2647AD42E39A1721299D5D970F1E42CE6636ACA53009DC0D0D1F8B6F2FD516B7D3EEDAAF1EEDA364D54DA6C18FB929C385EC1BDDA08AEA50370B357" Packaging="embedded" SourcePath="a0" Container="WixAttachedContainer" />
+  <Payload Id="PuomPkg2.msi" FilePath="PuomPkg2.msi" FileSize="32768" Hash="F927CE9CD3272AF6571E39C72A68E6BD6808D944B6893B09253887B1942E1C043EC5E1E1E758D3C261FF8B566121EE809C4CBCB931D00EBF14CC6CFE24001292" Packaging="embedded" SourcePath="a1" Container="WixAttachedContainer" />
+  <Payload Id="PerUserPkg.msi" FilePath="PerUserPkg.msi" FileSize="32768" Hash="26CA1B74EFC52FA969279450110B6A9472E629004EF5655A661D8609A7E4DDB76CA220E5DB6FC2AE554415D9A4E28567014F48EF978EFDEE0B4431E81498572F" Packaging="embedded" SourcePath="a2" Container="WixAttachedContainer" />
+  <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
+  <Registration BundleId="PuPuomBundle" Code="{6440CE0F-C219-4559-A051-97A655C4230A}" ExecutableName="PuPuomBundle.exe" Scope="perUser" Tag="" Version="1.0.0.0" ProviderKey="{6440CE0F-C219-4559-A051-97A655C4230A}">
+    <Arp DisplayName="PuPuomBundle" DisplayVersion="1.0.0.0" Publisher="Acme" />
+  </Registration>
+  <Chain>
+    <MsiPackage Id="PuomPkg1.msi" Cache="keep" CacheId="{167C572B-D847-4BCF-9693-C8B5EB6350CD}v1.0.0.0" InstallSize="279" Size="32768" Scope="perUserOrMachine" Permanent="no" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PuomPkg1.msi" RollbackLogPathVariable="WixBundleRollbackLog_PuomPkg1.msi" ProductCode="{167C572B-D847-4BCF-9693-C8B5EB6350CD}" Language="1033" Version="1.0.0.0" UpgradeCode="{AC3A2D0C-CB37-5F8B-8CE1-9233B963E5BB}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{167C572B-D847-4BCF-9693-C8B5EB6350CD}_v1.0.0.0" Version="1.0.0.0" DisplayName="PuomPkg1" />
+      <RelatedPackage Id="{AC3A2D0C-CB37-5F8B-8CE1-9233B963E5BB}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{AC3A2D0C-CB37-5F8B-8CE1-9233B963E5BB}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PuomPkg1.msi" />
+    </MsiPackage>
+    <MsiPackage Id="PuomPkg2.msi" Cache="keep" CacheId="{07617017-CE68-4F88-981A-4629835C9BD2}v1.0.0.0" InstallSize="279" Size="32768" Scope="perUserOrMachine" Permanent="no" Vital="yes" LogPathVariable="WixBundleLog_PuomPkg2.msi" RollbackLogPathVariable="WixBundleRollbackLog_PuomPkg2.msi" ProductCode="{07617017-CE68-4F88-981A-4629835C9BD2}" Language="1033" Version="1.0.0.0" UpgradeCode="{C977A922-168B-59F0-84FD-CAB89DB314E0}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{07617017-CE68-4F88-981A-4629835C9BD2}_v1.0.0.0" Version="1.0.0.0" DisplayName="PuomPkg2" />
+      <RelatedPackage Id="{C977A922-168B-59F0-84FD-CAB89DB314E0}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{C977A922-168B-59F0-84FD-CAB89DB314E0}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PuomPkg2.msi" />
+    </MsiPackage>
+    <MsiPackage Id="PerUserPkg.msi" Cache="keep" CacheId="{7DA760D5-30A8-4A32-A2E0-1563E0C99CEB}v1.0.0.0" InstallSize="274" Size="32768" Scope="perUser" Permanent="no" Vital="yes" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PerUserPkg.msi" RollbackLogPathVariable="WixBundleRollbackLog_PerUserPkg.msi" ProductCode="{7DA760D5-30A8-4A32-A2E0-1563E0C99CEB}" Language="1033" Version="1.0.0.0" UpgradeCode="{0D1FCBA3-488C-5309-B67C-E00C8B3FCADD}">
+      <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
+      <MsiProperty Id="MSIFASTINSTALL" Value="7" />
+      <Provides Key="{7DA760D5-30A8-4A32-A2E0-1563E0C99CEB}_v1.0.0.0" Version="1.0.0.0" DisplayName="PerUserPkg" />
+      <RelatedPackage Id="{0D1FCBA3-488C-5309-B67C-E00C8B3FCADD}" MaxVersion="1.0.0.0" MaxInclusive="no" OnlyDetect="no" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <RelatedPackage Id="{0D1FCBA3-488C-5309-B67C-E00C8B3FCADD}" MinVersion="1.0.0.0" MinInclusive="no" OnlyDetect="yes" LangInclusive="yes">
+        <Language Id="1033" />
+      </RelatedPackage>
+      <PayloadRef Id="PerUserPkg.msi" />
+    </MsiPackage>
+  </Chain>
+</BurnManifest>
+\ No newline at end of file
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/PuomBundlePackage_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/PuomBundlePackage_manifest.xml
new file mode 100644
index 00000000..60123409
--- /dev/null
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/PuomBundlePackage_manifest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<BurnManifest EngineVersion="7.0.0.54" ProtocolVersion="1" Win64="no" xmlns="http://wixtoolset.org/schemas/v4/2008/Burn">
+  <Log PathVariable="WixBundleLog" Prefix="AllPuomBundle" Extension="log" />
+  <RelatedBundle Code="{689DDFCE-6492-596F-92DC-341CCDF59ABB}" Action="Upgrade" />
+  <UX PrimaryPayloadId="WixStandardBootstrapperApplication_X86">
+    <Payload Id="payberKyKpNVb0s10isnONgjD92jYc" FilePath="thm.xml" SourcePath="u0" />
+    <Payload Id="payXE.1bvyKgymWAWeJwB8BL4ifPGo" FilePath="thm.wxl" SourcePath="u1" />
+    <Payload Id="pay8cUoxSucOqsVErqhu1LEW8wSG1s" FilePath="logo.png" SourcePath="u2" />
+    <Payload Id="WixStandardBootstrapperApplication_X86" FilePath="wixstdba.exe" SourcePath="u3" />
+    <Payload Id="uxTxMXPVMXwQrPTMIGa5WGt93w0Ns" FilePath="BootstrapperApplicationData.xml" SourcePath="u4" />
+    <Payload Id="uxmKgAFS4cS31ZH_Myfqo5J4kHixQ" FilePath="BootstrapperExtensionData.xml" SourcePath="u5" />
+  </UX>
+  <Container Id="WixAttachedContainer" FileSize="6212364" Hash="62B3BCE91659C71B4382EBE5699FDB0D9A903D5293EB6EC9211D401590C72F9A0C755F28F88D0A70BB7716710457B5480A8EBC9FEC6E103A30F2A03A301AFD10" FilePath="PuomBundlePackage.exe" AttachedIndex="1" Attached="yes" Primary="yes" />
+  <Payload Id="AllPuomBundle.exe" FilePath="AllPuomBundle.exe" FileSize="6210781" Hash="99C28419B07FDFC7C89AAB483FE7B2BB35102556959E9F2169CAB8A25FCFF2583F7B1079A69CB902ACDD3EE390E890AC9C9D54A108D70BFBB4AF26EC61AB4929" Packaging="embedded" SourcePath="a0" Container="WixAttachedContainer" />
+  <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
+  <Registration BundleId="AllPuomBundle" Code="{AF0B0375-34C0-4BEF-9411-ACD15D2084CB}" ExecutableName="PuomBundlePackage.exe" Scope="perUserOrMachine" Tag="" Version="1.0.0.0" ProviderKey="{AF0B0375-34C0-4BEF-9411-ACD15D2084CB}">
+    <Arp DisplayName="AllPuomBundle" DisplayVersion="1.0.0.0" Publisher="Acme" />
+  </Registration>
+  <Chain>
+    <BundlePackage Id="AllPuomBundle.exe" Cache="keep" CacheId="{37A6F602-178E-4A32-B766-EDC2CB81274B}v1.0.0.0" InstallSize="558" Size="6210781" Scope="perUserOrMachine" Permanent="no" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_AllPuomBundle.exe" RollbackLogPathVariable="WixBundleRollbackLog_AllPuomBundle.exe" BundleCode="{37A6F602-178E-4A32-B766-EDC2CB81274B}" Version="1.0.0.0" InstallArguments="" UninstallArguments="" RepairArguments="" SupportsBurnProtocol="yes" Win64="no" HideARP="yes">
+      <Provides Key="{37A6F602-178E-4A32-B766-EDC2CB81274B}" Version="1.0.0.0" DisplayName="AllPuomBundle" Imported="yes" />
+      <RelatedBundle Code="{689DDFCE-6492-596F-92DC-341CCDF59ABB}" Action="Upgrade" />
+      <PayloadRef Id="AllPuomBundle.exe" />
+    </BundlePackage>
+  </Chain>
+</BurnManifest>
+\ No newline at end of file
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_manifest.xml
index 495bbf05..e4075796 100644
--- a/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_manifest.xml
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_manifest.xml
@@ -45,14 +45,14 @@
    <Payload Id="PackageA" FilePath="PackageAv1.msi" FileSize="32768" Hash="2369B16B7219B3C834DFBC5D2AF8B2EF8803D43D" Packaging="external" SourcePath="PackageAv1.msi" />
    <Payload Id="PatchA" FilePath="PatchA.msp" FileSize="20480" Hash="FABC6C18E4A778E127E84CDF67F93A291CAEC8BB" Packaging="external" SourcePath="PatchA.msp" />
    <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
-    <Registration Code="{22D1DDBA-284D-40A7-BD14-95EA07906F21}" ExecutableName="BundleA.exe" PerMachine="yes" Tag="" Version="1.0.0.0" ProviderKey="{22D1DDBA-284D-40A7-BD14-95EA07906F21}">
+    <Registration Code="{22D1DDBA-284D-40A7-BD14-95EA07906F21}" ExecutableName="BundleA.exe" Scope="permachine" Tag="" Version="1.0.0.0" ProviderKey="{22D1DDBA-284D-40A7-BD14-95EA07906F21}">
        <Arp Register="yes" DisplayName="~SlipstreamTests - BundleA" DisplayVersion="1.0.0.0" />
    </Registration>
    <Chain>
-        <ExePackage Id="NetFx48Web" Cache="keep" CacheId="5A84A8E612E270E27D0061D58DB6B470153BE1F9" InstallSize="1479400" Size="1479400" PerMachine="yes" Permanent="yes" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" LogPathVariable="NetFx48WebLog" RollbackLogPathVariable="WixBundleRollbackLog_NetFx48Web" DetectCondition="NETFRAMEWORK45 &gt;= 528040" InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;" UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;" RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;" Repairable="yes" Uninstallable="yes" Protocol="netfx4" DetectionType="condition">
+        <ExePackage Id="NetFx48Web" Cache="keep" CacheId="5A84A8E612E270E27D0061D58DB6B470153BE1F9" InstallSize="1479400" Size="1479400" Scope="permachine" Permanent="yes" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" LogPathVariable="NetFx48WebLog" RollbackLogPathVariable="WixBundleRollbackLog_NetFx48Web" DetectCondition="NETFRAMEWORK45 &gt;= 528040" InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;" UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;" RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;" Repairable="yes" Uninstallable="yes" Protocol="netfx4" DetectionType="condition">
            <PayloadRef Id="NetFx48Web" />
        </ExePackage>
-        <MsiPackage Id="PackageA" Cache="keep" CacheId="{5FF7F534-3FFC-41E0-80CD-E6361E5E7B7B}v1.0.0.0" InstallSize="2103" Size="32768" PerMachine="yes" Permanent="no" Vital="yes" LogPathVariable="WixBundleLog_PackageA" RollbackLogPathVariable="WixBundleRollbackLog_PackageA" ProductCode="{5FF7F534-3FFC-41E0-80CD-E6361E5E7B7B}" Language="1033" Version="1.0.0.0" UpgradeCode="{DB87BB66-FE5D-4293-81AC-EE313D3F864B}">
+        <MsiPackage Id="PackageA" Cache="keep" CacheId="{5FF7F534-3FFC-41E0-80CD-E6361E5E7B7B}v1.0.0.0" InstallSize="2103" Size="32768" Scope="permachine" Permanent="no" Vital="yes" LogPathVariable="WixBundleLog_PackageA" RollbackLogPathVariable="WixBundleRollbackLog_PackageA" ProductCode="{5FF7F534-3FFC-41E0-80CD-E6361E5E7B7B}" Language="1033" Version="1.0.0.0" UpgradeCode="{DB87BB66-FE5D-4293-81AC-EE313D3F864B}">
            <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
            <MsiProperty Id="MSIFASTINSTALL" Value="7" />
            <SlipstreamMsp Id="PatchA" />
@@ -65,7 +65,7 @@
            </RelatedPackage>
            <PayloadRef Id="PackageA" />
        </MsiPackage>
-        <MspPackage Id="PatchA" Cache="keep" CacheId="{0A5113E3-06A5-4CE0-8E83-9EB42F6764A6}" InstallSize="20480" Size="20480" PerMachine="yes" Permanent="no" Vital="yes" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PatchA" RollbackLogPathVariable="WixBundleRollbackLog_PatchA" PatchCode="{0A5113E3-06A5-4CE0-8E83-9EB42F6764A6}" PatchXml="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;MsiPatch xmlns=&quot;http://www.microsoft.com/msi/patch_applicability.xsd&quot; SchemaVersion=&quot;1.0.0.0&quot; PatchGUID=&quot;{0A5113E3-06A5-4CE0-8E83-9EB42F6764A6}&quot; MinMsiVersion=&quot;5&quot; TargetsRTM=&quot;true&quot;&gt;&lt;TargetProduct MinMsiVersion=&quot;500&quot;&gt;&lt;TargetProductCode Validate=&quot;true&quot;&gt;{5FF7F534-3FFC-41E0-80CD-E6361E5E7B7B}&lt;/TargetProductCode&gt;&lt;TargetVersion Validate=&quot;true&quot; ComparisonType=&quot;Equal&quot; ComparisonFilter=&quot;MajorMinorUpdate&quot;&gt;1.0.0.0&lt;/TargetVersion&gt;&lt;UpdatedVersion&gt;1.0.1.0&lt;/UpdatedVersion&gt;&lt;TargetLanguage Validate=&quot;false&quot;&gt;1033&lt;/TargetLanguage&gt;&lt;UpdatedLanguages&gt;1033&lt;/UpdatedLanguages&gt;&lt;UpgradeCode Validate=&quot;true&quot;&gt;{DB87BB66-FE5D-4293-81AC-EE313D3F864B}&lt;/UpgradeCode&gt;&lt;/TargetProduct&gt;&lt;TargetProductCode&gt;{5FF7F534-3FFC-41E0-80CD-E6361E5E7B7B}&lt;/TargetProductCode&gt;&lt;/MsiPatch&gt;">
+        <MspPackage Id="PatchA" Cache="keep" CacheId="{0A5113E3-06A5-4CE0-8E83-9EB42F6764A6}" InstallSize="20480" Size="20480" Scope="permachine" Permanent="no" Vital="yes" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PatchA" RollbackLogPathVariable="WixBundleRollbackLog_PatchA" PatchCode="{0A5113E3-06A5-4CE0-8E83-9EB42F6764A6}" PatchXml="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;MsiPatch xmlns=&quot;http://www.microsoft.com/msi/patch_applicability.xsd&quot; SchemaVersion=&quot;1.0.0.0&quot; PatchGUID=&quot;{0A5113E3-06A5-4CE0-8E83-9EB42F6764A6}&quot; MinMsiVersion=&quot;5&quot; TargetsRTM=&quot;true&quot;&gt;&lt;TargetProduct MinMsiVersion=&quot;500&quot;&gt;&lt;TargetProductCode Validate=&quot;true&quot;&gt;{5FF7F534-3FFC-41E0-80CD-E6361E5E7B7B}&lt;/TargetProductCode&gt;&lt;TargetVersion Validate=&quot;true&quot; ComparisonType=&quot;Equal&quot; ComparisonFilter=&quot;MajorMinorUpdate&quot;&gt;1.0.0.0&lt;/TargetVersion&gt;&lt;UpdatedVersion&gt;1.0.1.0&lt;/UpdatedVersion&gt;&lt;TargetLanguage Validate=&quot;false&quot;&gt;1033&lt;/TargetLanguage&gt;&lt;UpdatedLanguages&gt;1033&lt;/UpdatedLanguages&gt;&lt;UpgradeCode Validate=&quot;true&quot;&gt;{DB87BB66-FE5D-4293-81AC-EE313D3F864B}&lt;/UpgradeCode&gt;&lt;/TargetProduct&gt;&lt;TargetProductCode&gt;{5FF7F534-3FFC-41E0-80CD-E6361E5E7B7B}&lt;/TargetProductCode&gt;&lt;/MsiPatch&gt;">
            <Provides Key="{0A5113E3-06A5-4CE0-8E83-9EB42F6764A6}" DisplayName="SlipstreamTests - Patch A" />
            <PayloadRef Id="PatchA" />
        </MspPackage>
diff --git a/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_modified_manifest.xml b/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_modified_manifest.xml
index de73c66f..1d9fcbee 100644
--- a/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_modified_manifest.xml
+++ b/src/burn/test/BurnUnitTest/TestData/PlanTest/Slipstream_BundleA_modified_manifest.xml
@@ -44,14 +44,14 @@
    <Payload Id="NetFx48Web" FilePath="redist\ndp48-web.exe" FileSize="1479400" Hash="5A84A8E612E270E27D0061D58DB6B470153BE1F9" DownloadUrl="https://go.microsoft.com/fwlink/?LinkId=2085155" Packaging="external" SourcePath="redist\ndp48-web.exe" />
    <Payload Id="PackageA" FilePath="PackageAv1.msi" FileSize="32768" Hash="2369B16B7219B3C834DFBC5D2AF8B2EF8803D43D" Packaging="external" SourcePath="PackageAv1.msi" />
    <RollbackBoundary Id="WixDefaultBoundary" Vital="yes" Transaction="no" />
-    <Registration Code="{22D1DDBA-284D-40A7-BD14-95EA07906F21}" ExecutableName="BundleA.exe" PerMachine="yes" Tag="" Version="1.0.0.0" ProviderKey="{DC94A8E0-4BF4-4026-B80B-2755DAFC05D3}">
+    <Registration Code="{22D1DDBA-284D-40A7-BD14-95EA07906F21}" ExecutableName="BundleA.exe" Scope="permachine" Tag="" Version="1.0.0.0" ProviderKey="{DC94A8E0-4BF4-4026-B80B-2755DAFC05D3}">
        <Arp Register="yes" DisplayName="~SlipstreamTests - BundleA" DisplayVersion="1.0.0.0" />
    </Registration>
    <Chain>
-        <ExePackage Id="NetFx48Web" Cache="keep" CacheId="5A84A8E612E270E27D0061D58DB6B470153BE1F9" InstallSize="1479400" Size="1479400" PerMachine="yes" Permanent="yes" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" LogPathVariable="NetFx48WebLog" RollbackLogPathVariable="WixBundleRollbackLog_NetFx48Web" DetectCondition="NETFRAMEWORK45 &gt;= 528040" InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;" UninstallArguments="" RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;" Repairable="yes" Uninstallable="no" Protocol="netfx4" DetectionType="condition">
+        <ExePackage Id="NetFx48Web" Cache="keep" CacheId="5A84A8E612E270E27D0061D58DB6B470153BE1F9" InstallSize="1479400" Size="1479400" Scope="permachine" Permanent="yes" Vital="yes" RollbackBoundaryForward="WixDefaultBoundary" LogPathVariable="NetFx48WebLog" RollbackLogPathVariable="WixBundleRollbackLog_NetFx48Web" DetectCondition="NETFRAMEWORK45 &gt;= 528040" InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;" UninstallArguments="" RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;" Repairable="yes" Uninstallable="no" Protocol="netfx4" DetectionType="condition">
            <PayloadRef Id="NetFx48Web" />
        </ExePackage>
-        <MsiPackage Id="PackageA" Cache="keep" CacheId="{5FF7F534-3FFC-41E0-80CD-E6361E5E7B7B}v1.0.0.0" InstallSize="2103" Size="32768" PerMachine="yes" Permanent="no" Vital="yes" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PackageA" RollbackLogPathVariable="WixBundleRollbackLog_PackageA" ProductCode="{5FF7F534-3FFC-41E0-80CD-E6361E5E7B7B}" Language="1033" Version="1.0.0.0" UpgradeCode="{DB87BB66-FE5D-4293-81AC-EE313D3F864B}">
+        <MsiPackage Id="PackageA" Cache="keep" CacheId="{5FF7F534-3FFC-41E0-80CD-E6361E5E7B7B}v1.0.0.0" InstallSize="2103" Size="32768" Scope="permachine" Permanent="no" Vital="yes" RollbackBoundaryBackward="WixDefaultBoundary" LogPathVariable="WixBundleLog_PackageA" RollbackLogPathVariable="WixBundleRollbackLog_PackageA" ProductCode="{5FF7F534-3FFC-41E0-80CD-E6361E5E7B7B}" Language="1033" Version="1.0.0.0" UpgradeCode="{DB87BB66-FE5D-4293-81AC-EE313D3F864B}">
            <MsiProperty Id="ARPSYSTEMCOMPONENT" Value="1" />
            <MsiProperty Id="MSIFASTINSTALL" Value="7" />
            <Provides Key="{5FF7F534-3FFC-41E0-80CD-E6361E5E7B7B}" Version="1.0.0.0" DisplayName="~SlipstreamTests - PackageA" />
diff --git a/src/burn/test/BurnUnitTest/VariableHelpers.cpp b/src/burn/test/BurnUnitTest/VariableHelpers.cpp
index 40f958f8..b1106492 100644
--- a/src/burn/test/BurnUnitTest/VariableHelpers.cpp
+++ b/src/burn/test/BurnUnitTest/VariableHelpers.cpp
@@ -7,11 +7,7 @@ using namespace System;
 using namespace Xunit;
-namespace Microsoft
+namespace WixToolset
-{
-namespace Tools
-{
-namespace WindowsInstallerXml
 {
 namespace Test
 {
@@ -213,5 +209,3 @@ namespace Bootstrapper
 }
 }
 }
-}
-}
diff --git a/src/burn/test/BurnUnitTest/VariableHelpers.h b/src/burn/test/BurnUnitTest/VariableHelpers.h
index d460c60f..4783c48c 100644
--- a/src/burn/test/BurnUnitTest/VariableHelpers.h
+++ b/src/burn/test/BurnUnitTest/VariableHelpers.h
@@ -2,11 +2,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
-namespace Microsoft
+namespace WixToolset
-{
-namespace Tools
-{
-namespace WindowsInstallerXml
 {
 namespace Test
 {
@@ -32,5 +28,3 @@ int VariableGetTypeHelper(BURN_VARIABLES* pVariables, LPCWSTR wzVariable);
 }
 }
 }
-}
-}
diff --git a/src/burn/test/BurnUnitTest/VariableTest.cpp b/src/burn/test/BurnUnitTest/VariableTest.cpp
index 2e2c36c9..7bd6f20a 100644
--- a/src/burn/test/BurnUnitTest/VariableTest.cpp
+++ b/src/burn/test/BurnUnitTest/VariableTest.cpp
@@ -4,11 +4,7 @@
 #undef GetTempPath
 #undef GetEnvironmentVariable
-namespace Microsoft
+namespace WixToolset
-{
-namespace Tools
-{
-namespace WindowsInstallerXml
 {
 namespace Test
 {
@@ -618,5 +614,3 @@ namespace Bootstrapper
 }
 }
 }
-}
-}
diff --git a/src/burn/test/BurnUnitTest/VariantTest.cpp b/src/burn/test/BurnUnitTest/VariantTest.cpp
index 035864cf..8dd44a5d 100644
--- a/src/burn/test/BurnUnitTest/VariantTest.cpp
+++ b/src/burn/test/BurnUnitTest/VariantTest.cpp
@@ -2,11 +2,7 @@
 #include "precomp.h"
-namespace Microsoft
+namespace WixToolset
-{
-namespace Tools
-{
-namespace WindowsInstallerXml
 {
 namespace Test
 {
@@ -215,5 +211,3 @@ namespace Bootstrapper
 }
 }
 }
-}
-}
diff --git a/src/ext/Bal/stdbas/WixInternalUIBootstrapperApplication.cpp b/src/ext/Bal/stdbas/WixInternalUIBootstrapperApplication.cpp
index bae098d4..e746ff75 100644
--- a/src/ext/Bal/stdbas/WixInternalUIBootstrapperApplication.cpp
+++ b/src/ext/Bal/stdbas/WixInternalUIBootstrapperApplication.cpp
@@ -708,7 +708,10 @@ private:
        m_plannedAction = action;
-        hr = m_pEngine->Plan(action);
+        // InternalUiBootstrapperApplication isn't in a position to let the user
+        // choose the scope, so we use the default. Unfortunately, a scope choice
+        // in the MSI UI can't "flow" back to affect bundle scope.
+        hr = m_pEngine->Plan(action, BOOTSTRAPPER_SCOPE_DEFAULT);
        BalExitOnFailure(hr, "Failed to start planning packages.");
    LExit:
diff --git a/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp b/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
index c1e8b2b3..74c6b4db 100644
--- a/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
+++ b/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
@@ -3420,7 +3420,7 @@ private:
    static LRESULT CallDefaultWndProc(
-        __in CWixStandardBootstrapperApplication* pBA,
+        __in_opt CWixStandardBootstrapperApplication* pBA,
        __in HWND hWnd,
        __in UINT uMsg,
        __in WPARAM wParam,
@@ -3824,7 +3824,7 @@ private:
        SetState(WIXSTDBA_STATE_PLANNING, hr);
-        hr = m_pEngine->Plan(action);
+        hr = m_pEngine->Plan(action, BOOTSTRAPPER_SCOPE_DEFAULT/*TODO*/);
        BalExitOnFailure(hr, "Failed to start planning packages.");
    LExit:
@@ -3848,7 +3848,7 @@ private:
        SetState(WIXSTDBA_STATE_PLANNING_PREREQS, hr);
-        hr = m_pEngine->Plan(action);
+        hr = m_pEngine->Plan(action, BOOTSTRAPPER_SCOPE_DEFAULT);
        BalExitOnFailure(hr, "Failed to start planning prereq packages.");
    LExit:
@@ -4546,6 +4546,8 @@ LExit:
        __out DWORD* pdwPageId
        )
    {
+        *pdwPageId = 0;
        if (BOOTSTRAPPER_DISPLAY_PASSIVE == m_commandDisplay)
        {
            switch (state)
@@ -4574,10 +4576,6 @@ LExit:
            case WIXSTDBA_STATE_EXECUTED:
                *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS_PASSIVE] ? m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS_PASSIVE] : m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS];
                break;
-            default:
-                *pdwPageId = 0;
-                break;
            }
        }
        else if (BOOTSTRAPPER_DISPLAY_FULL == m_commandDisplay)
diff --git a/src/internal/WixInternal.TestSupport.Native/NativeAssert.h b/src/internal/WixInternal.TestSupport.Native/NativeAssert.h
index 9ca04fea..8663c511 100644
--- a/src/internal/WixInternal.TestSupport.Native/NativeAssert.h
+++ b/src/internal/WixInternal.TestSupport.Native/NativeAssert.h
@@ -43,6 +43,16 @@ namespace TestSupport {
            WixAssert::StringEqual(NativeAssert::LPWSTRToString(expected), NativeAssert::LPWSTRToString(actual), ignoreCase);
        }
+        static void StringEqual(LPCSTR expected, LPCSTR actual)
+        {
+            NativeAssert::StringEqual(expected, actual, FALSE);
+        }
+        static void StringEqual(LPCSTR expected, LPCSTR actual, BOOL ignoreCase)
+        {
+            WixAssert::StringEqual(NativeAssert::LPSTRToString(expected), NativeAssert::LPSTRToString(actual), ignoreCase);
+        }
        static void Succeeded(HRESULT hr, LPCSTR zFormat, LPCSTR zArg, ... array<LPCSTR>^ zArgs)
        {
            array<Object^>^ formatArgs = gcnew array<Object^, 1>(zArgs->Length + 1);
@@ -91,10 +101,11 @@ namespace TestSupport {
        }
    private:
-        static String^ LPSTRToString(LPCSTR z)
+        static String^ LPSTRToString(LPCSTR sz)
        {
-            return z ? gcnew String(z) : nullptr;
+            return sz ? gcnew String(sz) : nullptr;
        }
        static String^ LPWSTRToString(LPCWSTR wz)
        {
            return wz ? gcnew String(wz) : nullptr;
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/strutil.h b/src/libs/dutil/WixToolset.DUtil/inc/strutil.h
index f2324a80..6710f599 100644
--- a/src/libs/dutil/WixToolset.DUtil/inc/strutil.h
+++ b/src/libs/dutil/WixToolset.DUtil/inc/strutil.h
@@ -309,10 +309,10 @@ HRESULT DAPI StrSplitAllocArray(
    );
 HRESULT DAPI StrSecureZeroString(
-    __in LPWSTR pwz
+    __in_z_opt LPWSTR pwz
    );
 HRESULT DAPI StrSecureZeroFreeString(
-    __in LPWSTR pwz
+    __in_z_opt LPWSTR pwz
    );
 #ifdef __cplusplus
diff --git a/src/libs/dutil/WixToolset.DUtil/strutil.cpp b/src/libs/dutil/WixToolset.DUtil/strutil.cpp
index 013c1b12..3c643879 100644
--- a/src/libs/dutil/WixToolset.DUtil/strutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/strutil.cpp
@@ -2774,7 +2774,7 @@ don't remain in memory.
 ****************************************************************************/
 extern "C" DAPI_(HRESULT) StrSecureZeroString(
-    __in LPWSTR pwz
+    __in_z_opt LPWSTR pwz
    )
 {
    HRESULT hr = S_OK;
@@ -2798,7 +2798,7 @@ don't remain in memory, then frees the string.
 ****************************************************************************/
 extern "C" DAPI_(HRESULT) StrSecureZeroFreeString(
-    __in LPWSTR pwz
+    __in_z_opt LPWSTR pwz
    )
 {
    HRESULT hr = S_OK;
diff --git a/src/test/burn/TestBA/TestBA.cs b/src/test/burn/TestBA/TestBA.cs
index 51fc1cbd..abab863a 100644
--- a/src/test/burn/TestBA/TestBA.cs
+++ b/src/test/burn/TestBA/TestBA.cs
@@ -43,6 +43,7 @@ namespace WixToolset.Test.BA
        private bool rollingBack;
        private string forceDownloadSource;
        private string forceUpdateSource;
+        private BundleScope bundleScope;
        private IBootstrapperCommand Command { get; set; }
@@ -160,6 +161,12 @@ namespace WixToolset.Test.BA
                this.quitAfterDetect = false;
            }
+            string bundleScope = this.ReadPackageAction(null, "BundleScope");
+            if (String.IsNullOrEmpty(bundleScope) || !Enum.TryParse<BundleScope>(bundleScope, out this.bundleScope))
+            {
+                this.bundleScope = BundleScope.Default;
+            }
            this.ImportContainerSources();
            this.ImportPayloadSources();
@@ -227,7 +234,6 @@ namespace WixToolset.Test.BA
            {
                this.Log("    OnDetectBegin::ForceUpdateSource: {0}", this.forceUpdateSource);
            }
        }
        protected override void OnDetectUpdateBegin(DetectUpdateBeginEventArgs args)
@@ -294,7 +300,7 @@ namespace WixToolset.Test.BA
                }
                else
                {
-                    this.Engine.Plan(this.action);
+                    this.Engine.Plan(this.action, this.bundleScope);
                }
            }
            else
@@ -312,7 +318,7 @@ namespace WixToolset.Test.BA
        {
            if (this.explicitlyElevateAndPlanFromOnElevateBegin)
            {
-                this.Engine.Plan(this.action);
+                this.Engine.Plan(this.action, this.bundleScope);
                // Simulate showing some UI since these tests won't actually show the UAC prompt.
                MessagePump.ProcessMessages(10);
diff --git a/src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesWithRemoteBundle/MultipleBundlePackagesWithRemoteBundle.wxs b/src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesWithRemoteBundle/MultipleBundlePackagesWithRemoteBundle.wxs
index 0d05700f..3ff752b2 100644
--- a/src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesWithRemoteBundle/MultipleBundlePackagesWithRemoteBundle.wxs
+++ b/src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesWithRemoteBundle/MultipleBundlePackagesWithRemoteBundle.wxs
@@ -12,7 +12,7 @@
      <BundlePackage Id="Dotnet_Runtime_6.0" Permanent="yes">
        <BundlePackagePayload Id="Dotnet_Runtime_6.0" Name="dotnet-runtime-6.0.10-win-x64.exe" ProductName="Microsoft .NET Runtime - 6.0.10 (x64)" Description="Microsoft .NET Runtime - 6.0.10 (x64)" DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/50336bc7-7fd1-4a12-b5a2-81ce0219edf9/8d862413975808de0d835888e41e49a7/dotnet-runtime-6.0.10-win-x64.exe" Hash="23E4C862AFEF34A2C0D6476A93274CE0158D28F1609E0404737663E4BE17263E61E5A8760382FB125D288A0965394E3D04B9E1C77F99DE80A2C590DD295B8732" Size="27912752" Version="6.0.10.31726">
-          <RemoteBundle BundleCode="{9A89127E-80A4-45FB-AD62-58F72634274A}" DisplayName="Microsoft .NET Runtime - 6.0.10 (x64)" InstallSize="71462036" ManifestNamespace="http://schemas.microsoft.com/wix/2008/Burn" PerMachine="yes" ProviderKey="{9a89127e-80a4-45fb-ad62-58f72634274a}" ProtocolVersion="1" Version="6.0.10.31726" Win64="no" UpgradeCode="{B19A028F-5C89-7AF4-5102-0F8ED67CCACA}" />
+          <RemoteBundle BundleCode="{9A89127E-80A4-45FB-AD62-58F72634274A}" DisplayName="Microsoft .NET Runtime - 6.0.10 (x64)" InstallSize="71462036" ManifestNamespace="http://schemas.microsoft.com/wix/2008/Burn" Scope="perMachine" ProviderKey="{9a89127e-80a4-45fb-ad62-58f72634274a}" ProtocolVersion="1" Version="6.0.10.31726" Win64="no" UpgradeCode="{B19A028F-5C89-7AF4-5102-0F8ED67CCACA}" />
        </BundlePackagePayload>
      </BundlePackage>
    </PackageGroup>
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/AllPmouBundle/AllPmouBundleTestBA.wixproj b/src/test/burn/TestData/ConfigurableScopeTests/AllPmouBundle/AllPmouBundleTestBA.wixproj
new file mode 100644
index 00000000..30d850d4
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/AllPmouBundle/AllPmouBundleTestBA.wixproj
@@ -0,0 +1,7 @@
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <BA>TestBA</BA>
+  </PropertyGroup>
+  <Import Project="Bundle.props" />
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/AllPmouBundle/AllPmouBundleWixStdBA.wixproj b/src/test/burn/TestData/ConfigurableScopeTests/AllPmouBundle/AllPmouBundleWixStdBA.wixproj
new file mode 100644
index 00000000..56db1fdc
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/AllPmouBundle/AllPmouBundleWixStdBA.wixproj
@@ -0,0 +1,7 @@
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <BA>WixStdBA</BA>
+  </PropertyGroup>
+  <Import Project="Bundle.props" />
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/AllPmouBundle/Bundle.props b/src/test/burn/TestData/ConfigurableScopeTests/AllPmouBundle/Bundle.props
new file mode 100644
index 00000000..a200a063
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/AllPmouBundle/Bundle.props
@@ -0,0 +1,14 @@
+<Project>
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
+    <PackageReference Include="WixToolset.NetFx.wixext" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+    <ProjectReference Include="..\PmouPkg1\PmouPkg1.wixproj" />
+    <ProjectReference Include="..\PmouPkg2\PmouPkg2.wixproj" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/AllPmouBundle/Bundle.wxs b/src/test/burn/TestData/ConfigurableScopeTests/AllPmouBundle/Bundle.wxs
new file mode 100644
index 00000000..48708db4
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/AllPmouBundle/Bundle.wxs
@@ -0,0 +1,19 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Bundle Id="AllPmouBundle$(BA)" Name="AllPmouBundle$(BA)" Manufacturer="Acme" Version="1.0.0.0">
+    <?if $(BA) = "WixStdBA"?>
+    <BootstrapperApplication>
+      <bal:WixStandardBootstrapperApplication LicenseUrl="https://www.example.com/license" Theme="hyperlinkLicense" />
+    </BootstrapperApplication>
+    <?endif?>
+    <Variable Name="TestGroupName" Value="ConfigurableScopeTests" />
+    <Chain>
+      <?if $(BA) = "TestBA"?>
+      <PackageGroupRef Id="TestBA" />
+      <?endif?>
+      <MsiPackage SourceFile="PmouPkg1.msi" />
+      <MsiPackage SourceFile="PmouPkg2.msi" />
+    </Chain>
+  </Bundle>
+</Wix>
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/AllPuomBundleTestBA.wixproj b/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/AllPuomBundleTestBA.wixproj
new file mode 100644
index 00000000..30d850d4
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/AllPuomBundleTestBA.wixproj
@@ -0,0 +1,7 @@
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <BA>TestBA</BA>
+  </PropertyGroup>
+  <Import Project="Bundle.props" />
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/AllPuomBundleWixStdBA.wixproj b/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/AllPuomBundleWixStdBA.wixproj
new file mode 100644
index 00000000..56db1fdc
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/AllPuomBundleWixStdBA.wixproj
@@ -0,0 +1,7 @@
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <BA>WixStdBA</BA>
+  </PropertyGroup>
+  <Import Project="Bundle.props" />
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/Bundle.props b/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/Bundle.props
new file mode 100644
index 00000000..d704544c
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/Bundle.props
@@ -0,0 +1,14 @@
+<Project>
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
+    <PackageReference Include="WixToolset.NetFx.wixext" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+    <ProjectReference Include="..\PuomPkg1\PuomPkg1.wixproj" />
+    <ProjectReference Include="..\PuomPkg2\PuomPkg2.wixproj" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/Bundle.wxs b/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/Bundle.wxs
new file mode 100644
index 00000000..4cb11a98
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/AllPuomBundle/Bundle.wxs
@@ -0,0 +1,19 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Bundle Id="AllPuomBundle$(BA)" Name="AllPuomBundle$(BA)" Manufacturer="Acme" Version="1.0.0.0">
+    <?if $(BA) = "WixStdBA"?>
+    <BootstrapperApplication>
+      <bal:WixStandardBootstrapperApplication LicenseUrl="https://www.example.com/license" Theme="hyperlinkLicense" />
+    </BootstrapperApplication>
+    <?endif?>
+    <Variable Name="TestGroupName" Value="ConfigurableScopeTests" />
+    <Chain>
+      <?if $(BA) = "TestBA"?>
+      <PackageGroupRef Id="TestBA" />
+      <?endif?>
+      <MsiPackage SourceFile="PuomPkg1.msi" />
+      <MsiPackage SourceFile="PuomPkg2.msi" />
+    </Chain>
+  </Bundle>
+</Wix>
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PerMachineBundle/Bundle.wxs b/src/test/burn/TestData/ConfigurableScopeTests/PerMachineBundle/Bundle.wxs
new file mode 100644
index 00000000..e170667b
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PerMachineBundle/Bundle.wxs
@@ -0,0 +1,11 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Bundle Id="PerMachineBundle" Name="PerMachineBundle" Manufacturer="Acme" Version="1.0.0.0">
+    <BootstrapperApplication>
+      <bal:WixStandardBootstrapperApplication LicenseUrl="https://www.example.com/license" Theme="hyperlinkLicense" />
+    </BootstrapperApplication>
+    <Chain>
+      <MsiPackage SourceFile="PerMachinePkg.msi" />
+    </Chain>
+  </Bundle>
+</Wix>
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PerMachineBundle/PerMachineBundle.wixproj b/src/test/burn/TestData/ConfigurableScopeTests/PerMachineBundle/PerMachineBundle.wixproj
new file mode 100644
index 00000000..ade65220
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PerMachineBundle/PerMachineBundle.wixproj
@@ -0,0 +1,11 @@
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PerMachinePkg\PerMachinePkg.wixproj" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PerMachinePkg/PerMachinePkg.wixproj b/src/test/burn/TestData/ConfigurableScopeTests/PerMachinePkg/PerMachinePkg.wixproj
new file mode 100644
index 00000000..20673927
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PerMachinePkg/PerMachinePkg.wixproj
@@ -0,0 +1,2 @@
+<Project Sdk="WixToolset.Sdk">
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PerMachinePkg/product.wxs b/src/test/burn/TestData/ConfigurableScopeTests/PerMachinePkg/product.wxs
new file mode 100644
index 00000000..4b14c9d2
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PerMachinePkg/product.wxs
@@ -0,0 +1,6 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Id="PerMachinePkg" Name="PerMachinePkg" Language="1033" Version="1.0.0.0" Manufacturer="Acme" Scope="perMachine">
+    <MediaTemplate EmbedCab="yes" />
+    <File Source="$(sys.SOURCEFILEPATH)" />
+  </Package>
+</Wix>
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PerUserBundle/Bundle.wxs b/src/test/burn/TestData/ConfigurableScopeTests/PerUserBundle/Bundle.wxs
new file mode 100644
index 00000000..e0a4c170
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PerUserBundle/Bundle.wxs
@@ -0,0 +1,11 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Bundle Id="PerUserBundle" Name="PerUserBundle" Manufacturer="Acme" Version="1.0.0.0">
+    <BootstrapperApplication>
+      <bal:WixStandardBootstrapperApplication LicenseUrl="https://www.example.com/license" Theme="hyperlinkLicense" />
+    </BootstrapperApplication>
+    <Chain>
+      <MsiPackage SourceFile="PerUserPkg.msi" />
+    </Chain>
+  </Bundle>
+</Wix>
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PerUserBundle/PerUserBundle.wixproj b/src/test/burn/TestData/ConfigurableScopeTests/PerUserBundle/PerUserBundle.wixproj
new file mode 100644
index 00000000..7af6148b
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PerUserBundle/PerUserBundle.wixproj
@@ -0,0 +1,11 @@
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PerUserPkg\PerUserPkg.wixproj" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PerUserPkg/PerUserPkg.wixproj b/src/test/burn/TestData/ConfigurableScopeTests/PerUserPkg/PerUserPkg.wixproj
new file mode 100644
index 00000000..20673927
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PerUserPkg/PerUserPkg.wixproj
@@ -0,0 +1,2 @@
+<Project Sdk="WixToolset.Sdk">
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PerUserPkg/product.wxs b/src/test/burn/TestData/ConfigurableScopeTests/PerUserPkg/product.wxs
new file mode 100644
index 00000000..17c25409
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PerUserPkg/product.wxs
@@ -0,0 +1,6 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Id="PerUserPkg" Name="PerUserPkg" Language="1033" Version="1.0.0.0" Manufacturer="Acme" Scope="perUser">
+    <MediaTemplate EmbedCab="yes" />
+    <File Source="$(sys.SOURCEFILEPATH)" />
+  </Package>
+</Wix>
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PmPmouBundle/Bundle.props b/src/test/burn/TestData/ConfigurableScopeTests/PmPmouBundle/Bundle.props
new file mode 100644
index 00000000..9ecde613
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PmPmouBundle/Bundle.props
@@ -0,0 +1,15 @@
+<Project>
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
+    <PackageReference Include="WixToolset.NetFx.wixext" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+    <ProjectReference Include="..\PerMachinePkg\PerMachinePkg.wixproj" />
+    <ProjectReference Include="..\PmouPkg1\PmouPkg1.wixproj" />
+    <ProjectReference Include="..\PmouPkg2\PmouPkg2.wixproj" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PmPmouBundle/Bundle.wxs b/src/test/burn/TestData/ConfigurableScopeTests/PmPmouBundle/Bundle.wxs
new file mode 100644
index 00000000..ecb8571b
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PmPmouBundle/Bundle.wxs
@@ -0,0 +1,20 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Bundle Id="PmPmouBundle$(BA)" Name="PmPmouBundle$(BA)" Manufacturer="Acme" Version="1.0.0.0">
+    <?if $(BA) = "WixStdBA"?>
+    <BootstrapperApplication>
+      <bal:WixStandardBootstrapperApplication LicenseUrl="https://www.example.com/license" Theme="hyperlinkLicense" />
+    </BootstrapperApplication>
+    <?endif?>
+    <Variable Name="TestGroupName" Value="ConfigurableScopeTests" />
+    <Chain>
+      <?if $(BA) = "TestBA"?>
+      <PackageGroupRef Id="TestBA" />
+      <?endif?>
+      <MsiPackage SourceFile="PerMachinePkg.msi" />
+      <MsiPackage SourceFile="PmouPkg1.msi" />
+      <MsiPackage SourceFile="PmouPkg2.msi" />
+    </Chain>
+  </Bundle>
+</Wix>
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PmPmouBundle/PmPmouBundleTestBA.wixproj b/src/test/burn/TestData/ConfigurableScopeTests/PmPmouBundle/PmPmouBundleTestBA.wixproj
new file mode 100644
index 00000000..66ad737c
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PmPmouBundle/PmPmouBundleTestBA.wixproj
@@ -0,0 +1,7 @@
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <BA>TestBA</BA>
+  </PropertyGroup>
+  <Import Project="Bundle.props" />
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PmPuPmouBundle/Bundle.props b/src/test/burn/TestData/ConfigurableScopeTests/PmPuPmouBundle/Bundle.props
new file mode 100644
index 00000000..51458cdd
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PmPuPmouBundle/Bundle.props
@@ -0,0 +1,17 @@
+<Project>
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <SuppressSpecificWarnings>1140</SuppressSpecificWarnings>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
+    <PackageReference Include="WixToolset.NetFx.wixext" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+    <ProjectReference Include="..\PerMachinePkg\PerMachinePkg.wixproj" />
+    <ProjectReference Include="..\PmouPkg1\PmouPkg1.wixproj" />
+    <ProjectReference Include="..\PmouPkg2\PmouPkg2.wixproj" />
+    <ProjectReference Include="..\PerUserPkg\PerUserPkg.wixproj" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PmPuPmouBundle/Bundle.wxs b/src/test/burn/TestData/ConfigurableScopeTests/PmPuPmouBundle/Bundle.wxs
new file mode 100644
index 00000000..64361b42
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PmPuPmouBundle/Bundle.wxs
@@ -0,0 +1,21 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Bundle Id="PmPuPmouBundle$(BA)" Name="PmPuPmouBundle$(BA)" Manufacturer="Acme" Version="1.0.0.0">
+    <?if $(BA) = "WixStdBA"?>
+    <BootstrapperApplication>
+      <bal:WixStandardBootstrapperApplication LicenseUrl="https://www.example.com/license" Theme="hyperlinkLicense" />
+    </BootstrapperApplication>
+    <?endif?>
+    <Variable Name="TestGroupName" Value="ConfigurableScopeTests" />
+    <Chain>
+      <?if $(BA) = "TestBA"?>
+      <PackageGroupRef Id="TestBA" />
+      <?endif?>
+      <MsiPackage SourceFile="PerMachinePkg.msi" />
+      <MsiPackage SourceFile="PmouPkg1.msi" />
+      <MsiPackage SourceFile="PmouPkg2.msi" />
+      <MsiPackage SourceFile="PerUserPkg.msi" />
+    </Chain>
+  </Bundle>
+</Wix>
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PmPuPmouBundle/PmPuPmouBundleTestBA.wixproj b/src/test/burn/TestData/ConfigurableScopeTests/PmPuPmouBundle/PmPuPmouBundleTestBA.wixproj
new file mode 100644
index 00000000..30d850d4
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PmPuPmouBundle/PmPuPmouBundleTestBA.wixproj
@@ -0,0 +1,7 @@
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <BA>TestBA</BA>
+  </PropertyGroup>
+  <Import Project="Bundle.props" />
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PmPuPuomBundle/Bundle.props b/src/test/burn/TestData/ConfigurableScopeTests/PmPuPuomBundle/Bundle.props
new file mode 100644
index 00000000..7da4792a
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PmPuPuomBundle/Bundle.props
@@ -0,0 +1,17 @@
+<Project>
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <SuppressSpecificWarnings>1140</SuppressSpecificWarnings>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
+    <PackageReference Include="WixToolset.NetFx.wixext" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+    <ProjectReference Include="..\PerMachinePkg\PerMachinePkg.wixproj" />
+    <ProjectReference Include="..\PuomPkg1\PuomPkg1.wixproj" />
+    <ProjectReference Include="..\PuomPkg2\PuomPkg2.wixproj" />
+    <ProjectReference Include="..\PerUserPkg\PerUserPkg.wixproj" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PmPuPuomBundle/Bundle.wxs b/src/test/burn/TestData/ConfigurableScopeTests/PmPuPuomBundle/Bundle.wxs
new file mode 100644
index 00000000..4c9ce68c
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PmPuPuomBundle/Bundle.wxs
@@ -0,0 +1,21 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Bundle Id="PmPuPuomBundle$(BA)" Name="PmPuPuomBundle$(BA)" Manufacturer="Acme" Version="1.0.0.0">
+    <?if $(BA) = "WixStdBA"?>
+    <BootstrapperApplication>
+      <bal:WixStandardBootstrapperApplication LicenseUrl="https://www.example.com/license" Theme="hyperlinkLicense" />
+    </BootstrapperApplication>
+    <?endif?>
+    <Variable Name="TestGroupName" Value="ConfigurableScopeTests" />
+    <Chain>
+      <?if $(BA) = "TestBA"?>
+      <PackageGroupRef Id="TestBA" />
+      <?endif?>
+      <MsiPackage SourceFile="PerMachinePkg.msi" />
+      <MsiPackage SourceFile="PuomPkg1.msi" />
+      <MsiPackage SourceFile="PuomPkg2.msi" />
+      <MsiPackage SourceFile="PerUserPkg.msi" />
+    </Chain>
+  </Bundle>
+</Wix>
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PmPuPuomBundle/PmPuPuomBundleTestBA.wixproj b/src/test/burn/TestData/ConfigurableScopeTests/PmPuPuomBundle/PmPuPuomBundleTestBA.wixproj
new file mode 100644
index 00000000..30d850d4
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PmPuPuomBundle/PmPuPuomBundleTestBA.wixproj
@@ -0,0 +1,7 @@
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <BA>TestBA</BA>
+  </PropertyGroup>
+  <Import Project="Bundle.props" />
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PmPuomBundle/Bundle.props b/src/test/burn/TestData/ConfigurableScopeTests/PmPuomBundle/Bundle.props
new file mode 100644
index 00000000..9ecde613
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PmPuomBundle/Bundle.props
@@ -0,0 +1,15 @@
+<Project>
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
+    <PackageReference Include="WixToolset.NetFx.wixext" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+    <ProjectReference Include="..\PerMachinePkg\PerMachinePkg.wixproj" />
+    <ProjectReference Include="..\PmouPkg1\PmouPkg1.wixproj" />
+    <ProjectReference Include="..\PmouPkg2\PmouPkg2.wixproj" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PmPuomBundle/Bundle.wxs b/src/test/burn/TestData/ConfigurableScopeTests/PmPuomBundle/Bundle.wxs
new file mode 100644
index 00000000..7f53f09a
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PmPuomBundle/Bundle.wxs
@@ -0,0 +1,20 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Bundle Id="PmPuomBundle$(BA)" Name="PmPuomBundle$(BA)" Manufacturer="Acme" Version="1.0.0.0">
+    <?if $(BA) = "WixStdBA"?>
+    <BootstrapperApplication>
+      <bal:WixStandardBootstrapperApplication LicenseUrl="https://www.example.com/license" Theme="hyperlinkLicense" />
+    </BootstrapperApplication>
+    <?endif?>
+    <Variable Name="TestGroupName" Value="ConfigurableScopeTests" />
+    <Chain>
+      <?if $(BA) = "TestBA"?>
+      <PackageGroupRef Id="TestBA" />
+      <?endif?>
+      <MsiPackage SourceFile="PerMachinePkg.msi" />
+      <MsiPackage SourceFile="PuomPkg1.msi" />
+      <MsiPackage SourceFile="PuomPkg2.msi" />
+    </Chain>
+  </Bundle>
+</Wix>
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PmPuomBundle/PmPuomBundleTestBA.wixproj b/src/test/burn/TestData/ConfigurableScopeTests/PmPuomBundle/PmPuomBundleTestBA.wixproj
new file mode 100644
index 00000000..30d850d4
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PmPuomBundle/PmPuomBundleTestBA.wixproj
@@ -0,0 +1,7 @@
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <BA>TestBA</BA>
+  </PropertyGroup>
+  <Import Project="Bundle.props" />
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PmouPkg1/PmouPkg1.wixproj b/src/test/burn/TestData/ConfigurableScopeTests/PmouPkg1/PmouPkg1.wixproj
new file mode 100644
index 00000000..20673927
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PmouPkg1/PmouPkg1.wixproj
@@ -0,0 +1,2 @@
+<Project Sdk="WixToolset.Sdk">
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PmouPkg1/product.wxs b/src/test/burn/TestData/ConfigurableScopeTests/PmouPkg1/product.wxs
new file mode 100644
index 00000000..a41e99ca
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PmouPkg1/product.wxs
@@ -0,0 +1,6 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Id="PmouPkg1" Name="PmouPkg1" Language="1033" Version="1.0.0.0" Manufacturer="Acme" Scope="perMachineOrUser">
+    <MediaTemplate EmbedCab="yes" />
+    <File Source="$(sys.SOURCEFILEPATH)" />
+  </Package>
+</Wix>
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PmouPkg2/PmouPkg2.wixproj b/src/test/burn/TestData/ConfigurableScopeTests/PmouPkg2/PmouPkg2.wixproj
new file mode 100644
index 00000000..20673927
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PmouPkg2/PmouPkg2.wixproj
@@ -0,0 +1,2 @@
+<Project Sdk="WixToolset.Sdk">
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PmouPkg2/product.wxs b/src/test/burn/TestData/ConfigurableScopeTests/PmouPkg2/product.wxs
new file mode 100644
index 00000000..84f74769
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PmouPkg2/product.wxs
@@ -0,0 +1,6 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Id="PmouPkg2" Name="PmouPkg2" Language="1033" Version="1.0.0.0" Manufacturer="Acme" Scope="perMachineOrUser">
+    <MediaTemplate EmbedCab="yes" />
+    <File Source="$(sys.SOURCEFILEPATH)" />
+  </Package>
+</Wix>
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PuPmouBundle/Bundle.props b/src/test/burn/TestData/ConfigurableScopeTests/PuPmouBundle/Bundle.props
new file mode 100644
index 00000000..95acbebe
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PuPmouBundle/Bundle.props
@@ -0,0 +1,16 @@
+<Project>
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <SuppressSpecificWarnings>1140</SuppressSpecificWarnings>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
+    <PackageReference Include="WixToolset.NetFx.wixext" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+    <ProjectReference Include="..\PerUserPkg\PerUserPkg.wixproj" />
+    <ProjectReference Include="..\PmouPkg1\PmouPkg1.wixproj" />
+    <ProjectReference Include="..\PmouPkg2\PmouPkg2.wixproj" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PuPmouBundle/Bundle.wxs b/src/test/burn/TestData/ConfigurableScopeTests/PuPmouBundle/Bundle.wxs
new file mode 100644
index 00000000..70e84690
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PuPmouBundle/Bundle.wxs
@@ -0,0 +1,20 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Bundle Id="PuPmouBundle$(BA)" Name="PuPmouBundle$(BA)" Manufacturer="Acme" Version="1.0.0.0">
+    <?if $(BA) = "WixStdBA"?>
+    <BootstrapperApplication>
+      <bal:WixStandardBootstrapperApplication LicenseUrl="https://www.example.com/license" Theme="hyperlinkLicense" />
+    </BootstrapperApplication>
+    <?endif?>
+    <Variable Name="TestGroupName" Value="ConfigurableScopeTests" />
+    <Chain>
+      <?if $(BA) = "TestBA"?>
+      <PackageGroupRef Id="TestBA" />
+      <?endif?>
+      <MsiPackage SourceFile="PmouPkg1.msi" />
+      <MsiPackage SourceFile="PmouPkg2.msi" />
+      <MsiPackage SourceFile="PerUserPkg.msi" />
+    </Chain>
+  </Bundle>
+</Wix>
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PuPmouBundle/PuPmouBundleTestBA.wixproj b/src/test/burn/TestData/ConfigurableScopeTests/PuPmouBundle/PuPmouBundleTestBA.wixproj
new file mode 100644
index 00000000..30d850d4
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PuPmouBundle/PuPmouBundleTestBA.wixproj
@@ -0,0 +1,7 @@
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <BA>TestBA</BA>
+  </PropertyGroup>
+  <Import Project="Bundle.props" />
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PuPuomBundle/Bundle.props b/src/test/burn/TestData/ConfigurableScopeTests/PuPuomBundle/Bundle.props
new file mode 100644
index 00000000..6d0a58f1
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PuPuomBundle/Bundle.props
@@ -0,0 +1,16 @@
+<Project>
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <SuppressSpecificWarnings>1140</SuppressSpecificWarnings>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
+    <PackageReference Include="WixToolset.NetFx.wixext" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+    <ProjectReference Include="..\PuomPkg1\PuomPkg1.wixproj" />
+    <ProjectReference Include="..\PuomPkg2\PuomPkg2.wixproj" />
+    <ProjectReference Include="..\PerUserPkg\PerUserPkg.wixproj" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PuPuomBundle/Bundle.wxs b/src/test/burn/TestData/ConfigurableScopeTests/PuPuomBundle/Bundle.wxs
new file mode 100644
index 00000000..6c5b6845
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PuPuomBundle/Bundle.wxs
@@ -0,0 +1,20 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Bundle Id="PuPuomBundle$(BA)" Name="PuPuomBundle$(BA)" Manufacturer="Acme" Version="1.0.0.0">
+    <?if $(BA) = "WixStdBA"?>
+    <BootstrapperApplication>
+      <bal:WixStandardBootstrapperApplication LicenseUrl="https://www.example.com/license" Theme="hyperlinkLicense" />
+    </BootstrapperApplication>
+    <?endif?>
+    <Variable Name="TestGroupName" Value="ConfigurableScopeTests" />
+    <Chain>
+      <?if $(BA) = "TestBA"?>
+      <PackageGroupRef Id="TestBA" />
+      <?endif?>
+      <MsiPackage SourceFile="PuomPkg1.msi" />
+      <MsiPackage SourceFile="PuomPkg2.msi" />
+      <MsiPackage SourceFile="PerUserPkg.msi" />
+    </Chain>
+  </Bundle>
+</Wix>
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PuPuomBundle/PuPuomBundleTestBA.wixproj b/src/test/burn/TestData/ConfigurableScopeTests/PuPuomBundle/PuPuomBundleTestBA.wixproj
new file mode 100644
index 00000000..30d850d4
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PuPuomBundle/PuPuomBundleTestBA.wixproj
@@ -0,0 +1,7 @@
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <BA>TestBA</BA>
+  </PropertyGroup>
+  <Import Project="Bundle.props" />
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PuomBundlePackage/Bundle.wxs b/src/test/burn/TestData/ConfigurableScopeTests/PuomBundlePackage/Bundle.wxs
new file mode 100644
index 00000000..8b585e18
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PuomBundlePackage/Bundle.wxs
@@ -0,0 +1,11 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Bundle Id="AllPuomBundle" Name="AllPuomBundle" Manufacturer="Acme" Version="1.0.0.0">
+    <BootstrapperApplication>
+      <bal:WixStandardBootstrapperApplication LicenseUrl="https://www.example.com/license" Theme="hyperlinkLicense" />
+    </BootstrapperApplication>
+    <Chain>
+      <BundlePackage SourceFile="AllPuomBundleTestBA.exe" />
+    </Chain>
+  </Bundle>
+</Wix>
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PuomBundlePackage/PuomBundlePackage.wixproj b/src/test/burn/TestData/ConfigurableScopeTests/PuomBundlePackage/PuomBundlePackage.wixproj
new file mode 100644
index 00000000..55edd282
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PuomBundlePackage/PuomBundlePackage.wixproj
@@ -0,0 +1,11 @@
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\AllPuomBundle\AllPuomBundleTestBA.wixproj" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PuomPkg1/PuomPkg1.wixproj b/src/test/burn/TestData/ConfigurableScopeTests/PuomPkg1/PuomPkg1.wixproj
new file mode 100644
index 00000000..20673927
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PuomPkg1/PuomPkg1.wixproj
@@ -0,0 +1,2 @@
+<Project Sdk="WixToolset.Sdk">
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PuomPkg1/product.wxs b/src/test/burn/TestData/ConfigurableScopeTests/PuomPkg1/product.wxs
new file mode 100644
index 00000000..b136f7dd
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PuomPkg1/product.wxs
@@ -0,0 +1,6 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Id="PuomPkg1" Name="PuomPkg1" Language="1033" Version="1.0.0.0" Manufacturer="Acme" Scope="perUserOrMachine">
+    <MediaTemplate EmbedCab="yes" />
+    <File Source="$(sys.SOURCEFILEPATH)" />
+  </Package>
+</Wix>
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PuomPkg2/PuomPkg2.wixproj b/src/test/burn/TestData/ConfigurableScopeTests/PuomPkg2/PuomPkg2.wixproj
new file mode 100644
index 00000000..20673927
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PuomPkg2/PuomPkg2.wixproj
@@ -0,0 +1,2 @@
+<Project Sdk="WixToolset.Sdk">
+</Project>
+\ No newline at end of file
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PuomPkg2/product.wxs b/src/test/burn/TestData/ConfigurableScopeTests/PuomPkg2/product.wxs
new file mode 100644
index 00000000..2c4cb170
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PuomPkg2/product.wxs
@@ -0,0 +1,6 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Id="PuomPkg2" Name="PuomPkg2" Language="1033" Version="1.0.0.0" Manufacturer="Acme" Scope="perUserOrMachine">
+    <MediaTemplate EmbedCab="yes" />
+    <File Source="$(sys.SOURCEFILEPATH)" />
+  </Package>
+</Wix>
diff --git a/src/test/burn/WixTestTools/ArpEntryVerifier.cs b/src/test/burn/WixTestTools/ArpEntryVerifier.cs
index b3c70337..4e43062a 100644
--- a/src/test/burn/WixTestTools/ArpEntryVerifier.cs
+++ b/src/test/burn/WixTestTools/ArpEntryVerifier.cs
@@ -8,17 +8,25 @@ namespace WixTestTools
    {
        public bool TryGetRegistration(out GenericArpRegistration registration)
        {
-            bool success = !this.PerMachine ? GenericArpRegistration.TryGetPerUserRegistrationById(this.ArpId, out registration)
+            var success = this.PerMachine
-                                            : GenericArpRegistration.TryGetPerMachineRegistrationById(this.ArpId, this.X64, out registration);
+                ? GenericArpRegistration.TryGetPerMachineRegistrationById(this.ArpId, this.X64, this.TestContext.TestOutputHelper, out registration)
+                : GenericArpRegistration.TryGetPerUserRegistrationById(this.ArpId, this.TestContext.TestOutputHelper, out registration);
            return success;
        }
        public void VerifyRegistered(bool registered)
        {
-            bool success = this.TryGetRegistration(out _);
+            var success = this.TryGetRegistration(out _);
-            Assert.Equal(registered, success);
+            if (registered)
+            {
+                Assert.True(success);
+            }
+            else
+            {
+                Assert.False(success);
+            }
        }
    }
 }
diff --git a/src/test/burn/WixTestTools/BundleInstaller.cs b/src/test/burn/WixTestTools/BundleInstaller.cs
index 0f2cfa8f..93602661 100644
--- a/src/test/burn/WixTestTools/BundleInstaller.cs
+++ b/src/test/burn/WixTestTools/BundleInstaller.cs
@@ -189,7 +189,8 @@ namespace WixTestTools
        /// <returns>Path to the generated log file.</returns>
        private string RunBundleWithArguments(int expectedExitCode, MSIExec.MSIExecMode mode, string[] arguments, bool assertOnError = true, string bundlePath = null, string layoutDirectory = null)
        {
-            TestTool bundle = new TestTool(bundlePath ?? this.Bundle);
+            var exePath = bundlePath ?? this.Bundle;
+            var bundle = new TestTool(exePath);
            var sb = new StringBuilder();
            // Be sure to run silent.
@@ -230,6 +231,8 @@ namespace WixTestTools
            // Set the arguments.
            bundle.Arguments = sb.ToString();
+            this.TestContext.TestOutputHelper.WriteLine($"Launching '{exePath}' with arguments '{bundle.Arguments}'...");
            // Run the tool and assert the expected code.
            bundle.ExpectedExitCode = expectedExitCode;
            bundle.AlternateExitCode = this.AlternateExitCode;
diff --git a/src/test/burn/WixTestTools/BundleRegistration.cs b/src/test/burn/WixTestTools/BundleRegistration.cs
index 524d4616..57581510 100644
--- a/src/test/burn/WixTestTools/BundleRegistration.cs
+++ b/src/test/burn/WixTestTools/BundleRegistration.cs
@@ -4,6 +4,7 @@ namespace WixTestTools
 {
    using System;
    using Microsoft.Win32;
+    using Xunit.Abstractions;
    public class BundleRegistration : GenericArpRegistration
    {
@@ -36,19 +37,19 @@ namespace WixTestTools
        public string[] UpgradeCodes { get; set; }
-        public static bool TryGetPerMachineBundleRegistrationById(string id, bool x64, out BundleRegistration registration)
+        public static bool TryGetPerMachineBundleRegistrationById(string id, bool x64, ITestOutputHelper testOutputHelper, out BundleRegistration registration)
        {
-            return TryGetRegistrationById(id, x64, false, out registration);
+            return TryGetRegistrationById(id, x64, false, testOutputHelper, out registration);
        }
-        public static bool TryGetPerUserBundleRegistrationById(string id, out BundleRegistration registration)
+        public static bool TryGetPerUserBundleRegistrationById(string id, ITestOutputHelper testOutputHelper, out BundleRegistration registration)
        {
-            return TryGetRegistrationById(id, true, true, out registration);
+            return TryGetRegistrationById(id, true, true, testOutputHelper, out registration);
        }
-        private static bool TryGetRegistrationById(string id, bool x64, bool perUser, out BundleRegistration registration)
+        private static bool TryGetRegistrationById(string id, bool x64, bool perUser, ITestOutputHelper testOutputHelper, out BundleRegistration registration)
        {
-            registration = GetGenericArpRegistration(id, x64, perUser, key => GetBundleRegistration(key));
+            registration = GetGenericArpRegistration(id, x64, perUser, testOutputHelper, key => GetBundleRegistration(key));
            return registration != null;
        }
diff --git a/src/test/burn/WixTestTools/BundleVerifier.cs b/src/test/burn/WixTestTools/BundleVerifier.cs
index b6181047..7bfba687 100644
--- a/src/test/burn/WixTestTools/BundleVerifier.cs
+++ b/src/test/burn/WixTestTools/BundleVerifier.cs
@@ -5,8 +5,6 @@ namespace WixTestTools
    using System;
    using System.IO;
    using System.Linq;
-    using System.Text;
-    using System.Xml.Linq;
    using Microsoft.Win32;
    using WixInternal.TestSupport;
    using WixToolset.Data;
@@ -56,43 +54,64 @@ namespace WixTestTools
        {
            var bundleSymbol = this.GetBundleSymbol();
            var x64 = bundleSymbol.Platform != Platform.X86;
            return x64 ? FULL_BURN_POLICY_REGISTRY_PATH : FULL_BURN_POLICY_REGISTRY_PATH_WOW6432NODE;
        }
-        public string GetPackageCachePathForCacheId(string cacheId, bool perMachine)
+        public string GetPackageCachePathForCacheId(string cacheId, WixBundleScopeType? scope, bool? plannedPerMachine = null)
        {
            string cachePath;
-            if (perMachine)
+            if (scope == WixBundleScopeType.PerMachine)
            {
-                using var policyKey = Registry.LocalMachine.OpenSubKey(this.GetFullBurnPolicyRegistryPath());
+                cachePath = GetPerMachineCacheRoot();
-                var redirectedCachePath = policyKey?.GetValue("PackageCache") as string;
+            }
-                cachePath = redirectedCachePath ?? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), PACKAGE_CACHE_FOLDER_NAME);
+            else if (scope == WixBundleScopeType.PerUser)
+            {
+                cachePath = GetPerUserCacheRoot();
            }
            else
            {
-                cachePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), PACKAGE_CACHE_FOLDER_NAME);
+                cachePath = plannedPerMachine.Value ? GetPerMachineCacheRoot() : GetPerUserCacheRoot();
            }
            return Path.Combine(cachePath, cacheId);
+            string GetPerMachineCacheRoot()
+            {
+                using var policyKey = Registry.LocalMachine.OpenSubKey(this.GetFullBurnPolicyRegistryPath());
+                var redirectedCachePath = policyKey?.GetValue("PackageCache") as string;
+                return redirectedCachePath ?? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), PACKAGE_CACHE_FOLDER_NAME);
+            }
+            string GetPerUserCacheRoot()
+            {
+                return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), PACKAGE_CACHE_FOLDER_NAME);
+            }
        }
-        public string GetExpectedCachedBundlePath()
+        public string GetExpectedCachedBundlePath(bool? plannedPerMachine = null)
        {
            var bundleSymbol = this.GetBundleSymbol();
-            var cachePath = this.GetPackageCachePathForCacheId(bundleSymbol.BundleCode, bundleSymbol.PerMachine);
+            var cachePath = this.GetPackageCachePathForCacheId(bundleSymbol.BundleCode, bundleSymbol.Scope, plannedPerMachine);
            return Path.Combine(cachePath, Path.GetFileName(this.Bundle));
        }
-        public string ManuallyCache()
+        public string ManuallyCache(bool? plannedPerMachine = null)
        {
-            var expectedCachePath = this.GetExpectedCachedBundlePath();
+            var expectedCachePath = this.GetExpectedCachedBundlePath(plannedPerMachine);
            Directory.CreateDirectory(Path.GetDirectoryName(expectedCachePath));
            File.Copy(this.Bundle, expectedCachePath);
            return expectedCachePath;
        }
-        public void ManuallyUncache()
+        public void ManuallyUncache(bool? plannedPerMachine = null)
        {
-            var expectedCachePath = this.GetExpectedCachedBundlePath();
+            var expectedCachePath = this.GetExpectedCachedBundlePath(plannedPerMachine);
            File.Delete(expectedCachePath);
        }
@@ -103,38 +122,51 @@ namespace WixTestTools
            var section = intermediate.Sections.Single();
            var packageSymbol = section.Symbols.OfType<WixBundlePackageSymbol>().SingleOrDefault(p => p.Id.Id == packageId);
            var exePackageSymbol = section.Symbols.OfType<WixBundleExePackageSymbol>().SingleOrDefault(p => p.Id.Id == packageId);
            if (packageSymbol == null || exePackageSymbol == null || exePackageSymbol.DetectionType != WixBundleExePackageDetectionType.Arp)
            {
+                this.TestContext.TestOutputHelper.WriteLine($"Missing config for ExePackage {packageId}");
                arpId = null;
                arpVersion = null;
                arpWin64 = false;
                perMachine = false;
                return false;
            }
            arpId = exePackageSymbol.ArpId;
            arpVersion = exePackageSymbol.ArpDisplayVersion;
            arpWin64 = exePackageSymbol.ArpWin64;
-            perMachine = packageSymbol.PerMachine == true;
+            perMachine = packageSymbol.Scope == WixBundleScopeType.PerMachine;
+            this.TestContext.TestOutputHelper.WriteLine($"Config for ExePackage {packageId}: arpId={arpId}, arpVersion={arpVersion}, arpWin64={arpWin64}, perMachine={perMachine}");
            return true;
        }
-        public bool TryGetRegistration(out BundleRegistration registration)
+        public bool TryGetRegistration(bool? plannedPerMachine, out BundleRegistration registration)
        {
            var bundleSymbol = this.GetBundleSymbol();
            var x64 = bundleSymbol.Platform != Platform.X86;
            var bundleCode = bundleSymbol.BundleCode;
-            if (bundleSymbol.PerMachine)
+            if (bundleSymbol.Scope == WixBundleScopeType.PerMachine)
+            {
+                return BundleRegistration.TryGetPerMachineBundleRegistrationById(bundleCode, x64, this.TestContext.TestOutputHelper, out registration);
+            }
+            else if (bundleSymbol.Scope == WixBundleScopeType.PerUser)
            {
-                return BundleRegistration.TryGetPerMachineBundleRegistrationById(bundleCode, x64, out registration);
+                return BundleRegistration.TryGetPerUserBundleRegistrationById(bundleCode, this.TestContext.TestOutputHelper, out registration);
            }
            else
            {
-                return BundleRegistration.TryGetPerUserBundleRegistrationById(bundleCode, out registration);
+                return plannedPerMachine.Value ? BundleRegistration.TryGetPerMachineBundleRegistrationById(bundleCode, x64, this.TestContext.TestOutputHelper, out registration)
+                    : BundleRegistration.TryGetPerUserBundleRegistrationById(bundleCode, this.TestContext.TestOutputHelper, out registration);
            }
        }
-        public bool TryGetUpdateRegistration(out BundleUpdateRegistration registration)
+        public bool TryGetUpdateRegistration(bool? plannedPerMachine, out BundleUpdateRegistration registration)
        {
            var bundleSymbol = this.GetBundleSymbol();
            var x64 = bundleSymbol.Platform != Platform.X86;
@@ -144,84 +176,93 @@ namespace WixTestTools
            var productFamily = updateRegistrationSymbol.ProductFamily;
            var name = updateRegistrationSymbol.Name;
+            if (bundleSymbol.Scope == WixBundleScopeType.PerMachine)
-            if (bundleSymbol.PerMachine)
            {
                return BundleUpdateRegistration.TryGetPerMachineBundleUpdateRegistration(manufacturer, productFamily, name, x64, out registration);
            }
-            else
+            else if (bundleSymbol.Scope == WixBundleScopeType.PerUser)
            {
                return BundleUpdateRegistration.TryGetPerUserBundleUpdateRegistration(manufacturer, productFamily, name, out registration);
            }
+            else
+            {
+                return plannedPerMachine.Value ? BundleUpdateRegistration.TryGetPerMachineBundleUpdateRegistration(manufacturer, productFamily, name, x64, out registration)
+                    : BundleUpdateRegistration.TryGetPerUserBundleUpdateRegistration(manufacturer, productFamily, name, out registration);
+            }
        }
-        public BundleRegistration VerifyRegisteredAndInPackageCache(int? expectedSystemComponent = null)
+        public BundleRegistration VerifyRegisteredAndInPackageCache(int? expectedSystemComponent = null, bool? plannedPerMachine = null)
        {
-            Assert.True(this.TryGetRegistration(out var registration));
+            Assert.True(this.TryGetRegistration(plannedPerMachine, out var registration));
            Assert.Equal(expectedSystemComponent, registration.SystemComponent);
            Assert.NotNull(registration.CachePath);
            Assert.True(File.Exists(registration.CachePath));
-            var expectedCachePath = this.GetExpectedCachedBundlePath();
+            var expectedCachePath = this.GetExpectedCachedBundlePath(plannedPerMachine);
            WixAssert.StringEqual(expectedCachePath, registration.CachePath, true);
            return registration;
        }
-        public void VerifyUnregisteredAndRemovedFromPackageCache()
+        public void VerifyUnregisteredAndRemovedFromPackageCache(bool? plannedPerMachine = null)
        {
-            var cachedBundlePath = this.GetExpectedCachedBundlePath();
+            var cachedBundlePath = this.GetExpectedCachedBundlePath(plannedPerMachine);
-            this.VerifyUnregisteredAndRemovedFromPackageCache(cachedBundlePath);
+            this.VerifyUnregisteredAndRemovedFromPackageCache(cachedBundlePath, plannedPerMachine);
        }
-        public void VerifyUnregisteredAndRemovedFromPackageCache(string cachedBundlePath)
+        public void VerifyUnregisteredAndRemovedFromPackageCache(string cachedBundlePath, bool? plannedPerMachine = null)
        {
-            Assert.False(this.TryGetRegistration(out _), $"Bundle cached at '{cachedBundlePath}' should not still be registered.");
+            Assert.False(this.TryGetRegistration(plannedPerMachine, out _), $"Bundle cached at '{cachedBundlePath}' should not still be registered.");
            Assert.False(File.Exists(cachedBundlePath), $"Cached bundle should have been removed from package cache at '{cachedBundlePath}'.");
        }
-        public void RemovePackageFromCache(string packageId)
+        public void RemovePackageFromCache(string packageId, bool? plannedPerMachine = null)
        {
            using var wixOutput = WixOutput.Read(this.BundlePdb);
            var intermediate = Intermediate.Load(wixOutput);
            var section = intermediate.Sections.Single();
            var packageSymbol = section.Symbols.OfType<WixBundlePackageSymbol>().Single(p => p.Id.Id == packageId);
-            var cachePath = this.GetPackageCachePathForCacheId(packageSymbol.CacheId, packageSymbol.PerMachine == true);
+            var cachePath = this.GetPackageCachePathForCacheId(packageSymbol.CacheId, packageSymbol.Scope, plannedPerMachine);
            if (Directory.Exists(cachePath))
            {
                Directory.Delete(cachePath, true);
            }
        }
-        public string GetPackageEntryPointCachePath(string packageId)
+        public string GetPackageEntryPointCachePath(string packageId, bool? plannedPerMachine = null)
        {
            using var wixOutput = WixOutput.Read(this.BundlePdb);
            var intermediate = Intermediate.Load(wixOutput);
            var section = intermediate.Sections.Single();
            var packageSymbol = section.Symbols.OfType<WixBundlePackageSymbol>().Single(p => p.Id.Id == packageId);
            var packagePayloadSymbol = section.Symbols.OfType<WixBundlePayloadSymbol>().Single(p => p.Id.Id == packageSymbol.PayloadRef);
-            var cachePath = this.GetPackageCachePathForCacheId(packageSymbol.CacheId, packageSymbol.PerMachine == true);
+            var cachePath = this.GetPackageCachePathForCacheId(packageSymbol.CacheId, packageSymbol.Scope, plannedPerMachine);
            return Path.Combine(cachePath, packagePayloadSymbol.Name);
        }
-        public void VerifyPackageIsCached(string packageId, bool cached = true)
+        public void VerifyPackageIsCached(string packageId, bool cached = true, bool? plannedPerMachine = null)
        {
-            var entryPointCachePath = this.GetPackageEntryPointCachePath(packageId);
+            var entryPointCachePath = this.GetPackageEntryPointCachePath(packageId, plannedPerMachine);
            Assert.Equal(cached, File.Exists(entryPointCachePath));
        }
-        public void VerifyPackageProviderRemoved(string packageId)
+        public void VerifyPackageProviderRemoved(string packageId, bool? plannedPerMachine = null)
        {
            using var wixOutput = WixOutput.Read(this.BundlePdb);
            var intermediate = Intermediate.Load(wixOutput);
            var section = intermediate.Sections.Single();
            var packageSymbol = section.Symbols.OfType<WixBundlePackageSymbol>().Single(p => p.Id.Id == packageId);
            var providerSymbol = section.Symbols.OfType<WixDependencyProviderSymbol>().Single(p => p.ParentRef == packageId);
-            var registryRoot = packageSymbol.PerMachine == true ? Registry.LocalMachine : Registry.CurrentUser;
+            var registryRoot = plannedPerMachine.HasValue ? (plannedPerMachine.Value ? Registry.LocalMachine : Registry.CurrentUser) : packageSymbol.Scope == WixBundleScopeType.PerMachine ? Registry.LocalMachine : Registry.CurrentUser;
            var subkeyPath = Path.Combine(DependencyRegistryRoot, providerSymbol.ProviderKey);
            using var registryKey = registryRoot.OpenSubKey(subkeyPath);
            if (registryKey != null)
            {
                WixAssert.StringEqual(null, subkeyPath);
diff --git a/src/test/burn/WixTestTools/GenericArpRegistration.cs b/src/test/burn/WixTestTools/GenericArpRegistration.cs
index dfddd9a3..f3590fa4 100644
--- a/src/test/burn/WixTestTools/GenericArpRegistration.cs
+++ b/src/test/burn/WixTestTools/GenericArpRegistration.cs
@@ -4,6 +4,8 @@ namespace WixTestTools
 {
    using System;
    using Microsoft.Win32;
+    using Xunit;
+    using Xunit.Abstractions;
    public class GenericArpRegistration
    {
@@ -69,23 +71,23 @@ namespace WixTestTools
        public string UrlUpdateInfo { get; set; }
-        public static bool TryGetPerMachineRegistrationById(string id, bool x64, out GenericArpRegistration registration)
+        public static bool TryGetPerMachineRegistrationById(string id, bool x64, ITestOutputHelper testOutputHelper, out GenericArpRegistration registration)
        {
-            return TryGetRegistrationById(id, x64, false, out registration);
+            return TryGetRegistrationById(id, x64, perUser: false, testOutputHelper, out registration);
        }
-        public static bool TryGetPerUserRegistrationById(string id, out GenericArpRegistration registration)
+        public static bool TryGetPerUserRegistrationById(string id, ITestOutputHelper testOutputHelper, out GenericArpRegistration registration)
        {
-            return TryGetRegistrationById(id, true, true, out registration);
+            return TryGetRegistrationById(id, x64: true, perUser: true, testOutputHelper, out registration);
        }
-        private static bool TryGetRegistrationById(string id, bool x64, bool perUser, out GenericArpRegistration registration)
+        private static bool TryGetRegistrationById(string id, bool x64, bool perUser, ITestOutputHelper testOutputHelper, out GenericArpRegistration registration)
        {
-            registration = GetGenericArpRegistration(id, x64, perUser, key => new GenericArpRegistration());
+            registration = GetGenericArpRegistration(id, x64, perUser, testOutputHelper, key => new GenericArpRegistration());
            return registration != null;
        }
-        protected static T GetGenericArpRegistration<T>(string id, bool x64, bool perUser, Func<RegistryKey, T> fnCreate)
+        protected static T GetGenericArpRegistration<T>(string id, bool x64, bool perUser, ITestOutputHelper testOutputHelper, Func<RegistryKey, T> fnCreate)
            where T : GenericArpRegistration
        {
            var baseKey = perUser ? Registry.CurrentUser : Registry.LocalMachine;
@@ -95,6 +97,8 @@ namespace WixTestTools
            if (idKey == null)
            {
+                testOutputHelper.WriteLine($"Failed to open key {baseKey} {registrationKeyPath} (per-user {perUser}).");
                return null;
            }
diff --git a/src/test/burn/WixTestTools/PackageVerifier.cs b/src/test/burn/WixTestTools/PackageVerifier.cs
index 76bc17ab..f7c7b2e6 100644
--- a/src/test/burn/WixTestTools/PackageVerifier.cs
+++ b/src/test/burn/WixTestTools/PackageVerifier.cs
@@ -82,14 +82,32 @@ namespace WixTestTools
            return MsiUtilities.IsProductInstalledWithVersion(productCode, prodVersion);
        }
-        public void VerifyInstalled(bool installed)
+        public void VerifyInstalled(bool installed = true)
        {
-            Assert.Equal(installed, this.IsInstalled());
+            var isInstalled = this.IsInstalled();
+            if (installed)
+            {
+                Assert.True(isInstalled);
+            }
+            else
+            {
+                Assert.False(isInstalled);
+            }
        }
-        public void VerifyInstalledWithVersion(bool installed)
+        public void VerifyInstalledWithVersion(bool installed = true)
        {
-            Assert.Equal(installed, this.IsInstalledWithVersion());
+            var isInstalled = this.IsInstalledWithVersion();
+            if (installed)
+            {
+                Assert.True(isInstalled);
+            }
+            else
+            {
+                Assert.False(isInstalled);
+            }
        }
        public void DeleteTestRegistryValue(string name)
diff --git a/src/test/burn/WixTestTools/TestTool.cs b/src/test/burn/WixTestTools/TestTool.cs
index b6d18ac9..6c9ad1d7 100644
--- a/src/test/burn/WixTestTools/TestTool.cs
+++ b/src/test/burn/WixTestTools/TestTool.cs
@@ -26,7 +26,7 @@ namespace WixTestTools
        public TestTool(string toolFile)
            : base(toolFile)
        {
-            this.PrintOutputToConsole = true;
+            this.PrintOutputToConsoleOnError = true;
        }
        /// <summary>
@@ -75,6 +75,11 @@ namespace WixTestTools
        public bool PrintOutputToConsole { get; set; }
        /// <summary>
+        /// Print output from the tool execution to the console
+        /// </summary>
+        public bool PrintOutputToConsoleOnError { get; set; }
+        /// <summary>
        /// The working directory of the tool
        /// </summary>
        public string WorkingDirectory { get; set; }
@@ -123,7 +128,12 @@ namespace WixTestTools
            if (assertOnError && 0 < this.Errors.Count)
            {
-                if (this.PrintOutputToConsole)
+                if (this.PrintOutputToConsoleOnError)
+                {
+                    Console.WriteLine(FormatResult(result));
+                }
+                if (this.PrintOutputToConsole || this.PrintOutputToConsoleOnError)
                {
                    this.PrintErrors();
                }
diff --git a/src/test/burn/WixTestTools/WixTestContext.cs b/src/test/burn/WixTestTools/WixTestContext.cs
index a87a56fa..b30d5739 100644
--- a/src/test/burn/WixTestTools/WixTestContext.cs
+++ b/src/test/burn/WixTestTools/WixTestContext.cs
@@ -16,6 +16,8 @@ namespace WixTestTools
        public WixTestContext(ITestOutputHelper testOutputHelper)
        {
+            this.TestOutputHelper = testOutputHelper;
            var test = GetTest(testOutputHelper);
            var splitClassName = test.TestCase.TestMethod.TestClass.Class.Name.Split('.');
@@ -34,6 +36,8 @@ namespace WixTestTools
        public string TestName { get; }
+        public ITestOutputHelper TestOutputHelper { get; }
        /// <summary>
        /// Gets the test install directory for the current test.
        /// </summary>
diff --git a/src/test/burn/WixToolset.WixBA/WixBA.cs b/src/test/burn/WixToolset.WixBA/WixBA.cs
index dca12ce8..a98bfa36 100644
--- a/src/test/burn/WixToolset.WixBA/WixBA.cs
+++ b/src/test/burn/WixToolset.WixBA/WixBA.cs
@@ -104,7 +104,7 @@ namespace WixToolset.WixBA
        public static void Plan(LaunchAction action)
        {
            WixBA.Model.PlannedAction = action;
-            WixBA.Model.Engine.Plan(WixBA.Model.PlannedAction);
+            WixBA.Model.Engine.Plan(WixBA.Model.PlannedAction, BundleScope.Default);
        }
        public static void PlanLayout()
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs
index dc793cf0..b066899b 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs
@@ -92,7 +92,7 @@ namespace WixToolsetTest.BurnE2E
            Assert.True(LogVerifier.MessageInLogFile(logPath, "Applied execute package: v3bundle.exe, result: 0x0, restart: None"));
-            Assert.True(BundleRegistration.TryGetPerMachineBundleRegistrationById(v3BundleId, false, out var v3Registration));
+            Assert.True(BundleRegistration.TryGetPerMachineBundleRegistrationById(v3BundleId, false, this.TestContext.TestOutputHelper, out var v3Registration));
            Assert.Null(v3Registration.SystemComponent);
        }
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/ConfigurableScopeTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/ConfigurableScopeTests.cs
new file mode 100644
index 00000000..1b7d6d75
--- /dev/null
+++ b/src/test/burn/WixToolsetTest.BurnE2E/ConfigurableScopeTests.cs
@@ -0,0 +1,631 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+namespace WixToolsetTest.BurnE2E
+{
+    using WixTestTools;
+    using WixToolset.BootstrapperApplicationApi;
+    using Xunit;
+    using Xunit.Abstractions;
+    public class ConfigurableScopeTests : BurnE2ETests
+    {
+        public ConfigurableScopeTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { }
+        [RuntimeFact]
+        public void CommandLineScopeTestNoopBecauseNonDefaultPlan()
+        {
+            var testBAController = this.CreateTestBAController();
+            testBAController.SetBundleScope(BundleScope.PerMachine);
+            var bundle = this.CreateBundleInstaller("AllPmouBundleTestBA");
+            var pkg1 = this.CreatePackageInstaller("PmouPkg1");
+            var pkg2 = this.CreatePackageInstaller("PmouPkg2");
+            var log = bundle.Install(arguments: "/peruser");
+            bundle.VerifyRegisteredAndInPackageCache(plannedPerMachine: true);
+            pkg1.VerifyInstalled();
+            pkg2.VerifyInstalled();
+            Assert.True(LogVerifier.MessageInLogFile(log, "Scope command-line switch ignored because the bootstrapper application already specified a scope."));
+            bundle.Uninstall();
+            bundle.VerifyUnregisteredAndRemovedFromPackageCache(plannedPerMachine: true);
+            pkg1.VerifyInstalled(false);
+            pkg2.VerifyInstalled(false);
+        }
+        [RuntimeFact]
+        public void CommandLineScopeTestNoopBecauseNoConfigurablePackages()
+        {
+            var bundle = this.CreateBundleInstaller("PerMachineBundle");
+            var log = bundle.Install(arguments: "/peruser");
+            Assert.True(LogVerifier.MessageInLogFile(log, "Scope command-line switch ignored because the bundle doesn't have any packages with configurable scope."));
+        }
+        [RuntimeFact]
+        public void CommandLineScopeTestPerUser()
+        {
+            var testBAController = this.CreateTestBAController();
+            testBAController.SetBundleScope(BundleScope.Default);
+            var bundle = this.CreateBundleInstaller("AllPmouBundleTestBA");
+            var pkg1 = this.CreatePackageInstaller("PmouPkg1");
+            var pkg2 = this.CreatePackageInstaller("PmouPkg2");
+            var log = bundle.Install(arguments: "/peruser");
+            bundle.VerifyRegisteredAndInPackageCache(plannedPerMachine: false);
+            pkg1.VerifyInstalled();
+            pkg2.VerifyInstalled();
+            Assert.True(LogVerifier.MessageInLogFile(log, "Plan begin, 3 packages, action: Install, planned scope: Default"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned configurable scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PmouPkg1.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PmouPkg2.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser"));
+            bundle.Uninstall(arguments: "/peruser");
+            bundle.VerifyUnregisteredAndRemovedFromPackageCache(plannedPerMachine: false);
+            pkg1.VerifyInstalled(false);
+            pkg2.VerifyInstalled(false);
+        }
+        [RuntimeFact]
+        public void CommandLineScopeTestPerMachine()
+        {
+            var testBAController = this.CreateTestBAController();
+            testBAController.SetBundleScope(BundleScope.Default);
+            var bundle = this.CreateBundleInstaller("AllPuomBundleTestBA");
+            var pkg1 = this.CreatePackageInstaller("PuomPkg1");
+            var pkg2 = this.CreatePackageInstaller("PuomPkg2");
+            var log = bundle.Install(arguments: "/permachine");
+            bundle.VerifyRegisteredAndInPackageCache(plannedPerMachine: true);
+            pkg1.VerifyInstalled();
+            pkg2.VerifyInstalled();
+            Assert.True(LogVerifier.MessageInLogFile(log, "Plan begin, 3 packages, action: Install, planned scope: Default"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned configurable scope: PerMachine"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PuomPkg1.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine,"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PuomPkg2.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine,"));
+            bundle.Uninstall(arguments: "/permachine");
+            bundle.VerifyUnregisteredAndRemovedFromPackageCache(plannedPerMachine: true);
+            pkg1.VerifyInstalled(false);
+            pkg2.VerifyInstalled(false);
+        }
+        [RuntimeFact]
+        public void PMOU_Bundle_Default_Plan_Installs_PerMachine()
+        {
+            var testBAController = this.CreateTestBAController();
+            testBAController.SetBundleScope(BundleScope.Default);
+            var bundle = this.CreateBundleInstaller("AllPmouBundleTestBA");
+            var pkg1 = this.CreatePackageInstaller("PmouPkg1");
+            var pkg2 = this.CreatePackageInstaller("PmouPkg2");
+            var log = bundle.Install();
+            bundle.VerifyRegisteredAndInPackageCache(plannedPerMachine: true);
+            pkg1.VerifyInstalled();
+            pkg2.VerifyInstalled();
+            Assert.True(LogVerifier.MessageInLogFile(log, "Plan begin, 3 packages, action: Install, planned scope: Default"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned configurable scope: PerMachine"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PmouPkg1.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine,"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PmouPkg2.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine,"));
+            bundle.Uninstall();
+            bundle.VerifyUnregisteredAndRemovedFromPackageCache(plannedPerMachine: true);
+            pkg1.VerifyInstalled(false);
+            pkg2.VerifyInstalled(false);
+        }
+        [RuntimeFact]
+        public void PUOM_Bundle_Default_Plan_Installs_PerUser()
+        {
+            var testBAController = this.CreateTestBAController();
+            testBAController.SetBundleScope(BundleScope.Default);
+            var bundle = this.CreateBundleInstaller("AllPuomBundleTestBA");
+            var pkg1 = this.CreatePackageInstaller("PuomPkg1");
+            var pkg2 = this.CreatePackageInstaller("PuomPkg2");
+            var log = bundle.Install();
+            bundle.VerifyRegisteredAndInPackageCache(plannedPerMachine: false);
+            pkg1.VerifyInstalled();
+            pkg2.VerifyInstalled();
+            Assert.True(LogVerifier.MessageInLogFile(log, "Plan begin, 3 packages, action: Install, planned scope: Default"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned configurable scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PuomPkg1.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PuomPkg2.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser"));
+            bundle.Uninstall();
+            bundle.VerifyUnregisteredAndRemovedFromPackageCache(plannedPerMachine: false);
+            pkg1.VerifyInstalled(false);
+            pkg2.VerifyInstalled(false);
+        }
+        [RuntimeFact]
+        public void PMOU_Bundle_PM_Plan_Installs_PerMachine()
+        {
+            var testBAController = this.CreateTestBAController();
+            testBAController.SetBundleScope(BundleScope.PerMachine);
+            var bundle = this.CreateBundleInstaller("AllPmouBundleTestBA");
+            var pkg1 = this.CreatePackageInstaller("PmouPkg1");
+            var pkg2 = this.CreatePackageInstaller("PmouPkg2");
+            var log = bundle.Install();
+            bundle.VerifyRegisteredAndInPackageCache(plannedPerMachine: true);
+            pkg1.VerifyInstalled();
+            pkg2.VerifyInstalled();
+            Assert.True(LogVerifier.MessageInLogFile(log, "Plan begin, 3 packages, action: Install, planned scope: PerMachine"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned configurable scope: PerMachine"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PmouPkg1.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine,"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PmouPkg2.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine,"));
+            bundle.Uninstall();
+            bundle.VerifyUnregisteredAndRemovedFromPackageCache(plannedPerMachine: true);
+            pkg1.VerifyInstalled(false);
+            pkg2.VerifyInstalled(false);
+        }
+        [RuntimeFact]
+        public void PUOM_Bundle_PM_Plan_Installs_PerMachine()
+        {
+            var testBAController = this.CreateTestBAController();
+            testBAController.SetBundleScope(BundleScope.PerMachine);
+            var bundle = this.CreateBundleInstaller("AllPuomBundleTestBA");
+            var pkg1 = this.CreatePackageInstaller("PuomPkg1");
+            var pkg2 = this.CreatePackageInstaller("PuomPkg2");
+            var log = bundle.Install();
+            bundle.VerifyRegisteredAndInPackageCache(plannedPerMachine: true);
+            pkg1.VerifyInstalled();
+            pkg2.VerifyInstalled();
+            Assert.True(LogVerifier.MessageInLogFile(log, "Plan begin, 3 packages, action: Install, planned scope: PerMachine"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned configurable scope: PerMachine"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PuomPkg1.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine,"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PuomPkg2.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine,"));
+            bundle.Uninstall();
+            bundle.VerifyUnregisteredAndRemovedFromPackageCache(plannedPerMachine: true);
+            pkg1.VerifyInstalled(false);
+            pkg2.VerifyInstalled(false);
+        }
+        [RuntimeFact]
+        public void PMOU_Bundle_PU_Plan_Installs_PerUser()
+        {
+            var testBAController = this.CreateTestBAController();
+            testBAController.SetBundleScope(BundleScope.PerUser);
+            var bundle = this.CreateBundleInstaller("AllPmouBundleTestBA");
+            var pkg1 = this.CreatePackageInstaller("PmouPkg1");
+            var pkg2 = this.CreatePackageInstaller("PmouPkg2");
+            var log = bundle.Install();
+            bundle.VerifyRegisteredAndInPackageCache(plannedPerMachine: false);
+            pkg1.VerifyInstalled();
+            pkg2.VerifyInstalled();
+            Assert.True(LogVerifier.MessageInLogFile(log, "Plan begin, 3 packages, action: Install, planned scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned configurable scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PmouPkg1.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser,"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PmouPkg2.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser,"));
+            bundle.Uninstall();
+            bundle.VerifyUnregisteredAndRemovedFromPackageCache(plannedPerMachine: false);
+            pkg1.VerifyInstalled(false);
+            pkg2.VerifyInstalled(false);
+        }
+        [RuntimeFact]
+        public void PUOM_Bundle_PU_Plan_Installs_PerUser()
+        {
+            var testBAController = this.CreateTestBAController();
+            testBAController.SetBundleScope(BundleScope.PerUser);
+            var bundle = this.CreateBundleInstaller("AllPuomBundleTestBA");
+            var pkg1 = this.CreatePackageInstaller("PuomPkg1");
+            var pkg2 = this.CreatePackageInstaller("PuomPkg2");
+            var log = bundle.Install();
+            bundle.VerifyRegisteredAndInPackageCache(plannedPerMachine: false);
+            pkg1.VerifyInstalled();
+            pkg2.VerifyInstalled();
+            Assert.True(LogVerifier.MessageInLogFile(log, "Plan begin, 3 packages, action: Install, planned scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned configurable scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PuomPkg1.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PuomPkg2.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser"));
+            bundle.Uninstall();
+            bundle.VerifyUnregisteredAndRemovedFromPackageCache(plannedPerMachine: false);
+            pkg1.VerifyInstalled(false);
+            pkg2.VerifyInstalled(false);
+        }
+        [RuntimeFact]
+        public void PM_PMOU_Bundle_Default_Plan_Installs_PerMachine()
+        {
+            var testBAController = this.CreateTestBAController();
+            testBAController.SetBundleScope(BundleScope.Default);
+            var bundle = this.CreateBundleInstaller("PmPmouBundleTestBA");
+            var perMachinePkg = this.CreatePackageInstaller("PerMachinePkg");
+            var pkg1 = this.CreatePackageInstaller("PmouPkg1");
+            var pkg2 = this.CreatePackageInstaller("PmouPkg2");
+            var log = bundle.Install();
+            bundle.VerifyRegisteredAndInPackageCache(plannedPerMachine: true);
+            perMachinePkg.VerifyInstalled();
+            pkg1.VerifyInstalled();
+            pkg2.VerifyInstalled();
+            Assert.True(LogVerifier.MessageInLogFile(log, "Plan begin, 4 packages, action: Install, planned scope: Default"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned configurable scope: PerMachine"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PerMachinePkg.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine,"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PmouPkg1.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine,"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PmouPkg2.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine,"));
+            bundle.Uninstall();
+            bundle.VerifyUnregisteredAndRemovedFromPackageCache(plannedPerMachine: true);
+            perMachinePkg.VerifyInstalled(false);
+            pkg1.VerifyInstalled(false);
+            pkg2.VerifyInstalled(false);
+        }
+        [RuntimeFact]
+        public void PM_PMOU_Bundle_PM_Plan_Installs_PerMachine()
+        {
+            var testBAController = this.CreateTestBAController();
+            testBAController.SetBundleScope(BundleScope.PerMachine);
+            var bundle = this.CreateBundleInstaller("PmPmouBundleTestBA");
+            var perMachinePkg = this.CreatePackageInstaller("PerMachinePkg");
+            var pkg1 = this.CreatePackageInstaller("PmouPkg1");
+            var pkg2 = this.CreatePackageInstaller("PmouPkg2");
+            var log = bundle.Install();
+            bundle.VerifyRegisteredAndInPackageCache(plannedPerMachine: true);
+            perMachinePkg.VerifyInstalled();
+            pkg1.VerifyInstalled();
+            pkg2.VerifyInstalled();
+            Assert.True(LogVerifier.MessageInLogFile(log, "Plan begin, 4 packages, action: Install, planned scope: PerMachine"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned configurable scope: PerMachine"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PerMachinePkg.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine,"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PmouPkg1.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PmouPkg2.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine"));
+            bundle.Uninstall();
+            bundle.VerifyUnregisteredAndRemovedFromPackageCache(plannedPerMachine: true);
+            perMachinePkg.VerifyInstalled(false);
+            pkg1.VerifyInstalled(false);
+            pkg2.VerifyInstalled(false);
+        }
+        [RuntimeFact]
+        public void PM_PMOU_Bundle_PU_Plan_Installs_PerUserMostly()
+        {
+            var testBAController = this.CreateTestBAController();
+            testBAController.SetBundleScope(BundleScope.PerUser);
+            var bundle = this.CreateBundleInstaller("PmPmouBundleTestBA");
+            var perMachinePkg = this.CreatePackageInstaller("PerMachinePkg");
+            var pkg1 = this.CreatePackageInstaller("PmouPkg1");
+            var pkg2 = this.CreatePackageInstaller("PmouPkg2");
+            var log = bundle.Install();
+            bundle.VerifyRegisteredAndInPackageCache(plannedPerMachine: false);
+            perMachinePkg.VerifyInstalled();
+            pkg1.VerifyInstalled();
+            pkg2.VerifyInstalled();
+            Assert.True(LogVerifier.MessageInLogFile(log, "Plan begin, 4 packages, action: Install, planned scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned configurable scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PerMachinePkg.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine,"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PmouPkg1.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser,"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PmouPkg2.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser,"));
+            bundle.Uninstall();
+            bundle.VerifyUnregisteredAndRemovedFromPackageCache(plannedPerMachine: false);
+            perMachinePkg.VerifyInstalled(false);
+            pkg1.VerifyInstalled(false);
+            pkg2.VerifyInstalled(false);
+        }
+        [RuntimeFact]
+        public void PM_PUOM_Bundle_Default_Plan_Installs_PerUser()
+        {
+            var testBAController = this.CreateTestBAController();
+            testBAController.SetBundleScope(BundleScope.Default);
+            var bundle = this.CreateBundleInstaller("PmPuomBundleTestBA");
+            var perMachinePkg = this.CreatePackageInstaller("PerMachinePkg");
+            var pkg1 = this.CreatePackageInstaller("PuomPkg1");
+            var pkg2 = this.CreatePackageInstaller("PuomPkg2");
+            var log = bundle.Install();
+            bundle.VerifyRegisteredAndInPackageCache(plannedPerMachine: false);
+            perMachinePkg.VerifyInstalled();
+            pkg1.VerifyInstalled();
+            pkg2.VerifyInstalled();
+            Assert.True(LogVerifier.MessageInLogFile(log, "Plan begin, 4 packages, action: Install, planned scope: Default"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned configurable scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PerMachinePkg.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine,"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PuomPkg1.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PuomPkg2.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser"));
+            bundle.Uninstall();
+            bundle.VerifyUnregisteredAndRemovedFromPackageCache(plannedPerMachine: false);
+            perMachinePkg.VerifyInstalled(false);
+            pkg1.VerifyInstalled(false);
+            pkg2.VerifyInstalled(false);
+        }
+        [RuntimeFact]
+        public void PM_PUOM_Bundle_PM_Plan_Installs_PerMachine()
+        {
+            var testBAController = this.CreateTestBAController();
+            testBAController.SetBundleScope(BundleScope.PerMachine);
+            var bundle = this.CreateBundleInstaller("PmPuomBundleTestBA");
+            var perMachinePkg = this.CreatePackageInstaller("PerMachinePkg");
+            var pkg1 = this.CreatePackageInstaller("PuomPkg1");
+            var pkg2 = this.CreatePackageInstaller("PuomPkg2");
+            var log = bundle.Install();
+            bundle.VerifyRegisteredAndInPackageCache(plannedPerMachine: true);
+            perMachinePkg.VerifyInstalled();
+            pkg1.VerifyInstalled();
+            pkg2.VerifyInstalled();
+            Assert.True(LogVerifier.MessageInLogFile(log, "Plan begin, 4 packages, action: Install, planned scope: PerMachine"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned configurable scope: PerMachine"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PerMachinePkg.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine,"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PuomPkg1.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PuomPkg2.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine"));
+            bundle.Uninstall();
+            bundle.VerifyUnregisteredAndRemovedFromPackageCache(plannedPerMachine: true);
+            perMachinePkg.VerifyInstalled(false);
+            pkg1.VerifyInstalled(false);
+            pkg2.VerifyInstalled(false);
+        }
+        [RuntimeFact]
+        public void PM_PUOM_Bundle_PU_Plan_Installs_PerUserMostly()
+        {
+            var testBAController = this.CreateTestBAController();
+            testBAController.SetBundleScope(BundleScope.PerUser);
+            var bundle = this.CreateBundleInstaller("PmPuomBundleTestBA");
+            var perMachinePkg = this.CreatePackageInstaller("PerMachinePkg");
+            var pkg1 = this.CreatePackageInstaller("PuomPkg1");
+            var pkg2 = this.CreatePackageInstaller("PuomPkg2");
+            var log = bundle.Install();
+            bundle.VerifyRegisteredAndInPackageCache(plannedPerMachine: false);
+            perMachinePkg.VerifyInstalled();
+            pkg1.VerifyInstalled();
+            pkg2.VerifyInstalled();
+            Assert.True(LogVerifier.MessageInLogFile(log, "Plan begin, 4 packages, action: Install, planned scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned configurable scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PerMachinePkg.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PuomPkg1.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PuomPkg2.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser"));
+            bundle.Uninstall();
+            bundle.VerifyUnregisteredAndRemovedFromPackageCache(plannedPerMachine: false);
+            perMachinePkg.VerifyInstalled(false);
+            pkg1.VerifyInstalled(false);
+            pkg2.VerifyInstalled(false);
+        }
+        [RuntimeFact]
+        public void PM_PU_PMOU_Bundle_Default_Plan_Installs_PerMachine()
+        {
+            var testBAController = this.CreateTestBAController();
+            testBAController.SetBundleScope(BundleScope.Default);
+            var bundle = this.CreateBundleInstaller("PmPuPmouBundleTestBA");
+            var perMachinePkg = this.CreatePackageInstaller("PerMachinePkg");
+            var pkg1 = this.CreatePackageInstaller("PmouPkg1");
+            var pkg2 = this.CreatePackageInstaller("PmouPkg2");
+            var log = bundle.Install();
+            bundle.VerifyRegisteredAndInPackageCache(plannedPerMachine: true);
+            perMachinePkg.VerifyInstalled();
+            pkg1.VerifyInstalled();
+            pkg2.VerifyInstalled();
+            Assert.True(LogVerifier.MessageInLogFile(log, "Plan begin, 5 packages, action: Install, planned scope: Default"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PerMachinePkg.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine,"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PerUserPkg.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PmouPkg1.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine,"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PmouPkg2.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine,"));
+            bundle.Uninstall();
+            bundle.VerifyUnregisteredAndRemovedFromPackageCache(plannedPerMachine: true);
+            perMachinePkg.VerifyInstalled(false);
+            pkg1.VerifyInstalled(false);
+            pkg2.VerifyInstalled(false);
+        }
+        [RuntimeFact]
+        public void PM_PU_PMOU_Bundle_PM_Plan_Installs_PerMachine()
+        {
+            var testBAController = this.CreateTestBAController();
+            testBAController.SetBundleScope(BundleScope.PerMachine);
+            var bundle = this.CreateBundleInstaller("PmPuPmouBundleTestBA");
+            var perMachinePkg = this.CreatePackageInstaller("PerMachinePkg");
+            var perUserPkg = this.CreatePackageInstaller("PerUserPkg");
+            var pkg1 = this.CreatePackageInstaller("PmouPkg1");
+            var pkg2 = this.CreatePackageInstaller("PmouPkg2");
+            var log = bundle.Install();
+            bundle.VerifyRegisteredAndInPackageCache(plannedPerMachine: true);
+            perMachinePkg.VerifyInstalled();
+            perUserPkg.VerifyInstalled();
+            pkg1.VerifyInstalled();
+            pkg2.VerifyInstalled();
+            Assert.True(LogVerifier.MessageInLogFile(log, "Plan begin, 5 packages, action: Install, planned scope: PerMachine"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PerMachinePkg.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine,"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PerUserPkg.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PmouPkg1.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PmouPkg2.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine"));
+            bundle.Uninstall();
+            bundle.VerifyUnregisteredAndRemovedFromPackageCache(plannedPerMachine: true);
+            perMachinePkg.VerifyInstalled(false);
+            perUserPkg.VerifyInstalled(false);
+            pkg1.VerifyInstalled(false);
+            pkg2.VerifyInstalled(false);
+        }
+        [RuntimeFact]
+        public void PM_PU_PMOU_Bundle_PU_Plan_Installs_PerUserMostly()
+        {
+            var testBAController = this.CreateTestBAController();
+            testBAController.SetBundleScope(BundleScope.PerUser);
+            var bundle = this.CreateBundleInstaller("PmPuPmouBundleTestBA");
+            var perMachinePkg = this.CreatePackageInstaller("PerMachinePkg");
+            var perUserPkg = this.CreatePackageInstaller("PerUserPkg");
+            var pkg1 = this.CreatePackageInstaller("PmouPkg1");
+            var pkg2 = this.CreatePackageInstaller("PmouPkg2");
+            var log = bundle.Install();
+            bundle.VerifyRegisteredAndInPackageCache(plannedPerMachine: false);
+            perMachinePkg.VerifyInstalled();
+            perUserPkg.VerifyInstalled();
+            pkg1.VerifyInstalled();
+            pkg2.VerifyInstalled();
+            Assert.True(LogVerifier.MessageInLogFile(log, "Plan begin, 5 packages, action: Install, planned scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PerMachinePkg.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine,"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PerUserPkg.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PmouPkg1.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser,"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PmouPkg2.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser,"));
+            bundle.Uninstall();
+            bundle.VerifyUnregisteredAndRemovedFromPackageCache(plannedPerMachine: false);
+            perMachinePkg.VerifyInstalled(false);
+            perUserPkg.VerifyInstalled(false);
+            pkg1.VerifyInstalled(false);
+            pkg2.VerifyInstalled(false);
+        }
+        [RuntimeFact]
+        public void PM_PU_PUOM_Bundle_Default_Plan_Installs_PerUser()
+        {
+            var testBAController = this.CreateTestBAController();
+            testBAController.SetBundleScope(BundleScope.Default);
+            var bundle = this.CreateBundleInstaller("PmPuPuomBundleTestBA");
+            var perMachinePkg = this.CreatePackageInstaller("PerMachinePkg");
+            var perUserPkg = this.CreatePackageInstaller("PerUserPkg");
+            var pkg1 = this.CreatePackageInstaller("PuomPkg1");
+            var pkg2 = this.CreatePackageInstaller("PuomPkg2");
+            var log = bundle.Install();
+            bundle.VerifyRegisteredAndInPackageCache(plannedPerMachine: false);
+            perMachinePkg.VerifyInstalled();
+            perUserPkg.VerifyInstalled();
+            pkg1.VerifyInstalled();
+            pkg2.VerifyInstalled();
+            Assert.True(LogVerifier.MessageInLogFile(log, "Plan begin, 5 packages, action: Install, planned scope: Default"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PerMachinePkg.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PerUserPkg.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PuomPkg1.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PuomPkg2.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser"));
+            bundle.Uninstall();
+            bundle.VerifyUnregisteredAndRemovedFromPackageCache(plannedPerMachine: false);
+            perMachinePkg.VerifyInstalled(false);
+            perUserPkg.VerifyInstalled(false);
+            pkg1.VerifyInstalled(false);
+            pkg2.VerifyInstalled(false);
+        }
+        [RuntimeFact]
+        public void PM_PU_PUOM_Bundle_PM_Plan_Installs_PerMachineMostly()
+        {
+            var testBAController = this.CreateTestBAController();
+            testBAController.SetBundleScope(BundleScope.PerMachine);
+            var bundle = this.CreateBundleInstaller("PmPuPuomBundleTestBA");
+            var perMachinePkg = this.CreatePackageInstaller("PerMachinePkg");
+            var perUserPkg = this.CreatePackageInstaller("PerUserPkg");
+            var pkg1 = this.CreatePackageInstaller("PuomPkg1");
+            var pkg2 = this.CreatePackageInstaller("PuomPkg2");
+            var log = bundle.Install();
+            bundle.VerifyRegisteredAndInPackageCache(plannedPerMachine: true);
+            perMachinePkg.VerifyInstalled();
+            perUserPkg.VerifyInstalled();
+            pkg1.VerifyInstalled();
+            pkg2.VerifyInstalled();
+            Assert.True(LogVerifier.MessageInLogFile(log, "Plan begin, 5 packages, action: Install, planned scope: PerMachine"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PerMachinePkg.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PerUserPkg.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PuomPkg1.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PuomPkg2.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine"));
+            bundle.Uninstall();
+            bundle.VerifyUnregisteredAndRemovedFromPackageCache(plannedPerMachine: true);
+            perMachinePkg.VerifyInstalled(false);
+            perUserPkg.VerifyInstalled(false);
+            pkg1.VerifyInstalled(false);
+            pkg2.VerifyInstalled(false);
+        }
+        [RuntimeFact]
+        public void PM_PU_PUOM_Bundle_PU_Plan_Installs_PerUserMostly()
+        {
+            var testBAController = this.CreateTestBAController();
+            testBAController.SetBundleScope(BundleScope.PerUser);
+            var bundle = this.CreateBundleInstaller("PmPuPuomBundleTestBA");
+            var perMachinePkg = this.CreatePackageInstaller("PerMachinePkg");
+            var perUserPkg = this.CreatePackageInstaller("PerUserPkg");
+            var pkg1 = this.CreatePackageInstaller("PuomPkg1");
+            var pkg2 = this.CreatePackageInstaller("PuomPkg2");
+            var log = bundle.Install();
+            bundle.VerifyRegisteredAndInPackageCache(plannedPerMachine: false);
+            perMachinePkg.VerifyInstalled();
+            perUserPkg.VerifyInstalled();
+            pkg1.VerifyInstalled();
+            pkg2.VerifyInstalled();
+            Assert.True(LogVerifier.MessageInLogFile(log, "Plan begin, 5 packages, action: Install, planned scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PerMachinePkg.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerMachine"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PerUserPkg.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PuomPkg1.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser"));
+            Assert.True(LogVerifier.MessageInLogFile(log, "Planned package: PuomPkg2.msi, state: Absent, default requested: Present, ba requested: Present, execute: Install, rollback: Uninstall, scope: PerUser"));
+            bundle.Uninstall();
+            bundle.VerifyUnregisteredAndRemovedFromPackageCache(plannedPerMachine: false);
+            perMachinePkg.VerifyInstalled(false);
+            perUserPkg.VerifyInstalled(false);
+            pkg1.VerifyInstalled(false);
+            pkg2.VerifyInstalled(false);
+        }
+    }
+}
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/OptionalUpdateRegistrationTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/OptionalUpdateRegistrationTests.cs
index 3731b0cc..3e848fbd 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/OptionalUpdateRegistrationTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/OptionalUpdateRegistrationTests.cs
@@ -20,11 +20,11 @@ namespace WixToolsetTest.BurnE2E
            bundleAv1.Install();
            bundleAv1.VerifyRegisteredAndInPackageCache();
-            var gotV1Registration = bundleAv1.TryGetUpdateRegistration(out var v1Registration);
+            var gotV1Registration = bundleAv1.TryGetUpdateRegistration(plannedPerMachine: null, out var v1Registration);
            bundleAv2.Install();
            bundleAv2.VerifyRegisteredAndInPackageCache();
-            var gotV2Registration = bundleAv2.TryGetUpdateRegistration(out var v2Registration);
+            var gotV2Registration = bundleAv2.TryGetUpdateRegistration(plannedPerMachine: null, out var v2Registration);
            bundleAv1.VerifyUnregisteredAndRemovedFromPackageCache();
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/Utilities/TestBAController.cs b/src/test/burn/WixToolsetTest.BurnE2E/Utilities/TestBAController.cs
index c344ebce..872e6954 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/Utilities/TestBAController.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/Utilities/TestBAController.cs
@@ -72,6 +72,11 @@ namespace WixToolsetTest.BurnE2E
            this.SetBurnTestValue("ForceUpdateSource", url);
        }
+        public void SetBundleScope(BundleScope scope)
+        {
+            this.SetBurnTestValue("BundleScope", scope.ToString());
+        }
        /// <summary>
        /// Slows the cache progress of a package.
        /// </summary>
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/runtests.cmd b/src/test/burn/WixToolsetTest.BurnE2E/runtests.cmd
index ecea18a0..f6950fb0 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/runtests.cmd
+++ b/src/test/burn/WixToolsetTest.BurnE2E/runtests.cmd
@@ -1,2 +1,4 @@
 SET RuntimeTestsEnabled=true
-dotnet test WixToolsetTest.BurnE2E.dll -v normal --logger trx
+dotnet test WixToolsetTest.BurnE2E.dll -v normal --logger trx;LogFileName=%TMP%\SandboxTests.trx
+ROBOCOPY /NFL /NDL /S /PURGE %TMP% C:\Build\SandboxLogs *.log *.trx
diff --git a/src/test/sandbox/TestSandbox.wsb b/src/test/sandbox/TestSandbox.wsb
index 97c3c759..1af3f5f9 100644
--- a/src/test/sandbox/TestSandbox.wsb
+++ b/src/test/sandbox/TestSandbox.wsb
@@ -1,22 +1,21 @@
 <Configuration>
+    <Networking>Enable</Networking>
    <MappedFolders>
        <MappedFolder>
            <HostFolder>..\..\..\build</HostFolder>
            <SandboxFolder>C:\build</SandboxFolder>
-            <ReadOnly>true</ReadOnly>
-        </MappedFolder>
-        <MappedFolder>
-            <HostFolder>..\..\..\build\logs</HostFolder>
-            <SandboxFolder>C:\logs</SandboxFolder>
            <ReadOnly>false</ReadOnly>
        </MappedFolder>
-                <MappedFolder>
+        <MappedFolder>
            <HostFolder>.\</HostFolder>
            <SandboxFolder>C:\sandbox</SandboxFolder>
            <ReadOnly>true</ReadOnly>
        </MappedFolder>
    </MappedFolders>
-        <LogonCommand>
+    
-                <Command>C:\sandbox\startup.bat</Command>
+    <LogonCommand>
-        </LogonCommand>
+      <Command>C:\sandbox\startup.bat</Command>
+    </LogonCommand>
 </Configuration>
diff --git a/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs b/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
index 64e65a55..92b25ea6 100644
--- a/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
@@ -101,8 +101,6 @@ namespace WixToolset.Core.Burn
            bundleSymbol.ProviderKey = bundleSymbol.BundleCode = Guid.NewGuid().ToString("B").ToUpperInvariant();
-            bundleSymbol.PerMachine = true; // default to per-machine but the first-per user package wil flip the bundle per-user.
            {
                var command = new NormalizeRelatedBundlesCommand(this.Messaging, bundleSymbol, section);
                command.Execute();
@@ -589,27 +587,32 @@ namespace WixToolset.Core.Burn
            foreach (var facade in facades)
            {
-                if (bundleSymbol.PerMachine && facade.PackageSymbol.PerMachine.HasValue && !facade.PackageSymbol.PerMachine.Value)
+                if (facade.PackageSymbol.Scope == WixBundleScopeType.PerUser)
                {
                    this.Messaging.Write(VerboseMessages.SwitchingToPerUserPackage(facade.PackageSymbol.SourceLineNumbers, facade.PackageId));
-                    bundleSymbol.PerMachine = false;
+                    bundleSymbol.Scope = WixBundleScopeType.PerUser;
-                    break;
+                }
+                else if (facade.PackageSymbol.Scope.HasValue && facade.PackageSymbol.Scope > bundleSymbol.Scope)
+                {
+                    bundleSymbol.Scope = facade.PackageSymbol.Scope.Value;
                }
            }
            foreach (var facade in facades)
            {
-                // Update package scope from bundle scope if default.
+                // Update package scope from bundle scope once we know it and the
-                if (!facade.PackageSymbol.PerMachine.HasValue)
+                // package doesn't have an explicit scope.
+                if (!facade.PackageSymbol.Scope.HasValue)
                {
-                    facade.PackageSymbol.PerMachine = bundleSymbol.PerMachine;
+                    facade.PackageSymbol.Scope = bundleSymbol.Scope;
                }
-                // We will only register packages in the same scope as the bundle. Warn if any packages with providers
+                // We know we won't register a per-machine package for per-user bundles. Warn for that here.
-                // are in a different scope and not permanent (permanents typically don't need a ref-count).
+                // (Ignore permanent packates as we won't register a reference count for them.)
-                if (!bundleSymbol.PerMachine &&
+                // TODO: At runtime, log such mismatches once we know the scope of PUOM or PMOU packages.
-                    facade.PackageSymbol.PerMachine.Value &&
+                if (bundleSymbol.Scope == WixBundleScopeType.PerUser &&
+                    facade.PackageSymbol.Scope.Value == WixBundleScopeType.PerMachine &&
                    !facade.PackageSymbol.Permanent &&
                    dependencySymbolsById.ContainsKey(facade.PackageId))
                {
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
index dd6171b6..d7f86592 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/CreateBootstrapperApplicationManifestCommand.cs
@@ -102,7 +102,7 @@ namespace WixToolset.Core.Burn.Bundles
            writer.WriteAttributeString("LogPathVariable", this.BundleSymbol.LogPathVariable);
            writer.WriteAttributeString("Compressed", this.BundleSymbol.Compressed == true ? "yes" : "no");
            writer.WriteAttributeString("UpgradeCode", this.BundleSymbol.UpgradeCode);
-            writer.WriteAttributeString("PerMachine", this.BundleSymbol.PerMachine ? "yes" : "no");
+            writer.WriteAttributeString("Scope", this.BundleSymbol.ScopeAsString);
            writer.WriteEndElement();
        }
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
index 8ce2623e..a1ca32ac 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs
@@ -223,7 +223,7 @@ namespace WixToolset.Core.Burn.Bundles
                writer.WriteAttributeString("Code", this.BundleSymbol.BundleCode);
                writer.WriteAttributeString("ExecutableName", this.ExecutableName);
-                writer.WriteAttributeString("PerMachine", this.BundleSymbol.PerMachine ? "yes" : "no");
+                writer.WriteAttributeString("Scope", this.BundleSymbol.ScopeAsString);
                writer.WriteAttributeString("Tag", this.BundleSymbol.Tag);
                writer.WriteAttributeString("Version", this.BundleSymbol.Version);
                writer.WriteAttributeString("ProviderKey", this.BundleSymbol.ProviderKey);
@@ -345,10 +345,8 @@ namespace WixToolset.Core.Burn.Bundles
                var slipstreamMspsByPackage = this.Section.Symbols.OfType<WixBundleSlipstreamMspSymbol>().ToLookup(r => r.TargetPackageRef);
                var exitCodesByPackage = this.Section.Symbols.OfType<WixBundlePackageExitCodeSymbol>().ToLookup(r => r.ChainPackageId);
                var commandLinesByPackage = this.Section.Symbols.OfType<WixBundlePackageCommandLineSymbol>().ToLookup(r => r.WixBundlePackageRef);
                var dependenciesByPackage = this.Section.Symbols.OfType<WixDependencyProviderSymbol>().ToLookup(p => p.ParentRef);
                // Build up the list of target codes from all the MSPs in the chain.
                var targetCodes = new List<WixBundlePatchTargetCodeSymbol>();
@@ -376,7 +374,12 @@ namespace WixToolset.Core.Burn.Bundles
                    writer.WriteAttributeString("CacheId", package.PackageSymbol.CacheId);
                    writer.WriteAttributeString("InstallSize", Convert.ToString(package.PackageSymbol.InstallSize));
                    writer.WriteAttributeString("Size", Convert.ToString(package.PackageSymbol.Size));
-                    writer.WriteAttributeString("PerMachine", package.PackageSymbol.PerMachine.HasValue && package.PackageSymbol.PerMachine.Value ? "yes" : "no");
+                    if (!String.IsNullOrEmpty(package.PackageSymbol.ScopeAsString))
+                    {
+                        writer.WriteAttributeString("Scope", package.PackageSymbol.ScopeAsString);
+                    }
                    writer.WriteAttributeString("Permanent", package.PackageSymbol.Permanent ? "yes" : "no");
                    writer.WriteAttributeString("Vital", package.PackageSymbol.Vital ? "yes" : "no");
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/HarvestBundlePackageCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/HarvestBundlePackageCommand.cs
index abc54be7..e7bad501 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/HarvestBundlePackageCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/HarvestBundlePackageCommand.cs
@@ -61,10 +61,10 @@ namespace WixToolset.Core.Burn.Bundles
            string engineVersion;
            int protocolVersion;
            string manifestNamespace;
-            bool perMachine;
            string version;
            string displayName;
            long installSize;
+            WixBundleScopeType scope;
            var sourcePath = this.PackagePayload.SourceFile.Path;
            var sourceLineNumbers = this.PackagePayload.SourceLineNumbers;
@@ -113,7 +113,21 @@ namespace WixToolset.Core.Burn.Bundles
                    var registrationElement = document.SelectSingleNode("/burn:BurnManifest/burn:Registration", namespaceManager) as XmlElement;
                    var arpElement = document.SelectSingleNode("/burn:BurnManifest/burn:Registration/burn:Arp", namespaceManager) as XmlElement;
-                    perMachine = registrationElement.GetAttribute("PerMachine") == "yes";
+                    var bundleScope = registrationElement.GetAttribute("Scope");
+                    if (!Enum.TryParse(bundleScope, ignoreCase: true, out scope))
+                    {
+                        // No Scope attribute means it's a <v6.0 bundle, so fall back to PerMachine.
+                        var perMachine = registrationElement.GetAttribute("PerMachine");
+                        if (!String.IsNullOrEmpty(perMachine))
+                        {
+                            scope = perMachine == "yes" ? WixBundleScopeType.PerMachine : WixBundleScopeType.PerUser;
+                        }
+                        else
+                        {
+                            this.Messaging.Write(BurnBackendErrors.InvalidBundleManifest(sourceLineNumbers, sourcePath, $"Expected bundle scope but got '{bundleScope}'."));
+                        }
+                    }
                    version = registrationElement.GetAttribute("Version");
@@ -148,7 +162,7 @@ namespace WixToolset.Core.Burn.Bundles
                EngineVersion = engineVersion,
                ManifestNamespace = manifestNamespace,
                ProtocolVersion = protocolVersion,
-                PerMachine = perMachine,
+                Scope = scope,
                Version = version,
                DisplayName = displayName,
                InstallSize = installSize,
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/ProcessBundlePackageCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/ProcessBundlePackageCommand.cs
index 35bd43e6..ccea04e1 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/ProcessBundlePackageCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/ProcessBundlePackageCommand.cs
@@ -87,7 +87,6 @@ namespace WixToolset.Core.Burn.Bundles
                this.ChainPackage.Visible = true;
            }
-            this.ChainPackage.PerMachine = harvestedBundlePackage.PerMachine;
            this.PackagePayload.Version = harvestedBundlePackage.Version;
            this.BundlePackage.Version = harvestedBundlePackage.Version;
            this.ChainPackage.Version = harvestedBundlePackage.Version;
@@ -103,6 +102,7 @@ namespace WixToolset.Core.Burn.Bundles
            }
            this.ChainPackage.InstallSize = harvestedBundlePackage.InstallSize;
+            this.ChainPackage.Scope = harvestedBundlePackage.Scope;
        }
        private WixBundleHarvestedBundlePackageSymbol HarvestPackage()
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
index 8b370b90..e6da5ce6 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
@@ -89,7 +89,6 @@ namespace WixToolset.Core.Burn.Bundles
                });
            }
-            this.ChainPackage.PerMachine = harvestedMsiPackage.PerMachine;
            this.ChainPackage.Win64 = harvestedMsiPackage.Win64;
            this.MsiPackage.ProductCode = harvestedMsiPackage.ProductCode;
@@ -123,7 +122,7 @@ namespace WixToolset.Core.Burn.Bundles
                this.Messaging.Write(WarningMessages.InvalidMsiProductVersion(this.PackagePayload.SourceLineNumbers, this.MsiPackage.ProductVersion, this.PackageId));
            }
-            this.SetPerMachineAppropriately(harvestedMsiPackage.AllUsers);
+            this.DeterminePackageScope(harvestedMsiPackage.PerMachine, harvestedMsiPackage.AllUsers, harvestedMsiPackage.MsiInstallPerUser);
            var msiPropertyNames = this.GetMsiPropertyNames();
@@ -146,6 +145,7 @@ namespace WixToolset.Core.Burn.Bundles
            string productName;
            string arpComments;
            string allUsers;
+            string msiInstallPerUser;
            string msiFastInstall;
            string arpSystemComponent;
            string productCode;
@@ -194,6 +194,7 @@ namespace WixToolset.Core.Burn.Bundles
                        productName = ProcessMsiPackageCommand.GetProperty(view, "ProductName");
                        arpComments = ProcessMsiPackageCommand.GetProperty(view, "ARPCOMMENTS");
                        allUsers = ProcessMsiPackageCommand.GetProperty(view, "ALLUSERS");
+                        msiInstallPerUser = ProcessMsiPackageCommand.GetProperty(view, "MSIINSTALLPERUSER");
                        msiFastInstall = ProcessMsiPackageCommand.GetProperty(view, "MSIFASTINSTALL");
                        arpSystemComponent = ProcessMsiPackageCommand.GetProperty(view, "ARPSYSTEMCOMPONENT");
@@ -234,6 +235,7 @@ namespace WixToolset.Core.Burn.Bundles
                ProductName = productName,
                ArpComments = arpComments,
                AllUsers = allUsers,
+                MsiInstallPerUser = msiInstallPerUser,
                MsiFastInstall = msiFastInstall,
                ArpSystemComponent = arpSystemComponent,
                ProductCode = productCode,
@@ -284,18 +286,17 @@ namespace WixToolset.Core.Burn.Bundles
            }
        }
-        private void SetPerMachineAppropriately(string allusers)
+        private void DeterminePackageScope(bool perMachine, string allusers, string msiInstallPerUser)
        {
-            Debug.Assert(this.ChainPackage.PerMachine.HasValue);
-            var perMachine = this.ChainPackage.PerMachine.Value;
            // Can ignore ALLUSERS from MsiProperties because it is not allowed there.
            if (this.MsiPackage.ForcePerMachine)
            {
+                this.ChainPackage.Scope = WixBundleScopeType.PerMachine; // ensure that we think the package is per-machine.
                if (!perMachine)
                {
                    this.Messaging.Write(BurnBackendWarnings.PerUserButForcingPerMachine(this.PackagePayload.SourceLineNumbers, this.PackageId));
-                    this.ChainPackage.PerMachine = true; // ensure that we think the package is per-machine.
+                    this.ChainPackage.Scope = WixBundleScopeType.PerMachine; // ensure that we think the package is per-machine.
                }
                // Force ALLUSERS=1 via the MSI command-line.
@@ -306,14 +307,17 @@ namespace WixToolset.Core.Burn.Bundles
                if (String.IsNullOrEmpty(allusers))
                {
                    // Not forced per-machine and no ALLUSERS property, flip back to per-user.
+                    this.ChainPackage.Scope = WixBundleScopeType.PerUser;
                    if (perMachine)
                    {
                        this.Messaging.Write(BurnBackendWarnings.ImplicitlyPerUser(this.ChainPackage.SourceLineNumbers, this.PackageId));
-                        this.ChainPackage.PerMachine = false;
                    }
                }
                else if (allusers.Equals("1", StringComparison.Ordinal))
                {
+                    this.ChainPackage.Scope = WixBundleScopeType.PerMachine; // ensure that we think the package is per-machine.
                    if (!perMachine)
                    {
                        this.Messaging.Write(BurnBackendErrors.PerUserButAllUsersEquals1(this.ChainPackage.SourceLineNumbers, this.PackageId));
@@ -321,7 +325,14 @@ namespace WixToolset.Core.Burn.Bundles
                }
                else if (allusers.Equals("2", StringComparison.Ordinal))
                {
-                    this.Messaging.Write(BurnBackendWarnings.DiscouragedAllUsersValue(this.ChainPackage.SourceLineNumbers, this.PackageId, perMachine ? "machine" : "user"));
+                    if (msiInstallPerUser?.Equals("1", StringComparison.Ordinal) == true)
+                    {
+                        this.ChainPackage.Scope = WixBundleScopeType.PerUserOrMachine;
+                    }
+                    else
+                    {
+                        this.ChainPackage.Scope = WixBundleScopeType.PerMachineOrUser;
+                    }
                }
                else
                {
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/ProcessMsuPackageCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/ProcessMsuPackageCommand.cs
index 47e89616..a3a38ed4 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/ProcessMsuPackageCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/ProcessMsuPackageCommand.cs
@@ -35,7 +35,7 @@ namespace WixToolset.Core.Burn.Bundles
                this.Facade.PackageSymbol.CacheId = CacheIdGenerator.GenerateLocalCacheId(this.Messaging, null, packagePayload, this.Facade.PackageSymbol.SourceLineNumbers, "MsuPackage");
            }
-            this.Facade.PackageSymbol.PerMachine = true; // MSUs are always per-machine.
+            this.Facade.PackageSymbol.Scope = WixBundleScopeType.PerMachine; // MSUs are always per-machine.
        }
    }
 }
diff --git a/src/wix/WixToolset.Core.Burn/BurnBackendWarnings.cs b/src/wix/WixToolset.Core.Burn/BurnBackendWarnings.cs
index ab045981..0349c942 100644
--- a/src/wix/WixToolset.Core.Burn/BurnBackendWarnings.cs
+++ b/src/wix/WixToolset.Core.Burn/BurnBackendWarnings.cs
@@ -61,11 +61,6 @@ namespace WixToolset.Core.Burn
            return Message(sourceLineNumbers, Ids.DiscardedRollbackBoundary2, "Location of rollback boundary related to previous warning.");
        }
-        public static Message DiscouragedAllUsersValue(SourceLineNumber sourceLineNumbers, string path, string machineOrUser)
-        {
-            return Message(sourceLineNumbers, Ids.DiscouragedAllUsersValue, "Bundles require a package to be either per-machine or per-user. The MSI '{0}' ALLUSERS Property is set to '2' which may change from per-user to per-machine at install time. The Bundle will assume the package is per-{1} and will not work correctly if that changes. If possible, use the Package/@Scope attribute values 'perUser' or 'perMachine' instead.", path, machineOrUser);
-        }
        public static Message DownloadUrlNotSupportedForAttachedContainers(SourceLineNumber sourceLineNumbers, string containerId)
        {
            return Message(sourceLineNumbers, Ids.DownloadUrlNotSupportedForAttachedContainers, "The Container '{0}' is attached but included a @DownloadUrl attribute. Attached Containers cannot be downloaded so the download URL is being ignored.", containerId);
@@ -104,7 +99,6 @@ namespace WixToolset.Core.Burn
        public enum Ids
        {
            DiscardedRollbackBoundary = 1129,
-            DiscouragedAllUsersValue = 1133,
            ImplicitlyPerUser = 1134,
            PerUserButForcingPerMachine = 1135,
            NoPerMachineDependencies = 1140,
diff --git a/src/wix/WixToolset.Core.Burn/CommandLine/RemotePayloadSubcommand.cs b/src/wix/WixToolset.Core.Burn/CommandLine/RemotePayloadSubcommand.cs
index 7ccae3fd..f4d557fe 100644
--- a/src/wix/WixToolset.Core.Burn/CommandLine/RemotePayloadSubcommand.cs
+++ b/src/wix/WixToolset.Core.Burn/CommandLine/RemotePayloadSubcommand.cs
@@ -438,7 +438,23 @@ namespace WixToolset.Core.Burn.CommandLine
                bundleElement.Add(new XAttribute("InstallSize", command.HarvestedBundlePackage.InstallSize));
                bundleElement.Add(new XAttribute("ManifestNamespace", command.HarvestedBundlePackage.ManifestNamespace));
-                bundleElement.Add(new XAttribute("PerMachine", command.HarvestedBundlePackage.PerMachine ? "yes" : "no"));
+                switch (command.HarvestedBundlePackage.Scope)
+                {
+                    case WixBundleScopeType.PerMachine:
+                        bundleElement.Add(new XAttribute("Scope", "perMachine"));
+                        break;
+                    case WixBundleScopeType.PerUser:
+                        bundleElement.Add(new XAttribute("Scope", "perUser"));
+                        break;
+                    case WixBundleScopeType.PerUserOrMachine:
+                        bundleElement.Add(new XAttribute("Scope", "perUserOrMachine"));
+                        break;
+                    case WixBundleScopeType.PerMachineOrUser:
+                        bundleElement.Add(new XAttribute("Scope", "perMachineOrUser"));
+                        break;
+                }
                bundleElement.Add(new XAttribute("ProviderKey", command.HarvestedDependencyProvider.ProviderKey));
                bundleElement.Add(new XAttribute("ProtocolVersion", command.HarvestedBundlePackage.ProtocolVersion));
diff --git a/src/wix/WixToolset.Core/Compiler_Bundle.cs b/src/wix/WixToolset.Core/Compiler_Bundle.cs
index 2a36581c..1c8666af 100644
--- a/src/wix/WixToolset.Core/Compiler_Bundle.cs
+++ b/src/wix/WixToolset.Core/Compiler_Bundle.cs
@@ -2610,11 +2610,11 @@ namespace WixToolset.Core
                if (perMachine == YesNoDefaultType.Yes)
                {
-                    chainPackageSymbol.PerMachine = true;
+                    chainPackageSymbol.Scope = WixBundleScopeType.PerMachine;
                }
                else if (perMachine == YesNoDefaultType.No)
                {
-                    chainPackageSymbol.PerMachine = false;
+                    chainPackageSymbol.Scope = WixBundleScopeType.PerUser;
                }
                if (installSize.HasValue)
@@ -2871,9 +2871,9 @@ namespace WixToolset.Core
            string bundleCode = null;
            string displayName = null;
            string engineVersion = null;
+            WixBundleScopeType? scope = null;
            long? installSize = null;
            string manifestNamespace = null;
-            var perMachine = YesNoType.NotSet;
            var protocolVersion = -1;
            string providerKey = null;
            string upgradeCode = null;
@@ -2905,7 +2905,14 @@ namespace WixToolset.Core
                            manifestNamespace = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
                            break;
                        case "PerMachine":
-                            perMachine = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
+                            if (scope.HasValue)
+                            {
+                                this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "PerMachine", "Scope", eitherOr: true));
+                            }
+                            else
+                            {
+                                scope = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib) == YesNoType.Yes ? WixBundleScopeType.PerMachine : WixBundleScopeType.PerUser;
+                            }
                            break;
                        case "ProtocolVersion":
                            protocolVersion = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, 0, Int32.MaxValue);
@@ -2913,6 +2920,34 @@ namespace WixToolset.Core
                        case "ProviderKey":
                            providerKey = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
                            break;
+                        case "Scope":
+                            if (scope.HasValue)
+                            {
+                                this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "PerMachine", "Scope", eitherOr: true));
+                            }
+                            else
+                            {
+                                var installScope = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
+                                switch (installScope)
+                                {
+                                    case "perMachine":
+                                        scope = WixBundleScopeType.PerMachine;
+                                        break;
+                                    case "perUser":
+                                        scope = WixBundleScopeType.PerUser;
+                                        break;
+                                    case "perUserOrMachine":
+                                        scope = WixBundleScopeType.PerUserOrMachine;
+                                        break;
+                                    case "perMachineOrUser":
+                                        scope = WixBundleScopeType.PerMachineOrUser;
+                                        break;
+                                    default:
+                                        this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, installScope, "perMachine", "perUser", "perUserOrMachine"));
+                                        break;
+                                }
+                            }
+                            break;
                        case "UpgradeCode":
                            upgradeCode = this.Core.GetAttributeGuidValue(sourceLineNumbers, attrib);
                            break;
@@ -2943,9 +2978,9 @@ namespace WixToolset.Core
                this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "ManifestNamespace"));
            }
-            if (perMachine == YesNoType.NotSet)
+            if (scope == null)
            {
-                this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "PerMachine"));
+                this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Scope"));
            }
            if (protocolVersion == -1)
@@ -2976,12 +3011,12 @@ namespace WixToolset.Core
            if (!this.Messaging.EncounteredError)
            {
                WixBundleHarvestedBundlePackageAttributes bundleAttributes = 0;
-                bundleAttributes |= (YesNoType.Yes == perMachine) ? WixBundleHarvestedBundlePackageAttributes.PerMachine : 0;
                bundleAttributes |= (YesNoType.Yes == win64) ? WixBundleHarvestedBundlePackageAttributes.Win64 : 0;
                var symbol = this.Core.AddSymbol(new WixBundleHarvestedBundlePackageSymbol(sourceLineNumbers, new Identifier(AccessModifier.Section, packagePayloadId))
                {
                    Attributes = bundleAttributes,
+                    Scope = scope ?? WixBundleScopeType.PerMachine,
                    BundleCode = bundleCode,
                    DisplayName = displayName,
                    EngineVersion = engineVersion,
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
index 8fbd4ddb..93aae7be 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs
@@ -170,7 +170,7 @@ namespace WixToolsetTest.CoreIntegration
                    var registrationElements = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Registration");
                    WixAssert.CompareLineByLine(new[]
                    {
-                        $"<Registration Code='{bundleSymbol.BundleCode}' ExecutableName='test.exe' PerMachine='yes' Tag='' Version='1.0.0.0' ProviderKey='{bundleSymbol.BundleCode}'>" +
+                        $"<Registration Code='{bundleSymbol.BundleCode}' ExecutableName='test.exe' Scope='perMachine' Tag='' Version='1.0.0.0' ProviderKey='{bundleSymbol.BundleCode}'>" +
                        "<Arp DisplayName='~TestBundle' DisplayVersion='1.0.0.0' InProgressDisplayName='~InProgressTestBundle' Publisher='Example Corporation' />" +
                        "</Registration>",
                    }, registrationElements);
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs
index 30d3aaea..7162bd60 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs
@@ -5,11 +5,11 @@ namespace WixToolsetTest.CoreIntegration
    using System;
    using System.Collections.Generic;
    using System.IO;
+    using System.Linq;
    using Example.Extension;
    using WixInternal.TestSupport;
    using WixInternal.Core.TestPackage;
    using Xunit;
-    using System.Linq;
    public class BundleManifestFixture
    {
@@ -187,7 +187,7 @@ namespace WixToolsetTest.CoreIntegration
                var dataRelatedBundlesElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixBundleProperties", ignoreAttributesByElementName);
                WixAssert.CompareLineByLine(new[]
                {
-                    "<WixBundleProperties BundleId='WixToolsetTest.BundleWithInvalidUpgradeCode' Code='*' DisplayName='*' LogPathVariable='WixBundleLog' Compressed='no' UpgradeCode='{6D4CE32B-FB91-45DA-A9B5-7E0D9929A3C3}' PerMachine='yes' />",
+                    "<WixBundleProperties BundleId='WixToolsetTest.BundleWithInvalidUpgradeCode' Code='*' DisplayName='*' LogPathVariable='WixBundleLog' Compressed='no' UpgradeCode='{6D4CE32B-FB91-45DA-A9B5-7E0D9929A3C3}' Scope='perMachine' />",
                }, dataRelatedBundlesElements);
            }
        }
@@ -381,8 +381,8 @@ namespace WixToolsetTest.CoreIntegration
                var exePackageElements = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:ExePackage", ignoreAttributesByElementName);
                WixAssert.CompareLineByLine(new[]
                {
-                    "<ExePackage Id='credwiz.exe' Cache='keep' CacheId='*' InstallSize='*' Size='*' PerMachine='yes' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' LogPathVariable='WixBundleLog_credwiz.exe' RollbackLogPathVariable='WixBundleRollbackLog_credwiz.exe' InstallArguments='' RepairArguments='' Repairable='no' DetectionType='condition' DetectCondition='none' UninstallArguments='-foo' Uninstallable='yes' Protocol='burn' Bundle='yes'><PayloadRef Id='credwiz.exe' /><PayloadRef Id='pldbF0sgj0VCScDauGEpgwmywekS84' /></ExePackage>",
+                    "<ExePackage Id='credwiz.exe' Cache='keep' CacheId='*' InstallSize='*' Size='*' Scope='perMachine' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' LogPathVariable='WixBundleLog_credwiz.exe' RollbackLogPathVariable='WixBundleRollbackLog_credwiz.exe' InstallArguments='' RepairArguments='' Repairable='no' DetectionType='condition' DetectCondition='none' UninstallArguments='-foo' Uninstallable='yes' Protocol='burn' Bundle='yes'><PayloadRef Id='credwiz.exe' /><PayloadRef Id='pldbF0sgj0VCScDauGEpgwmywekS84' /></ExePackage>",
-                    "<ExePackage Id='cscript.exe' Cache='keep' CacheId='*' InstallSize='*' Size='*' PerMachine='yes' Permanent='yes' Vital='yes' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_cscript.exe' RollbackLogPathVariable='WixBundleRollbackLog_cscript.exe' InstallArguments='' RepairArguments='' Repairable='no' DetectionType='condition' DetectCondition='none' UninstallArguments='' Uninstallable='yes' Protocol='none' Bundle='yes'><PayloadRef Id='cscript.exe' /><PayloadRef Id='pldbF0sgj0VCScDauGEpgwmywekS84' /></ExePackage>",
+                    "<ExePackage Id='cscript.exe' Cache='keep' CacheId='*' InstallSize='*' Size='*' Scope='perMachine' Permanent='yes' Vital='yes' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_cscript.exe' RollbackLogPathVariable='WixBundleRollbackLog_cscript.exe' InstallArguments='' RepairArguments='' Repairable='no' DetectionType='condition' DetectCondition='none' UninstallArguments='' Uninstallable='yes' Protocol='none' Bundle='yes'><PayloadRef Id='cscript.exe' /><PayloadRef Id='pldbF0sgj0VCScDauGEpgwmywekS84' /></ExePackage>",
                }, exePackageElements);
            }
        }
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BundlePackageFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BundlePackageFixture.cs
index d4ff0dbd..51fdac6f 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/BundlePackageFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/BundlePackageFixture.cs
@@ -80,7 +80,7 @@ namespace WixToolsetTest.CoreIntegration
                var bundlePackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:BundlePackage", ignoreAttributesByElementName);
                WixAssert.CompareLineByLine(new[]
                {
-                    $"<BundlePackage Id='chain.exe' Cache='keep' CacheId='{chainBundleId}v1.0.0.0' InstallSize='34' Size='*' PerMachine='yes' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_chain.exe' RollbackLogPathVariable='WixBundleRollbackLog_chain.exe' BundleCode='{chainBundleId}' Version='1.0.0.0' InstallArguments='' UninstallArguments='' RepairArguments='' SupportsBurnProtocol='yes' Win64='no' HideARP='yes'>" +
+                    $"<BundlePackage Id='chain.exe' Cache='keep' CacheId='{chainBundleId}v1.0.0.0' InstallSize='34' Size='*' Scope='perMachine' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_chain.exe' RollbackLogPathVariable='WixBundleRollbackLog_chain.exe' BundleCode='{chainBundleId}' Version='1.0.0.0' InstallArguments='' UninstallArguments='' RepairArguments='' SupportsBurnProtocol='yes' Win64='no' HideARP='yes'>" +
                    "<Provides Key='MyProviderKey,v1.0' Version='1.0.0.0' DisplayName='BurnBundle' Imported='yes' />" +
                    "<RelatedBundle Code='{DFEA7F84-8F9D-5330-AAAE-7D849E650215}' Action='Upgrade' />" +
                    "<PayloadRef Id='chain.exe' />" +
@@ -91,7 +91,7 @@ namespace WixToolsetTest.CoreIntegration
                var registrations = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Registration");
                WixAssert.CompareLineByLine(new[]
                {
-                    $"<Registration BundleId='WixToolsetTest.TestBundle' Code='{parentBundleId}' ExecutableName='parent.exe' PerMachine='yes' Tag='' Version='1.0.1.0' ProviderKey='{parentBundleId}'>" +
+                    $"<Registration BundleId='WixToolsetTest.TestBundle' Code='{parentBundleId}' ExecutableName='parent.exe' Scope='perMachine' Tag='' Version='1.0.1.0' ProviderKey='{parentBundleId}'>" +
                    "<Arp DisplayName='BundlePackageBundle' DisplayVersion='1.0.1.0' Publisher='Example Corporation' />" +
                    "</Registration>"
                }, registrations);
@@ -133,7 +133,7 @@ namespace WixToolsetTest.CoreIntegration
                bundlePackages = grandparentExtractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:BundlePackage", ignoreAttributesByElementName);
                WixAssert.CompareLineByLine(new[]
                {
-                    $"<BundlePackage Id='parent.exe' Cache='keep' CacheId='{parentBundleId}v1.0.1.0' InstallSize='34' Size='*' PerMachine='yes' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_parent.exe' RollbackLogPathVariable='WixBundleRollbackLog_parent.exe' BundleCode='{parentBundleId}' Version='1.0.1.0' InstallArguments='' UninstallArguments='' RepairArguments='' SupportsBurnProtocol='yes' Win64='no'>" +
+                    $"<BundlePackage Id='parent.exe' Cache='keep' CacheId='{parentBundleId}v1.0.1.0' InstallSize='34' Size='*' Scope='perMachine' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_parent.exe' RollbackLogPathVariable='WixBundleRollbackLog_parent.exe' BundleCode='{parentBundleId}' Version='1.0.1.0' InstallArguments='' UninstallArguments='' RepairArguments='' SupportsBurnProtocol='yes' Win64='no'>" +
                    $"<Provides Key='{parentBundleId}' Version='1.0.1.0' DisplayName='BundlePackageBundle' Imported='yes' />" +
                    "<RelatedBundle Code='{DFEA7F84-8F9D-5330-AAAE-7D849E650215}' Action='Upgrade' />" +
                    "<PayloadRef Id='parent.exe' />" +
@@ -154,7 +154,7 @@ namespace WixToolsetTest.CoreIntegration
                registrations = grandparentExtractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Registration");
                WixAssert.CompareLineByLine(new[]
                {
-                    $"<Registration BundleId='WixToolsetTest.TestBundle' Code='{grandparentBundleId}' ExecutableName='grandparent.exe' PerMachine='yes' Tag='' Version='1.0.2.0' ProviderKey='{grandparentBundleId}'>" +
+                    $"<Registration BundleId='WixToolsetTest.TestBundle' Code='{grandparentBundleId}' ExecutableName='grandparent.exe' Scope='perMachine' Tag='' Version='1.0.2.0' ProviderKey='{grandparentBundleId}'>" +
                    "<Arp DisplayName='PermanentBundlePackageBundle' DisplayVersion='1.0.2.0' Publisher='Example Corporation' />" +
                    "</Registration>"
                }, registrations);
@@ -214,7 +214,7 @@ namespace WixToolsetTest.CoreIntegration
                var bundlePackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:BundlePackage", ignoreAttributesByElementName);
                WixAssert.CompareLineByLine(new[]
                {
-                    $"<BundlePackage Id='chain.exe' Cache='keep' CacheId='{chainBundleId}v1.0.0-foo.55' InstallSize='34' Size='*' PerMachine='yes' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_chain.exe' RollbackLogPathVariable='WixBundleRollbackLog_chain.exe' BundleCode='{chainBundleId}' Version='1.0.0-foo.55' InstallArguments='' UninstallArguments='' RepairArguments='' SupportsBurnProtocol='yes' Win64='no'>" +
+                    $"<BundlePackage Id='chain.exe' Cache='keep' CacheId='{chainBundleId}v1.0.0-foo.55' InstallSize='34' Size='*' Scope='perMachine' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_chain.exe' RollbackLogPathVariable='WixBundleRollbackLog_chain.exe' BundleCode='{chainBundleId}' Version='1.0.0-foo.55' InstallArguments='' UninstallArguments='' RepairArguments='' SupportsBurnProtocol='yes' Win64='no'>" +
                    "<Provides Key='MyProviderKey,v1.0' Version='1.0.0-foo.55' DisplayName='BurnBundle' Imported='yes' />" +
                    "<RelatedBundle Code='{B94478B1-E1F3-4700-9CE8-6AA090854AEC}' Action='Upgrade' />" +
                    "<PayloadRef Id='chain.exe' />" +
@@ -224,7 +224,7 @@ namespace WixToolsetTest.CoreIntegration
                var registrations = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Registration");
                WixAssert.CompareLineByLine(new[]
                {
-                    $"<Registration BundleId='WixToolsetTest.TestBundle' Code='{parentBundleId}' ExecutableName='parent.exe' PerMachine='yes' Tag='' Version='1.0.1.0' ProviderKey='{parentBundleId}'>" +
+                    $"<Registration BundleId='WixToolsetTest.TestBundle' Code='{parentBundleId}' ExecutableName='parent.exe' Scope='perMachine' Tag='' Version='1.0.1.0' ProviderKey='{parentBundleId}'>" +
                    "<Arp DisplayName='RemoteBundlePackageBundle' DisplayVersion='1.0.1.0' Publisher='Example Corporation' />" +
                    "</Registration>"
                }, registrations);
@@ -292,7 +292,7 @@ namespace WixToolsetTest.CoreIntegration
                var bundlePackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:BundlePackage", ignoreAttributesByElementName);
                WixAssert.CompareLineByLine(new[]
                {
-                    $"<BundlePackage Id='v3bundle.exe' Cache='keep' CacheId='{chainBundleId}v1.0.0.0' InstallSize='1135' Size='*' PerMachine='yes' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_v3bundle.exe' RollbackLogPathVariable='WixBundleRollbackLog_v3bundle.exe' RepairCondition='0' BundleCode='{chainBundleId}' Version='1.0.0.0' InstallArguments='' UninstallArguments='' RepairArguments='' SupportsBurnProtocol='yes' Win64='no'>" +
+                    $"<BundlePackage Id='v3bundle.exe' Cache='keep' CacheId='{chainBundleId}v1.0.0.0' InstallSize='1135' Size='*' Scope='perMachine' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_v3bundle.exe' RollbackLogPathVariable='WixBundleRollbackLog_v3bundle.exe' RepairCondition='0' BundleCode='{chainBundleId}' Version='1.0.0.0' InstallArguments='' UninstallArguments='' RepairArguments='' SupportsBurnProtocol='yes' Win64='no'>" +
                    "<Provides Key='{215a70db-ab35-48c7-be51-d66eaac87177}' Version='1.0.0.0' DisplayName='CustomV3Theme' Imported='yes' />" +
                    "<RelatedBundle Code='{2BF4C01F-C132-4E70-97AB-2BC68C7CCD10}' Action='Upgrade' />" +
                    "<PayloadRef Id='v3bundle.exe' />" +
@@ -302,7 +302,7 @@ namespace WixToolsetTest.CoreIntegration
                var registrations = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Registration");
                WixAssert.CompareLineByLine(new[]
                {
-                    $"<Registration Code='{parentBundleId}' ExecutableName='parent.exe' PerMachine='yes' Tag='' Version='1.1.1.1' ProviderKey='{parentBundleId}'>" +
+                    $"<Registration Code='{parentBundleId}' ExecutableName='parent.exe' Scope='perMachine' Tag='' Version='1.1.1.1' ProviderKey='{parentBundleId}'>" +
                    "<Arp DisplayName='V3BundlePackageBundle' DisplayVersion='1.1.1.1' Publisher='Example Corporation' />" +
                    "</Registration>"
                }, registrations);
@@ -320,6 +320,103 @@ namespace WixToolsetTest.CoreIntegration
        }
        [Fact]
+        public void CanBuildBundleWithPerUserOrMachineBundlePackage()
+        {
+            var folder = TestData.Get("TestData");
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var dataPath = Path.Combine(folder, ".Data");
+                var msiIntermediateFolder = Path.Combine(baseFolder, "obj", "msi");
+                var msiBinFolder = Path.Combine(baseFolder, "bin", "msi");
+                var msiPath = Path.Combine(msiBinFolder, "test.msi");
+                var baFolderPath = Path.Combine(baseFolder, "extract", "ba");
+                var extractFolderPath = Path.Combine(baseFolder, "extract", "files");
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "BundlePerUserOrMachine", "PerUserOrMachinePackage.wxs"),
+                    "-bindpath", dataPath,
+                    "-intermediateFolder", msiIntermediateFolder,
+                    "-o", msiPath
+                });
+                result.AssertSuccess();
+                var bundleIntermediateFolder = Path.Combine(baseFolder, "obj", "bundle");
+                var bundleBinFolder = Path.Combine(baseFolder, "bin", "bundle");
+                var bundlePath = Path.Combine(bundleBinFolder, "BundleWithPerUserOrMachinePackage.exe");
+                var bundlePdbPath = Path.Combine(bundleBinFolder, "BundleWithPerUserOrMachinePackage.wixpdb");
+                result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "BundlePerUserOrMachine", "BundleWithPerUserOrMachinePackage.wxs"),
+                    "-bindpath", dataPath,
+                    "-bindpath", msiBinFolder,
+                    "-intermediateFolder", bundleIntermediateFolder,
+                    "-o", bundlePath
+                });
+                result.AssertSuccess();
+                var bundleId = GetBundleCodeFromWixpdb(bundlePdbPath);
+                var consumingBundleIntermediateFolder = Path.Combine(baseFolder, "obj", "bundle2");
+                var consumingBundleBinFolder = Path.Combine(baseFolder, "bin", "bundle2");
+                var consumingBundlePath = Path.Combine(bundleBinFolder, "PerUserOrMachineBundlePackage.exe");
+                var consumingBundlePdbPath = Path.Combine(bundleBinFolder, "PerUserOrMachineBundlePackage.wixpdb");
+                result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "BundlePackage", "PerUserOrMachineBundlePackage.wxs"),
+                    "-bindpath", dataPath,
+                    "-bindpath", bundleBinFolder,
+                    "-intermediateFolder", consumingBundleIntermediateFolder,
+                    "-o", consumingBundlePath
+                });
+                result.AssertSuccess();
+                var bundle2Id = GetBundleCodeFromWixpdb(consumingBundlePdbPath);
+                var parentBaFolderPath = Path.Combine(baseFolder, "parentba");
+                var grandparentBaFolderPath = Path.Combine(baseFolder, "grandparentba");
+                var bundle2ExtractResult = BundleExtractor.ExtractBAContainer(null, consumingBundlePath, grandparentBaFolderPath, extractFolderPath);
+                bundle2ExtractResult.AssertSuccess();
+                var ignoreAttributesByElementName = new Dictionary<string, List<string>>
+                {
+                    { "BundlePackage", new List<string> { "Size" } },
+                };
+                var bundlePackages = bundle2ExtractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:BundlePackage", ignoreAttributesByElementName);
+                WixAssert.CompareLineByLine(new[]
+                {
+                    $"<BundlePackage Id='BundleWithPerUserOrMachinePackage.exe' Cache='keep' CacheId='{bundleId}v9.9' InstallSize='28' Size='*' Scope='perUserOrMachine' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_BundleWithPerUserOrMachinePackage.exe' RollbackLogPathVariable='WixBundleRollbackLog_BundleWithPerUserOrMachinePackage.exe' BundleCode='{bundleId}' Version='9.9' InstallArguments='' UninstallArguments='' RepairArguments='' SupportsBurnProtocol='yes' Win64='no' HideARP='yes'>" +
+                    $"<Provides Key='{bundleId}' Version='9.9' DisplayName='Per-user-or-machine Bundle' Imported='yes' />" +
+                    "<RelatedBundle Code='{BC2E5008-C3FF-5746-A3F1-A5C190E3BFC3}' Action='Upgrade' />" +
+                    "<PayloadRef Id='BundleWithPerUserOrMachinePackage.exe' />" +
+                    "</BundlePackage>",
+                }, bundlePackages);
+                var registrations = bundle2ExtractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Registration");
+                WixAssert.CompareLineByLine(new[]
+                {
+                    $"<Registration BundleId='WixToolsetTest.PerUserOrMachineBundlePackage' Code='{bundle2Id}' ExecutableName='PerUserOrMachineBundlePackage.exe' Scope='perUserOrMachine' Tag='' Version='1.0.2.0' ProviderKey='{bundle2Id}'>" +
+                    "<Arp DisplayName='PerUserOrMachineBundlePackage' DisplayVersion='1.0.2.0' Publisher='Example Corporation' />" +
+                    "</Registration>"
+                }, registrations);
+            }
+        }
+        [Fact]
        public void CanBuildBundleWithAllUsersPackage()
        {
            var folder = TestData.Get("TestData");
@@ -372,7 +469,7 @@ namespace WixToolsetTest.CoreIntegration
                var registrations = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Registration");
                WixAssert.CompareLineByLine(new[]
                {
-                    $"<Registration BundleId='WixToolsetTest.TestBundle' Code='{parentBundleId}' ExecutableName='bundle.exe' PerMachine='yes' Tag='' Version='9.9' ProviderKey='{parentBundleId}'>" +
+                    $"<Registration BundleId='WixToolsetTest.TestBundle' Code='{parentBundleId}' ExecutableName='bundle.exe' Scope='perMachine' Tag='' Version='9.9' ProviderKey='{parentBundleId}'>" +
                    "<Arp DisplayName='All Users Bundle' DisplayVersion='9.9' Publisher='Example Corporation' />" +
                    "</Registration>"
                }, registrations);
@@ -390,6 +487,148 @@ namespace WixToolsetTest.CoreIntegration
            }
        }
+        [Fact]
+        public void CanBuildBundleWithPerUserPackage()
+        {
+            var folder = TestData.Get("TestData");
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var dataPath = Path.Combine(folder, ".Data");
+                var msiIntermediateFolder = Path.Combine(baseFolder, "obj", "msi");
+                var msiBinFolder = Path.Combine(baseFolder, "bin", "msi");
+                var msiPath = Path.Combine(msiBinFolder, "test.msi");
+                var bundleIntermediateFolder = Path.Combine(baseFolder, "obj", "bundle");
+                var bundleBinFolder = Path.Combine(baseFolder, "bin", "bundle");
+                var bundlePath = Path.Combine(bundleBinFolder, "bundle.exe");
+                var bundlePdbPath = Path.Combine(bundleBinFolder, "bundle.wixpdb");
+                var baFolderPath = Path.Combine(baseFolder, "extract", "ba");
+                var extractFolderPath = Path.Combine(baseFolder, "extract", "files");
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "BundlePerUser", "PerUserPackage.wxs"),
+                    "-bindpath", dataPath,
+                    "-intermediateFolder", msiIntermediateFolder,
+                    "-o", msiPath
+                });
+                result.AssertSuccess();
+                result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "BundlePerUser", "BundleWithPerUserPackage.wxs"),
+                    "-bindpath", dataPath,
+                    "-bindpath", msiBinFolder,
+                    "-intermediateFolder", bundleIntermediateFolder,
+                    "-o", bundlePath
+                });
+                result.AssertSuccess();
+                var parentBundleId = GetBundleCodeFromWixpdb(bundlePdbPath);
+                var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
+                extractResult.AssertSuccess();
+                var registrations = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Registration");
+                WixAssert.CompareLineByLine(new[]
+                {
+                    $"<Registration BundleId='WixToolsetTest.PerUserBundle' Code='{parentBundleId}' ExecutableName='bundle.exe' Scope='perUser' Tag='' Version='9.9' ProviderKey='{parentBundleId}'>" +
+                    "<Arp DisplayName='Per-User Bundle' DisplayVersion='9.9' Publisher='Example Corporation' />" +
+                    "</Registration>"
+                }, registrations);
+                var ignoreAttributesByElementName = new Dictionary<string, List<string>>
+                {
+                    { "WixPackageProperties", new List<string> { "DownloadSize", "PackageSize" } },
+                };
+                var packageElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPackageProperties", ignoreAttributesByElementName);
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "<WixPackageProperties Package='test.msi' Vital='yes' DisplayName='Per-user Package' DownloadSize='*' PackageSize='*' InstalledSize='28' PackageType='Msi' Permanent='no' LogPathVariable='WixBundleLog_test.msi' RollbackLogPathVariable='WixBundleRollbackLog_test.msi' Compressed='no' ProductCode='{33333333-3333-3333-3333-333333333333}' UpgradeCode='{EDAFA1F3-6275-5D50-B94D-D5DEBFDA1076}' Version='1.0' Cache='keep' />",
+                }, packageElements);
+            }
+        }
+        [Fact]
+        public void CanBuildBundleWithPerUserOrMachinePackage()
+        {
+            var folder = TestData.Get("TestData");
+            using (var fs = new DisposableFileSystem())
+            {
+                var baseFolder = fs.GetFolder();
+                var dataPath = Path.Combine(folder, ".Data");
+                var msiIntermediateFolder = Path.Combine(baseFolder, "obj", "msi");
+                var msiBinFolder = Path.Combine(baseFolder, "bin", "msi");
+                var msiPath = Path.Combine(msiBinFolder, "test.msi");
+                var bundleIntermediateFolder = Path.Combine(baseFolder, "obj", "bundle");
+                var bundleBinFolder = Path.Combine(baseFolder, "bin", "bundle");
+                var bundlePath = Path.Combine(bundleBinFolder, "bundle.exe");
+                var bundlePdbPath = Path.Combine(bundleBinFolder, "bundle.wixpdb");
+                var baFolderPath = Path.Combine(baseFolder, "extract", "ba");
+                var extractFolderPath = Path.Combine(baseFolder, "extract", "files");
+                var result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "BundlePerUserOrMachine", "PerUserOrMachinePackage.wxs"),
+                    "-bindpath", dataPath,
+                    "-intermediateFolder", msiIntermediateFolder,
+                    "-o", msiPath
+                });
+                result.AssertSuccess();
+                result = WixRunner.Execute(new[]
+                {
+                    "build",
+                    Path.Combine(folder, "BundlePerUserOrMachine", "BundleWithPerUserOrMachinePackage.wxs"),
+                    "-bindpath", dataPath,
+                    "-bindpath", msiBinFolder,
+                    "-intermediateFolder", bundleIntermediateFolder,
+                    "-o", bundlePath
+                });
+                result.AssertSuccess();
+                var parentBundleId = GetBundleCodeFromWixpdb(bundlePdbPath);
+                var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
+                extractResult.AssertSuccess();
+                var registrations = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Registration");
+                WixAssert.CompareLineByLine(new[]
+                {
+                    $"<Registration BundleId='WixToolsetTest.PerUserOrMachineBundle' Code='{parentBundleId}' ExecutableName='bundle.exe' Scope='perUserOrMachine' Tag='' Version='9.9' ProviderKey='{parentBundleId}'>" +
+                    "<Arp DisplayName='Per-user-or-machine Bundle' DisplayVersion='9.9' Publisher='Example Corporation' />" +
+                    "</Registration>"
+                }, registrations);
+                var ignoreAttributesByElementName = new Dictionary<string, List<string>>
+                {
+                    { "WixPackageProperties", new List<string> { "DownloadSize", "PackageSize" } },
+                };
+                var packageElements = extractResult.GetBADataTestXmlLines("/ba:BootstrapperApplicationData/ba:WixPackageProperties", ignoreAttributesByElementName);
+                WixAssert.CompareLineByLine(new[]
+                {
+                    "<WixPackageProperties Package='test.msi' Vital='yes' DisplayName='Per-user-or-machine Package' DownloadSize='*' PackageSize='*' InstalledSize='28' PackageType='Msi' Permanent='no' LogPathVariable='WixBundleLog_test.msi' RollbackLogPathVariable='WixBundleRollbackLog_test.msi' Compressed='no' ProductCode='{33333333-3333-3333-3333-333333333333}' UpgradeCode='{EDAFA1F3-6275-5D50-B94D-D5DEBFDA1076}' Version='1.0' Cache='keep' />",
+                }, packageElements);
+            }
+        }
        private static string GetBundleCodeFromWixpdb(string bundlePdbPath)
        {
            using (var wixOutput = WixOutput.Read(bundlePdbPath))
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BurnRemotePayloadSubcommandFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BurnRemotePayloadSubcommandFixture.cs
index c1ca14e8..c3b5598a 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/BurnRemotePayloadSubcommandFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/BurnRemotePayloadSubcommandFixture.cs
@@ -61,7 +61,7 @@ namespace WixToolsetTest.CoreIntegration
                WixAssert.StringEqual(
                    "<BundlePackage>" +
                    "<BundlePackagePayload Name='test.exe' ProductName='DiversePayloadsBundle' Description='DiversePayloadsBundle' Hash='*' Size='*' Version='1.0.0.0'>" +
-                    "<RemoteBundle BundleCode='*' DisplayName='DiversePayloadsBundle' EngineVersion='*' InstallSize='3790116' ManifestNamespace='http://wixtoolset.org/schemas/v4/2008/Burn' PerMachine='yes' ProviderKey='*' ProtocolVersion='1' Version='1.0.0.0' Win64='no' UpgradeCode='{FEF1D2B8-4737-4A2A-9F91-77F7294FB55B}' />" +
+                    "<RemoteBundle BundleCode='*' DisplayName='DiversePayloadsBundle' EngineVersion='*' InstallSize='3790116' ManifestNamespace='http://wixtoolset.org/schemas/v4/2008/Burn' Scope='perMachine' ProviderKey='*' ProtocolVersion='1' Version='1.0.0.0' Win64='no' UpgradeCode='{FEF1D2B8-4737-4A2A-9F91-77F7294FB55B}' />" +
                    "</BundlePackagePayload>" +
                    "</BundlePackage>", xml.GetTestXml(ignoreAttributesByElementName));
@@ -83,7 +83,7 @@ namespace WixToolsetTest.CoreIntegration
                WixAssert.StringEqual(
                    "<BundlePackage>" +
                    "<BundlePackagePayload Name='test.exe' ProductName='DiversePayloadsBundle' Description='DiversePayloadsBundle' Hash='*' Size='*' Version='1.0.0.0'>" +
-                    "<RemoteBundle BundleCode='*' DisplayName='DiversePayloadsBundle' EngineVersion='*' InstallSize='3790116' ManifestNamespace='http://wixtoolset.org/schemas/v4/2008/Burn' PerMachine='yes' ProviderKey='*' ProtocolVersion='1' Version='1.0.0.0' Win64='no' UpgradeCode='{FEF1D2B8-4737-4A2A-9F91-77F7294FB55B}' />" +
+                    "<RemoteBundle BundleCode='*' DisplayName='DiversePayloadsBundle' EngineVersion='*' InstallSize='3790116' ManifestNamespace='http://wixtoolset.org/schemas/v4/2008/Burn' Scope='perMachine' ProviderKey='*' ProtocolVersion='1' Version='1.0.0.0' Win64='no' UpgradeCode='{FEF1D2B8-4737-4A2A-9F91-77F7294FB55B}' />" +
                    "</BundlePackagePayload>" +
                    "<Payload Name='External.cab' Hash='*' Size='*' />" +
                    "<Payload Name='test.msi' Hash='*' Size='*' />" +
@@ -109,7 +109,7 @@ namespace WixToolsetTest.CoreIntegration
                WixAssert.StringEqual(
                    "<BundlePackage>" +
                    "<BundlePackagePayload Name='test.exe' ProductName='DiversePayloadsBundle' Description='DiversePayloadsBundle' Hash='*' Size='*' Version='1.0.0.0'>" +
-                    "<RemoteBundle BundleCode='*' DisplayName='DiversePayloadsBundle' EngineVersion='*' InstallSize='3790116' ManifestNamespace='http://wixtoolset.org/schemas/v4/2008/Burn' PerMachine='yes' ProviderKey='*' ProtocolVersion='1' Version='1.0.0.0' Win64='no' UpgradeCode='{FEF1D2B8-4737-4A2A-9F91-77F7294FB55B}' />" +
+                    "<RemoteBundle BundleCode='*' DisplayName='DiversePayloadsBundle' EngineVersion='*' InstallSize='3790116' ManifestNamespace='http://wixtoolset.org/schemas/v4/2008/Burn' Scope='perMachine' ProviderKey='*' ProtocolVersion='1' Version='1.0.0.0' Win64='no' UpgradeCode='{FEF1D2B8-4737-4A2A-9F91-77F7294FB55B}' />" +
                    "</BundlePackagePayload>" +
                    "<Payload Name='External.cab' Hash='*' Size='*' />" +
                    "<Payload Name='Windows8.1-KB2937592-x86.msu' Hash='*' Size='*' />" +
@@ -136,7 +136,7 @@ namespace WixToolsetTest.CoreIntegration
                WixAssert.StringEqual(
                    "<BundlePackage>" +
                    "<BundlePackagePayload Name='test.exe' ProductName='DiversePayloadsBundle' Description='DiversePayloadsBundle' Hash='*' Size='*' Version='1.0.0.0'>" +
-                    "<RemoteBundle BundleCode='*' DisplayName='DiversePayloadsBundle' EngineVersion='*' InstallSize='3790116' ManifestNamespace='http://wixtoolset.org/schemas/v4/2008/Burn' PerMachine='yes' ProviderKey='*' ProtocolVersion='1' Version='1.0.0.0' Win64='no' UpgradeCode='{FEF1D2B8-4737-4A2A-9F91-77F7294FB55B}' />" +
+                    "<RemoteBundle BundleCode='*' DisplayName='DiversePayloadsBundle' EngineVersion='*' InstallSize='3790116' ManifestNamespace='http://wixtoolset.org/schemas/v4/2008/Burn' Scope='perMachine' ProviderKey='*' ProtocolVersion='1' Version='1.0.0.0' Win64='no' UpgradeCode='{FEF1D2B8-4737-4A2A-9F91-77F7294FB55B}' />" +
                    "</BundlePackagePayload>" +
                    "<Payload Name='External.cab' Hash='*' Size='*' />" +
                    "<Payload Name='signed_bundle_engine.exe' ProductName='~TestBundle' Description='~TestBundle' Hash='*' Size='*' Version='1.0.0.0' />" +
@@ -182,7 +182,7 @@ namespace WixToolsetTest.CoreIntegration
                {
                    @"<BundlePackage Visible='yes' CacheId='{C0BA713B-9CFE-42DF-B92C-883F6846B4BA}v3.14.0.4118C95FC39334E667F3DD3D'>",
                    @"  <BundlePackagePayload Name='signed_wix314_4118_engine.exe' ProductName='WiX Toolset v3.14.0.4118' Description='WiX Toolset v3.14.0.4118' DownloadUrl='http://wixtoolset.org/{0}' CertificatePublicKey='03169B5A32E602D436FC14EC14C435D7309945D4' CertificateThumbprint='C95FC39334E667F3DD3D82AF382E05719B88F7C1' Size='1088640' Version='3.14.0.4118'>",
-                    @"    <RemoteBundle BundleCode='{C0BA713B-9CFE-42DF-B92C-883F6846B4BA}' DisplayName='WiX Toolset v3.14.0.4118' InstallSize='188426175' ManifestNamespace='http://schemas.microsoft.com/wix/2008/Burn' PerMachine='yes' ProviderKey='{c0ba713b-9cfe-42df-b92c-883f6846b4ba}' ProtocolVersion='1' Version='3.14.0.4118' Win64='no' UpgradeCode='{65E893AD-EDD5-4E7D-80CA-F0F50F383532}' />",
+                    @"    <RemoteBundle BundleCode='{C0BA713B-9CFE-42DF-B92C-883F6846B4BA}' DisplayName='WiX Toolset v3.14.0.4118' InstallSize='188426175' ManifestNamespace='http://schemas.microsoft.com/wix/2008/Burn' Scope='perMachine' ProviderKey='{c0ba713b-9cfe-42df-b92c-883f6846b4ba}' ProtocolVersion='1' Version='3.14.0.4118' Win64='no' UpgradeCode='{65E893AD-EDD5-4E7D-80CA-F0F50F383532}' />",
                    @"  </BundlePackagePayload>",
                    @"</BundlePackage>",
                }, elements);
@@ -216,7 +216,7 @@ namespace WixToolsetTest.CoreIntegration
                var msuPackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:BundlePackage");
                WixAssert.CompareLineByLine(new string[]
                {
-                    "<BundlePackage Id='signed_wix314_4118_engine.exe' Cache='keep' CacheId='{C0BA713B-9CFE-42DF-B92C-883F6846B4BA}v3.14.0.4118C95FC39334E667F3DD3D' InstallSize='188426175' Size='1088640' PerMachine='yes' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_signed_wix314_4118_engine.exe' RollbackLogPathVariable='WixBundleRollbackLog_signed_wix314_4118_engine.exe' BundleCode='{C0BA713B-9CFE-42DF-B92C-883F6846B4BA}' Version='3.14.0.4118' InstallArguments='' UninstallArguments='' RepairArguments='' SupportsBurnProtocol='yes' Win64='no'>" +
+                    "<BundlePackage Id='signed_wix314_4118_engine.exe' Cache='keep' CacheId='{C0BA713B-9CFE-42DF-B92C-883F6846B4BA}v3.14.0.4118C95FC39334E667F3DD3D' InstallSize='188426175' Size='1088640' Scope='perMachine' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_signed_wix314_4118_engine.exe' RollbackLogPathVariable='WixBundleRollbackLog_signed_wix314_4118_engine.exe' BundleCode='{C0BA713B-9CFE-42DF-B92C-883F6846B4BA}' Version='3.14.0.4118' InstallArguments='' UninstallArguments='' RepairArguments='' SupportsBurnProtocol='yes' Win64='no'>" +
                    "<Provides Key='{c0ba713b-9cfe-42df-b92c-883f6846b4ba}' Version='3.14.0.4118' DisplayName='WiX Toolset v3.14.0.4118' Imported='yes' />" +
                    "<RelatedBundle Code='{65E893AD-EDD5-4E7D-80CA-F0F50F383532}' Action='Upgrade' />" +
                    "<PayloadRef Id='signed_wix314_4118_engine.exe' />" +
@@ -253,7 +253,7 @@ namespace WixToolsetTest.CoreIntegration
                {
                    "<BundlePackage Visible='yes'>",
                    "  <BundlePackagePayload Name='v3bundle.exe' ProductName='CustomV3Theme' Description='CustomV3Theme' DownloadUrl='https://www.example.com/files/{0}' Hash='80739E7B8C31D75B4CDC48D60D74F5E481CB904212A3AE3FB0920365A163FBF32B0C5C175AB516D4124F107923E96200605DE1D560D362FEB47350FA727823B4' Size='648397' Version='1.0.0.0'>",
-                    "    <RemoteBundle BundleCode='{215A70DB-AB35-48C7-BE51-D66EAAC87177}' DisplayName='CustomV3Theme' InstallSize='1135' ManifestNamespace='http://schemas.microsoft.com/wix/2008/Burn' PerMachine='yes' ProviderKey='{215a70db-ab35-48c7-be51-d66eaac87177}' ProtocolVersion='1' Version='1.0.0.0' Win64='no' UpgradeCode='{2BF4C01F-C132-4E70-97AB-2BC68C7CCD10}' />",
+                    "    <RemoteBundle BundleCode='{215A70DB-AB35-48C7-BE51-D66EAAC87177}' DisplayName='CustomV3Theme' InstallSize='1135' ManifestNamespace='http://schemas.microsoft.com/wix/2008/Burn' Scope='perMachine' ProviderKey='{215a70db-ab35-48c7-be51-d66eaac87177}' ProtocolVersion='1' Version='1.0.0.0' Win64='no' UpgradeCode='{2BF4C01F-C132-4E70-97AB-2BC68C7CCD10}' />",
                    "  </BundlePackagePayload>",
                    "</BundlePackage>",
                }, elements);
@@ -391,7 +391,7 @@ namespace WixToolsetTest.CoreIntegration
                var msuPackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:MsuPackage");
                WixAssert.CompareLineByLine(new string[]
                {
-                    "<MsuPackage Id='Windows8.1_KB2937592_x86.msu' Cache='keep' CacheId='904ADEA6AB675ACE16483138BF3F5850FD56ACB6E3A1108E2BA23632620C427C' InstallSize='309544' Size='309544' PerMachine='yes' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' DetectCondition='test'>" +
+                    "<MsuPackage Id='Windows8.1_KB2937592_x86.msu' Cache='keep' CacheId='904ADEA6AB675ACE16483138BF3F5850FD56ACB6E3A1108E2BA23632620C427C' InstallSize='309544' Size='309544' Scope='perMachine' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' DetectCondition='test'>" +
                    "<PayloadRef Id='Windows8.1_KB2937592_x86.msu' />" +
                    "</MsuPackage>",
                }, msuPackages);
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/ContainerFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/ContainerFixture.cs
index 37035664..dac0e363 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/ContainerFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/ContainerFixture.cs
@@ -149,7 +149,7 @@ namespace WixToolsetTest.CoreIntegration
                var msiPackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:MsiPackage", ignoreAttributes);
                WixAssert.CompareLineByLine(new[]
                {
-                    "<MsiPackage Id='FirstX86.msi' Cache='keep' CacheId='*' InstallSize='*' Size='*' PerMachine='yes' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' LogPathVariable='WixBundleLog_FirstX86.msi' RollbackLogPathVariable='WixBundleRollbackLog_FirstX86.msi' ProductCode='*' Language='1033' Version='1.0.0.0' UpgradeCode='{C00D7E9A-1276-51ED-B782-A20AB34D4070}'>" +
+                    "<MsiPackage Id='FirstX86.msi' Cache='keep' CacheId='*' InstallSize='*' Size='*' Scope='perMachine' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' LogPathVariable='WixBundleLog_FirstX86.msi' RollbackLogPathVariable='WixBundleRollbackLog_FirstX86.msi' ProductCode='*' Language='1033' Version='1.0.0.0' UpgradeCode='{C00D7E9A-1276-51ED-B782-A20AB34D4070}'>" +
                      "<MsiProperty Id='MSIFASTINSTALL' Value='1' />" +
                      "<MsiProperty Id='ARPSYSTEMCOMPONENT' Value='1' />" +
                     $"<Provides Key='{GetProductCodeFromMsiPdb(pdbPaths[0])}_v1.0.0.0' Version='1.0.0.0' DisplayName='MsiPackage' />" +
@@ -158,7 +158,7 @@ namespace WixToolsetTest.CoreIntegration
                      "<PayloadRef Id='FirstX86.msi' />" +
                      "<PayloadRef Id='fk1m38Cf9RZ2Bx_ipinRY6BftelU' />" +
                    "</MsiPackage>",
-                    "<MsiPackage Id='FirstX64.msi' Cache='keep' CacheId='*' InstallSize='*' Size='*' PerMachine='yes' Permanent='no' Vital='yes' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_FirstX64.msi' RollbackLogPathVariable='WixBundleRollbackLog_FirstX64.msi' ProductCode='*' Language='1033' Version='1.0.0.0' UpgradeCode='{C00D7E9A-1276-51ED-B782-A20AB34D4070}'>" +
+                    "<MsiPackage Id='FirstX64.msi' Cache='keep' CacheId='*' InstallSize='*' Size='*' Scope='perMachine' Permanent='no' Vital='yes' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_FirstX64.msi' RollbackLogPathVariable='WixBundleRollbackLog_FirstX64.msi' ProductCode='*' Language='1033' Version='1.0.0.0' UpgradeCode='{C00D7E9A-1276-51ED-B782-A20AB34D4070}'>" +
                      "<MsiProperty Id='ARPSYSTEMCOMPONENT' Value='1' />" +
                      "<MsiProperty Id='MSIFASTINSTALL' Value='7' />" +
                     $"<Provides Key='{GetProductCodeFromMsiPdb(pdbPaths[1])}_v1.0.0.0' Version='1.0.0.0' DisplayName='MsiPackage' />" +
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/DependencyExtensionFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/DependencyExtensionFixture.cs
index 665ae18f..e26fda71 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/DependencyExtensionFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/DependencyExtensionFixture.cs
@@ -144,7 +144,7 @@ namespace WixToolsetTest.CoreIntegration
                var registration = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Registration", ignoreAttributesByElementName);
                WixAssert.CompareLineByLine(new string[]
                {
-                    "<Registration BundleId='WixToolsetTest.TestBundle' Code='*' ExecutableName='test.exe' PerMachine='yes' Tag='' Version='1.0.0.0' ProviderKey='MyProviderKey,v1.0'><Arp DisplayName='BurnBundle' DisplayVersion='1.0.0.0' Publisher='Example Corporation' /></Registration>",
+                    "<Registration BundleId='WixToolsetTest.TestBundle' Code='*' ExecutableName='test.exe' Scope='perMachine' Tag='' Version='1.0.0.0' ProviderKey='MyProviderKey,v1.0'><Arp DisplayName='BurnBundle' DisplayVersion='1.0.0.0' Publisher='Example Corporation' /></Registration>",
                }, registration);
            }
        }
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/ExePackageFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/ExePackageFixture.cs
index 7403f96d..e7eb0432 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/ExePackageFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/ExePackageFixture.cs
@@ -47,7 +47,7 @@ namespace WixToolsetTest.CoreIntegration
                var exePackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:ExePackage");
                WixAssert.CompareLineByLine(new string[]
                {
-                    "<ExePackage Id='burn.exe' Cache='keep' CacheId='F6E722518AC3AB7E31C70099368D5770788C179AA23226110DCF07319B1E1964' InstallSize='463360' Size='463360' PerMachine='yes' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_burn.exe' RollbackLogPathVariable='WixBundleRollbackLog_burn.exe' InstallArguments='-install' RepairArguments='-repair' Repairable='yes' DetectionType='arp' ArpId='id' ArpDisplayVersion='1.0.0.0'>" +
+                    "<ExePackage Id='burn.exe' Cache='keep' CacheId='F6E722518AC3AB7E31C70099368D5770788C179AA23226110DCF07319B1E1964' InstallSize='463360' Size='463360' Scope='perMachine' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_burn.exe' RollbackLogPathVariable='WixBundleRollbackLog_burn.exe' InstallArguments='-install' RepairArguments='-repair' Repairable='yes' DetectionType='arp' ArpId='id' ArpDisplayVersion='1.0.0.0'>" +
                      "<PayloadRef Id='burn.exe' />" +
                    "</ExePackage>",
                }, exePackages);
@@ -89,7 +89,7 @@ namespace WixToolsetTest.CoreIntegration
                var exePackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:ExePackage");
                WixAssert.CompareLineByLine(new string[]
                {
-                    "<ExePackage Id='burn.exe' Cache='keep' CacheId='F6E722518AC3AB7E31C70099368D5770788C179AA23226110DCF07319B1E1964' InstallSize='463360' Size='463360' PerMachine='yes' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_burn.exe' RollbackLogPathVariable='WixBundleRollbackLog_burn.exe' InstallArguments='-install' RepairArguments='-repair' Repairable='yes' DetectionType='condition' DetectCondition='detect' UninstallArguments='-uninstall' Uninstallable='yes'>" +
+                    "<ExePackage Id='burn.exe' Cache='keep' CacheId='F6E722518AC3AB7E31C70099368D5770788C179AA23226110DCF07319B1E1964' InstallSize='463360' Size='463360' Scope='perMachine' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_burn.exe' RollbackLogPathVariable='WixBundleRollbackLog_burn.exe' InstallArguments='-install' RepairArguments='-repair' Repairable='yes' DetectionType='condition' DetectCondition='detect' UninstallArguments='-uninstall' Uninstallable='yes'>" +
                      "<ExitCode Code='0' Type='2' />" +
                      "<ExitCode Code='3' Type='3' />" +
                      "<ExitCode Code='4' Type='4' />" +
@@ -159,7 +159,7 @@ namespace WixToolsetTest.CoreIntegration
                var exePackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:ExePackage", ignoreAttributes);
                WixAssert.CompareLineByLine(new string[]
                {
-                    "<ExePackage Id='burn.exe' Cache='keep' CacheId='*' InstallSize='463360' Size='*' PerMachine='yes' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_burn.exe' RollbackLogPathVariable='WixBundleRollbackLog_burn.exe' InstallArguments='-install' RepairArguments='' Repairable='no' DetectionType='arp' ArpId='id' ArpDisplayVersion='1.0.0.abc'>" +
+                    "<ExePackage Id='burn.exe' Cache='keep' CacheId='*' InstallSize='463360' Size='*' Scope='perMachine' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_burn.exe' RollbackLogPathVariable='WixBundleRollbackLog_burn.exe' InstallArguments='-install' RepairArguments='' Repairable='no' DetectionType='arp' ArpId='id' ArpDisplayVersion='1.0.0.abc'>" +
                      "<PayloadRef Id='burn.exe' />" +
                    "</ExePackage>",
                }, exePackages);
@@ -209,7 +209,7 @@ namespace WixToolsetTest.CoreIntegration
                var exePackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:ExePackage", ignoreAttributes);
                WixAssert.CompareLineByLine(new string[]
                {
-                    "<ExePackage Id='burn.exe' Cache='keep' CacheId='*' InstallSize='463360' Size='*' PerMachine='yes' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_burn.exe' RollbackLogPathVariable='WixBundleRollbackLog_burn.exe' InstallArguments='-install' RepairArguments='' Repairable='no' DetectionType='none'>" +
+                    "<ExePackage Id='burn.exe' Cache='keep' CacheId='*' InstallSize='463360' Size='*' Scope='perMachine' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_burn.exe' RollbackLogPathVariable='WixBundleRollbackLog_burn.exe' InstallArguments='-install' RepairArguments='' Repairable='no' DetectionType='none'>" +
                      "<PayloadRef Id='burn.exe' />" +
                    "</ExePackage>",
                }, exePackages);
@@ -255,7 +255,7 @@ namespace WixToolsetTest.CoreIntegration
                var exePackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:ExePackage", ignoreAttributes);
                WixAssert.CompareLineByLine(new string[]
                {
-                    "<ExePackage Id='burn.exe' Cache='keep' CacheId='*' InstallSize='463360' Size='*' PerMachine='yes' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_burn.exe' RollbackLogPathVariable='WixBundleRollbackLog_burn.exe' InstallArguments='-install' RepairArguments='' Repairable='no' DetectionType='none'>" +
+                    "<ExePackage Id='burn.exe' Cache='keep' CacheId='*' InstallSize='463360' Size='*' Scope='perMachine' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_burn.exe' RollbackLogPathVariable='WixBundleRollbackLog_burn.exe' InstallArguments='-install' RepairArguments='' Repairable='no' DetectionType='none'>" +
                      "<PayloadRef Id='burn.exe' />" +
                    "</ExePackage>",
                }, exePackages);
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/MsuPackageFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/MsuPackageFixture.cs
index 7284181f..8713be90 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/MsuPackageFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/MsuPackageFixture.cs
@@ -44,7 +44,7 @@ namespace WixToolsetTest.CoreIntegration
                var msuPackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:MsuPackage");
                WixAssert.CompareLineByLine(new string[]
                {
-                    "<MsuPackage Id='test.msu' Cache='keep' CacheId='B040F02D2F90E04E9AFBDC91C00CEB5DF97D48E205D96DC0A44E10AF8870794D' InstallSize='28' Size='28' PerMachine='yes' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' DetectCondition='DetectedTheMsu'>" +
+                    "<MsuPackage Id='test.msu' Cache='keep' CacheId='B040F02D2F90E04E9AFBDC91C00CEB5DF97D48E205D96DC0A44E10AF8870794D' InstallSize='28' Size='28' Scope='perMachine' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' DetectCondition='DetectedTheMsu'>" +
                    "<PayloadRef Id='test.msu' />" +
                    "</MsuPackage>",
                }, msuPackages);
@@ -85,7 +85,7 @@ namespace WixToolsetTest.CoreIntegration
                var msuPackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:MsuPackage");
                WixAssert.CompareLineByLine(new string[]
                {
-                    "<MsuPackage Id='Windows8.1_KB2937592_x86.msu' Cache='keep' CacheId='8cf75b99-13c0-4184-82ce-dbde45dcd55a' InstallSize='309544' Size='309544' PerMachine='yes' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' DetectCondition='DetectedTheMsu'>" +
+                    "<MsuPackage Id='Windows8.1_KB2937592_x86.msu' Cache='keep' CacheId='8cf75b99-13c0-4184-82ce-dbde45dcd55a' InstallSize='309544' Size='309544' Scope='perMachine' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' DetectCondition='DetectedTheMsu'>" +
                    "<PayloadRef Id='Windows8.1_KB2937592_x86.msu' />" +
                    "</MsuPackage>",
                }, msuPackages);
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/PackagePayloadFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/PackagePayloadFixture.cs
index 1d291a7c..53b44d98 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/PackagePayloadFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/PackagePayloadFixture.cs
@@ -50,14 +50,14 @@ namespace WixToolsetTest.CoreIntegration
                var msiPackageElements = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:MsiPackage", ignoreAttributesByElementName);
                WixAssert.CompareLineByLine(new[]
                {
-                    "<MsiPackage Id='MsiWithFeatures' Cache='keep' CacheId='{040011E1-F84C-4927-AD62-50A5EC19CA32}v1.0.0.0_1' InstallSize='34' Size='32803' PerMachine='yes' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' LogPathVariable='WixBundleLog_MsiWithFeatures' RollbackLogPathVariable='WixBundleRollbackLog_MsiWithFeatures' ProductCode='{040011E1-F84C-4927-AD62-50A5EC19CA32}' Language='1033' Version='1.0.0.0' UpgradeCode='{047730A5-30FE-4A62-A520-DA9381B8226A}'>" +
+                    "<MsiPackage Id='MsiWithFeatures' Cache='keep' CacheId='{040011E1-F84C-4927-AD62-50A5EC19CA32}v1.0.0.0_1' InstallSize='34' Size='32803' Scope='perMachine' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' LogPathVariable='WixBundleLog_MsiWithFeatures' RollbackLogPathVariable='WixBundleRollbackLog_MsiWithFeatures' ProductCode='{040011E1-F84C-4927-AD62-50A5EC19CA32}' Language='1033' Version='1.0.0.0' UpgradeCode='{047730A5-30FE-4A62-A520-DA9381B8226A}'>" +
                    "<MsiFeature Id='ProductFeature' /><MsiProperty Id='ARPSYSTEMCOMPONENT' Value='1' /><MsiProperty Id='MSIFASTINSTALL' Value='7' /><Provides Key='{040011E1-F84C-4927-AD62-50A5EC19CA32}_v1.0.0.0' Version='1.0.0.0' DisplayName='MsiPackage' />" +
                    "<RelatedPackage Id='{047730A5-30FE-4A62-A520-DA9381B8226A}' MaxVersion='1.0.0.0' MaxInclusive='no' OnlyDetect='no' LangInclusive='yes'><Language Id='1033' /></RelatedPackage>" +
                    "<RelatedPackage Id='{047730A5-30FE-4A62-A520-DA9381B8226A}' MinVersion='1.0.0.0' MinInclusive='no' OnlyDetect='yes' LangInclusive='yes'><Language Id='1033' /></RelatedPackage>" +
                    "<PayloadRef Id='test.msi' /><PayloadRef Id='fhuZsOcBDTuIX8rF96kswqI6SnuI' /><PayloadRef Id='faf_OZ741BG7SJ6ZkcIvivZ2Yzo8' />" +
                    "</MsiPackage>",
-                    "<MsiPackage Id='MsiWithoutFeatures' Cache='keep' CacheId='{040011E1-F84C-4927-AD62-50A5EC19CA32}v1.0.0.0_2' InstallSize='34' Size='32803' PerMachine='yes' Permanent='no' Vital='yes' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_MsiWithoutFeatures' RollbackLogPathVariable='WixBundleRollbackLog_MsiWithoutFeatures' ProductCode='{040011E1-F84C-4927-AD62-50A5EC19CA32}' Language='1033' Version='1.0.0.0' UpgradeCode='{047730A5-30FE-4A62-A520-DA9381B8226A}'>" +
+                    "<MsiPackage Id='MsiWithoutFeatures' Cache='keep' CacheId='{040011E1-F84C-4927-AD62-50A5EC19CA32}v1.0.0.0_2' InstallSize='34' Size='32803' Scope='perMachine' Permanent='no' Vital='yes' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_MsiWithoutFeatures' RollbackLogPathVariable='WixBundleRollbackLog_MsiWithoutFeatures' ProductCode='{040011E1-F84C-4927-AD62-50A5EC19CA32}' Language='1033' Version='1.0.0.0' UpgradeCode='{047730A5-30FE-4A62-A520-DA9381B8226A}'>" +
                    "<MsiProperty Id='ARPSYSTEMCOMPONENT' Value='1' /><MsiProperty Id='MSIFASTINSTALL' Value='7' /><Provides Key='{040011E1-F84C-4927-AD62-50A5EC19CA32}_v1.0.0.0' Version='1.0.0.0' DisplayName='MsiPackage' />" +
                    "<RelatedPackage Id='{047730A5-30FE-4A62-A520-DA9381B8226A}' MaxVersion='1.0.0.0' MaxInclusive='no' OnlyDetect='no' LangInclusive='yes'><Language Id='1033' /></RelatedPackage>" +
                    "<RelatedPackage Id='{047730A5-30FE-4A62-A520-DA9381B8226A}' MinVersion='1.0.0.0' MinInclusive='no' OnlyDetect='yes' LangInclusive='yes'><Language Id='1033' /></RelatedPackage>" +
@@ -118,7 +118,7 @@ namespace WixToolsetTest.CoreIntegration
                var exePackageElements = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/burn:ExePackage", ignoreAttributesByElementName);
                WixAssert.CompareLineByLine(new[]
                {
-                    "<ExePackage Id='PackagePayloadInPayloadGroup' Cache='keep' CacheId='*' InstallSize='*' Size='*' PerMachine='yes' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_PackagePayloadInPayloadGroup' RollbackLogPathVariable='WixBundleRollbackLog_PackagePayloadInPayloadGroup' InstallArguments='' RepairArguments='' Repairable='no' DetectionType='condition' DetectCondition='none'><PayloadRef Id='burn.exe' /></ExePackage>",
+                    "<ExePackage Id='PackagePayloadInPayloadGroup' Cache='keep' CacheId='*' InstallSize='*' Size='*' Scope='perMachine' Permanent='yes' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_PackagePayloadInPayloadGroup' RollbackLogPathVariable='WixBundleRollbackLog_PackagePayloadInPayloadGroup' InstallArguments='' RepairArguments='' Repairable='no' DetectionType='condition' DetectCondition='none'><PayloadRef Id='burn.exe' /></ExePackage>",
                }, exePackageElements);
                var payloadElements = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Payload[@Id='burn.exe']");
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/RollbackBoundaryFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/RollbackBoundaryFixture.cs
index 54375f67..0840f358 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/RollbackBoundaryFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/RollbackBoundaryFixture.cs
@@ -124,7 +124,7 @@ namespace WixToolsetTest.CoreIntegration
                var chainPackages = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/burn:Chain/*", ignoreAttributesByElementName);
                WixAssert.CompareLineByLine(new[]
                {
-                    "<MsiPackage Id='test.msi' Cache='keep' CacheId='{040011E1-F84C-4927-AD62-50A5EC19CA32}v1.0.0.0' InstallSize='34' Size='*' PerMachine='yes' Permanent='no' Vital='yes' RollbackBoundaryForward='First' RollbackBoundaryBackward='First' LogPathVariable='WixBundleLog_test.msi' RollbackLogPathVariable='WixBundleRollbackLog_test.msi' ProductCode='{040011E1-F84C-4927-AD62-50A5EC19CA32}' Language='1033' Version='1.0.0.0' UpgradeCode='{047730A5-30FE-4A62-A520-DA9381B8226A}'>" +
+                    "<MsiPackage Id='test.msi' Cache='keep' CacheId='{040011E1-F84C-4927-AD62-50A5EC19CA32}v1.0.0.0' InstallSize='34' Size='*' Scope='perMachine' Permanent='no' Vital='yes' RollbackBoundaryForward='First' RollbackBoundaryBackward='First' LogPathVariable='WixBundleLog_test.msi' RollbackLogPathVariable='WixBundleRollbackLog_test.msi' ProductCode='{040011E1-F84C-4927-AD62-50A5EC19CA32}' Language='1033' Version='1.0.0.0' UpgradeCode='{047730A5-30FE-4A62-A520-DA9381B8226A}'>" +
                    "<MsiProperty Id='ARPSYSTEMCOMPONENT' Value='1' />" +
                    "<MsiProperty Id='MSIFASTINSTALL' Value='7' />" +
                    "<Provides Key='{040011E1-F84C-4927-AD62-50A5EC19CA32}_v1.0.0.0' Version='1.0.0.0' DisplayName='MsiPackage' />" +
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePackage/PerUserOrMachineBundlePackage.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePackage/PerUserOrMachineBundlePackage.wxs
new file mode 100644
index 00000000..3ea86a84
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePackage/PerUserOrMachineBundlePackage.wxs
@@ -0,0 +1,9 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Bundle Id="WixToolsetTest.PerUserOrMachineBundlePackage" Name="PerUserOrMachineBundlePackage" Version="1.0.2.0" Manufacturer="Example Corporation">
+    <BootstrapperApplication SourceFile="fakeba.dll" />
+    <Chain>
+      <BundlePackage SourceFile="BundleWithPerUserOrMachinePackage.exe" />
+    </Chain>
+  </Bundle>
+</Wix>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePackage/RemoteBundlePackage.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePackage/RemoteBundlePackage.wxs
index ecbe6bc5..2b7ed886 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePackage/RemoteBundlePackage.wxs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePackage/RemoteBundlePackage.wxs
@@ -13,7 +13,7 @@
                          DisplayName="BurnBundle"
                          InstallSize="34"
                          ManifestNamespace="http://wixtoolset.org/schemas/v4/2008/Burn"
-                          PerMachine="yes"
+                          Scope="perMachine"
                          ProtocolVersion="1"
                          ProviderKey="MyProviderKey,v1.0"
                          UpgradeCode="{B94478B1-E1F3-4700-9CE8-6AA090854AEC}"
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePerUser/BundleWithPerUserPackage.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePerUser/BundleWithPerUserPackage.wxs
new file mode 100644
index 00000000..a9d1039e
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePerUser/BundleWithPerUserPackage.wxs
@@ -0,0 +1,9 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Bundle Id="WixToolsetTest.PerUserBundle" Name="Per-User Bundle" Version="9.9" Manufacturer="Example Corporation" Compressed="no">
+    <BootstrapperApplication SourceFile="fakeba.dll" />
+    <Chain>
+      <MsiPackage SourceFile="test.msi" />
+    </Chain>
+  </Bundle>
+</Wix>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePerUser/PerUserPackage.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePerUser/PerUserPackage.wxs
new file mode 100644
index 00000000..978bd04b
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePerUser/PerUserPackage.wxs
@@ -0,0 +1,5 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Id="WixToolsetTest.PerUserPackage" ProductCode="33333333-3333-3333-3333-333333333333" Name="Per-user Package" Version="1.0" Manufacturer="Example Corporation" Scope="perUser">
+    <File Source="test.txt" />
+  </Package>
+</Wix>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePerUserOrMachine/BundleWithPerUserOrMachinePackage.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePerUserOrMachine/BundleWithPerUserOrMachinePackage.wxs
new file mode 100644
index 00000000..15349663
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePerUserOrMachine/BundleWithPerUserOrMachinePackage.wxs
@@ -0,0 +1,9 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Bundle Id="WixToolsetTest.PerUserOrMachineBundle" Name="Per-user-or-machine Bundle" Version="9.9" Manufacturer="Example Corporation" Compressed="no">
+    <BootstrapperApplication SourceFile="fakeba.dll" />
+    <Chain>
+      <MsiPackage SourceFile="test.msi" />
+    </Chain>
+  </Bundle>
+</Wix>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePerUserOrMachine/PerUserOrMachinePackage.wxs b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePerUserOrMachine/PerUserOrMachinePackage.wxs
new file mode 100644
index 00000000..abae7c2e
--- /dev/null
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/TestData/BundlePerUserOrMachine/PerUserOrMachinePackage.wxs
@@ -0,0 +1,5 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Id="WixToolsetTest.PerUserPackage" ProductCode="33333333-3333-3333-3333-333333333333" Name="Per-user-or-machine Package" Version="1.0" Manufacturer="Example Corporation" Scope="perUserOrMachine">
+    <File Source="test.txt" />
+  </Package>
+</Wix>