towards CRM-15555 add comments