improve performance by only polling used headerfields
Merge branch 'master' into jupis