SLIDER-639 workarounds for windows
Merge branch 'feature/SLIDER-622-windows' into develop