Merge pull request #5820 from GinkgoFJG/CRM-16497