Merge branch 'mn/sideband-no-ansi' into maint