Merge pull request #7871 from monishdeb/master