Fix merge
Imported 'external-channels' content from docness to writing/what-not.