cherry-pick-votes: Update with proposals of latest blead changes