Lower poll time to 6 seconds
Merge branch 'hotfix/0.4.4'