Merge pull request #5572 from monishdeb/4.6