CRM-11823 - D7 - Comment