31 files changed, 199 insertions, 289 deletions
diff --git a/src/ext/Bal/wixstdba/Resources/1028/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1028/mbapreq.wxl
index 19e79bac..f574bb9b 100644
--- a/src/ext/Bal/wixstdba/Resources/1028/mbapreq.wxl
+++ b/src/ext/Bal/wixstdba/Resources/1028/mbapreq.wxl
@@ -29,5 +29,6 @@
  <String Id="FailureRestartButton">重新啟動(&amp;R)</String>
  <String Id="FailureCloseButton">關閉(&amp;C)</String>
  <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
+  <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String>
  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
 </WixLocalization>
diff --git a/src/ext/Bal/wixstdba/Resources/1029/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1029/mbapreq.wxl
index e6e6f469..11d9f85a 100644
--- a/src/ext/Bal/wixstdba/Resources/1029/mbapreq.wxl
+++ b/src/ext/Bal/wixstdba/Resources/1029/mbapreq.wxl
@@ -32,5 +32,6 @@
  <String Id="FailureRestartButton">&amp;Restartovat</String>
  <String Id="FailureCloseButton">&amp;Zavřít</String>
  <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
+  <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String>
  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
 </WixLocalization>
diff --git a/src/ext/Bal/wixstdba/Resources/1030/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1030/mbapreq.wxl
index 98518edc..50412e12 100644
--- a/src/ext/Bal/wixstdba/Resources/1030/mbapreq.wxl
+++ b/src/ext/Bal/wixstdba/Resources/1030/mbapreq.wxl
@@ -32,5 +32,6 @@
  <String Id="FailureRestartButton">&amp;Genstart</String>
  <String Id="FailureCloseButton">&amp;Luk</String>
  <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
+  <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String>
  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
 </WixLocalization>
diff --git a/src/ext/Bal/wixstdba/Resources/1031/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1031/mbapreq.wxl
index e60b0c9a..4df66298 100644
--- a/src/ext/Bal/wixstdba/Resources/1031/mbapreq.wxl
+++ b/src/ext/Bal/wixstdba/Resources/1031/mbapreq.wxl
@@ -35,5 +35,6 @@
  <String Id="FailureRestartButton">&amp;Neu starten</String>
  <String Id="FailureCloseButton">&amp;Schließen</String>
  <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
+  <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String>
  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
 </WixLocalization>
diff --git a/src/ext/Bal/wixstdba/Resources/1032/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1032/mbapreq.wxl
index ea5dc130..05ac553f 100644
--- a/src/ext/Bal/wixstdba/Resources/1032/mbapreq.wxl
+++ b/src/ext/Bal/wixstdba/Resources/1032/mbapreq.wxl
@@ -34,5 +34,6 @@
  <String Id="FailureRestartButton">&amp;Επανεκκίνηση</String>
  <String Id="FailureCloseButton">&amp;Κλείσιμο</String>
  <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
+  <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String>
  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
 </WixLocalization>
diff --git a/src/ext/Bal/wixstdba/Resources/1035/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1035/mbapreq.wxl
index 803cacf5..2b7c0519 100644
--- a/src/ext/Bal/wixstdba/Resources/1035/mbapreq.wxl
+++ b/src/ext/Bal/wixstdba/Resources/1035/mbapreq.wxl
@@ -32,5 +32,6 @@
  <String Id="FailureRestartButton">&amp;Käynnistä uudelleen</String>
  <String Id="FailureCloseButton">&amp;Sulje</String>
  <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
+  <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String>
  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
 </WixLocalization>
diff --git a/src/ext/Bal/wixstdba/Resources/1036/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1036/mbapreq.wxl
index fb927f2b..3ae1cbd9 100644
--- a/src/ext/Bal/wixstdba/Resources/1036/mbapreq.wxl
+++ b/src/ext/Bal/wixstdba/Resources/1036/mbapreq.wxl
@@ -32,5 +32,6 @@
  <String Id="FailureRestartButton">&amp;Redémarrer</String>
  <String Id="FailureCloseButton">&amp;Fermer</String>
  <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
+  <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String>
  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
 </WixLocalization>
diff --git a/src/ext/Bal/wixstdba/Resources/1038/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1038/mbapreq.wxl
index 78c008b2..f491d6f2 100644
--- a/src/ext/Bal/wixstdba/Resources/1038/mbapreq.wxl
+++ b/src/ext/Bal/wixstdba/Resources/1038/mbapreq.wxl
@@ -32,5 +32,6 @@
  <String Id="FailureRestartButton">&amp;Újraindítás</String>
  <String Id="FailureCloseButton">&amp;Bezárás</String>
  <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
+  <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String>
  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
 </WixLocalization>
diff --git a/src/ext/Bal/wixstdba/Resources/1040/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1040/mbapreq.wxl
index b7966340..50bc73e8 100644
--- a/src/ext/Bal/wixstdba/Resources/1040/mbapreq.wxl
+++ b/src/ext/Bal/wixstdba/Resources/1040/mbapreq.wxl
@@ -33,5 +33,6 @@
  <String Id="FailureRestartButton">&amp;Riavvia</String>
  <String Id="FailureCloseButton">&amp;Chiudi</String>
  <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
+  <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String>
  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
 </WixLocalization>
diff --git a/src/ext/Bal/wixstdba/Resources/1041/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1041/mbapreq.wxl
index 9b7aa323..106c704a 100644
--- a/src/ext/Bal/wixstdba/Resources/1041/mbapreq.wxl
+++ b/src/ext/Bal/wixstdba/Resources/1041/mbapreq.wxl
@@ -29,5 +29,6 @@
  <String Id="FailureRestartButton">再起動(&amp;R)</String>
  <String Id="FailureCloseButton">閉じる(&amp;C)</String>
  <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
+  <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String>
  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
 </WixLocalization>
