ITTE-1218 Started work on client disconnect