CRM-11915 code comments