CRM-14684 add comments