Merge pull request #17147 from kartik1000/Fix#1650