CRM-13838: Edits by dlobo--tested and approved.