MBS-5566: break out edit vote-tally into its own macro