Merge pull request #7042 from monishdeb/CRM-17434