Merge pull request #16724 from kartik1000/core-1599