diff --git a/src/ext/Bal/wixstdba/Resources/1042/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1042/mbapreq.wxl
index 445d445b..24655588 100644
--- a/src/ext/Bal/wixstdba/Resources/1042/mbapreq.wxl
+++ b/src/ext/Bal/wixstdba/Resources/1042/mbapreq.wxl
@@ -29,5 +29,6 @@
  <String Id="FailureRestartButton">다시 시작(&amp;R)</String>
  <String Id="FailureCloseButton">닫기(&amp;C)</String>
  <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
+  <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String>
  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
 </WixLocalization>
diff --git a/src/ext/Bal/wixstdba/Resources/1043/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1043/mbapreq.wxl
index 60ba996e..d2e572fc 100644
--- a/src/ext/Bal/wixstdba/Resources/1043/mbapreq.wxl
+++ b/src/ext/Bal/wixstdba/Resources/1043/mbapreq.wxl
@@ -32,5 +32,6 @@
  <String Id="FailureRestartButton">&amp;Opnieuw opstarten</String>
  <String Id="FailureCloseButton">&amp;Sluiten</String>
  <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
+  <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String>
  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
 </WixLocalization>
diff --git a/src/ext/Bal/wixstdba/Resources/1044/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1044/mbapreq.wxl
index e0718b8d..cb6036ee 100644
--- a/src/ext/Bal/wixstdba/Resources/1044/mbapreq.wxl
+++ b/src/ext/Bal/wixstdba/Resources/1044/mbapreq.wxl
@@ -32,5 +32,6 @@
  <String Id="FailureRestartButton">&amp;Start på nytt</String>
  <String Id="FailureCloseButton">&amp;Lukk</String>
  <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
+  <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String>
  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
 </WixLocalization>
diff --git a/src/ext/Bal/wixstdba/Resources/1045/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1045/mbapreq.wxl
index 8b4eb758..41832b13 100644
--- a/src/ext/Bal/wixstdba/Resources/1045/mbapreq.wxl
+++ b/src/ext/Bal/wixstdba/Resources/1045/mbapreq.wxl
@@ -32,5 +32,6 @@
  <String Id="FailureRestartButton">&amp;Uruchom ponownie</String>
  <String Id="FailureCloseButton">&amp;Zamknij</String>
  <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
+  <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String>
  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
 </WixLocalization>
diff --git a/src/ext/Bal/wixstdba/Resources/1046/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1046/mbapreq.wxl
index 0155eb39..08968f93 100644
--- a/src/ext/Bal/wixstdba/Resources/1046/mbapreq.wxl
+++ b/src/ext/Bal/wixstdba/Resources/1046/mbapreq.wxl
@@ -31,5 +31,6 @@
  <String Id="FailureRestartButton">&amp;Reiniciar</String>
  <String Id="FailureCloseButton">&amp;Fechar</String>
  <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
+  <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String>
  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
 </WixLocalization>
diff --git a/src/ext/Bal/wixstdba/Resources/1049/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1049/mbapreq.wxl
index 87350745..271d5563 100644
--- a/src/ext/Bal/wixstdba/Resources/1049/mbapreq.wxl
+++ b/src/ext/Bal/wixstdba/Resources/1049/mbapreq.wxl
@@ -31,5 +31,6 @@
  <String Id="FailureRestartButton">&amp;Перезагрузить</String>
  <String Id="FailureCloseButton">&amp;Закрыть</String>
  <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
+  <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String>
  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
 </WixLocalization>
diff --git a/src/ext/Bal/wixstdba/Resources/1051/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1051/mbapreq.wxl
index 7645a37f..ce6f6eda 100644
--- a/src/ext/Bal/wixstdba/Resources/1051/mbapreq.wxl
+++ b/src/ext/Bal/wixstdba/Resources/1051/mbapreq.wxl
@@ -32,5 +32,6 @@
  <String Id="FailureRestartButton">&amp;Reštartovať</String>
  <String Id="FailureCloseButton">&amp;Zavrieť</String>
  <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
+  <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String>
  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
 </WixLocalization>
diff --git a/src/ext/Bal/wixstdba/Resources/1053/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1053/mbapreq.wxl
index b00205d8..2d0581b1 100644
--- a/src/ext/Bal/wixstdba/Resources/1053/mbapreq.wxl
+++ b/src/ext/Bal/wixstdba/Resources/1053/mbapreq.wxl
@@ -32,5 +32,6 @@
  <String Id="FailureRestartButton">&amp;Starta om</String>
  <String Id="FailureCloseButton">&amp;Stäng</String>
  <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
+  <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String>
  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
 </WixLocalization>
diff --git a/src/ext/Bal/wixstdba/Resources/1055/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1055/mbapreq.wxl
index 00c3c187..c48a44da 100644
--- a/src/ext/Bal/wixstdba/Resources/1055/mbapreq.wxl
+++ b/src/ext/Bal/wixstdba/Resources/1055/mbapreq.wxl
@@ -32,5 +32,6 @@
  <String Id="FailureRestartButton">&amp;Yeniden Başlat</String>
  <String Id="FailureCloseButton">&amp;Kapat</String>
  <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
+  <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String>
  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
 </WixLocalization>
diff --git a/src/ext/Bal/wixstdba/Resources/1060/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1060/mbapreq.wxl
index 72d48267..0398a7f1 100644
--- a/src/ext/Bal/wixstdba/Resources/1060/mbapreq.wxl
+++ b/src/ext/Bal/wixstdba/Resources/1060/mbapreq.wxl
@@ -32,5 +32,6 @@
  <String Id="FailureRestartButton">&amp;Ponovni zagon</String>
  <String Id="FailureCloseButton">&amp;Zapri</String>
  <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
+  <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String>
  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
 </WixLocalization>
diff --git a/src/ext/Bal/wixstdba/Resources/2052/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/2052/mbapreq.wxl
index 365ee7e6..09f09cb3 100644
--- a/src/ext/Bal/wixstdba/Resources/2052/mbapreq.wxl
+++ b/src/ext/Bal/wixstdba/Resources/2052/mbapreq.wxl
@@ -29,5 +29,6 @@
  <String Id="FailureRestartButton">重启(&amp;R)</String>
  <String Id="FailureCloseButton">关闭(&amp;C)</String>
  <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
