[control] fix crash on exit
[server] end the question thread on close
Merge branch 'master' into final