Merge remote-tracking branch 'upstream/user' into user
Add custom edit compound
Add custom edit compound
Merge pull request #521 from liuchuangww/user

User