Merge "Many more function case mismatches"