XD-1064,XD-1066 merged Andy Cs ChannelNode changes