HH-40589 fail-proof headers decoding
Merge remote branch 'origin/HH-40589' into release-candidate
release 2.0.0+hh18