Merge branch 'zk/prompt-rebase-step'