Remember to disconnect clients
Merge branch 'iss_233' into dev