+  <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String>
  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
 </WixLocalization>
diff --git a/src/ext/Bal/wixstdba/Resources/2070/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/2070/mbapreq.wxl
index 442a5571..f22822d8 100644
--- a/src/ext/Bal/wixstdba/Resources/2070/mbapreq.wxl
+++ b/src/ext/Bal/wixstdba/Resources/2070/mbapreq.wxl
@@ -31,5 +31,6 @@
  <String Id="FailureRestartButton">&amp;Reiniciar</String>
  <String Id="FailureCloseButton">&amp;Fechar</String>
  <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
+  <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String>
  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
 </WixLocalization>
diff --git a/src/ext/Bal/wixstdba/Resources/3082/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/3082/mbapreq.wxl
index 37c0dc05..edbf01c4 100644
--- a/src/ext/Bal/wixstdba/Resources/3082/mbapreq.wxl
+++ b/src/ext/Bal/wixstdba/Resources/3082/mbapreq.wxl
@@ -33,5 +33,6 @@
  <String Id="FailureRestartButton">&amp;Reiniciar</String>
  <String Id="FailureCloseButton">&amp;Cerrar</String>
  <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
+  <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String>
  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
 </WixLocalization>
diff --git a/src/ext/Bal/wixstdba/Resources/dncpreq.wxl b/src/ext/Bal/wixstdba/Resources/dncpreq.wxl
index a53b1c83..22fcd3dc 100644
--- a/src/ext/Bal/wixstdba/Resources/dncpreq.wxl
+++ b/src/ext/Bal/wixstdba/Resources/dncpreq.wxl
@@ -29,5 +29,6 @@
  <String Id="FailureRestartButton">&amp;Restart</String>
  <String Id="FailureCloseButton">&amp;Close</String>
  <String Id="SCDRUNTIMEFAILUREErrorMessage">[WixBundleName] cannot run on this machine. Install the latest updates and/or the latest OS to run in a supported environment.</String>
+  <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Core runtime even though all of the prerequisites are installed.</String>
  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
 </WixLocalization>
diff --git a/src/ext/Bal/wixstdba/Resources/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/mbapreq.wxl
index 5d410888..77859d31 100644
--- a/src/ext/Bal/wixstdba/Resources/mbapreq.wxl
+++ b/src/ext/Bal/wixstdba/Resources/mbapreq.wxl
@@ -29,5 +29,6 @@
  <String Id="FailureRestartButton">&amp;Restart</String>
  <String Id="FailureCloseButton">&amp;Close</String>
  <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
+  <String Id="PREREQBAINFINITELOOPErrorMessage">[WixBundleName] failed to load the .NET Framework runtime even though all of the prerequisites are installed.</String>
  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
 </WixLocalization>
diff --git a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp
index dd00a563..3774f49c 100644
--- a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp
+++ b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp
@@ -123,14 +123,6 @@ enum WIXSTDBA_CONTROL
    LAST_WIXSTDBA_CONTROL,
 };
-typedef struct _WIXSTDBA_PACKAGE_INFO
-{
-    LPWSTR sczPackageId;
-    BOOL fWasAlreadyInstalled;
-    BOOL fPlannedToBeInstalled;
-    BOOL fSuccessfullyInstalled;
-} WIXSTDBA_PACKAGE_INFO;
 static HRESULT DAPI EvaluateVariableConditionCallback(
    __in_z LPCWSTR wzCondition,
@@ -229,10 +221,7 @@ public: // IBootstrapperApplication
        {
            BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "The prerequisites were successfully installed. The bootstrapper application will be reloaded.");
            *pAction = BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER;
-        }
+            m_pPrereqData->fCompleted = TRUE;
-        else if (m_fPrereqAlreadyInstalled)
-        {
-            BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "The prerequisites were already installed. The bootstrapper application will not be reloaded to prevent an infinite loop.");
        }
        else if (m_fPrereq)
        {
@@ -311,38 +300,14 @@ public: // IBootstrapperApplication
        if (!fMissingFromCache)
        {
-            if (SUCCEEDED(BalInfoAddRelatedBundleAsPackage(&m_Bundle.packages, wzBundleId, relationType, fPerMachine, &pPackage)))
+            BalInfoAddRelatedBundleAsPackage(&m_Bundle.packages, wzBundleId, relationType, fPerMachine, &pPackage);
-            {
+            // Best effort
-                InitializePackageInfoForPackage(pPackage);
-            }
        }
        return CBalBaseBootstrapperApplication::OnDetectRelatedBundle(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, pfCancel);
    }
-    virtual STDMETHODIMP OnDetectPackageComplete(
-        __in LPCWSTR wzPackageId,
-        __in HRESULT /*hrStatus*/,
-        __in BOOTSTRAPPER_PACKAGE_STATE state,
-        __in BOOL /*fCached*/
-        )
-    {
-        WIXSTDBA_PACKAGE_INFO* pPackageInfo = NULL;
-        BAL_INFO_PACKAGE* pPackage = NULL;
-        if (BOOTSTRAPPER_PACKAGE_STATE_PRESENT == state &&
-            SUCCEEDED(GetPackageInfo(wzPackageId, &pPackageInfo, &pPackage)) &&
-            pPackageInfo)
-        {
-            // If the package is already installed, remember that.
-            pPackageInfo->fWasAlreadyInstalled = TRUE;
-        }
-        return S_OK;
-    }
    virtual STDMETHODIMP OnDetectComplete(
        __in HRESULT hrStatus,
        __in BOOL /*fEligibleForCleanup*/
@@ -366,29 +331,10 @@ public: // IBootstrapperApplication
        if (fEvaluateConditions)
        {
            hrStatus = EvaluateConditions();
-        }
-        if (FAILED(hrStatus))
+            if (FAILED(hrStatus))
-        {
-            fSkipToPlan = FALSE;
-        }
-        else
-        {
-            if (m_fPrereq)
            {
-                m_fPrereqAlreadyInstalled = TRUE;
+                fSkipToPlan = FALSE;
-                // At this point we have to assume that all prerequisite packages need to be installed, so set to false if any of them aren't installed.
-                for (DWORD i = 0; i < m_Bundle.packages.cPackages; ++i)
-                {
-                    BAL_INFO_PACKAGE* pPackage = &m_Bundle.packages.rgPackages[i];
-                    WIXSTDBA_PACKAGE_INFO* pPackageInfo = reinterpret_cast<WIXSTDBA_PACKAGE_INFO*>(pPackage->pvCustomData);
-                    if (pPackage->fPrereqPackage && pPackageInfo && !pPackageInfo->fWasAlreadyInstalled)
-                    {
-                        m_fPrereqAlreadyInstalled = FALSE;
-                        break;
-                    }
-                }
            }
        }
@@ -403,20 +349,20 @@ public: // IBootstrapperApplication
    }
