Merge pull request #9765 from monishdeb/CRM-19938