Resolve #123916 "For 4x"

Joseph Olstadrequested to merge
issue/votingapi-123916:123916-for-4x into 4.0.x

Closes #123916

Merge request reports