Merge pull request #2107 from mgbdev/CRM-13811