Merge branch 'sb/maint-rebase' into maint