Merge "Make sideband stream handle validation configurable" into main