Merge pull request #7998 from josephlacey/CRM-18188