Merge pull request #5791 from monishdeb/CRM-16338