-- added comments CRM-12233