Merge pull request #24164 from herbdool/core-3783