added connectivity back
Merge origin/InDev into InDev
added connectivity back