-    virtual STDMETHODIMP OnPlanRelatedBundle(
+    virtual STDMETHODIMP OnPlanRelatedBundleType(
        __in_z LPCWSTR wzBundleId,
-        __in BOOTSTRAPPER_REQUEST_STATE recommendedState,
+        __in BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE recommendedType,
-        __inout_z BOOTSTRAPPER_REQUEST_STATE* pRequestedState,
+        __inout BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE* pRequestedType,
        __inout BOOL* pfCancel
        )
    {
        // If we're only installing prerequisites, do not touch related bundles.
        if (m_fPrereq)
        {
-            *pRequestedState = BOOTSTRAPPER_REQUEST_STATE_NONE;
+            *pRequestedType = BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE_NONE;
        }
-        return CBalBaseBootstrapperApplication::OnPlanRelatedBundle(wzBundleId, recommendedState, pRequestedState, pfCancel);
+        return CBalBaseBootstrapperApplication::OnPlanRelatedBundleType(wzBundleId, recommendedType, pRequestedType, pfCancel);
    }
@@ -434,7 +380,6 @@ public: // IBootstrapperApplication
        )
    {
        HRESULT hr = S_OK;
-        WIXSTDBA_PACKAGE_INFO* pPackageInfo = NULL;
        BAL_INFO_PACKAGE* pPackage = NULL;
        // If we're planning to install prerequisites, install them. The prerequisites need to be installed
@@ -443,10 +388,11 @@ public: // IBootstrapperApplication
        {
            // Only install prerequisite packages, and check the InstallCondition on them.
            BOOL fInstall = FALSE;
-            hr = GetPackageInfo(wzPackageId, &pPackageInfo, &pPackage);
-            if (SUCCEEDED(hr) && pPackage->fPrereqPackage && pPackageInfo)
+            hr = BalInfoFindPackageById(&m_Bundle.packages, wzPackageId, &pPackage);
+            if (SUCCEEDED(hr) && pPackage->fPrereqPackage)
            {
-                pPackageInfo->fPlannedToBeInstalled = fInstall = BOOTSTRAPPER_PACKAGE_CONDITION_FALSE != installCondition;
+                fInstall = BOOTSTRAPPER_PACKAGE_CONDITION_FALSE != installCondition;
            }
            if (fInstall)
@@ -503,7 +449,6 @@ public: // IBootstrapperApplication
        )
    {
        HRESULT hr = S_OK;
-        WIXSTDBA_PACKAGE_INFO* pPackageInfo = NULL;
        BAL_INFO_PACKAGE* pPackage = NULL;
        BOOL fShowInternalUI = FALSE;
        INSTALLUILEVEL uiLevel = INSTALLUILEVEL_NOCHANGE;
@@ -521,7 +466,7 @@ public: // IBootstrapperApplication
        if (INSTALLUILEVEL_NOCHANGE != uiLevel)
        {
-            hr = GetPackageInfo(wzPackageId, &pPackageInfo, &pPackage);
+            hr = BalInfoFindPackageById(&m_Bundle.packages, wzPackageId, &pPackage);
            if (SUCCEEDED(hr) && pPackage->sczDisplayInternalUICondition)
            {
                hr = BalEvaluateCondition(pPackage->sczDisplayInternalUICondition, &fShowInternalUI);
@@ -545,23 +490,6 @@ public: // IBootstrapperApplication
    {
        HRESULT hr = S_OK;
-        if (m_fPrereq)
-        {
-            m_fPrereqAlreadyInstalled = TRUE;
-            // Now that we've planned the packages, we can focus on the prerequisite packages that are supposed to be installed.
-            for (DWORD i = 0; i < m_Bundle.packages.cPackages; ++i)
-            {
-                BAL_INFO_PACKAGE* pPackage = &m_Bundle.packages.rgPackages[i];
-                WIXSTDBA_PACKAGE_INFO* pPackageInfo = reinterpret_cast<WIXSTDBA_PACKAGE_INFO*>(pPackage->pvCustomData);
-                if (pPackage->fPrereqPackage && pPackageInfo && !pPackageInfo->fWasAlreadyInstalled && pPackageInfo->fPlannedToBeInstalled)
-                {
-                    m_fPrereqAlreadyInstalled = FALSE;
-                    break;
-                }
-            }
-        }
        SetState(WIXSTDBA_STATE_PLANNED, hrStatus);
        if (SUCCEEDED(hrStatus))
@@ -1033,13 +961,10 @@ public: // IBootstrapperApplication
        hr = __super::OnExecutePackageComplete(wzPackageId, hrStatus, restart, recommendation, pAction);
-        WIXSTDBA_PACKAGE_INFO* pPackageInfo = NULL;
+        BAL_INFO_PACKAGE* pPackage = NULL;
-        BAL_INFO_PACKAGE* pPackage;
+        HRESULT hrPrereq = BalInfoFindPackageById(&m_Bundle.packages, wzPackageId, &pPackage);
-        HRESULT hrPrereq = GetPackageInfo(wzPackageId, &pPackageInfo, &pPackage);
+        if (SUCCEEDED(hrPrereq))
-        if (SUCCEEDED(hrPrereq) && pPackageInfo)
        {
-            pPackageInfo->fSuccessfullyInstalled = SUCCEEDED(hrStatus);
            // If the prerequisite required a restart (any restart) then do an immediate
            // restart to ensure that the bundle will get launched again post reboot.
            if (m_fPrereq && pPackage->fPrereqPackage && BOOTSTRAPPER_APPLY_RESTART_NONE != restart)
@@ -1157,28 +1082,7 @@ public: // IBootstrapperApplication
        if (m_fPrereq)
        {
-            m_fPrereqInstalled = TRUE;
+            m_fPrereqInstalled = SUCCEEDED(hrStatus);
-            BOOL fInstalledAPackage = FALSE;
-            for (DWORD i = 0; i < m_Bundle.packages.cPackages; ++i)
-            {
-                BAL_INFO_PACKAGE* pPackage = &m_Bundle.packages.rgPackages[i];
-                WIXSTDBA_PACKAGE_INFO* pPackageInfo = reinterpret_cast<WIXSTDBA_PACKAGE_INFO*>(pPackage->pvCustomData);
-                if (pPackage->fPrereqPackage && pPackageInfo && pPackageInfo->fPlannedToBeInstalled && !pPackageInfo->fWasAlreadyInstalled)
-                {
-                    if (pPackageInfo->fSuccessfullyInstalled)
-                    {
-                        fInstalledAPackage = TRUE;
-                    }
-                    else
-                    {
-                        m_fPrereqInstalled = FALSE;
-                        break;
-                    }
-                }
-            }
-            m_fPrereqInstalled = m_fPrereqInstalled && fInstalledAPackage;
        }
        // If we are showing UI, wait a beat before moving to the final screen.
@@ -1223,10 +1127,10 @@ public: // IBootstrapperApplication
    {
        BAL_INFO_PACKAGE* pPackage = NULL;
-        if (SUCCEEDED(hrStatus) && wzNewPackageId &&
+        if (SUCCEEDED(hrStatus) && wzNewPackageId)
-            SUCCEEDED(BalInfoAddUpdateBundleAsPackage(&m_Bundle.packages, wzNewPackageId, wzPreviousPackageId, &pPackage)))
        {
-            InitializePackageInfoForPackage(pPackage);
+            BalInfoAddUpdateBundleAsPackage(&m_Bundle.packages, wzNewPackageId, wzPreviousPackageId, &pPackage);
+            // Best effort
        }
        return S_OK;
@@ -2201,6 +2105,36 @@ public: //CBalBaseBootstrapperApplication
        return hr;
    }
+    void Uninitialize(
+        __in const BOOTSTRAPPER_DESTROY_ARGS* pArgs,
+        __in BOOTSTRAPPER_DESTROY_RESULTS* /*pResults*/
+        )
+    {
+        if (m_hBAFModule)
+        {
+            BA_FUNCTIONS_DESTROY_ARGS args = { };
+            BA_FUNCTIONS_DESTROY_RESULTS results = { };
+            args.cbSize = sizeof(BA_FUNCTIONS_DESTROY_ARGS);
+            args.fReload = pArgs->fReload;
+            results.cbSize = sizeof(BA_FUNCTIONS_DESTROY_RESULTS);
+            PFN_BA_FUNCTIONS_DESTROY pfnBAFunctionsDestroy = reinterpret_cast<PFN_BA_FUNCTIONS_DESTROY>(::GetProcAddress(m_hBAFModule, "BAFunctionsDestroy"));
+            if (pfnBAFunctionsDestroy)
+            {
+                pfnBAFunctionsDestroy(&args, &results);
+            }
+            if (!results.fDisableUnloading)
+            {
+                ::FreeLibrary(m_hBAFModule);
+                m_hBAFModule = NULL;
+            }
+        }
+    }
 private:
    //
    // UiThreadProc - entrypoint for UI thread.
@@ -2214,6 +2148,7 @@ private:
        BOOL fComInitialized = FALSE;
        BOOL fRet = FALSE;
        MSG msg = { };
+        DWORD dwQuit = 0;
        // Initialize COM and theme.
        hr = ::CoInitialize(NULL);
@@ -2274,8 +2209,6 @@ private:
        pThis->DestroyMainWindow();
        pThis->UninitializeTaskbarButton();
-        // initiate engine shutdown
-        DWORD dwQuit = HRESULT_CODE(hr);
        if (BOOTSTRAPPER_APPLY_RESTART_INITIATED == pThis->m_restartResult)
        {
            dwQuit = ERROR_SUCCESS_REBOOT_INITIATED;
@@ -2284,6 +2217,17 @@ private:
        {
            dwQuit = ERROR_SUCCESS_REBOOT_REQUIRED;
        }
+        else if (SEVERITY_ERROR == HRESULT_SEVERITY(hr) && FACILITY_WIN32 == HRESULT_FACILITY(hr))
+        {
+            // Convert Win32 HRESULTs back to the error code.
+            dwQuit = HRESULT_CODE(hr);
+        }
+        else
+        {
+            dwQuit = hr;
+        }
+        // initiate engine shutdown
        pThis->m_pEngine->Quit(dwQuit);
        ReleaseTheme(pThis->m_pTheme);
@@ -2335,9 +2279,6 @@ private:
        GetBundleFileVersion();
        // don't fail if we couldn't get the version info; best-effort only
-        hr = InitializePackageInfo();
-        BalExitOnFailure(hr, "Failed to initialize wixstdba package information.");
        if (m_fPrereq)
        {
            hr = InitializePrerequisiteInformation();
@@ -2521,38 +2462,6 @@ private:
    }
-    HRESULT InitializePackageInfo()
-    {
-        HRESULT hr = S_OK;
-        BAL_INFO_PACKAGE* pPackage = NULL;
-        for (DWORD i = 0; i < m_Bundle.packages.cPackages; ++i)
-        {
-            pPackage = &m_Bundle.packages.rgPackages[i];
-            hr = InitializePackageInfoForPackage(pPackage);
-            BalExitOnFailure(hr, "Failed to initialize wixstdba package info for package: %ls.", pPackage->sczId);
-        }
-    LExit:
-        return hr;
-    }
-    HRESULT InitializePackageInfoForPackage(
-        __in BAL_INFO_PACKAGE* pPackage
-        )
-    {
-        HRESULT hr = S_OK;
-        pPackage->pvCustomData = MemAlloc(sizeof(WIXSTDBA_PACKAGE_INFO), TRUE);
-        BalExitOnNull(pPackage->pvCustomData, hr, E_OUTOFMEMORY, "Failed to allocate memory for wixstdba package info.");
-    LExit:
-        return hr;
-    }
    HRESULT InitializePrerequisiteInformation()
    {
        HRESULT hr = S_OK;
@@ -2673,35 +2582,6 @@ private:
        return hr;
    }
-    HRESULT GetPackageInfo(
-        __in_z LPCWSTR wzPackageId,
-        __out WIXSTDBA_PACKAGE_INFO** ppPackageInfo,
-        __out BAL_INFO_PACKAGE** ppPackage
-        )
-    {
-        HRESULT hr = E_NOTFOUND;
-        WIXSTDBA_PACKAGE_INFO* pPackageInfo = NULL;
-        BAL_INFO_PACKAGE* pPackage = NULL;
-        Assert(wzPackageId && *wzPackageId);
-        Assert(ppPackage);
-        Assert(ppPackageInfo);
-        hr = BalInfoFindPackageById(&m_Bundle.packages, wzPackageId, &pPackage);
-        if (E_NOTFOUND != hr)
-        {
-            ExitOnFailure(hr, "Failed trying to find the requested package.");
-            pPackageInfo = reinterpret_cast<WIXSTDBA_PACKAGE_INFO*>(pPackage->pvCustomData);
-        }
-        *ppPackageInfo = pPackageInfo;
-        *ppPackage = pPackage;
-    LExit:
-        return hr;
-    }
    //
    // Get the file version of the bootstrapper and record in bootstrapper log file
@@ -3408,6 +3288,23 @@ private:
                                }
                            }
                        }
+                        else if (E_PREREQBA_INFINITE_LOOP == m_hrFinal)
+                        {
+                            HRESULT hr = StrAllocString(&sczUnformattedText, L"#(loc.PREREQBAINFINITELOOPErrorMessage)", 0);
+                            if (FAILED(hr))
+                            {
+                                BalLogError(hr, "Failed to initialize PREREQBAINFINITELOOPErrorMessage loc identifier.");
+                            }
+                            else
+                            {
+                                hr = LocLocalizeString(m_pWixLoc, &sczUnformattedText);
+                                if (FAILED(hr))
+                                {
+                                    BalLogError(hr, "Failed to localize PREREQBAINFINITELOOPErrorMessage: %ls", sczUnformattedText);
+                                    ReleaseNullStr(sczUnformattedText);
+                                }
+                            }
+                        }
                        else // try to get the error message from the error code.
                        {
                            StrAllocFromError(&sczUnformattedText, m_hrFinal, NULL);
@@ -3424,14 +3321,9 @@ private:
                                StrAllocString(&sczText, sczUnformattedText, 0);
                            }
                        }
-                        else if (E_MBAHOST_NET452_ON_WIN7RTM == m_hrFinal)
+                        else if (E_MBAHOST_NET452_ON_WIN7RTM == m_hrFinal ||
-                        {
+                                 E_DNCHOST_SCD_RUNTIME_FAILURE == m_hrFinal ||
-                            if (sczUnformattedText)
+                                 E_PREREQBA_INFINITE_LOOP == m_hrFinal)
-                            {
-                                BalFormatString(sczUnformattedText, &sczText);
-                            }
-                        }
-                        else if (E_DNCHOST_SCD_RUNTIME_FAILURE == m_hrFinal)
                        {
                            if (sczUnformattedText)
                            {
@@ -4180,8 +4072,7 @@ public:
    //
    CWixStandardBootstrapperApplication(
        __in HMODULE hModule,
-        __in BOOL fPrereq,
+        __in_opt PREQBA_DATA* pPrereqData,
-        __in HRESULT hrHostInitialization,
        __in IBootstrapperEngine* pEngine
        ) : CBalBaseBootstrapperApplication(pEngine, 3, 3000)
    {
@@ -4210,7 +4101,7 @@ public:
        m_hWnd = NULL;
        m_state = WIXSTDBA_STATE_INITIALIZING;
-        m_hrFinal = hrHostInitialization;
+        m_hrFinal = pPrereqData ? pPrereqData->hrHostInitialization : S_OK;
        m_restartResult = BOOTSTRAPPER_APPLY_RESTART_NONE;
        m_fRestartRequired = FALSE;
@@ -4231,9 +4122,9 @@ public:
        m_fShowingInternalUiThisPackage = FALSE;
        m_fTriedToLaunchElevated = FALSE;
-        m_fPrereq = fPrereq;
+        m_pPrereqData = pPrereqData;
+        m_fPrereq = NULL != pPrereqData;
        m_fPrereqInstalled = FALSE;
-        m_fPrereqAlreadyInstalled = FALSE;
        pEngine->AddRef();
        m_pEngine = pEngine;
@@ -4418,11 +4309,6 @@ public:
        AssertSz(!m_pTaskbarList, "Taskbar should have been released before destructor.");
        AssertSz(!m_pTheme, "Theme should have been released before destructor.");
-        for (DWORD i = 0; i < m_Bundle.packages.cPackages; ++i)
-        {
-            ReleaseMem(m_Bundle.packages.rgPackages[i].pvCustomData);
-        }
        ::DeleteCriticalSection(&m_csShowingInternalUiThisPackage);
        ReleaseStr(m_sczFailedMessage);
        ReleaseStr(m_sczConfirmCloseMessage);
@@ -4436,18 +4322,6 @@ public:
        ReleaseStr(m_sczBundleVersion);
        ReleaseStr(m_sczAfterForcedRestartPackage);
        ReleaseNullObject(m_pEngine);
-        if (m_hBAFModule)
-        {
-            PFN_BA_FUNCTIONS_DESTROY pfnBAFunctionsDestroy = reinterpret_cast<PFN_BA_FUNCTIONS_DESTROY>(::GetProcAddress(m_hBAFModule, "BAFunctionsDestroy"));
-            if (pfnBAFunctionsDestroy)
-            {
-                pfnBAFunctionsDestroy();
-            }
-            ::FreeLibrary(m_hBAFModule);
-            m_hBAFModule = NULL;
-        }
    }
 private:
@@ -4529,9 +4403,9 @@ private:
    BOOL m_fSupportCacheOnly;
    BOOL m_fRequestedCacheOnly;
+    PREQBA_DATA* m_pPrereqData;
    BOOL m_fPrereq;
    BOOL m_fPrereqInstalled;
-    BOOL m_fPrereqAlreadyInstalled;
    ITaskbarList3* m_pTaskbarList;
    UINT m_uTaskbarButtonCreatedMessage;
@@ -4551,8 +4425,7 @@ private:
 //
 HRESULT CreateBootstrapperApplication(
    __in HMODULE hModule,
-    __in BOOL fPrereq,
+    __in_opt PREQBA_DATA* pPrereqData,
-    __in HRESULT hrHostInitialization,
    __in IBootstrapperEngine* pEngine,
    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
    __inout BOOTSTRAPPER_CREATE_RESULTS* pResults,
@@ -4567,7 +4440,7 @@ HRESULT CreateBootstrapperApplication(
        BalExitOnFailure(hr = E_INVALIDARG, "Engine requested Unknown display type.");
    }
-    pApplication = new CWixStandardBootstrapperApplication(hModule, fPrereq, hrHostInitialization, pEngine);
+    pApplication = new CWixStandardBootstrapperApplication(hModule, pPrereqData, pEngine);
    BalExitOnNull(pApplication, hr, E_OUTOFMEMORY, "Failed to create new standard bootstrapper application object.");
    hr = pApplication->Initialize(pArgs);
@@ -4584,6 +4457,17 @@ LExit:
 }
+void DestroyBootstrapperApplication(
+    __in IBootstrapperApplication* pApplication,
+    __in const BOOTSTRAPPER_DESTROY_ARGS* pArgs,
+    __inout BOOTSTRAPPER_DESTROY_RESULTS* pResults
+    )
+{
+    CWixStandardBootstrapperApplication* pBA = (CWixStandardBootstrapperApplication*)pApplication;
+    pBA->Uninitialize(pArgs, pResults);
+}
 static HRESULT DAPI EvaluateVariableConditionCallback(
    __in_z LPCWSTR wzCondition,
    __out BOOL* pf,
diff --git a/src/ext/Bal/wixstdba/inc/preqba.h b/src/ext/Bal/wixstdba/inc/preqba.h
new file mode 100644
index 00000000..93a547ed
--- /dev/null
+++ b/src/ext/Bal/wixstdba/inc/preqba.h
@@ -0,0 +1,16 @@
+#pragma once
+// 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.
+struct PREQBA_DATA
+{
+    HRESULT hrHostInitialization;
+    BOOL fCompleted;
+};
+extern "C" typedef HRESULT(WINAPI* PFN_PREQ_BOOTSTRAPPER_APPLICATION_CREATE)(
+    __in PREQBA_DATA* pPreqData,
+    __in IBootstrapperEngine* pEngine,
+    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
+    __inout BOOTSTRAPPER_CREATE_RESULTS* pResults
+    );
diff --git a/src/ext/Bal/wixstdba/precomp.h b/src/ext/Bal/wixstdba/precomp.h
index ba56ae6d..290c125b 100644
--- a/src/ext/Bal/wixstdba/precomp.h
+++ b/src/ext/Bal/wixstdba/precomp.h
@@ -17,43 +17,49 @@
 #include <strsafe.h>
 #include <stddef.h>
-#include "dutil.h"
+#include <dutil.h>
-#include "apputil.h"
+#include <apputil.h>
-#include "memutil.h"
+#include <memutil.h>
-#include "dictutil.h"
+#include <dictutil.h>
-#include "dirutil.h"
+#include <dirutil.h>
-#include "fileutil.h"
+#include <fileutil.h>
-#include "locutil.h"
+#include <locutil.h>
-#include "logutil.h"
+#include <logutil.h>
-#include "pathutil.h"
+#include <pathutil.h>
-#include "resrutil.h"
+#include <resrutil.h>
-#include "shelutil.h"
+#include <shelutil.h>
-#include "strutil.h"
+#include <strutil.h>
-#include "wndutil.h"
+#include <wndutil.h>
-#include "thmutil.h"
+#include <thmutil.h>
-#include "verutil.h"
+#include <verutil.h>
-#include "uriutil.h"
+#include <uriutil.h>
-#include "xmlutil.h"
+#include <xmlutil.h>
-#include "BootstrapperEngine.h"
-#include "BootstrapperApplication.h"
-#include "IBootstrapperEngine.h"
-#include "IBootstrapperApplication.h"
-#include "balutil.h"
-#include "balinfo.h"
-#include "balcondition.h"
-#include "BAFunctions.h"
+#include <BootstrapperEngine.h>
+#include <BootstrapperApplication.h>
+#include <IBootstrapperEngine.h>
+#include <IBootstrapperApplication.h>
+#include <balutil.h>
+#include <balinfo.h>
+#include <balcondition.h>
+#include <BAFunctions.h>
+#include "inc\preqba.h"
 #include "wixstdba.messages.h"
 HRESULT CreateBootstrapperApplication(
    __in HMODULE hModule,
-    __in BOOL fPrereq,
+    __in_opt PREQBA_DATA* pPrereqData,
-    __in HRESULT hrHostInitialization,
    __in IBootstrapperEngine* pEngine,
    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
    __inout BOOTSTRAPPER_CREATE_RESULTS* pResults,
    __out IBootstrapperApplication** ppApplication
    );
+void DestroyBootstrapperApplication(
+    __in IBootstrapperApplication* pApplication,
+    __in const BOOTSTRAPPER_DESTROY_ARGS* pArgs,
+    __inout BOOTSTRAPPER_DESTROY_RESULTS* pResults
+    );
diff --git a/src/ext/Bal/wixstdba/wixstdba.cpp b/src/ext/Bal/wixstdba/wixstdba.cpp
index a96f1738..47f3f677 100644
--- a/src/ext/Bal/wixstdba/wixstdba.cpp
+++ b/src/ext/Bal/wixstdba/wixstdba.cpp
@@ -50,7 +50,7 @@ extern "C" HRESULT WINAPI BootstrapperApplicationCreate(
    hr = BalInitializeFromCreateArgs(pArgs, &pEngine);
    ExitOnFailure(hr, "Failed to initialize Bal.");
-    hr = CreateBootstrapperApplication(vhInstance, FALSE, S_OK, pEngine, pArgs, pResults, &vpApplication);
+    hr = CreateBootstrapperApplication(vhInstance, NULL, pEngine, pArgs, pResults, &vpApplication);
    BalExitOnFailure(hr, "Failed to create bootstrapper application interface.");
 LExit:
@@ -60,45 +60,24 @@ LExit:
 }
-extern "C" void WINAPI BootstrapperApplicationDestroy()
+extern "C" void WINAPI BootstrapperApplicationDestroy(
-{
+    __in const BOOTSTRAPPER_DESTROY_ARGS* pArgs,
-    ReleaseNullObject(vpApplication);
+    __in BOOTSTRAPPER_DESTROY_RESULTS* pResults
-    BalUninitialize();
-    DutilUninitialize();
-}
-extern "C" HRESULT WINAPI DncPrereqBootstrapperApplicationCreate(
-    __in HRESULT hrHostInitialization,
-    __in IBootstrapperEngine* pEngine,
-    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
-    __inout BOOTSTRAPPER_CREATE_RESULTS* pResults
    )
 {
-    HRESULT hr = S_OK;
+    if (vpApplication)
+    {
-    DutilInitialize(&WixstdbaTraceError);
+        DestroyBootstrapperApplication(vpApplication, pArgs, pResults);
+    }
-    BalInitialize(pEngine);
-    hr = CreateBootstrapperApplication(vhInstance, TRUE, hrHostInitialization, pEngine, pArgs, pResults, &vpApplication);
-    BalExitOnFailure(hr, "Failed to create .NET Core prerequisite bootstrapper application interface.");
-LExit:
-    return hr;
-}
-extern "C" void WINAPI DncPrereqBootstrapperApplicationDestroy()
-{
    ReleaseNullObject(vpApplication);
    BalUninitialize();
    DutilUninitialize();
 }
-extern "C" HRESULT WINAPI MbaPrereqBootstrapperApplicationCreate(
+extern "C" HRESULT WINAPI PrereqBootstrapperApplicationCreate(
-    __in HRESULT hrHostInitialization,
+    __in_opt PREQBA_DATA* pPrereqData,
    __in IBootstrapperEngine* pEngine,
    __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
    __inout BOOTSTRAPPER_CREATE_RESULTS* pResults
@@ -110,19 +89,20 @@ extern "C" HRESULT WINAPI MbaPrereqBootstrapperApplicationCreate(
    BalInitialize(pEngine);
-    hr = CreateBootstrapperApplication(vhInstance, TRUE, hrHostInitialization, pEngine, pArgs, pResults, &vpApplication);
+    hr = CreateBootstrapperApplication(vhInstance, pPrereqData, pEngine, pArgs, pResults, &vpApplication);
-    BalExitOnFailure(hr, "Failed to create managed prerequisite bootstrapper application interface.");
+    BalExitOnFailure(hr, "Failed to create prerequisite bootstrapper application interface.");
 LExit:
    return hr;
 }
-extern "C" void WINAPI MbaPrereqBootstrapperApplicationDestroy()
+extern "C" void WINAPI PrereqBootstrapperApplicationDestroy(
+    __in const BOOTSTRAPPER_DESTROY_ARGS* pArgs,
+    __in BOOTSTRAPPER_DESTROY_RESULTS* pResults
+    )
 {
-    ReleaseNullObject(vpApplication);
+    BootstrapperApplicationDestroy(pArgs, pResults);
-    BalUninitialize();
-    DutilUninitialize();
 }
 static void CALLBACK WixstdbaTraceError(
diff --git a/src/ext/Bal/wixstdba/wixstdba.def b/src/ext/Bal/wixstdba/wixstdba.def
index ba9980d3..e377196b 100644
--- a/src/ext/Bal/wixstdba/wixstdba.def
+++ b/src/ext/Bal/wixstdba/wixstdba.def
@@ -4,7 +4,5 @@
 EXPORTS
    BootstrapperApplicationCreate
    BootstrapperApplicationDestroy
-    DncPrereqBootstrapperApplicationCreate
+    PrereqBootstrapperApplicationCreate
-    DncPrereqBootstrapperApplicationDestroy
+    PrereqBootstrapperApplicationDestroy
-    MbaPrereqBootstrapperApplicationCreate
-    MbaPrereqBootstrapperApplicationDestroy
diff --git a/src/ext/Bal/wixstdba/wixstdba.vcxproj b/src/ext/Bal/wixstdba/wixstdba.vcxproj
index a43cc345..9273c1ed 100644
--- a/src/ext/Bal/wixstdba/wixstdba.vcxproj
+++ b/src/ext/Bal/wixstdba/wixstdba.vcxproj
@@ -52,6 +52,7 @@
    <ClCompile Include="wixstdba.cpp" />
  </ItemGroup>
  <ItemGroup>
+    <ClInclude Include="inc\preqba.h" />
    <ClInclude Include="precomp.h" />
    <ClInclude Include="resource.h" />
  </ItemGroup>