Merge pull request #4382 from rohankatkar/CRM-15458