Merge branch 'rr/prompt-rebase-breakage-fix'