Merge pull request #5956 from rohankatkar/CRM-16451