Merge "Add opportunity to directly update headers"