82 files changed, 1728 insertions, 89 deletions

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 0ca36281..110ccb28 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -33,9 +33,9 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Authors Condition=" '$(WixOfficialBuild)'!='true' ">Private WiX Build</Authors>
+    <Authors Condition=" '$(WixOfficialBuild)'!='true' ">WiX Dev Build</Authors>
     <Authors Condition=" '$(WixOfficialBuild)'=='true' ">WiX Toolset Team</Authors>
-    <Company Condition=" '$(WixOfficialBuild)'!='true' ">Private WiX Build</Company>
+    <Company Condition=" '$(WixOfficialBuild)'!='true' ">WiX Dev Build</Company>
     <Company Condition=" '$(WixOfficialBuild)'=='true' ">WiX Toolset</Company>
     <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
 
@@ -43,7 +43,7 @@
     <PackageLicenseFile>OSMFEULA.txt</PackageLicenseFile>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
 
-    <Product Condition=" '$(WixOfficialBuild)'!='true' ">Private WiX Build</Product>
+    <Product Condition=" '$(WixOfficialBuild)'!='true' ">WiX Dev Build</Product>
     <Product Condition=" '$(WixOfficialBuild)'=='true' ">WiX Toolset</Product>
     <ProjectUrl>https://wixtoolset.org/</ProjectUrl>
     <PackageIcon>icon.png</PackageIcon>
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/Engine.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/Engine.cs
index 44d77359..25413790 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/Engine.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/Engine.cs
@@ -259,9 +259,9 @@ namespace WixToolset.BootstrapperApplicationApi
         }
 
         /// <inheritdoc/>
-        public void SetUpdateSource(string url)
+        public void SetUpdateSource(string url, string authorizationHeader)
         {
-            this.engine.SetUpdateSource(url);
+            this.engine.SetUpdateSource(url, authorizationHeader);
         }
 
         /// <inheritdoc/>
@@ -271,9 +271,9 @@ namespace WixToolset.BootstrapperApplicationApi
         }
 
         /// <inheritdoc/>
-        public void SetDownloadSource(string packageOrContainerId, string payloadId, string url, string user, string password)
+        public void SetDownloadSource(string packageOrContainerId, string payloadId, string url, string user, string password, string authorizationHeader)
         {
-            this.engine.SetDownloadSource(packageOrContainerId, payloadId, url, user, password);
+            this.engine.SetDownloadSource(packageOrContainerId, payloadId, url, user, password, authorizationHeader);
         }
 
         /// <inheritdoc/>
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperEngine.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperEngine.cs
index c7b0c003..13702757 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperEngine.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/IBootstrapperEngine.cs
@@ -129,14 +129,15 @@ namespace WixToolset.BootstrapperApplicationApi
             );
 
         /// <summary>
-        /// See <see cref="IEngine.SetDownloadSource(string, string, string, string, string)"/>.
+        /// See <see cref="IEngine.SetDownloadSource(string, string, string, string, string, string)"/>.
         /// </summary>
         void SetDownloadSource(
             [MarshalAs(UnmanagedType.LPWStr)] string wzPackageOrContainerId,
             [MarshalAs(UnmanagedType.LPWStr)] string wzPayloadId,
             [MarshalAs(UnmanagedType.LPWStr)] string wzUrl,
             [MarshalAs(UnmanagedType.LPWStr)] string wzUser,
-            [MarshalAs(UnmanagedType.LPWStr)] string wzPassword
+            [MarshalAs(UnmanagedType.LPWStr)] string wzPassword,
+            [MarshalAs(UnmanagedType.LPWStr)] string wzAuthorizationHeader
             );
 
         /// <summary>
@@ -219,7 +220,8 @@ namespace WixToolset.BootstrapperApplicationApi
         /// Sets the URL to the update feed.
         /// </summary>
         void SetUpdateSource(
-            [MarshalAs(UnmanagedType.LPWStr)] string url
+            [MarshalAs(UnmanagedType.LPWStr)] string url,
+            [MarshalAs(UnmanagedType.LPWStr)] string wzAuthorizationHeader
             );
 
         /// <summary>
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/IDefaultBootstrapperApplication.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/IDefaultBootstrapperApplication.cs
index ad51b2be..1ff12c28 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/IDefaultBootstrapperApplication.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/IDefaultBootstrapperApplication.cs
@@ -37,14 +37,14 @@ namespace WixToolset.BootstrapperApplicationApi
         /// <summary>
         /// Fired when the engine has begun acquiring the payload or container.
         /// The BA can change the source using <see cref="IEngine.SetLocalSource(String, String, String)"/>
-        /// or <see cref="IEngine.SetDownloadSource(String, String, String, String, String)"/>.
+        /// or <see cref="IEngine.SetDownloadSource(String, String, String, String, String, String)"/>.
         /// </summary>
         event EventHandler<CacheAcquireBeginEventArgs> CacheAcquireBegin;
 
         /// <summary>
         /// Fired when the engine has completed the acquisition of the payload or container.
         /// The BA can change the source using <see cref="IEngine.SetLocalSource(String, String, String)"/>
-        /// or <see cref="IEngine.SetDownloadSource(String, String, String, String, String)"/>.
+        /// or <see cref="IEngine.SetDownloadSource(String, String, String, String, String, String)"/>.
         /// </summary>
         event EventHandler<CacheAcquireCompleteEventArgs> CacheAcquireComplete;
 
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/IEngine.cs b/src/api/burn/WixToolset.BootstrapperApplicationApi/IEngine.cs
index bd78409b..03ceed06 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/IEngine.cs
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/IEngine.cs
@@ -156,7 +156,8 @@ namespace WixToolset.BootstrapperApplicationApi
         /// Sets the URL to the update feed.
         /// </summary>
         /// <param name="url">URL of the update feed.</param>
-        void SetUpdateSource(string url);
+        /// <param name="authorizationHeader">Additional proxy authentication header. Not currently used.</param>
+        void SetUpdateSource(string url, string authorizationHeader);
 
         /// <summary>
         /// Set the local source for a package or container.
@@ -174,7 +175,8 @@ namespace WixToolset.BootstrapperApplicationApi
         /// <param name="url">The new url.</param>
         /// <param name="user">The user name for proxy authentication.</param>
         /// <param name="password">The password for proxy authentication.</param>
-        void SetDownloadSource(string packageOrContainerId, string payloadId, string url, string user, string password);
+        /// <param name="authorizationHeader">Additional proxy authentication header. Not currently used.</param>
+        void SetDownloadSource(string packageOrContainerId, string payloadId, string url, string user, string password, string authorizationHeader);
 
         /// <summary>
         /// Sets numeric variables for the engine.
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/README.md b/src/api/burn/WixToolset.BootstrapperApplicationApi/README.md
new file mode 100644
index 00000000..eeedbf9f
--- /dev/null
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/README.md
@@ -0,0 +1,37 @@
+# WixToolset.BootstrapperApplicationApi - managed BootstrapperApplication API
+
+The `WixToolset.BootstrapperApplicationApi` package contains the SDK for building managed BootstrapperApplications.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Getting started
+
+BAFunctions are native-code DLLs (typically written in C++) that let you supplement the behavior of WixStdBA, rather than writing an entirely new BA to tweak existing BA behavior.
+
+The best way to learn is via the samples at: https://github.com/wixtoolset/wix/tree/HEAD/src/ext/Bal/Samples/bafunctions
+
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec b/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
index 63acc895..73fef99b 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
@@ -7,6 +7,7 @@
     <description>$description$</description>
     <authors>$authors$</authors>
     <icon>icon.png</icon>
+    <readme>README.md</readme>
     <license type="file">OSMFEULA.txt</license>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <tags>$packageTags$</tags>
@@ -25,6 +26,7 @@
   <files>
     <file src="$eulaTxt$" />
     <file src="$iconPng$" />
+    <file src="$projectFolder$\README.md" />
 
     <file src="$projectFolder$\build\WixToolset.BootstrapperApplicationApi.props" target="build\" />
 
diff --git a/src/api/burn/bextutil/README.md b/src/api/burn/bextutil/README.md
new file mode 100644
index 00000000..cee7e98c
--- /dev/null
+++ b/src/api/burn/bextutil/README.md
@@ -0,0 +1,30 @@
+# WixToolset.BootstrapperExtensionApi - extend WiX Bootstrapper Engine
+
+The `WixToolset.BootstrapperExtensionApi` package contains the SDK for extending the WiX Bootstrapper Engine, better known as "burn".
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/api/burn/bextutil/bextutil.nuspec b/src/api/burn/bextutil/bextutil.nuspec
index f790e0b8..065b72a3 100644
--- a/src/api/burn/bextutil/bextutil.nuspec
+++ b/src/api/burn/bextutil/bextutil.nuspec
@@ -7,6 +7,7 @@
     <description>$description$</description>
     <authors>$authors$</authors>
     <icon>icon.png</icon>
+    <readme>README.md</readme>
     <license type="file">OSMFEULA.txt</license>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <tags>$packageTags$</tags>
@@ -21,6 +22,7 @@
   <files>
     <file src="$eulaTxt$" />
     <file src="$iconPng$" />
+    <file src="$projectFolder$\README.md" />
     <file src="$projectFolder$\build\$id$.props" target="build\" />
     <file src="$projectFolder$\inc\*" target="build\native\include" />
     <file src="$projectFolder$\..\inc\BootstrapperExtensionTypes.h" target="build\native\include" />
