Merge "arch-specific diff of header"