Merge remote-tracking branch 't-b/sideband-bug'