updating channel maker
Merge remote-tracking branch 'origin/diffquery3' into diffquery