Merge pull request #6467 from vijayanandnandam/master