Merge pull request #18115 from sunilpawar/dev_1943