Merge branch 'jx/sideband-cleanup'