Merge pull request #2691 from wpaulino/refactor-channel-state