Merge pull request #6983 from yashodha/CRM-17354