stable commit with pending tests workign on Windows