Extra changes for str_case_ops