feat: applied patch

Bram Driesenrequested to merge
issue/poll-3082110:3082110-2x into 2.0.x

Closes #3082110

Merge request reports