B-49477 header identity config changes