Connection dev 5 0

Same as gh-1838 on dev_5_0
To test PR, follow steps of the connection scenario.