Merge pull request #31445 from IlanZuckerman/fix-OCPBUGS-98719-retry-voting-members