Merge pull request #2699 from mhrheaume/mhr/temporary_channel_id