Merge pull request #18235 from pradpnayak/dev-1946