Look for post-constructor conflicts
Merge branch 'topics/polling'