Fix to core
Merge branch 'hotfix/1.1.14'