Merge branch 'ma/windows-dynload-fix'