Merge pull request #3426 from softins/client-side-channels

Manage client-side channels locally, own channel always 0

Author: softins