Merge branch 'nd/clean-preserve-errno-in-warning'