Fixed scoping issue causing poll delay to stay at 200 ms.
Merge branch 'release-3.3' into task_progress

this merge is necessary,
Ik ben echt dom... return result