merge connectivity module from master branch