Merge pull request #2912 from jkczyz/2024-02-prefer-more-connections