Merge pull request #3103 from adamwight/CRM-14473