Merge branch 'hn/highlight-sideband-keywords'