Merge "Close leaking FD." into sc-dev