backport connectivity check strings

@DeepDiver1975 @MorrisJobke