Merge "ion: isolate msm-specific ion extensions"