Additional except for Windows
Merge branch 'hotfix/issue319_v2'