Merge "ion: Update ion header"