Merge branch 'sg/rebase-progress'