Merge pull request
Merge branch 'coret-master'