Merge "Allow connecting with no requests if we're already connected." into oc-mr1-dev