This issue is tracking the cherry-picking of #8402.
The contents of this patch were necessary on preparation for implementing the solution for vote extension propagation (upcoming PR)