Merge pull request #2 from ding2tal/core-pr-3

Core pr 3
Merge branch 'master' into release
Merge branch 'release' into development
Merge remote-tracking branch 'origin' into release
Merge remote-tracking branch 'ding2tal/release' into ding2-master
Merge branch 'ding2-master' into develop