官方表达式存储模式改成CDATA
Merge remote-tracking branch 'origin/master' into emap-develop