Fix for #8654
Merge branch 'master' of https://github.com/requist/core