Merge pull request #15321 from yashodha/dev_1065