Merge "Ensure created fd being closed"