diff --git a/src/api/wix/WixToolset.Data/README.md b/src/api/wix/WixToolset.Data/README.md
new file mode 100644
index 00000000..192e7993
--- /dev/null
+++ b/src/api/wix/WixToolset.Data/README.md
@@ -0,0 +1,30 @@
+# WixToolset.Data - fundamental data types for the WiX Toolset
+
+The `WixToolset.Data` package provides the fundamental data types used throughout the WiX Toolset.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/api/wix/WixToolset.Data/WixToolset.Data.csproj b/src/api/wix/WixToolset.Data/WixToolset.Data.csproj
index e2d71e87..257b9415 100644
--- a/src/api/wix/WixToolset.Data/WixToolset.Data.csproj
+++ b/src/api/wix/WixToolset.Data/WixToolset.Data.csproj
@@ -6,8 +6,9 @@
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
     <LangVersion>7.3</LangVersion>
-    <Description>WiX Toolset Data</Description>
     <DebugType>embedded</DebugType>
+    <Description>WiX Toolset Data</Description>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <CreateDocumentationFile>true</CreateDocumentationFile>
     <!-- TODO: This shouldn't be ignored because this is public-facing -->
@@ -15,6 +16,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <None Include="README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
+  <ItemGroup>
     <PackageReference Include="System.IO.Compression" />
   </ItemGroup>
 </Project>
diff --git a/src/api/wix/WixToolset.Extensibility/README.md b/src/api/wix/WixToolset.Extensibility/README.md
new file mode 100644
index 00000000..62dee501
--- /dev/null
+++ b/src/api/wix/WixToolset.Extensibility/README.md
@@ -0,0 +1,30 @@
+# WixToolset.Extensibility - extensibility interfaces for the WiX Toolset
+
+The `WixToolset.Extensibility` package provides the interfaces and base classes WiX Extensions implement to extend the WiX Toolset.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/api/wix/WixToolset.Extensibility/WixToolset.Extensibility.csproj b/src/api/wix/WixToolset.Extensibility/WixToolset.Extensibility.csproj
index 86ee754d..f0938b6f 100644
--- a/src/api/wix/WixToolset.Extensibility/WixToolset.Extensibility.csproj
+++ b/src/api/wix/WixToolset.Extensibility/WixToolset.Extensibility.csproj
@@ -5,14 +5,18 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
-    <Title>WiX Toolset Extensibility</Title>
-    <Description></Description>
     <DebugType>embedded</DebugType>
+    <Description>WiX Toolset Extensibility</Description>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <CreateDocumentationFile>true</CreateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
+    <None Include="README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
+  <ItemGroup>
     <ProjectReference Include="..\WixToolset.Data\WixToolset.Data.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/dtf/WixToolset.Dtf.Compression.Cab/README.md b/src/dtf/WixToolset.Dtf.Compression.Cab/README.md
new file mode 100644
index 00000000..d67ea7d1
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Cab/README.md
@@ -0,0 +1,30 @@
+# WixToolset.Dtf.Compression.Cab - managed cabinet compression API
+
+The `WixToolset.Dtf.Compression.Cab` package contains the managed libraries for cabinet archive packing and unpacking.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj b/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj
index 08a88b30..e6ed8004 100644
--- a/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj
+++ b/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj
@@ -7,11 +7,13 @@
     <AssemblyName>WixToolset.Dtf.Compression.Cab</AssemblyName>
     <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
     <Description>Managed libraries for cabinet archive packing and unpacking</Description>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <CreateDocumentationFile>true</CreateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
     <None Include="Errors.txt" />
+    <None Include="README.md" Pack="true" PackagePath="\" />
     <EmbeddedResource Include="Errors.resources" />
   </ItemGroup>
 
diff --git a/src/dtf/WixToolset.Dtf.Compression.Zip/README.md b/src/dtf/WixToolset.Dtf.Compression.Zip/README.md
new file mode 100644
index 00000000..3837e985
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Zip/README.md
@@ -0,0 +1,30 @@
+# WixToolset.Dtf.Compression.Zip - managed zip compression API
+
+The `WixToolset.Dtf.Compression.Zip` package contains the managed libraries for zip archive packing and unpacking.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj b/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj
index aa97019d..1d185162 100644
--- a/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj
+++ b/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj
@@ -7,10 +7,15 @@
     <AssemblyName>WixToolset.Dtf.Compression.Zip</AssemblyName>
     <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
     <Description>Managed libraries for zip archive packing and unpacking</Description>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <CreateDocumentationFile>true</CreateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
+    <None Include="README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
+  <ItemGroup>
     <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/dtf/WixToolset.Dtf.Compression/README.md b/src/dtf/WixToolset.Dtf.Compression/README.md
new file mode 100644
index 00000000..b96d3172
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression/README.md
@@ -0,0 +1,30 @@
+# WixToolset.Dtf.Compression - managed compression API
+
+The `WixToolset.Dtf.Compression` package contains the abstract base libraries for archive packing and unpacking.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj b/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj
index 907e7a04..99a4017c 100644
--- a/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj
+++ b/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj
@@ -7,10 +7,12 @@
     <AssemblyName>WixToolset.Dtf.Compression</AssemblyName>
     <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
     <Description>Abstract base libraries for archive packing and unpacking</Description>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <CreateDocumentationFile>true</CreateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
     <None Include="Compression.cd" />
+    <None Include="README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
 </Project>
diff --git a/src/dtf/WixToolset.Dtf.CustomAction/README.md b/src/dtf/WixToolset.Dtf.CustomAction/README.md
new file mode 100644
index 00000000..ad8621b0
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.CustomAction/README.md
@@ -0,0 +1,30 @@
+# WixToolset.Dtf.CustomAction - the WiX Toolset Managed CustomAction Framework
+
+The `WixToolset.Dtf.CustomAction` package enables developers to create managed custom actions for the Windows Installer. This package contains the tools necessary to convert your project into a managed custom action.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.csproj b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.csproj
index 379aa194..9204e22b 100644
--- a/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.csproj
+++ b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.csproj
@@ -7,7 +7,6 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <Title>The WiX Toolset Managed CustomAction Framework.</Title>
     <Description>The WiX Toolset lets developers create managed custom actions for the Windows Installer. This package contains the tools necessary to convert your project into a managed custom action.</Description>
-
     <NuspecBasePath>$(OutputPath)</NuspecBasePath>
   </PropertyGroup>
 
diff --git a/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec
index 8eb7110f..bac680dc 100644
--- a/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec
+++ b/src/dtf/WixToolset.Dtf.CustomAction/WixToolset.Dtf.CustomAction.nuspec
@@ -7,6 +7,7 @@
     <description>$description$</description>
     <authors>$authors$</authors>
     <icon>icon.png</icon>
+    <readme>README.md</readme>
     <license type="file">OSMFEULA.txt</license>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <tags>$packageTags$ CustomActions</tags>
@@ -21,6 +22,7 @@
   <files>
     <file src="$eulaTxt$" />
     <file src="$iconPng$" />
+    <file src="$projectFolder$\README.md" />
     <file src="$projectFolder$\$id$.targets" target="build" />
     <file src="net472\WixToolset.Dtf.MakeSfxCA.exe" target="tools" />
     <file src="net472\WixToolset.Dtf.MakeSfxCA.exe.config" target="tools" />
diff --git a/src/dtf/WixToolset.Dtf.Resources/README.md b/src/dtf/WixToolset.Dtf.Resources/README.md
new file mode 100644
index 00000000..00b0ea18
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Resources/README.md
@@ -0,0 +1,30 @@
+# WixToolset.Dtf.Resources - managed executable resource API
+
+The `WixToolset.Dtf.Resources` package contains support for reading and writing resource data in executable files.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj b/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj
index 89bff841..41f55dcd 100644
--- a/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj
+++ b/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj
@@ -7,6 +7,11 @@
     <AssemblyName>WixToolset.Dtf.Resources</AssemblyName>
     <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
     <Description>Classes for reading and writing resource data in executable files</Description>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <CreateDocumentationFile>true</CreateDocumentationFile>
   </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
 </Project>
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/README.md b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/README.md
new file mode 100644
index 00000000..c667bd4c
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/README.md
@@ -0,0 +1,30 @@
+# WixToolset.Dtf.WindowsInstaller.Linq - managed Widows Installer LINQ extensions
+
+The `WixToolset.Dtf.WindowsInstaller.Linq` package contains the LINQ extensions for the managed Windows Installer API.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj
index fbc85880..010fc5af 100644
--- a/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj
@@ -7,10 +7,15 @@
     <AssemblyName>WixToolset.Dtf.WindowsInstaller.Linq</AssemblyName>
     <TargetFrameworks>netstandard2.0;net35</TargetFrameworks>
     <Description>LINQ extensions for Windows Installer classes</Description>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <CreateDocumentationFile>true</CreateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
+    <None Include="README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
+  <ItemGroup>
     <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/README.md b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/README.md
