[508669] Fix CS regeneration
30 files changed