Patch for cesm_1_2_1