Merge pull request #13776 from lcdservices/dev-core-644