Merge pull request #4650 from yashodha/CRM-15627