(ITS#7125) Misplaced connection_done() calls