Also, fix existing tests regarding connectivity action. Fixes: ce9619047c (cherry picked from commit 6dec8ea9f3)
ce9619047c
6dec8ea9f3