Merge branch 'jx/sideband-chomp-newline-fix' into maint-2.43