GCP-7000 Fixes on QFAG and H2H Headers