Merge "Modify ion header"