CRM-12202

check comments in commit