Improve diagnostics win Win/Web test
Merge branch 'master40'