[Sub-issue of #9053]

Estimation: 7 days

This is the bulk of the "synchronization" between the old implementation of PrepareProposal and the new one (i.e., the one matching the spec).
We are also including here further changes to PrepareProposal that were committed as separate PRs in the original implementation.