Merge "Update ion header" into jb-mr1-dev