Description of the Issue

x64 Installer contains x64 component for no reason

Steps to Reproduce the Issue

1. Open EXE installer with 7Zip
2. Review the content
3. See the x86 component that should not there as it is a x64 version

Expected Behavior

No x86 Shell DLL in x64 installer. Same for x86 installer that should not contain both DLLs with the SAME name. If you need both, name at least the x64 as x64 in the name, please.

Actual Behavior

Setup cannot easily extracted to build the MSI setup.