CRM-13981, generated data fixes and reverted bad commit