Merge "Replace callId with Connection instance" into main