Merge pull request #6661 from yashodha/CRM-17132