remove IModel.ChannelFlow
merge bug25962 into default