Merge pull request #10344 from GinkgoFJG/CRM-12059