Merge HY with Xin #2

Merge HY with Xin #2 An