Improvement for poll fix
Merge branch 'tmp2'