Merge branch 'lf/recv-sideband-cleanup' into maint