Changes for the username channel query lookup
Merge remote-tracking branch 'origin/master'
From after merge