Merge iic modifiy by xiangfu