Merge "Fix the scripts to generate ucfirst overriddes"