Merge pull request #5744 from davejenx/CRM-16427