Merge pull request #3493 from jimyhuang/CRM-14817