Merge recent changes through WiX v3.9.526.0