Reapply "Merge pull request #1580 from YJSoft/patch-1"
Reapply "Merge pull request #1580 from YJSoft/patch-1"

This reverts commit 9e55447045c9e11a827ccaf1fe95b72a0713ed2b.

xetown/xe-core,xetown/xe-core,xetown/xe-core