Revert "General communication enhancement"

This reverts commit 8e60dd3a2e18f3d28e0b01b8f1e77d317dc101f4.
Revert "Revert "General communication enhancement""

This reverts commit 095be5ac055c5bdb8e42d670bfbcf9714e420943.
Revert "Revert "Revert "General communication enhancement"""

This reverts commit ef941c0d1b616c31c9bf5af2eb3fcbd02d9a3b32.