Make DLL use correct configuration
Merge