[DEV-282] Fix segfault when closing a server
Merge branch 'master' into uds