Merge pull request #14249 from yashodha/959_dev