Merge pull request #11691 from JKingsnorth/CRM-21773