Merge branch 'fs-file-descriptor-optimization'