Merge branch 'yan12125-IE_Xuite'