Merge branch 'remove-no-fd-set' into 'master'