merge test from windows client