merge xenonHD changes
add msm_ion