Fix the list containing closed connection so testDisconnect waits forever
Merge branch 'refs/heads/ImageServer' into dev
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev