Merge pull request #5667 from JKingsnorth/CRM-16328