Check if waiting for Reeti server socket
Revert "Check if waiting for Reeti server socket"

This reverts commit 312f787487c07b83ce0b9fadfb1c952b9d8d486a.
Revert "Revert "Check if waiting for Reeti server socket""

This reverts commit f4cdb0120d747223d3ed5b98ef7328655208cd56.
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop' into socketreset