Merge branch 'setxattr-dos-mode' into v3-2-test