Merge "Let the connectivity module see the shims"