Merge "Fix SO healthcheck on multi-node cluster"