Merge branch 'kb/avoid-fchmod-for-now'