Partially solved regression introduced in last commit. Still needs a workaround
for supporting external dll