Re #8635. Hopefully fixing broken windoze build.
Merge branch 'feature/8635_kernel_strings' into develop