Merge pull request #6449 from monishdeb/master