polling unit tests ergänzt
Merged 'dev'.
Finish polling