CRM-12261
CRM-12254
Merge pull request #297 from dlobo/CRM-12254

CRM-12254