Merge pull request #5015 from rohankatkar/CRM-15853