Merge pull request #11557 from JKingsnorth/CRM-21683