Merge branch 'pw/prompt-cherry-pick-revert-fix'