Connection dev 5 0

Same as gh-1838 
To test: 
 * Follow the steps of the connection scenario