CRM-12183
CRM-12185
Merge pull request #230 from dlobo/CRM-12185

CRM-12185
Merge pull request #229 from dlobo/CRM-12183

CRM-12183