Add probe support for 'headers'
Merge remote-tracking branch 'origin/master'