Merge branch 'channel_list_mutex'