Merge pull request #6405 from JKingsnorth/CRM-16959