new file mode 100644
index 00000000..e9eea708
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/README.md
@@ -0,0 +1,30 @@
+# WixToolset.Dtf.WindowsInstaller.Package - managed extended Windows Installer API
+
+The `WixToolset.Dtf.WindowsInstaller.Package` package contains extended managed libraries for accessing the Windows Installer API.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj
index b3952177..85442fc4 100644
--- a/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj
@@ -7,10 +7,15 @@
     <AssemblyName>WixToolset.Dtf.WindowsInstaller.Package</AssemblyName>
     <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
     <Description>Extended managed libraries for Windows Installer</Description>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <CreateDocumentationFile>true</CreateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
+    <None Include="README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
+  <ItemGroup>
     <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj" />
     <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" />
     <ProjectReference Include="..\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj" />
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/README.md b/src/dtf/WixToolset.Dtf.WindowsInstaller/README.md
new file mode 100644
index 00000000..22cefde7
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/README.md
@@ -0,0 +1,30 @@
+# WixToolset.Dtf.WindowsInstaller - managed Windows Installer API
+
+The `WixToolset.Dtf.WindowsInstaller` package contains managed libraries for accessing the Windows Installer.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj b/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj
index 117a4114..55a9dc79 100644
--- a/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj
@@ -7,6 +7,7 @@
     <AssemblyName>WixToolset.Dtf.WindowsInstaller</AssemblyName>
     <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
     <Description>Managed libraries for Windows Installer</Description>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <CreateDocumentationFile>true</CreateDocumentationFile>
   </PropertyGroup>
 
@@ -17,6 +18,7 @@
   <ItemGroup>
     <None Include="Errors.txt" />
     <None Include="WindowsInstaller.cd" />
