Merge "Proper duping / closing of FileDescriptors" into sc-dev