Merge branch 'np/maint-sideband-favor-status'