Merge "Move Connection off of RefBase" into udc-dev