Reintegrate header branch