CRM-12212
CRM-12212
Merge pull request #256 from dlobo/CRM-12212

CRM-12122
worked on CRM-12216, shortened field label
Merge pull request #259 from kurund/CRM-12216

worked on CRM-12216, shortened field label