CRM-12108 fix merge of intermediary commit