Merge HY to XinL

Merge HY to XinL