Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev