CRM-12964, fixes for generated data
Merge pull request #1121 from kurund/CRM-12964

CRM-12964, fixes for generated data