Re #8365 Fix win build. Remove DLL macros.
Merge branch 'feature/8365_ILL_D2B' into develop