bugfix: delete local channel
Merge branch 'master' into dev