Merge pull request #1899 from dlobo/CRM-13697