Merge pull request #18843 from bluehorndigital/dev/core-2140