Merge pull request #5759 from rohankatkar/CRM-16438