Merge branch 'lf/sideband-returns-void' into maint