Merge branch 'kw/rebase-progress'