Merge branch 'lf/sideband-returns-void'