first commit on CustomConnection fork