Merge branch 'master' into channel_list_mutex