Merge pull request #1 from ding2tal/core-pr-4

Core pr 4
Merge branch 'master' into development
Merge remote-tracking branch 'origin' into release