[[ MERG-6.7 ]] Fixes Windows' issues