re-instate DS connect behavior

-closes #2675 
-closes #2663 
-closes #2677