Port the safe current-turn replay from #4622 onto current main. Co-authored-by: Kinso <kinsolee@users.noreply.github.com>