Merge branch 'refs/heads/t/fchdir-warning-fix'