merged from windows