Merge branch 'refs/heads/t/clean_server_exit'