Merge pull request #7574 from JKingsnorth/CRM-17803