Merge pull request #4546 from rohankatkar/CRM-15514