Merge pull request #21564 from lcdservices/dev-core-2850