fixed some issues for windows, but still has problems in the "concat" step
Authored by: ingo 2021-04-30
Parent: [r9]
Child: [r11]
