Windows first commit not for linux branch.
Merge branch 'dev_linux' into dev_win32