Added handling for the case where headers are announced over more than one message. refs #12453 Github-Pull: #13192 Rebased-From: 12d1b77f7eb2ca274890d9fb45d6c19a40ba8f74