Merge branch 'pw/rebase-progress-test-cleanup'