Merge pull request #4764 from rohankatkar/CRM-15615