Merge branch 'sb/rebase-summary'