Merge pull request #14052 from yashodha/dev-876