#4137 Consolidating projects/dlls