Merge pull request #2776 from jkczyz/2023-12-direct-connect-follow-ups