CONN-53 subtask CONN-145: code complete.