Merge pull request #4845 from vijayanandnandam/master