e76fc0a577
Motivation: I did not correctly adjust the code before cherry-pick, causing a compilation error in the test Modifications: Use ChannelHandler Result: No more compilation error