CRM-12924, add missing files for PR #41