Merge branch 'rr/prompt-revert-head'