Merge from 1.3.x#363

ligangty merged 4 commits intoCommonjava:mainCommonjava/charon:mainfrom

ligangty:mainligangty/charon:mainCopy head branch name to clipboard