Merge pull request #11388 from MegaphoneJon/CRM-21531