+    <None Include="README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)'=='net20' ">
diff --git a/src/ext/Bal/README.md b/src/ext/Bal/README.md
index 4a14b1a2..5e969c4f 100644
--- a/src/ext/Bal/README.md
+++ b/src/ext/Bal/README.md
@@ -1,2 +1,58 @@
-# WixToolset.BootstrapperApplications.wixext
-WixToolset.BootstrapperApplications.wixext - Bootstrapper Applications WiX Toolset Extension
+# WixToolset.BootstrapperApplications.wixext - Bootstrapper Applications WiX Toolset Extension
+
+This WiX Extension provides the standard BootstrapperApplications provided by the WiX Toolset.
+
+- WixStdBA ([WixStandardBootstrapperApplication](https://docs.firegiant.com/wix/schema/bal/wixstandardbootstrapperapplication/)), a bootstrapper application with support for custom themes
+- WixIuiBA ([WixInternalUIBootstrapperApplication](https://docs.firegiant.com/wix/schema/bal/wixinternaluibootstrapperapplication/)), a bootstrapper application for showing internal UI of Windows Installer packages
+- WixPreqBA ([WixPrerequisiteBootstrapperApplication](https://docs.firegiant.com/wix/schema/bal/wixprerequisitebootstrapperapplication/)), a secondary bootstrapper application for bootstrapping the prerequisites needed for a primary bootstrapper application
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Getting started
+
+Add the WiX Extension as a PackageReference to your .wixproj:
+
+```
+<Project Sdk="WixToolset.Sdk/6.0.0">
+  <ItemGroup>
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" Version="6.0.0" />
+  </ItemGroup>
+</Project>
+```
+
+Then add the namespace and bootstrapper application of choice:
+
+```
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Bundle BundleId="AcmeCorp.Example" Name="Example Bundle" Version="0.0.0.1" Manufacturer="ACME Corporation">
+    <BootstrapperApplication>
+      <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" />
+    </BootstrapperApplication>
+  </Bundle>
+</Wix>
+```
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/ext/Bal/wixext/README.md b/src/ext/Bal/wixext/README.md
deleted file mode 100644
index a986cb0e..00000000
--- a/src/ext/Bal/wixext/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# WixToolset.BootstrapperApplications
-
-WixToolset.BootstrapperApplications is a WiX extension that provides the WiX bootstrapper applications:
-
-- WixStdBA ([WixStandardBootstrapperApplication](https://wixtoolset.org/docs/schema/bal/wixstandardbootstrapperapplication/)), a bootstrapper application with support for custom themes
-- WixIuiBA ([WixInternalUIBootstrapperApplication](https://wixtoolset.org/docs/schema/bal/wixinternaluibootstrapperapplication/)), a bootstrapper application for showing internal UI of Windows Installer packages
-- WixPreqBA ([WixPrerequisiteBootstrapperApplication](https://wixtoolset.org/docs/schema/bal/wixprerequisitebootstrapperapplication/)), a secondary bootstrapper application for bootstrapping the prerequisites needed for a primary bootstrapper application
diff --git a/src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.csproj b/src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.csproj
index de32ff4d..adc6a86f 100644
--- a/src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.csproj
+++ b/src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="README.md" Pack="true" PackagePath="\" />
+    <None Include="..\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
diff --git a/src/ext/Bal/wixstdfn/README.md b/src/ext/Bal/wixstdfn/README.md
index 0977ff42..4aef768e 100644
--- a/src/ext/Bal/wixstdfn/README.md
+++ b/src/ext/Bal/wixstdfn/README.md
@@ -1,11 +1,37 @@
-# WixToolset.WixStandardBootstrapperApplicationFunctionApi
+# WixToolset.WixStandardBootstrapperApplicationFunctionApi - extend WiX Standard Bootstrapper Application
 
-WixToolset.WixStandardBootstrapperApplicationFunctionApi contains the SDK for building **BAFunctions** extensions for WixStdBA, the WiX Standard Bootstrapper Application for Burn bootstrapper bundles.
+The `WixToolset.WixStandardBootstrapperApplicationFunctionApi` package contains the SDK for building **BAFunctions** extensions for WixStdBA, the WiX Standard Bootstrapper Application for Burn bootstrapper bundles.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Getting started
 
 BAFunctions are native-code DLLs (typically written in C++) that let you supplement the behavior of WixStdBA, rather than writing an entirely new BA to tweak existing BA behavior.
 
-## Sources
-https://github.com/wixtoolset/wix/tree/HEAD/src/ext/Bal/wixstdfn
+The best way to learn is via the samples at: https://github.com/wixtoolset/wix/tree/HEAD/src/ext/Bal/Samples/bafunctions
+
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
 
-## Samples
-https://github.com/wixtoolset/wix/tree/HEAD/src/ext/Bal/Samples/bafunctions
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/ext/Bal/wixstdfn/wixstdfn.nuspec b/src/ext/Bal/wixstdfn/wixstdfn.nuspec
index 86860b67..d4b6e104 100644
--- a/src/ext/Bal/wixstdfn/wixstdfn.nuspec
+++ b/src/ext/Bal/wixstdfn/wixstdfn.nuspec
@@ -7,13 +7,13 @@
     <description>$description$</description>
     <authors>$authors$</authors>
     <icon>icon.png</icon>
+    <readme>README.md</readme>
     <license type="file">OSMFEULA.txt</license>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <tags>$packageTags$</tags>
     <copyright>$copyright$</copyright>
     <projectUrl>$projectUrl$</projectUrl>
     <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
-    <readme>README.md</readme>
     <dependencies>
       <group targetFramework="Native">
         <dependency id="WixToolset.BootstrapperApplicationApi" version="[$version$,$nextmajorversion$)" />
diff --git a/src/ext/ComPlus/README.md b/src/ext/ComPlus/README.md
index 8604c104..2412a6d1 100644
--- a/src/ext/ComPlus/README.md
+++ b/src/ext/ComPlus/README.md
@@ -1,2 +1,52 @@
-# ComPlus.wixext
-WixToolset.ComPlus.wixext - COM+ WiX Toolset Extension
+# WixToolset.ComPlus.wixext - COM+ WiX Toolset Extension
+
+This WiX Extension provides support for configuring COM+.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Getting started
+
+Add the WiX Extension as a PackageReference to your .wixproj:
+
+```
+<Project Sdk="WixToolset.Sdk/6.0.0">
+  <ItemGroup>
+    <PackageReference Include="WixToolset.ComPlus.wixext" Version="6.0.0" />
+  </ItemGroup>
+</Project>
+```
+
+Then add the extension's namespace:
+
+```
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:complus="http://wixtoolset.org/schemas/v4/wxs/complus">
+
+  ..
+</Wix>
+```
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj
index 1975d7d4..11911b35 100644
--- a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj
+++ b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.csproj
@@ -7,6 +7,7 @@
     <RootNamespace>WixToolset.ComPlus</RootNamespace>
     <Description>WiX Toolset ComPlus Extension</Description>
     <Title>WiX Toolset ComPlus Extension</Title>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
@@ -16,6 +17,10 @@
     <EmbeddedResource Include="$(OutputPath)..\complus.wixlib" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\complus.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
diff --git a/src/ext/Dependency/README.md b/src/ext/Dependency/README.md
index 09feba68..0d7fd7b3 100644
--- a/src/ext/Dependency/README.md
+++ b/src/ext/Dependency/README.md
@@ -1,2 +1,52 @@
-# Dependency.wixext
-WixToolset.Dependency.wixext - Dependency WiX Toolset Extension
+# WixToolset.Dependency.wixext - Dependency WiX Toolset Extension
+
+This WiX Extension provides support for configuring package dependencies.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Getting started
+
+Add the WiX Extension as a PackageReference to your .wixproj:
+
+```
+<Project Sdk="WixToolset.Sdk/6.0.0">
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Dependency.wixext" Version="6.0.0" />
+  </ItemGroup>
+</Project>
+```
+
+Then add the extension's namespace:
+
+```
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:dep="http://wixtoolset.org/schemas/v4/wxs/dependency">
+
+  ..
+</Wix>
+```
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj
index b61c6665..51010891 100644
--- a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj
+++ b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.csproj
@@ -7,6 +7,7 @@
     <RootNamespace>WixToolset.Dependency</RootNamespace>
     <Description>WiX Toolset Dependency Extension</Description>
     <Title>WiX Toolset Dependency Extension</Title>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
@@ -16,6 +17,10 @@
     <EmbeddedResource Include="$(OutputPath)..\dependency.wixlib" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\dependency.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
diff --git a/src/ext/DirectX/README.md b/src/ext/DirectX/README.md
index 6131cf35..2f9f3f08 100644
--- a/src/ext/DirectX/README.md
+++ b/src/ext/DirectX/README.md
@@ -1,2 +1,52 @@
-# DirectX.wixext
-WixToolset.DirectX.wixext - DirectX WiX Toolset Extension
+# WixToolset.DirectX.wixext - DirectX WiX Toolset Extension
+
+This WiX Extension provides support for configuring DirectX.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Getting started
+
+Add the WiX Extension as a PackageReference to your .wixproj:
+
+```
+<Project Sdk="WixToolset.Sdk/6.0.0">
+  <ItemGroup>
+    <PackageReference Include="WixToolset.DirectX.wixext" Version="6.0.0" />
+  </ItemGroup>
+</Project>
+```
+
+Then add the extension's namespace:
+
+```
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:dx="http://wixtoolset.org/schemas/v4/wxs/directx">
+
+  ..
+</Wix>
+```
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj b/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj
index 80263e9a..eadbc193 100644
--- a/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj
+++ b/src/ext/DirectX/wixext/WixToolset.DirectX.wixext.csproj
@@ -7,6 +7,7 @@
     <RootNamespace>WixToolset.DirectX</RootNamespace>
     <Description>WiX Toolset DirectX Extension</Description>
     <Title>WiX Toolset DirectX Extension</Title>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
@@ -16,6 +17,10 @@
     <EmbeddedResource Include="$(OutputPath)..\directx.wixlib" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\directx.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
diff --git a/src/ext/Firewall/README.md b/src/ext/Firewall/README.md
index be5801da..bd2b3fce 100644
--- a/src/ext/Firewall/README.md
+++ b/src/ext/Firewall/README.md
@@ -1,2 +1,52 @@
-# Firewall.wixext
-WixToolset.Firewall.wixext - Firewall WiX Toolset Extension 
+# WixToolset.Firewall.wixext - Firewall WiX Toolset Extension
+
+This WiX Extension provides support for configuring Windows Firewall.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Getting started
+
+Add the WiX Extension as a PackageReference to your .wixproj:
+
+```
+<Project Sdk="WixToolset.Sdk/6.0.0">
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Firewall.wixext" Version="6.0.0" />
+  </ItemGroup>
+</Project>
+```
+
+Then add the extension's namespace:
+
+```
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:fw="http://wixtoolset.org/schemas/v4/wxs/firewall">
+
+  ..
+</Wix>
+```
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj b/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj
index 25322dc4..f9032032 100644
--- a/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj
+++ b/src/ext/Firewall/wixext/WixToolset.Firewall.wixext.csproj
@@ -7,6 +7,7 @@
     <RootNamespace>WixToolset.Firewall</RootNamespace>
     <Description>WiX Toolset Firewall Extension</Description>
     <Title>WiX Toolset Firewall Extension</Title>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
@@ -16,6 +17,10 @@
     <EmbeddedResource Include="$(OutputPath)..\firewall.wixlib" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\firewall.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
diff --git a/src/ext/Http/README.md b/src/ext/Http/README.md
index 2d9f1895..64cbbf51 100644
--- a/src/ext/Http/README.md
+++ b/src/ext/Http/README.md
@@ -1,2 +1,52 @@
-# Http.wixext
-WixToolset.Http.wixext - Http WiX Toolset Extension 
+# WixToolset.Http.wixext - Http WiX Toolset Extension
+
+This WiX Extension provides support for configuring HTTP.SYS.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Getting started
+
+Add the WiX Extension as a PackageReference to your .wixproj:
+
+```
+<Project Sdk="WixToolset.Sdk/6.0.0">
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Http.wixext" Version="6.0.0" />
+  </ItemGroup>
+</Project>
+```
+
+Then add the extension's namespace:
+
+```
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:http="http://wixtoolset.org/schemas/v4/wxs/http">
+
+  ..
+</Wix>
+```
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/ext/Http/wixext/WixToolset.Http.wixext.csproj b/src/ext/Http/wixext/WixToolset.Http.wixext.csproj
index cee26f86..64c0785c 100644
--- a/src/ext/Http/wixext/WixToolset.Http.wixext.csproj
+++ b/src/ext/Http/wixext/WixToolset.Http.wixext.csproj
@@ -7,6 +7,7 @@
     <RootNamespace>WixToolset.Http</RootNamespace>
     <Description>WiX Toolset Http Extension</Description>
     <Title>WiX Toolset Http Extension</Title>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
@@ -16,6 +17,10 @@
     <EmbeddedResource Include="$(OutputPath)..\http.wixlib" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\http.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
diff --git a/src/ext/Iis/README.md b/src/ext/Iis/README.md
index ddb21a82..3344d10c 100644
--- a/src/ext/Iis/README.md
+++ b/src/ext/Iis/README.md
@@ -1,2 +1,52 @@
-# Iis.wixext
-WixToolset.Iis.wixext - Iis WiX Toolset Extension 
+# WixToolset.Iis.wixext - IIS WiX Toolset Extension
+
+This WiX Extension provides support for configuring IIS.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Getting started
+
+Add the WiX Extension as a PackageReference to your .wixproj:
+
+```
+<Project Sdk="WixToolset.Sdk/6.0.0">
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Iis.wixext" Version="6.0.0" />
+  </ItemGroup>
+</Project>
+```
+
+Then add the extension's namespace:
+
+```
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:iis="http://wixtoolset.org/schemas/v4/wxs/iis">
+
+  ..
+</Wix>
+```
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/ext/Iis/wixext/IIsCompiler.cs b/src/ext/Iis/wixext/IIsCompiler.cs
index 5e3c0a95..53160dcd 100644
--- a/src/ext/Iis/wixext/IIsCompiler.cs
+++ b/src/ext/Iis/wixext/IIsCompiler.cs
@@ -219,7 +219,7 @@ namespace WixToolset.Iis
                                         break;
                                     default:
                                         storeLocation = -1;
-                                        this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "StoreLocation", storeLocationValue, "currentUser", "localMachine"));
+                                        this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "StoreLocation", storeLocationValue, "currentUser", "localMachine", "services", "users", "userPolicy", "localMachinePolicy", "localMachineEnterprise"));
                                         break;
                                 }
                             }
diff --git a/src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj b/src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj
index 79c8dae7..72d32cfa 100644
--- a/src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj
+++ b/src/ext/Iis/wixext/WixToolset.Iis.wixext.csproj
@@ -7,6 +7,7 @@
     <RootNamespace>WixToolset.Iis</RootNamespace>
     <Description>WiX Toolset Iis Extension</Description>
     <Title>WiX Toolset Iis Extension</Title>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
@@ -16,6 +17,10 @@
     <EmbeddedResource Include="$(OutputPath)..\iis.wixlib" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\iis.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
diff --git a/src/ext/Msmq/README.md b/src/ext/Msmq/README.md
index fa3c277f..6ebd70e9 100644
--- a/src/ext/Msmq/README.md
+++ b/src/ext/Msmq/README.md
@@ -1,2 +1,52 @@
-# Msmq.wixext
-WixToolset.Msmq.wixext - MSMQ WiX Toolset Extension 
+# WixToolset.Msmq.wixext - MSMQ WiX Toolset Extension
+
+This WiX Extension provides support for configuring MSMQ.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Getting started
+
+Add the WiX Extension as a PackageReference to your .wixproj:
+
+```
+<Project Sdk="WixToolset.Sdk/6.0.0">
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Msmq.wixext" Version="6.0.0" />
+  </ItemGroup>
+</Project>
+```
+
+Then add the extension's namespace:
+
+```
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:msmq="http://wixtoolset.org/schemas/v4/wxs/msmq">
+
+  ..
+</Wix>
+```
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj b/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj
index ef369c2c..5aa81b74 100644
--- a/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj
+++ b/src/ext/Msmq/wixext/WixToolset.Msmq.wixext.csproj
@@ -7,6 +7,7 @@
     <RootNamespace>WixToolset.Msmq</RootNamespace>
     <Description>WiX Toolset MSMQ Extension</Description>
     <Title>WiX Toolset MSMQ Extension</Title>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
@@ -16,6 +17,10 @@
     <EmbeddedResource Include="$(OutputPath)..\msmq.wixlib" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\msmq.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
diff --git a/src/ext/NetFx/README.md b/src/ext/NetFx/README.md
index a31cfd1d..ace02de3 100644
--- a/src/ext/NetFx/README.md
+++ b/src/ext/NetFx/README.md
@@ -1,2 +1,52 @@
-# NetFx.wixext
-WixToolset.NetFx.wixext - .NET Framework WiX Toolset Extension 
+# WixToolset.NetFx.wixext - .NET Framework WiX Toolset Extension
+
+This WiX Extension provides support for configuring .NET Framework.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Getting started
+
+Add the WiX Extension as a PackageReference to your .wixproj:
+
+```
+<Project Sdk="WixToolset.Sdk/6.0.0">
+  <ItemGroup>
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="6.0.0" />
+  </ItemGroup>
+</Project>
+```
+
+Then add the extension's namespace:
+
+```
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:netfx="http://wixtoolset.org/schemas/v4/wxs/netfx">
+
+  ..
+</Wix>
+```
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj
index 67759ab3..2c63a42d 100644
--- a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj
+++ b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj
@@ -7,6 +7,7 @@
     <RootNamespace>WixToolset.Netfx</RootNamespace>
     <Description>WiX Toolset .NET extension</Description>
     <Title>WiX Toolset .NET extension</Title>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
@@ -16,6 +17,10 @@
     <EmbeddedResource Include="$(OutputPath)..\netfx.wixlib" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\netfx.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
diff --git a/src/ext/NetFx/wixlib/NetFx48.wxs b/src/ext/NetFx/wixlib/NetFx48.wxs
index a2aaf70f..14689829 100644
--- a/src/ext/NetFx/wixlib/NetFx48.wxs
+++ b/src/ext/NetFx/wixlib/NetFx48.wxs
@@ -52,7 +52,7 @@
 
     <PackageGroup Id="$(var.NetFx48RedistId)">
       <ExePackage CacheId="$(var.NetFx48RedistId)_ABDCA79AF9DD48A0EA702AD45260B3C03093FB4B" InstallArguments="/q /norestart /log &quot;[NetFx48RedistLog].html&quot;" PerMachine="yes" DetectCondition="!(wix.NetFx48RedistDetectCondition)" InstallCondition="!(wix.NetFx48RedistInstallCondition)" Id="$(var.NetFx48RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx48RedistLog" Cache="remove">
-        <ExePackagePayload Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe" DownloadUrl="$(var.NetFx48RedistLink)" ProductName="Microsoft .NET Framework 4.8" Description="Microsoft .NET Framework 4.8 Setup" CertificatePublicKey="F49F9B33E25E33CCA0BFB15A62B7C29FFAB3880B" CertificateThumbprint="C2048FB509F1C37A8C3E9EC6648118458AA01780" Size="121346568" Version="4.8.4115.0" />
+        <ExePackagePayload Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe" DownloadUrl="$(var.NetFx48RedistLink)" ProductName="Microsoft .NET Framework 4.8" Description="Microsoft .NET Framework 4.8 Setup" CertificatePublicKey="597A58F3E398F113D0B4305649AEB6DCAD457361" CertificateThumbprint="C2048FB509F1C37A8C3E9EC6648118458AA01780" Size="121346568" Version="4.8.4115.0" />
       </ExePackage>
     </PackageGroup>
   </Fragment>
diff --git a/src/ext/PowerShell/README.md b/src/ext/PowerShell/README.md
index 6de236f7..7ee2f5e2 100644
--- a/src/ext/PowerShell/README.md
+++ b/src/ext/PowerShell/README.md
@@ -1,2 +1,52 @@
-# PowerShell.wixext
-WixToolset.PowerShell.wixext - PowerShell WiX Toolset Extension 
+# WixToolset.PowerShell.wixext - PowerShell WiX Toolset Extension
+
+This WiX Extension provides support for configuring PowerShell.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Getting started
+
+Add the WiX Extension as a PackageReference to your .wixproj:
+
+```
+<Project Sdk="WixToolset.Sdk/6.0.0">
+  <ItemGroup>
+    <PackageReference Include="WixToolset.PowerShell.wixext" Version="6.0.0" />
+  </ItemGroup>
+</Project>
+```
+
+Then add the extension's namespace:
+
+```
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:ps="http://wixtoolset.org/schemas/v4/wxs/powershell">
+
+  ..
+</Wix>
+```
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj b/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj
index 812915a8..93ac837c 100644
--- a/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj
+++ b/src/ext/PowerShell/wixext/WixToolset.PowerShell.wixext.csproj
@@ -7,6 +7,7 @@
     <RootNamespace>WixToolset.PowerShell</RootNamespace>
     <Description>WiX Toolset PowerShell Extension</Description>
     <Title>WiX Toolset PowerShell Extension</Title>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
@@ -16,6 +17,10 @@
     <EmbeddedResource Include="$(OutputPath)..\powershell.wixlib" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\powershell.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
diff --git a/src/ext/Sql/README.md b/src/ext/Sql/README.md
index 377c9032..adc543c8 100644
--- a/src/ext/Sql/README.md
+++ b/src/ext/Sql/README.md
@@ -1,2 +1,52 @@
-# Sql.wixext
-WixToolset.Sql.wixext - Sql WiX Toolset Extension 
+# WixToolset.Sql.wixext - Sql WiX Toolset Extension
+
+This WiX Extension provides support for configuring SQL Server.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Getting started
+
+Add the WiX Extension as a PackageReference to your .wixproj:
+
+```
+<Project Sdk="WixToolset.Sdk/6.0.0">
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Sql.wixext" Version="6.0.0" />
+  </ItemGroup>
+</Project>
+```
+
+Then add the extension's namespace:
+
+```
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:sql="http://wixtoolset.org/schemas/v4/wxs/sql">
+
+  ..
+</Wix>
+```
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj b/src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj
index 28a66297..32386b79 100644
--- a/src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj
+++ b/src/ext/Sql/wixext/WixToolset.Sql.wixext.csproj
@@ -7,6 +7,7 @@
     <RootNamespace>WixToolset.Sql</RootNamespace>
     <Description>WiX Toolset Sql Extension</Description>
     <Title>WiX Toolset Sql Extension</Title>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
@@ -16,6 +17,10 @@
     <EmbeddedResource Include="$(OutputPath)..\sql.wixlib" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\sql.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
diff --git a/src/ext/UI/README.md b/src/ext/UI/README.md
index ebfefedd..19d5ba0c 100644
--- a/src/ext/UI/README.md
+++ b/src/ext/UI/README.md
@@ -1,2 +1,52 @@
-# UI.wixext
-WixToolset.UI.wixext - UI WiX Toolset Extension 
+# WixToolset.UI.wixext - UI WiX Toolset Extension
+
+This WiX Extension provides support for standard internal MSI UI.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Getting started
+
+Add the WiX Extension as a PackageReference to your .wixproj:
+
+```
+<Project Sdk="WixToolset.Sdk/6.0.0">
+  <ItemGroup>
+    <PackageReference Include="WixToolset.UI.wixext" Version="6.0.0" />
+  </ItemGroup>
+</Project>
+```
+
+Then add the extension's namespace:
+
+```
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
+
+  ..
+</Wix>
+```
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
index e06feac7..ae3a49be 100644
--- a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
+++ b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
@@ -109,7 +109,7 @@ namespace WixToolsetTest.UI
             var bindFolder = TestData.Get(@"TestData", "data");
             var build = new Builder(folder, typeof(UIExtensionFactory), new[] { bindFolder });
 
-            var results = build.BuildAndQuery(BuildX64, "Binary", "Dialog", "CustomAction", "ControlEvent", "InstallUISequence");
+            var results = build.BuildAndQuery(Build, validate: true, "Binary", "Dialog", "CustomAction", "ControlEvent", "InstallUISequence");
             WixAssert.Single(results, result => result.StartsWith("Dialog:WelcomeDlg\t"));
             WixAssert.Single(results, result => result.StartsWith("Dialog:CustomizeDlg\t"));
             WixAssert.Empty(results.Where(result => result.StartsWith("Dialog:SetupTypeDlg\t")));
diff --git a/src/ext/UI/wixext/WixToolset.UI.wixext.csproj b/src/ext/UI/wixext/WixToolset.UI.wixext.csproj
index 288b4a85..1ba64a5a 100644
--- a/src/ext/UI/wixext/WixToolset.UI.wixext.csproj
+++ b/src/ext/UI/wixext/WixToolset.UI.wixext.csproj
@@ -7,6 +7,7 @@
     <RootNamespace>WixToolset.UI</RootNamespace>
     <Description>WiX Toolset UI Extension</Description>
     <Title>WiX Toolset UI Extension</Title>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
@@ -16,6 +17,10 @@
     <EmbeddedResource Include="$(OutputPath)..\ui.wixlib" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\ui.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
diff --git a/src/ext/UI/wixlib/WixUI_FeatureTree.wxs b/src/ext/UI/wixlib/WixUI_FeatureTree.wxs
index 5ec27445..a02ad28b 100644
--- a/src/ext/UI/wixlib/WixUI_FeatureTree.wxs
+++ b/src/ext/UI/wixlib/WixUI_FeatureTree.wxs
@@ -35,6 +35,8 @@ Patch dialog sequence:
 
             <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
 
+            <DialogRef Id="BrowseDlg" />
+            <DialogRef Id="DiskCostDlg" />
             <DialogRef Id="ErrorDlg" />
             <DialogRef Id="FatalError" />
             <DialogRef Id="FilesInUse" />
@@ -56,6 +58,9 @@ Patch dialog sequence:
             <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg" Order="2" Condition="NOT Installed" />
             <Publish Dialog="CustomizeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" />
 
+            <Publish Dialog="BrowseDlg" Control="OK" Event="SetTargetPath" Value="[_BrowseProperty]" Order="3" />
+            <Publish Dialog="BrowseDlg" Control="OK" Event="EndDialog" Value="Return" Order="4" />
+
             <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="CustomizeDlg" Order="1" Condition="NOT Installed OR WixUI_InstallMode = &quot;Change&quot;" />
             <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2" Condition="Installed AND NOT PATCH" />
             <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="3" Condition="Installed AND PATCH" />
diff --git a/src/ext/Util/README.md b/src/ext/Util/README.md
index 540c539c..11d7a363 100644
--- a/src/ext/Util/README.md
+++ b/src/ext/Util/README.md
@@ -1,3 +1,52 @@
-# Util.wixext
-WixToolset.Util.wixext - Utility WiX Toolset Extension 
+# WixToolset.Util.wixext - Utility WiX Toolset Extension
 
+This WiX Extension provides support for configuring various parts of Windows.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Getting started
+
+Add the WiX Extension as a PackageReference to your .wixproj:
+
+```
+<Project Sdk="WixToolset.Sdk/6.0.0">
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Util.wixext" Version="6.0.0" />
+  </ItemGroup>
+</Project>
+```
+
+Then add the extension's namespace:
+
+```
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+
+  ..
+</Wix>
+```
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/ext/Util/wixext/WixToolset.Util.wixext.csproj b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj
index a4fcaf14..2a2a2f6a 100644
--- a/src/ext/Util/wixext/WixToolset.Util.wixext.csproj
+++ b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj
@@ -7,6 +7,7 @@
     <RootNamespace>WixToolset.Util</RootNamespace>
     <Description>WiX Toolset Utility extension</Description>
     <Title>WiX Toolset Utility extension</Title>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
@@ -16,6 +17,10 @@
     <EmbeddedResource Include="$(OutputPath)..\util.wixlib" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\util.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
diff --git a/src/ext/VisualStudio/README.md b/src/ext/VisualStudio/README.md
index 76fbd4ce..a418d49b 100644
--- a/src/ext/VisualStudio/README.md
+++ b/src/ext/VisualStudio/README.md
@@ -1,2 +1,52 @@
-# VisualStudio.wixext
-WixToolset.VisualStudio.wixext - Visual Studio WiX Toolset Extension 
+# WixToolset.VisualStudio.wixext - Visual Studio WiX Toolset Extension
+
+This WiX Extension provides support for configuring Visual Studio.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Getting started
+
+Add the WiX Extension as a PackageReference to your .wixproj:
+
+```
+<Project Sdk="WixToolset.Sdk/6.0.0">
+  <ItemGroup>
+    <PackageReference Include="WixToolset.VisualStudio.wixext" Version="6.0.0" />
+  </ItemGroup>
+</Project>
+```
+
+Then add the extension's namespace:
+
+```
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:vs="http://wixtoolset.org/schemas/v4/wxs/vs">
+
+  ..
+</Wix>
+```
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj
index 0224c98c..eb410c35 100644
--- a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj
+++ b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.csproj
@@ -7,6 +7,7 @@
     <RootNamespace>WixToolset.VisualStudio</RootNamespace>
     <Description>WiX Toolset Visual Studio Extension</Description>
     <Title>WiX Toolset VS Extension</Title>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
@@ -16,6 +17,10 @@
     <EmbeddedResource Include="$(OutputPath)..\vs.wixlib" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
     <ProjectReference Include="..\wixlib\vs.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
   </ItemGroup>
diff --git a/src/libs/WixToolset.Versioning/README.md b/src/libs/WixToolset.Versioning/README.md
new file mode 100644
index 00000000..d24f1c5a
--- /dev/null
+++ b/src/libs/WixToolset.Versioning/README.md
@@ -0,0 +1,30 @@
+# WixToolset.Versioning - WiX Toolset Versioning library
+
+The `WixToolset.Versioning` package provides methods for handling the various version types supported in the WiX Toolset. Standard 4-part versions (#.#.#.#) are supported as is SemVer (#.#.#-pre.#) and tolerance for very unusual versions created by other installation technologies.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/libs/WixToolset.Versioning/WixToolset.Versioning.csproj b/src/libs/WixToolset.Versioning/WixToolset.Versioning.csproj
index 2c23f391..504e8a19 100644
--- a/src/libs/WixToolset.Versioning/WixToolset.Versioning.csproj
+++ b/src/libs/WixToolset.Versioning/WixToolset.Versioning.csproj
@@ -7,8 +7,13 @@
     <TargetFrameworks Condition=" '$(Configuration)'=='Release' ">$(TargetFrameworks);net472</TargetFrameworks>
     <LangVersion>7.3</LangVersion>
     <Description>WiX Toolset Versioning</Description>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <DebugType>embedded</DebugType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <CreateDocumentationFile>true</CreateDocumentationFile>
   </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
 </Project>
diff --git a/src/libs/dutil/README.md b/src/libs/dutil/README.md
index 2d6605fe..ffc0aacd 100644
--- a/src/libs/dutil/README.md
+++ b/src/libs/dutil/README.md
@@ -1,2 +1,30 @@
-# dutil
-dutil.lib - foundation library for all native code in WiX Toolset
+# WixToolset.DUtil (dutil.lib) - foundation library for all native code in WiX Toolset
+
+The `WixToolset.DUtil` package provides native code utility functions used throughout the WiX Toolset.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/libs/wcautil/README.md b/src/libs/wcautil/README.md
index aa004554..15c49400 100644
--- a/src/libs/wcautil/README.md
+++ b/src/libs/wcautil/README.md
@@ -1,2 +1,30 @@
-# wcautil
-wcautil.lib - WiX Toolset Custom Action native utility library
+# WixToolset.WcaUtil (wcautil.lib) - WiX Toolset Custom Action native utility library
+
+The `WixToolset.WcaUtil` package provides native code functions to aid the development of Custom Actions.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/setup/OSMFEULA.rtf b/src/setup/OSMFEULA.rtf
index e988b435..46dfbfca 100644
--- a/src/setup/OSMFEULA.rtf
+++ b/src/setup/OSMFEULA.rtf
diff --git a/src/test/burn/TestBA/TestBA.cs b/src/test/burn/TestBA/TestBA.cs
index 1556acd0..51fc1cbd 100644
--- a/src/test/burn/TestBA/TestBA.cs
+++ b/src/test/burn/TestBA/TestBA.cs
@@ -41,6 +41,8 @@ namespace WixToolset.Test.BA
         private int cancelOnProgressAtProgress;
         private int retryExecuteFilesInUse;
         private bool rollingBack;
+        private string forceDownloadSource;
+        private string forceUpdateSource;
 
         private IBootstrapperCommand Command { get; set; }
 
@@ -216,9 +218,28 @@ namespace WixToolset.Test.BA
             }
         }
 
+        protected override void OnDetectBegin(DetectBeginEventArgs args)
+        {
+            this.Log("OnDetectBegin");
+
+            this.forceUpdateSource = this.ReadPackageAction(null, "ForceUpdateSource");
+            if (!String.IsNullOrEmpty(this.forceUpdateSource))
+            {
+                this.Log("    OnDetectBegin::ForceUpdateSource: {0}", this.forceUpdateSource);
+            }
+
+        }
+
         protected override void OnDetectUpdateBegin(DetectUpdateBeginEventArgs args)
         {
             this.Log("OnDetectUpdateBegin");
+
+            if (!String.IsNullOrEmpty(this.forceUpdateSource))
+            {
+                this.Log("    OnDetectUpdateBegin::ForceUpdateSource: {0}", this.forceUpdateSource);
+                this.Engine.SetUpdateSource(this.forceUpdateSource, String.Empty);
+            }
+
             if (LaunchAction.UpdateReplaceEmbedded == this.action || LaunchAction.UpdateReplace == this.action)
             {
                 args.Skip = false;
@@ -375,6 +396,12 @@ namespace WixToolset.Test.BA
             {
                 this.Log("    CancelCacheAtProgress: {0}", this.cancelCacheAtProgress);
             }
+
+            this.forceDownloadSource = this.ReadPackageAction(args.PackageId, "ForceDownloadSource");
+            if (!String.IsNullOrEmpty(this.forceDownloadSource))
+            {
+                this.Log("    ForceDownloadSource: {0}", this.forceDownloadSource);
+            }
         }
 
         protected override void OnCachePackageNonVitalValidationFailure(CachePackageNonVitalValidationFailureEventArgs args)
@@ -387,6 +414,29 @@ namespace WixToolset.Test.BA
             this.Log("OnCachePackageNonVitalValidationFailure() - id: {0}, default: {1}, requested: {2}", args.PackageId, args.Recommendation, args.Action);
         }
 
+        protected override void OnCacheAcquireResolving(CacheAcquireResolvingEventArgs args)
+        {
+            if (!String.IsNullOrEmpty(this.forceDownloadSource))
+            {
+                args.Action = CacheResolveOperation.Download;
+                var url = String.Format(this.forceDownloadSource, args.PayloadId);
+
+                this.Log("OnCacheAcquireResolving: {0} => {1}", this.forceDownloadSource, url);
+
+                this.engine.SetDownloadSource(
+                    String.Empty,
+                    args.PayloadId,
+                    url,
+                    String.Empty,
+                    String.Empty,
+                    String.Empty);
+            }
+            else
+            {
+                this.Log("OnCacheAcquireResolving not forcing download");
+            }
+        }
+
         protected override void OnCacheAcquireProgress(CacheAcquireProgressEventArgs args)
         {
             this.Log("OnCacheAcquireProgress() - container/package: {0}, payload: {1}, progress: {2}, total: {3}, overall progress: {4}%", args.PackageOrContainerId, args.PayloadId, args.Progress, args.Total, args.OverallPercentage);
diff --git a/src/test/burn/TestData/FailureTests/BundleUpdate/Bundle.wxs b/src/test/burn/TestData/FailureTests/BundleUpdate/Bundle.wxs
new file mode 100644
index 00000000..0af817c1
--- /dev/null
+++ b/src/test/burn/TestData/FailureTests/BundleUpdate/Bundle.wxs
@@ -0,0 +1,31 @@
+<!-- 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. -->
+
+<?ifndef TestVersion?>
+<?define TestVersion = 1.0.0.0?>
+<?endif?>
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Bundle 
+    Name="~$(var.TestGroupName) - $(var.BundleName)" 
+    Version="$(var.TestVersion)" 
+    Id="WixToolset.Burn.SetUpdateSourceTest" 
+    Compressed="yes">
+    
+    <Update Location="updateurl" />
+    
+    <Log Prefix="~$(var.TestGroupName)_$(var.BundleName)" />
+
+    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
+
+    <Chain>
+      <PackageGroupRef Id="TestBA" />
+      <PackageGroupRef Id="BundlePackages" />
+    </Chain>
+  </Bundle>
+
+  <Fragment>
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/burn/TestData/FailureTests/BundleUpdate/BundleUpdate.wixproj b/src/test/burn/TestData/FailureTests/BundleUpdate/BundleUpdate.wixproj
new file mode 100644
index 00000000..34ab1aef
--- /dev/null
+++ b/src/test/burn/TestData/FailureTests/BundleUpdate/BundleUpdate.wixproj
@@ -0,0 +1,16 @@
+<!-- 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 Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <UpgradeCode>{C60B9483-CE87-4FDA-AE5A-B39A52E956E8}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageA\PackageA.wixproj" />
+    <ProjectReference Include="..\PackageB\PackageB.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
+    <PackageReference Include="WixToolset.NetFx.wixext" />
+  </ItemGroup>
+</Project>
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/FailureTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/FailureTests.cs
index bd3762ed..7d399df0 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/FailureTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/FailureTests.cs
@@ -2,7 +2,6 @@
 
 namespace WixToolsetTest.BurnE2E
 {
-    using System.Threading;
     using WixTestTools;
     using WixToolset.BootstrapperApplicationApi;
     using Xunit;
@@ -13,6 +12,42 @@ namespace WixToolsetTest.BurnE2E
         public FailureTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { }
 
         [RuntimeFact]
+        public void CanSetDownloadSourceAndForceDownload()
+        {
+            var packageA = this.CreatePackageInstaller("PackageA");
+            var bundleA = this.CreateBundleInstaller("BundleA");
+            var testBAController = this.CreateTestBAController();
+
+            testBAController.SetPackageForceDownloadSource("PackageA", "https://1e1bf2be1c384fd1a0c4c0500eef971b/downloads/payloads/{0}");
+
+            packageA.VerifyInstalled(false);
+
+            bundleA.VerifyUnregisteredAndRemovedFromPackageCache();
+
+            bundleA.Install(0x2ee7/*ERROR_INTERNET_NAME_NOT_RESOLVED*/);
+
+            packageA.VerifyInstalled(false);
+        }
+
+        [RuntimeFact]
+        public void CanSetUpdateSource()
+        {
+            var packageA = this.CreatePackageInstaller("PackageA");
+            var bundleA = this.CreateBundleInstaller("BundleUpdate");
+            var testBAController = this.CreateTestBAController();
+
+            testBAController.SetForceUpdateSource("https://1e1bf2be1c384fd1a0c4c0500eef971b/update_feed.atom.xml");
+
+            packageA.VerifyInstalled(false);
+
+            bundleA.VerifyUnregisteredAndRemovedFromPackageCache();
+
+            bundleA.Install();
+
+            packageA.VerifyInstalled(true);
+        }
+
+        [RuntimeFact]
         public void CanCancelExePackageAndAbandonIt()
         {
             var bundleD = this.CreateBundleInstaller("BundleD");
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/Utilities/TestBAController.cs b/src/test/burn/WixToolsetTest.BurnE2E/Utilities/TestBAController.cs
index a378545e..c344ebce 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/Utilities/TestBAController.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/Utilities/TestBAController.cs
@@ -67,6 +67,11 @@ namespace WixToolsetTest.BurnE2E
             this.SetBurnTestValue("QuitAfterDetect", value);
         }
 
+        public void SetForceUpdateSource(string url)
+        {
+            this.SetBurnTestValue("ForceUpdateSource", url);
+        }
+
         /// <summary>
         /// Slows the cache progress of a package.
         /// </summary>
@@ -108,6 +113,16 @@ namespace WixToolsetTest.BurnE2E
         }
 
         /// <summary>
+        /// Forces a download action and sets the download source.
+        /// </summary>
+        /// <param name="packageId">Package identity.</param>
+        /// <param name="actionName">The URL format string.</param>
+        public void SetPackageForceDownloadSource(string packageId, string url)
+        {
+            this.SetPackageState(packageId, "ForceDownloadSource", url);
+        }
+
+        /// <summary>
         /// Cancels the execute of a package at the next progess after the specified MSI action start.
         /// </summary>
         /// <param name="packageId">Package identity.</param>
diff --git a/src/tools/WixToolset.Heat/README.md b/src/tools/WixToolset.Heat/README.md
new file mode 100644
index 00000000..7858da67
--- /dev/null
+++ b/src/tools/WixToolset.Heat/README.md
@@ -0,0 +1,30 @@
+# WixToolset.Heat - old harvesting tool from WiX v3
+
+The `WixToolset.Heat` package provides the (now deprecated) harvesting tools originally designed for WiX v3. The bulk of the functionality provided by this package has been eclipsed by the `Files` element. It is recommended to migrate to that new functionality or a custom solution.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/tools/WixToolset.Heat/WixToolset.Heat.nuspec b/src/tools/WixToolset.Heat/WixToolset.Heat.nuspec
index 48e94797..f01faa04 100644
--- a/src/tools/WixToolset.Heat/WixToolset.Heat.nuspec
+++ b/src/tools/WixToolset.Heat/WixToolset.Heat.nuspec
@@ -7,6 +7,7 @@
     <description>$description$</description>
     <authors>$authors$</authors>
     <icon>icon.png</icon>
+    <readme>README.md</readme>
     <license type="file">OSMFEULA.txt</license>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <tags>$packageTags$</tags>
@@ -18,6 +19,7 @@
   <files>
     <file src="$eulaTxt$" />
     <file src="$iconPng$" />
+    <file src="$projectFolder$\README.md" />
     <file src="$projectFolder$\$id$.targets" target="build" />
     <file src="tools\**\*" target="tools" />
   </files>
diff --git a/src/wix/WixToolset.Sdk/README.md b/src/wix/WixToolset.Sdk/README.md
index 6b139d9c..bf93e84b 100644
--- a/src/wix/WixToolset.Sdk/README.md
+++ b/src/wix/WixToolset.Sdk/README.md
@@ -1,12 +1,59 @@
 # WixToolset.Sdk
 
-The `WixToolset.Sdk` package provides the WiX Toolset as an MSBuild SDK for both .NET (v6 or later) and .NET Framework (v4.7.2 or later). SDK-style projects have smart defaults that make for simple .wixproj project authoring. For example, here's a minimal .wixproj that builds an MSI from the .wxs source files in the project directory:
+The `WixToolset.Sdk` package provides the WiX Toolset as an MSBuild SDK for both .NET (v6 or later) and .NET Framework (v4.7.2 or later). SDK-style projects have smart defaults that make for simple .wixproj project authoring.
 
-```xml
-<Project Sdk="WixToolset.Sdk/5.0.0">
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Getting started
+
+Here's a minimal .wixproj that builds an MSI from the .wxs source files in the project directory:
+
+Example project file: `QuickStart.wixproj`
+```
+<Project Sdk="WixToolset.Sdk/6.0.0">
 </Project>
 ```
 
-For more information about WiX as an MSBuild SDK, see https://wixtoolset.org/docs/intro/#msbuild.
+Example source code: `QuickStart.wxs`
+```
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Id="AcmeCorp.QuickStart" Name="QuickStart Example" Manufacturer="ACME Corp" Version="0.0.1">
+    <File Source="example.txt" />
+  </Package>
+</Wix>
+```
+
+Build your MSI from the command-line:
+```
+dotnet build
+```
+
+For more information about WiX as an MSBuild SDK, see https://docs.firegiant.com/wix/using-wix/#msbuild-and-dotnet-build.
+
+For more information about WiX targets, properties, and items, see https://docs.firegiant.com/wix/tools/msbuild/.
+
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
 
-For more information about WiX targets, properties, and items, see https://wixtoolset.org/docs/tools/msbuild/.
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/wix/pack-wix/README.md b/src/wix/pack-wix/README.md
index 95ac7c82..8b03dd48 100644
--- a/src/wix/pack-wix/README.md
+++ b/src/wix/pack-wix/README.md
@@ -1,7 +1,72 @@
-# wix
+# wix - the WiX Toolset from the command-line
 
-The `wix` package provides the WiX Toolset as a .NET Tool, perfect for your command-line packaging pleasure. Version 6 or later of the .NET SDK is required.
+The `wix` package provides the WiX Toolset as a .NET Tool, perfect for your command-line packaging pleasure (even if we recommend using the [WixToolset.Sdk][sdk]).
 
-To install WiX as a .NET tool or upgrade to a later version, see https://wixtoolset.org/docs/intro/#nettool.
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
 
-To read about available commands and switches, see https://wixtoolset.org/docs/tools/wixexe/.
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Before we begin
+
+For most users, we recommend using the [WixToolset.Sdk][sdk] to build your installation packages instead of this command-line tool. The Sdk provides a better development experience than the command-line, especially as your project grows. The following is a quick example.
+
+Example project file: `QuickStart.wixproj`
+```
+<Project Sdk="WixToolset.Sdk/6.0.0">
+</Project>
+```
+
+Example source code: `QuickStart.wxs`
+```
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Id="AcmeCorp.QuickStart" Name="QuickStart Example" Manufacturer="ACME Corp" Version="0.0.1">
+    <File Source="example.txt" />
+  </Package>
+</Wix>
+```
+
+Build your MSI from the command-line:
+```
+dotnet build
+```
+
+
+## Getting started
+
+If you still decide to use this command-line tool instead of the [WixToolset.Sdk][sdk], install the latest version with:
+
+```
+dotnet tool install --global wix
+```
+
+Verify it was successfully installed with:
+
+```
+wix --version
+```
+
+For more information, see https://docs.firegiant.com/wix/using-wix/#command-line-net-tool. To read about available commands and switches, see https://docs.firegiant.com/wix/tools/wixexe/.
+
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/xsd/iis.xsd b/src/xsd/iis.xsd
index b43bff42..4bc59cf2 100644
--- a/src/xsd/iis.xsd
+++ b/src/xsd/iis.xsd
@@ -685,10 +685,21 @@
         </xs:simpleType>
       </xs:attribute>
       <xs:attribute name="StoreLocation" use="required">
+        <xs:annotation>
+          <xs:documentation>
+              This attribute controls which Certificate Store Location will be used for the Certificate.
+              See <a href="https://learn.microsoft.com/en-us/windows/win32/seccrypto/system-store-locations" target="_blank">MSDN documentation</a> for more information.
+          </xs:documentation>
+        </xs:annotation>
         <xs:simpleType>
           <xs:restriction base="xs:string">
             <xs:enumeration value="currentUser"/>
             <xs:enumeration value="localMachine"/>
+            <xs:enumeration value="services"/>
+            <xs:enumeration value="users"/>
+            <xs:enumeration value="userPolicy"/>
+            <xs:enumeration value="localMachinePolicy"/>
+            <xs:enumeration value="localMachineEnterprise"/>
           </xs:restriction>
         </xs:simpleType>
       </xs:attribute>
diff --git a/src/xsd/util.xsd b/src/xsd/util.xsd
index 1b649f48..c0a9e44a 100644
--- a/src/xsd/util.xsd
+++ b/src/xsd/util.xsd
@@ -701,19 +701,18 @@
 
   <xs:element name="Group">
     <xs:annotation>
+      <xs:documentation>Group for all kinds of (usergroup) things.  When it is not nested under a component it is included in the MSI so it can be referenced by other elements such as the GroupRef element under a User element (to add the User to the Group).  When it is nested under a Component element, the Group will be created on install and can also be used for reference.</xs:documentation>
       <xs:appinfo>
+        <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Component" />
         <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Fragment" />
         <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Module" />
         <xse:parent namespace="http://wixtoolset.org/schemas/v4/wxs" ref="Package" />
+        <xse:seeAlso ref="GroupRef" />
       </xs:appinfo>
-      <xs:documentation>
-        Finds user groups on the local machine or specified Active Directory domain. The local machine will be
-        searched for the group first then fallback to looking in Active Directory. This element is not capable
-        of creating new groups but can be used to add new or existing users to an existing group.
-      </xs:documentation>
     </xs:annotation>
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="GroupRef" minOccurs="0" maxOccurs="unbounded" />
         <xs:any namespace="##other" processContents="lax">
           <xs:annotation>
             <xs:documentation>
@@ -730,7 +729,7 @@
       </xs:attribute>
       <xs:attribute name="Name" type="xs:string" use="required">
         <xs:annotation>
-          <xs:documentation>A [Formatted](https://learn.microsoft.com/en-us/windows/win32/msi/formatted) string that contains the name of the group to be found.</xs:documentation>
+          <xs:documentation>A [Formatted](https://learn.microsoft.com/en-us/windows/win32/msi/formatted) string that contains the name of the group.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="Domain" type="xs:string">
@@ -738,6 +737,41 @@
           <xs:documentation>An optional [Formatted](https://learn.microsoft.com/en-us/windows/win32/msi/formatted) string that specifies the domain for the group.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
+      <xs:attribute name="RemoveOnUninstall" type="wxs:YesNoTypeUnion">
+        <xs:annotation>
+          <xs:documentation>Indicates whether the group should be removed or left behind on uninstall.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="FailIfExists" type="wxs:YesNoTypeUnion">
+        <xs:annotation>
+          <xs:documentation>Indicates if the install should fail if the group already exists.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="UpdateIfExists" type="wxs:YesNoTypeUnion">
+        <xs:annotation>
+          <xs:documentation>Indicates if the group properties should be updated if the group already exists.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="CreateGroup" type="wxs:YesNoTypeUnion">
+        <xs:annotation>
+          <xs:documentation>Indicates whether or not to create the group.  Group creation can be skipped if all that is desired is to add group memberships.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="Vital" type="wxs:YesNoTypeUnion">
+        <xs:annotation>
+          <xs:documentation>Indicates whether failure to create the group or add the group to another group fails the installation. The default value is "yes".</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="Comment" type="xs:string">
+        <xs:annotation>
+            <xs:documentation>Optional comment to set on the group.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="RemoveComment" type="wxs:YesNoTypeUnion">
+        <xs:annotation>
+          <xs:documentation>Indicates whether remove the comment from the group. The default value is "no".</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
       <xs:anyAttribute namespace="##other" processContents="lax">
         <xs:annotation>
           <xs:documentation>
@@ -751,7 +785,7 @@
 
   <xs:element name="GroupRef">
     <xs:annotation>
-      <xs:documentation>Used to join a user to a group</xs:documentation>
+      <xs:documentation>Used to join a user / group to a group</xs:documentation>
     </xs:annotation>
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -1853,12 +1887,12 @@
       <xs:attribute name="Id" type="xs:string" />
       <xs:attribute name="Name" type="xs:string" use="required">
         <xs:annotation>
-          <xs:documentation>A [Formatted])(https://learn.microsoft.com/en-us/windows/win32/msi/formatted) string that contains the name of the user account.</xs:documentation>
+          <xs:documentation>A [Formatted](https://learn.microsoft.com/en-us/windows/win32/msi/formatted) string that contains the name of the user account.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="Domain" type="xs:string">
         <xs:annotation>
-          <xs:documentation>A [Formatted])(https://learn.microsoft.com/en-us/windows/win32/msi/formatted) string that contains the local machine or Active Directory domain for the user.</xs:documentation>
+          <xs:documentation>A [Formatted](https://learn.microsoft.com/en-us/windows/win32/msi/formatted) string that contains the local machine or Active Directory domain for the user.</xs:documentation>
         </xs:annotation>
       </xs:attribute>
       <xs:attribute name="Password" type="xs:string">
diff --git a/src/xsd/wix.xsd b/src/xsd/wix.xsd
index 4816ae8c..8cf81048 100644
--- a/src/xsd/wix.xsd
+++ b/src/xsd/wix.xsd
@@ -187,7 +187,7 @@
       <xs:attribute name="Id" type="xs:string">
         <xs:annotation>
           <xs:documentation>
-            _New in WiX v6: WiX v6 adds this attribute to the `Package` element._
+            _New in WiX v6: WiX v6 adds this attribute to the `Bundle` element._
             A globally unique identiifer for the bundle in the world. It is recommended to use a prefix such as "CompanyName." to
             create a namespace of sorts. By default, higher versioned upgrade lower versioned bundles with the same Id. Use this
             attribute instead of the UpgradeCode attribute in new development.
@@ -2341,7 +2341,14 @@
           </xs:annotation>
         </xs:any>
       </xs:choice>
-      <xs:attribute name="Id" type="Guid" use="required">
+      <xs:attribute name="Id" type="Guid">
+        <xs:annotation>
+          <xs:appinfo>
+            <xse:deprecated ref="Code" />
+          </xs:appinfo>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="Code" type="Guid" use="required">
         <xs:annotation>
           <xs:documentation>The identifier of the RelatedBundle group.</xs:documentation>
         </xs:annotation>