André Andreassa

I edited the PR body in #1057, which should make this obsolete in favor of #1084.

Updating branch to see the issue. I can probably take this one if I have time in the upcoming next weeks (related to my other polling harness PR)